From a5a9df650b1a1d8ab34c4bdfa4930f52e01164ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 5 Oct 2026 03:03:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=85=AC=E5=8F=B8=E8=8C=83=E5=9B=B4):=20D?= =?UTF-8?q?ataReadScope=20=E5=94=AF=E4=B8=80=E8=AF=BB=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=87=BA=E5=8F=A3=20+=20G2=20=E6=89=AB=20company=5Fid=20?= =?UTF-8?q?=E7=AB=AF=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ReadScope/DataReadScope 落在 common/service:超管不选公司=不筛、选公司=成员集替换、 选不存在公司=空页(不 403 不全量);非超管永远锁本公司且与分组可见集求交(只能收窄), 传别家得空结果,没公司归属则炸 - G2 护栏逐文件扫"含 company_id 的 controller 必须走 readScope( 且显式 name=", 带取样非空自检;白名单点名只放先于本计划存在的 AdminUserController, 且只豁免 readScope 那一条、不豁免取样与显式 name= --- .../aiimage/common/service/DataReadScope.java | 42 ++++++++ .../aiimage/common/service/ReadScope.java | 48 +++++++++ ...ompanyIdParamGoesThroughReadScopeTest.java | 84 ++++++++++++++++ .../common/service/DataReadScopeTest.java | 99 +++++++++++++++++++ 4 files changed, 273 insertions(+) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/service/ReadScope.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/common/service/CompanyIdParamGoesThroughReadScopeTest.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/common/service/DataReadScopeTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java b/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java new file mode 100644 index 000000000..36e26da22 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java @@ -0,0 +1,42 @@ +package com.nanri.aiimage.common.service; + +import com.nanri.aiimage.common.model.entity.AdminUserEntity; +import com.nanri.aiimage.common.security.AdminAuthSupport; +import com.nanri.aiimage.modules.permission.support.UserDataScopeSupport; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * "操作者 + 请求里的 company_id → 该查哪批账号"的**唯一**出口(设计文档 §7)。 + * + *
各页 service 一律走这里,不许自己写 if:一条越权旁路的成本是"这一页的过滤是假的", + * 而它不会报错。护栏 {@code CompanyIdParamGoesThroughReadScopeTest} 逐文件扫这条纪律。
+ */ +@Service +@RequiredArgsConstructor +public class DataReadScope { + + private static final String SUPER_ADMIN = "super_admin"; + + private final CompanyScopeSupport companyScope; + private final AdminAuthSupport adminAuthSupport; + private final UserDataScopeSupport userDataScopeSupport; + + public ReadScope readScope(AdminUserEntity operator, Long requestedCompanyId) { + Long companyId = requestedCompanyId != null && requestedCompanyId > 0 ? requestedCompanyId : null; + if (SUPER_ADMIN.equals(adminAuthSupport.currentRole(operator))) { + if (companyId == null) { + return ReadScope.unfiltered(); + } + return ReadScope.users(companyScope.memberUserIds(companyId)); + } + // 非超管:一律按会话裁剪,前端传什么都不算(spec §4——tab 不是安全边界,这条才是)。 + Long own = companyScope.requireCompanyId(operator); + if (companyId != null && !companyId.equals(own)) { + return ReadScope.users(List.of()); + } + List{@link #userIdsOr(List)} 是它与各页**既有** `scopedUserIds` 唯一的接合点: + * base 传 null 表示"这页原本不筛",此时返回公司范围;两边都有值时求交, + * 因为公司 tab 只能**收窄**、不能放大组长本来看不到的行。
+ */ +public final class ReadScope { + + private final boolean unfiltered; + private final List扫描对象是 controller 层,与计划的定案一致:有的页(如 {@code ShopManageService.page})手上只有 + * {@code operatorId} + 一个布尔、没有操作者实体,所以 {@code readScope(AdminUserEntity, Long)} 只能由 + * controller 调,再把算好的成员集当参数传进去(docs/plans/19-company-tab.md「Task 11 已确认现状」第 2 条)。 + * 因此"controller 里出现 readScope("就是这一页接了唯一出口的证据。
+ */ +class CompanyIdParamGoesThroughReadScopeTest { + + /** + * 点名白名单(精确到文件名,不许通配/前缀)。 + * + *只放一条:{@code AdminUserController} 的 {@code GET /api/admin/users?company_id=} 是先于本计划 + * 存在、已在生产的那"第二个 if"——用户管理页不在本计划 8 个 tab 页里 + * ({@code admin-frontend-vue/src/config/company-scope.ts} 的 {@code COMPANY_SCOPED_PAGES} 无 + * {@code admin_users}),而它的实现({@code AdminUserService} 里"筛别家 = 空页、故意不报错也不越权") + * 正是全局约束 2 点名的参考形状。本批次不迁它:迁了等于把 140 值的 {@code id IN(...)} 换回 + * {@code company_id =} 直查,性能方向是负的;已另记为批次 1 之后独立一笔。
+ * + *豁免只作用于第一条断言(必须含 {@code readScope(})。不作用于取样——今天非白名单的 + * 含 company_id controller 恰好 0 支,把白名单文件从取样列表里剔掉再自检非空,那条自检当场就红 + * (全局约束 15 要的正是这条自检,不能绕过)。也不豁免第二条:白名单内的文件仍然必须显式 + * {@code @RequestParam(name = "company_id")},驼峰参数名静默失效那一类错不能被白名单盖住。
+ */ + private static final Set