From e903bc1845d8cfa4f094e9f2d961df61615cf659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 20 Nov 2026 02:05:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd-collect):=20groups=20=E7=AB=AF=E7=82=B9?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E8=BA=AB=E4=BB=BD=E7=9B=B4=E5=8F=96=E2=80=94?= =?UTF-8?q?=E2=80=94requireOwnershipUserId(httpRequest,null)=20=E5=AF=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A7=92=E8=89=B2=E8=B1=81=E5=85=8D=E5=8E=9F?= =?UTF-8?q?=E6=A0=B7=E8=BF=94=20null=20=E2=87=92=20=E4=BD=9C=E7=94=A8?= =?UTF-8?q?=E5=9F=9F=E7=A9=BA=E3=80=81=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=88=86=E7=B1=BB=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=85=A8=E7=A9=BA=EF=BC=882026-11-20=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AE=9E=E5=BD=95=EF=BC=8C=E6=99=AE=E9=80=9A=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E5=8F=97=E5=BD=B1=E5=93=8D=EF=BC=89=EF=BC=9B=E6=94=B9?= =?UTF-8?q?=20requireSessionOwnerUserId=EF=BC=88JdPublishController=20?= =?UTF-8?q?=E5=90=8C=E6=AC=BE=E6=97=A2=E6=9C=89=E6=96=B9=E6=B3=95=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=8D=AE=E6=B5=8B=E8=AF=95=E6=94=B9=E7=AB=AF?= =?UTF-8?q?=E7=82=B9=E7=BA=A7=E6=96=AD=E8=A8=80=EF=BC=8B=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E7=BB=8A=E7=BA=BF=EF=BC=88=E9=80=80=E5=9B=9E=E5=8D=B3=E7=BA=A2?= =?UTF-8?q?=EF=BC=89=E3=80=82jdcat=20=E7=AA=97=E5=AE=8C=E6=88=90=E4=BB=B6?= =?UTF-8?q?=E9=9A=8F=E8=81=94=E9=AA=8C=E6=81=A2=E5=A4=8D=E7=AA=97=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=8F=91=E7=89=88=EF=BC=9BDesktopHomePage.vue=20?= =?UTF-8?q?=E5=B1=9E=E8=AF=A5=E7=AA=97=E5=9C=A8=E9=A3=9E=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=9C=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jd/controller/JdCollectController.java | 9 ++++-- .../JdCollectGroupsEndpointTest.java | 30 ++++++++++++++----- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java index 1100a41dd..38d92acba 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java @@ -88,8 +88,13 @@ public class JdCollectController { + "(自己所属组的组长带的组)的分类,别组的一律不下发——这正是「不同组不能看到跨组的分类」。" + "只读不写——分类的增删改仍只在后管(本组管理员)。") public ApiResponse> groups(HttpServletRequest httpRequest) { - // 登录用户即可读:解析不出会话身份就 401(fail-closed,与建单同口径)。 - Long userId = adminAuthSupport.requireOwnershipUserId(httpRequest, null); + // 会话身份直取(管理员也不例外):requireOwnershipUserId 走 bindOwnershipUserId,对管理角色 + // 豁免时「原样返回请求值」——传 null 就拿回 null,resolveByUserId(null) 落空作用域, + // 平台超管/公司超管/管理员三类账号的客户端分类下拉全空(2026-11-20 用户实录:后管 + // 京东数据库有分类、客户端「无数据」;普通号走 identity.getId() 不受影响, + // 2026-11-16「普通账户都能看到」口径验证时没暴露)。登录用户即可读, + // 解析不出会话身份仍 401(fail-closed)。 + Long userId = adminAuthSupport.requireSessionOwnerUserId(httpRequest, null); JdCategoryScopeService.JdCategoryScope scope = jdCategoryScopeService.resolveByUserId(userId); return ApiResponse.success(jdProductGroupService.listForGroups(scope.visibleGroupIds())); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java index 7f5f5bdcc..db8969acd 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.isNull; @@ -53,13 +54,28 @@ class JdCollectGroupsEndpointTest { String source = Files.readString(CONTROLLER); assertTrue(source.contains("@GetMapping(\"/groups\")"), "用户侧分类列表必须是 GET /groups(categories 同形)"); - assertTrue(source.contains("jdCategoryScopeService.resolveByUserId(userId)"), + String groupsBody = groupsMethodBody(source); + assertTrue(groupsBody.contains("adminAuthSupport.requireSessionOwnerUserId(httpRequest, null)"), + "groups 必须用 requireSessionOwnerUserId 直取会话 id——requireOwnershipUserId(httpRequest, null)" + + " 对管理角色(super_admin/company_super_admin/admin)豁免时原样返回请求值 null," + + "resolveByUserId(null) 落空作用域,管理员账号的客户端分类下拉全空" + + "(2026-11-20 用户实录:后管京东数据库有分类、客户端「无数据」)"); + assertFalse(groupsBody.contains("requireOwnershipUserId(httpRequest, null)"), + "groups 不得退回 requireOwnershipUserId(httpRequest, null)(管理角色豁免 ⇒ null ⇒ 空作用域);" + + "categories 端点不消费返回值、不受此判据约束"); + assertTrue(groupsBody.contains("jdCategoryScopeService.resolveByUserId(userId)"), "可见组必须由 JdCategoryScopeService 按登录用户解析(端点不自己判角色)"); - assertTrue(source.contains("jdProductGroupService.listForGroups(scope.visibleGroupIds())"), + assertTrue(groupsBody.contains("jdProductGroupService.listForGroups(scope.visibleGroupIds())"), "必须按可见组取分类(listForGroups),不得退回 list() 全量下发" + "——否则普通号仍能看到别组的分类"); - assertTrue(source.contains("adminAuthSupport.requireOwnershipUserId(httpRequest, null)"), - "登录用户即可读但必须 fail-closed:解析不出会话身份就 401(与 categories 同口径)"); + } + + /** 截取 @GetMapping("/groups") 方法体到下一个映射注解(判据只看本端点,不误伤 categories)。 */ + private static String groupsMethodBody(String source) { + int start = source.indexOf("@GetMapping(\"/groups\")"); + assertTrue(start >= 0, "groups 端点必须存在"); + int end = source.indexOf("@GetMapping", start + 1); + return end > start ? source.substring(start, end) : source.substring(start); } @Test @@ -85,7 +101,7 @@ class JdCollectGroupsEndpointTest { vo.setName("ASSS"); vo.setOwnerGroupId(GROUP_ID); vo.setProductCount(20L); - when(authSupport.requireOwnershipUserId(same(request), isNull())).thenReturn(USER_ID); + when(authSupport.requireSessionOwnerUserId(same(request), isNull())).thenReturn(USER_ID); when(scopeService.resolveByUserId(USER_ID)).thenReturn(scope(GROUP_ID)); when(groupService.listForGroups(List.of(GROUP_ID))).thenReturn(List.of(vo)); @@ -99,7 +115,7 @@ class JdCollectGroupsEndpointTest { assertEquals(GROUP_ID, response.getData().get(0).getOwnerGroupId()); assertEquals(20L, response.getData().get(0).getProductCount()); // 鉴权闸先行:解析不出会话身份就 401,读不到任何数据。 - verify(authSupport).requireOwnershipUserId(same(request), isNull()); + verify(authSupport).requireSessionOwnerUserId(same(request), isNull()); verify(scopeService).resolveByUserId(USER_ID); verify(groupService).listForGroups(List.of(GROUP_ID)); } @@ -121,7 +137,7 @@ class JdCollectGroupsEndpointTest { mock(TaskProgressOwnershipSupport.class), authSupport); HttpServletRequest request = mock(HttpServletRequest.class); - when(authSupport.requireOwnershipUserId(same(request), isNull())).thenReturn(USER_ID); + when(authSupport.requireSessionOwnerUserId(same(request), isNull())).thenReturn(USER_ID); when(scopeService.resolveByUserId(USER_ID)).thenReturn(JdCategoryScopeService.JdCategoryScope.empty()); when(groupService.listForGroups(List.of())).thenReturn(List.of());