Skip to content

Commit 6b60bfe

Browse files
(improvement)(Headless) Fix model list auth checking (#883)
* (improvement)(Headless) Fix model list auth check * (improvement)(Headless) Fix row permission --------- Co-authored-by: jolunoluo
1 parent ff56fd1 commit 6b60bfe

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,16 @@ public List<ModelResp> getModelRespAuthInheritDomain(User user, Long domainId, A
306306
List<Long> domainIds = domainService.getDomainAuthSet(user, authType)
307307
.stream().map(DomainResp::getId)
308308
.collect(Collectors.toList());
309-
if (domainIds.contains(domainId)) {
310-
domainIds = Lists.newArrayList(domainId);
311-
} else {
309+
if (CollectionUtils.isEmpty(domainIds)) {
312310
return Lists.newArrayList();
313311
}
312+
if (domainId != null) {
313+
if (domainIds.contains(domainId)) {
314+
domainIds = Lists.newArrayList(domainId);
315+
} else {
316+
return Lists.newArrayList();
317+
}
318+
}
314319
ModelFilter modelFilter = new ModelFilter();
315320
modelFilter.setIncludesDetail(false);
316321
modelFilter.setDomainIds(domainIds);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void test_getDomainList_alice() {
3939
@Test
4040
public void test_getModelList_alice() {
4141
User user = DataUtils.getUserAlice();
42-
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, 0L, AuthType.ADMIN);
42+
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.ADMIN);
4343
List<Long> expectedModelIds = Lists.newArrayList(1L, 4L);
4444
Assertions.assertEquals(expectedModelIds,
4545
modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()));
@@ -48,7 +48,7 @@ public void test_getModelList_alice() {
4848
@Test
4949
public void test_getVisibleModelList_alice() {
5050
User user = DataUtils.getUserAlice();
51-
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, 0L, AuthType.VISIBLE);
51+
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.VISIBLE);
5252
List<Long> expectedModelIds = Lists.newArrayList(1L, 4L);
5353
Assertions.assertEquals(expectedModelIds,
5454
modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()));
@@ -75,7 +75,7 @@ public void test_getDomainList_jack() {
7575
@Test
7676
public void test_getModelList_jack() {
7777
User user = DataUtils.getUserJack();
78-
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, 0L, AuthType.ADMIN);
78+
List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.ADMIN);
7979
List<Long> expectedModelIds = Lists.newArrayList(1L, 2L, 3L);
8080
Assertions.assertEquals(expectedModelIds,
8181
modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()));

launchers/standalone/src/test/resources/application-local.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ logging:
7777

7878
inMemoryEmbeddingStore:
7979
persistent:
80-
path: d://
80+
path: /tmp

0 commit comments

Comments
 (0)