refactor(租户): 站点超管判定收成唯一静态出口,看板补第四道门
"super_admin 才算平台超管"这句判断此前在 src/main 里被手抄过 19 遍,2026-10-07 定的 「company_super_admin 在业务数据面同权、只在管理动作收窄」要落地就得一次改到每一处, 漏一处的表现是某一页静默 403 或静默多放行,两边都不报错。现在口径只在 DeviceSessionPolicy.isSuper 比一次: - 出口做成静态谓词而不是 AdminAuthSupport 实例方法——那 18 支测试里 mock 的是 AdminAuthSupport,新增实例方法不会被桩到,默认 false 会把范围静默改窄; - 12 个文件的 15 处调用点改为 DeviceSessionPolicy.isSuper(currentRole(...)), DataReadScope/AdminAuthSupport 只留一个委托包装; - 「客户端任务管理」五个 handler 的成员集计算折进 DataReadScope.superAdminScopedUserIds, 并在 CompanyIdParamGoesThroughReadScopeTest 里补成第四道门(正反探针各一, 判据不会因"抽进私有方法"而失明); - 护栏 SuperAdminPredicateSingleOutletTest 双向钉:出口定义==1、包装==1、调用点==16, 且 banned 掉实例方法形状(自检断言保证它真能红)。 今天口径仍只认 super_admin,这一层是接缝不是开关。Java 全量在本批收口后的那棵树实测 4032 例 0 红 7 skip(7 支是要本地凭据/夹具的回放与实况探测类,历来 skip)。 一并落在这支的文件(同一文件只能进一次提交,故与同批的归属收口混装):ImageVideo/InvalidAsin/ AdminDeviceLog/AdminTaskCenter/DedupeTotalData/AdminShopDataCrawlTasks/AdminShopDataDuplicateCheck/ QueryAsin/ShopManage/SkipPriceAsin 这 10 支控制器的请求身份改走会话出口见 cp-item7 的说明; PermissionMenuService 还删掉了 create/update/delete 三个"operator 传 null 即跳过归属闸门"的 无操作者写重载(src/main 无人调用),判据在 MenuWriteOutletOperatorTest。
This commit is contained in:
+3
-36
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
|
||||
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
|
||||
import com.nanri.aiimage.modules.permission.mapper.UserColumnPermissionMapper;
|
||||
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateRequest;
|
||||
@@ -222,17 +223,6 @@ public class PermissionMenuService {
|
||||
return typeById;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public PermissionMenuItemVo create(PermissionMenuCreateRequest request) {
|
||||
return create(null, null, request);
|
||||
}
|
||||
|
||||
/** Controller-facing variant; the caller may pass the authenticated admin. */
|
||||
@Transactional
|
||||
public PermissionMenuItemVo create(AdminUserEntity operator, PermissionMenuCreateRequest request) {
|
||||
return create(operator, null, request);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增菜单。归属公司由 {@code requestedCompanyId} 决定,缺省取操作者本公司(设计文档 §5):
|
||||
* 站点超管可以替别家建菜单(今天就是他一人在给 133 只账号配权限),非超管只能在自已公司建,
|
||||
@@ -274,11 +264,6 @@ public class PermissionMenuService {
|
||||
return toItemVo(getMenuById(entity.getId()));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public PermissionMenuItemVo update(Long id, PermissionMenuUpdateRequest request) {
|
||||
return update(null, id, request);
|
||||
}
|
||||
|
||||
/** Controller-facing variant; validates a parent change against the full ancestor chain. */
|
||||
@Transactional
|
||||
public PermissionMenuItemVo update(AdminUserEntity operator, Long id, PermissionMenuUpdateRequest request) {
|
||||
@@ -318,11 +303,6 @@ public class PermissionMenuService {
|
||||
return toItemVo(getMenuById(id));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void delete(Long id) {
|
||||
delete(null, id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a leaf menu only. Refusing a parent deletion prevents orphaned
|
||||
* hierarchy rows and makes the direct-grant meaning deterministic.
|
||||
@@ -827,11 +807,6 @@ public class PermissionMenuService {
|
||||
return wantedIds.stream().anyMatch(effective::contains);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void updateUserColumnPermissions(Long userId, UserColumnPermissionUpdateRequest request) {
|
||||
updateUserColumnPermissions(null, userId, request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces direct grants. A non-super admin may only grant effective menus
|
||||
* that the operator already has, and only to themself or a directly-created
|
||||
@@ -1335,16 +1310,8 @@ public class PermissionMenuService {
|
||||
}
|
||||
|
||||
private boolean isSuperAdmin(AdminUserEntity user) {
|
||||
if (user == null) {
|
||||
return false;
|
||||
}
|
||||
String role = normalizeRole(user.getRole());
|
||||
if ("super_admin".equals(role)) {
|
||||
return true;
|
||||
}
|
||||
return role.isEmpty()
|
||||
&& Integer.valueOf(1).equals(user.getIsAdmin())
|
||||
&& user.getCreatedById() == null;
|
||||
return user != null
|
||||
&& DeviceSessionPolicy.isSuperAdmin(user.getRole(), user.getIsAdmin(), user.getCreatedById());
|
||||
}
|
||||
|
||||
private boolean isNormalUser(AdminUserEntity user) {
|
||||
|
||||
Reference in New Issue
Block a user