topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(Headless) Fix model list auth checking (#883)

Browse Source 
* (improvement)(Headless) Fix model list auth check

* (improvement)(Headless) Fix row permission

---------

Co-authored-by: jolunoluo
This commit is contained in:
LXW
2024-04-03 20:36:49 +08:00
committed by GitHub
parent ff56fd1e46
commit 6b60bfe6bc
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
View File

@@ -306,11 +306,16 @@ public class ModelServiceImpl implements ModelService {
List<Long> domainIds = domainService.getDomainAuthSet(user, authType) List<Long> domainIds = domainService.getDomainAuthSet(user, authType)
.stream().map(DomainResp::getId) .stream().map(DomainResp::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
if (domainIds.contains(domainId)) { if (CollectionUtils.isEmpty(domainIds)) {
domainIds = Lists.newArrayList(domainId);
} else {
return Lists.newArrayList(); return Lists.newArrayList();
} }
if (domainId != null) {
if (domainIds.contains(domainId)) {
domainIds = Lists.newArrayList(domainId);
} else {
return Lists.newArrayList();
}
}
ModelFilter modelFilter = new ModelFilter(); ModelFilter modelFilter = new ModelFilter();
modelFilter.setIncludesDetail(false); modelFilter.setIncludesDetail(false);
modelFilter.setDomainIds(domainIds); modelFilter.setDomainIds(domainIds);

6
launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java
View File

@@ -39,7 +39,7 @@ public class SchemaAuthTest extends BaseTest {
@Test @Test
public void test_getModelList_alice() { public void test_getModelList_alice() {
User user = DataUtils.getUserAlice(); User user = DataUtils.getUserAlice();
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, 0L, AuthType.ADMIN); List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.ADMIN);
List<Long> expectedModelIds = Lists.newArrayList(1L, 4L); List<Long> expectedModelIds = Lists.newArrayList(1L, 4L);
Assertions.assertEquals(expectedModelIds, Assertions.assertEquals(expectedModelIds,
modelResps.stream().map(ModelResp::getId).collect(Collectors.toList())); modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()));
@@ -48,7 +48,7 @@ public class SchemaAuthTest extends BaseTest {
@Test @Test
public void test_getVisibleModelList_alice() { public void test_getVisibleModelList_alice() {
User user = DataUtils.getUserAlice(); User user = DataUtils.getUserAlice();
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, 0L, AuthType.VISIBLE); List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.VISIBLE);
List<Long> expectedModelIds = Lists.newArrayList(1L, 4L); List<Long> expectedModelIds = Lists.newArrayList(1L, 4L);
Assertions.assertEquals(expectedModelIds, Assertions.assertEquals(expectedModelIds,
modelResps.stream().map(ModelResp::getId).collect(Collectors.toList())); modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()));
@@ -75,7 +75,7 @@ public class SchemaAuthTest extends BaseTest {
@Test @Test
public void test_getModelList_jack() { public void test_getModelList_jack() {
User user = DataUtils.getUserJack(); User user = DataUtils.getUserJack();
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, 0L, AuthType.ADMIN); List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.ADMIN);
List<Long> expectedModelIds = Lists.newArrayList(1L, 2L, 3L); List<Long> expectedModelIds = Lists.newArrayList(1L, 2L, 3L);
Assertions.assertEquals(expectedModelIds, Assertions.assertEquals(expectedModelIds,
modelResps.stream().map(ModelResp::getId).collect(Collectors.toList())); modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()));

2
launchers/standalone/src/test/resources/application-local.yaml
View File

@@ -77,4 +77,4 @@ logging:
inMemoryEmbeddingStore: inMemoryEmbeddingStore:
persistent: persistent:
path: d:// path: /tmp