fix(多公司): 公司目录读端点摘掉菜单闸门,别再把它当数据可见性用
GET /api/admin/companies 同时是「用户管理」页公司下拉的数据源,而它第一行查的是 admin_companies 菜单权限 —— V143 只插了 columns 那一行、一笔 user_column_permission 都没发,于是 15 个公司内管理员一打开用户管理页就吃 403。收窄本来已由 role + companyId 完成,本公司管理员能读到的那一行就是登录响应和 /current-user 里本来就回带的自己的公司名, 这道闸门一个字节都没多守住,却把整个页面挡住了。 写入口(create/update)继续走 ensureSuperAdmin 不变;MENU_KEY 与 PermissionMenuService 依赖随闸门一起删净,护栏 CompanyReadPathMenuGateTest 用源码扫描钉住"公司服务不查菜单", 并自检取样集非空(闸门在用户管理、生成记录两处仍是正当手段,必须扫得到)。
This commit is contained in:
+6
-13
@@ -7,7 +7,6 @@ import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.company.mapper.CompanyMapper;
|
||||
import com.nanri.aiimage.modules.company.model.dto.CompanySaveRequest;
|
||||
import com.nanri.aiimage.modules.company.model.entity.CompanyEntity;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -26,16 +25,12 @@ public class CompanyService {
|
||||
public static final int STATUS_ACTIVE = 1;
|
||||
public static final int STATUS_DISABLED = 0;
|
||||
|
||||
/** 后台「公司管理」菜单的 column_key(V143 插入 columns 表那一行的值)。 */
|
||||
public static final String MENU_KEY = "admin_companies";
|
||||
|
||||
/** 列宽取自 V143:company_name varchar(128)、remark varchar(255)。超长先进校验,别让 MySQL 报 1406 变 500。 */
|
||||
private static final int NAME_MAX_LENGTH = 128;
|
||||
private static final int REMARK_MAX_LENGTH = 255;
|
||||
|
||||
private final CompanyMapper companyMapper;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final PermissionMenuService permissionMenuService;
|
||||
|
||||
/** 建号指定的公司必须真实存在且启用:否则账号挂在查不到的公司上,按公司筛选时整体失明。 */
|
||||
public CompanyEntity requireActive(Long companyId) {
|
||||
@@ -54,9 +49,13 @@ public class CompanyService {
|
||||
*
|
||||
* <p>读口径必须和写口径一起收窄——只把写拦成超管、列表仍返回全部公司,等于把别家公司的
|
||||
* 名字泄露给本公司管理员。管理员没有公司归属时是拒绝,不是"那就不过滤"。</p>
|
||||
*
|
||||
* <p>这里<b>不查菜单权限</b>:{@code admin_companies} 那道闸门管的是「公司管理」这个页面
|
||||
* 出不出现在侧边栏,而本方法同时是「用户管理」页公司下拉的数据源,两者不是一回事。
|
||||
* 收窄靠 role + companyId 已经到位,本公司管理员能读到的那一行就是他在登录响应和
|
||||
* /current-user 里本来就拿着的那个自己的公司名,菜单闸门在这里多守不住一个字节。</p>
|
||||
*/
|
||||
public List<CompanyEntity> listVisible(AdminUserEntity operator) {
|
||||
ensureCompanyMenu(operator);
|
||||
String role = adminAuthSupport.currentRole(operator);
|
||||
if (role == null) {
|
||||
throw new BusinessException(403, "需要管理员权限");
|
||||
@@ -78,7 +77,7 @@ public class CompanyService {
|
||||
*
|
||||
* <p><b>这个方法不做权限判断</b>:它只是把调用方已经拿在手里的那些 id 换成名字,
|
||||
* 谁能看到哪些行由调用方的查询范围决定(同 {@code AdminUserService.loadCreatorMap} 的口径)。
|
||||
* 要给前端列公司目录请走 {@link #listVisible},它才带收窄与菜单闸门。</p>
|
||||
* 要给前端列公司目录请走 {@link #listVisible},它才按角色和公司收窄。</p>
|
||||
*/
|
||||
public Map<Long, String> namesByIds(Collection<Long> companyIds) {
|
||||
if (companyIds == null || companyIds.isEmpty()) {
|
||||
@@ -196,12 +195,6 @@ public class CompanyService {
|
||||
return remark;
|
||||
}
|
||||
|
||||
private void ensureCompanyMenu(AdminUserEntity operator) {
|
||||
if (!permissionMenuService.hasAnyAdminMenu(operator, List.of(MENU_KEY))) {
|
||||
throw new BusinessException(403, "无权访问公司管理模块");
|
||||
}
|
||||
}
|
||||
|
||||
private void ensureSuperAdmin(AdminUserEntity operator) {
|
||||
if (!"super_admin".equals(adminAuthSupport.currentRole(operator))) {
|
||||
throw new BusinessException(403, "只有超级管理员可以新增或修改公司");
|
||||
|
||||
+113
@@ -0,0 +1,113 @@
|
||||
package com.nanri.aiimage.modules.company.service;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* 公司目录的读路径不许挂菜单闸门(2026-10-04 生产事故的出口)。
|
||||
*
|
||||
* <p>{@code admin_companies} 这道菜单闸门原先写在 {@code CompanyService.listVisible} 第一行,
|
||||
* 而这个端点同时是「用户管理」页公司下拉的数据源:V143 只插了 columns 那一行、
|
||||
* 一笔 {@code user_column_permission} 授权都没发,于是 15 个公司内管理员一打开用户管理页
|
||||
* 就吃到 403,前端再把 403 当未登录整页踢回登录页 —— 报上来的症状是"登录闪退"。</p>
|
||||
*
|
||||
* <p>页面可见性(菜单)和数据可见性(角色 + 公司归属)是两件事,混在一处就会互相误伤。
|
||||
* 注释会腐烂,所以把"公司服务不查菜单"做成实跑用例。</p>
|
||||
*/
|
||||
class CompanyReadPathMenuGateTest {
|
||||
|
||||
private static final String COMPANY_SERVICE = "CompanyService.java";
|
||||
private static final String MENU_GATE_CALL = "hasAnyAdminMenu(";
|
||||
|
||||
@Test
|
||||
void companyServiceDoesNotConsultMenuPermissionAnywhere() throws IOException {
|
||||
String text = read(sourceOf(COMPANY_SERVICE));
|
||||
|
||||
assertThat(executableLines(text))
|
||||
.as("CompanyService 一旦重新查菜单权限,任何把 GET 端点当共享下拉数据源用的页面都会跟着挂")
|
||||
.noneMatch(line -> line.contains(MENU_GATE_CALL));
|
||||
}
|
||||
|
||||
@Test
|
||||
void companyServiceStillWritesOnlyForSuperAdmin() throws IOException {
|
||||
String text = read(sourceOf(COMPANY_SERVICE));
|
||||
|
||||
List<String> guards = executableLines(text).stream()
|
||||
.filter(line -> line.contains("ensureSuperAdmin(operator);"))
|
||||
.collect(Collectors.toList());
|
||||
assertThat(guards)
|
||||
.as("create 与 update 两处写入口的超管闸门 must 保留")
|
||||
.hasSize(2);
|
||||
}
|
||||
|
||||
/** 取样集非空自检:扫描一旦 0 命中,上面几条就恒绿,等于没护栏。 */
|
||||
@Test
|
||||
void menuGateCallSitesAreActuallyBeingScanned() throws IOException {
|
||||
List<String> sites = mainSources().stream()
|
||||
.filter(p -> executableLines(read(p)).stream().anyMatch(l -> l.contains(MENU_GATE_CALL)))
|
||||
.map(p -> p.getFileName().toString())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
assertThat(sites)
|
||||
.as("菜单闸门本身在别处仍是正当手段(用户管理、生成记录),扫描必须真能命中它们")
|
||||
.contains("PermissionMenuService.java", "AdminUserService.java", "ImageHistoryController.java");
|
||||
}
|
||||
|
||||
private static List<String> executableLines(String text) {
|
||||
return Arrays.stream(text.split("\n", -1))
|
||||
.map(String::trim)
|
||||
.filter(line -> !line.isEmpty())
|
||||
.filter(line -> !line.startsWith("//") && !line.startsWith("/*") && !line.startsWith("*"))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private static List<Path> mainSources() throws IOException {
|
||||
Path root = moduleRoot().resolve("src/main/java");
|
||||
if (!Files.isDirectory(root)) {
|
||||
fail("找不到 " + root + " —— 用例依赖以 backend-java 为工作目录运行,别让守卫静默通过");
|
||||
}
|
||||
try (Stream<Path> walk = Files.walk(root)) {
|
||||
return walk.filter(Files::isRegularFile)
|
||||
.filter(p -> p.getFileName().toString().endsWith(".java"))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
private static Path sourceOf(String fileName) throws IOException {
|
||||
return mainSources().stream()
|
||||
.filter(p -> p.getFileName().toString().equals(fileName))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new IllegalStateException("找不到 " + fileName));
|
||||
}
|
||||
|
||||
private static String read(Path path) {
|
||||
try {
|
||||
return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读不到 " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
/** surefire 的工作目录是模块目录;从仓库根或 IDE 跑时退到 backend-java/。 */
|
||||
private static Path moduleRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
if (Files.isDirectory(here.resolve("src/main/java"))) {
|
||||
return here;
|
||||
}
|
||||
Path nested = here.resolve("crawler-plugin/backend-java");
|
||||
if (Files.isDirectory(nested.resolve("src/main/java"))) {
|
||||
return nested;
|
||||
}
|
||||
return here;
|
||||
}
|
||||
}
|
||||
+20
-15
@@ -9,7 +9,6 @@ import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.company.mapper.CompanyMapper;
|
||||
import com.nanri.aiimage.modules.company.model.dto.CompanySaveRequest;
|
||||
import com.nanri.aiimage.modules.company.model.entity.CompanyEntity;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
@@ -21,7 +20,6 @@ import java.util.List;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
@@ -31,13 +29,13 @@ import static org.mockito.Mockito.when;
|
||||
* 公司目录(设计文档 §2.3)的可见范围与写入边界。
|
||||
*
|
||||
* <p>读口径与写口径必须一起收窄:只把写拦成超管、列表仍返回全部公司,等于把别家公司的
|
||||
* 名字泄露给本公司管理员。</p>
|
||||
* 名字泄露给本公司管理员。收窄靠 role + companyId,不靠菜单权限(见
|
||||
* {@link CompanyReadPathMenuGateTest} 钉住的那条)。</p>
|
||||
*/
|
||||
class CompanyServiceDirectoryTest {
|
||||
|
||||
private CompanyMapper companyMapper;
|
||||
private AdminAuthSupport adminAuthSupport;
|
||||
private PermissionMenuService permissionMenuService;
|
||||
private CompanyService companyService;
|
||||
|
||||
@BeforeEach
|
||||
@@ -47,9 +45,7 @@ class CompanyServiceDirectoryTest {
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), CompanyEntity.class);
|
||||
companyMapper = mock(CompanyMapper.class);
|
||||
adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
permissionMenuService = mock(PermissionMenuService.class);
|
||||
when(permissionMenuService.hasAnyAdminMenu(any(), anyList())).thenReturn(true);
|
||||
companyService = new CompanyService(companyMapper, adminAuthSupport, permissionMenuService);
|
||||
companyService = new CompanyService(companyMapper, adminAuthSupport);
|
||||
}
|
||||
|
||||
private AdminUserEntity operator(String role, Long companyId) {
|
||||
@@ -152,19 +148,28 @@ class CompanyServiceDirectoryTest {
|
||||
verify(companyMapper, never()).selectList(any());
|
||||
}
|
||||
|
||||
/**
|
||||
* 回归用例(2026-10-04 生产事故):「用户管理」页的公司下拉也走这个读端点,
|
||||
* 而 admin_companies 菜单 V143 建了行却一笔授权都没发,15 个公司内管理员因此全被 403,
|
||||
* 前端把 403 当未登录整页踢回登录页,症状看起来是"登录闪退"。
|
||||
*
|
||||
* <p>菜单权限管的是「公司管理」这个页面出不出现在侧边栏,不是这份数据谁能读。
|
||||
* 读端点挂菜单闸门等于把"页面可见性"当"数据可见性"用;收窄靠 role + companyId 就够了,
|
||||
* 何况公司名在登录响应和 /current-user 里本来就回带,这道闸门一个字节都没多守住。</p>
|
||||
*/
|
||||
@Test
|
||||
@DisplayName("没有被授予 admin_companies 菜单的人一律 403")
|
||||
void callerWithoutCompanyMenuIsRejected() {
|
||||
when(permissionMenuService.hasAnyAdminMenu(any(), anyList())).thenReturn(false);
|
||||
@DisplayName("公司内管理员读到本公司那一行:读端点不查 admin_companies 菜单")
|
||||
void companyScopedAdminReadsOwnCompanyWithoutTheMenuGrant() {
|
||||
when(companyMapper.selectList(any())).thenReturn(List.of(company(2, "福州数富", 1)));
|
||||
|
||||
assertThatThrownBy(() -> companyService.listVisible(operator("admin", 2L)))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("公司");
|
||||
verify(companyMapper, never()).selectList(any());
|
||||
List<CompanyEntity> visible = companyService.listVisible(operator("admin", 2L));
|
||||
|
||||
assertThat(visible).hasSize(1);
|
||||
assertThat(capturedSelectList().getParamNameValuePairs()).containsValue(2L);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("新增公司仅超管:公司内管理员即使拿到菜单也不能建第二家公司")
|
||||
@DisplayName("新增公司仅超管:公司内管理员读得到目录也不能建第二家公司")
|
||||
void companyAdminCannotCreate() {
|
||||
assertThatThrownBy(() -> companyService.create(operator("admin", 2L), request("福州数富", null, null)))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
|
||||
+1
-3
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.company.mapper.CompanyMapper;
|
||||
import com.nanri.aiimage.modules.company.model.entity.CompanyEntity;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
@@ -42,8 +41,7 @@ class CompanyServiceNameLookupTest {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), CompanyEntity.class);
|
||||
companyMapper = mock(CompanyMapper.class);
|
||||
companyService = new CompanyService(companyMapper, mock(AdminAuthSupport.class),
|
||||
mock(PermissionMenuService.class));
|
||||
companyService = new CompanyService(companyMapper, mock(AdminAuthSupport.class));
|
||||
}
|
||||
|
||||
private CompanyEntity company(Long id, String name, int status) {
|
||||
|
||||
+1
-2
@@ -4,7 +4,6 @@ import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.company.mapper.CompanyMapper;
|
||||
import com.nanri.aiimage.modules.company.model.entity.CompanyEntity;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
@@ -50,7 +49,7 @@ class CompanyServiceRequireActiveTest {
|
||||
}
|
||||
|
||||
private CompanyService service(CompanyMapper mapper) {
|
||||
return new CompanyService(mapper, mock(AdminAuthSupport.class), mock(PermissionMenuService.class));
|
||||
return new CompanyService(mapper, mock(AdminAuthSupport.class));
|
||||
}
|
||||
|
||||
private CompanyEntity company(Long id, Integer status) {
|
||||
|
||||
Reference in New Issue
Block a user