fix(鉴权): 请求身份全量改走会话出口;公开默认 JWT 密钥从出厂件里摘掉
三件事都属"失败很安静"那一类:
1) 请求自带 user_id 当范围条件。cp-item2 只收了会改状态/花钱的出口,其余 28 支控制器
(进度/列表/详情,本支 18 支、另 10 支因与租户判定收口同文件而随 cp-item3 那笔)照旧把
"这单是谁的"交给调用方自报:A 传 B 的 user_id 就读到 B 的进度,
接口 200、日志无声。现在 190 支取请求身份的 handler 只经一个出口(写类 require/resolve、
读类 resolve),护栏 RequestSuppliedIdentityOutletTest 钉分母 126 写 + 63 读 + 1 豁免
(内部代理通道 InternalUserProxyController Get /user-proxy 按内部令牌放行)。DTO 形态
(控制器把整个 @RequestBody 递给 service)靠"该 DTO 是否声明 userId 字段"的索引识别,
少了这层判据会漏掉一半;进度类 28 支另由 ProgressQueryOwnershipOutletTest 单独钉。
桌面执行器 4.0.44 不带凭据是既定事实,[ownership-anonymous] 按 URI 计数留证据,
哪一支的匿名计数归零才允许把它从 resolve 换成 require。
2) 默认 JWT 密钥。application.yml 原本写的是
`${AIIMAGE_JWT_SECRET:please-change-this-secret-…}`,那个兜底默认值就是 2026-10-07
现网取证到的东西:两台都跑 profile server 且 env 里没有这个键,于是 JwtService 的启动闸门
看到的是公开字面量(非空)——既不拒绝启动也不告警,签出来的 token 任何读过源码的人都能伪造
(含超管)。现在占位符不带默认值、AuthProperties 缺省空串、isInsecure 同时认空串与该字面量,
server profile 缺密钥直接拒绝启动(宁可起不来)。JwtSecretFallbackGuardrailTest 五例钉
"资源文件里不许再出现那个字面量"与"两形都算不安全"。
发版顺序是硬约束:先在 A/B 两台 .env 配好与对方一致的 AIIMAGE_JWT_SECRET,再上新 jar;
轮换会把所有 web 会话退出登录。
3) 菜单写侧的无操作者重载(create/update/delete)删掉——三道闸门对 operator==null 的处置是
return(放行),src/main 里没人调用它们,但这条路在,下一支控制器接上去就是静默的跨公司改删。
读侧 list(String menuType) 是登录态自读与内部代理用的,故意保留,并被点名只许 1 处。
TaskProgressOwnershipSupport / SimilarAsinTaskLightControllerTest / ResultSuccessTimingContractTest
是 handler 加上 HttpServletRequest 之后的既有契约用例订正;SourceScan 补 withoutComments/methodBody
两支取文助手(源码守卫的匹配面必须剥注释,否则 javadoc 里提一句就能把"必须存在"那形喂绿)。
变异自证:RequestSuppliedIdentityOutletTest 4/4(M1 删参数形出口、M2 删 DTO 形出口、
M3 出口只写进注释、M4 isBound 恒真);JwtSecretFallbackGuardrailTest 4/4(J1 恢复 yml 默认值、
J2 恢复 AuthProperties 默认值、J3 闸门退回只判 isBlank、J4 isInsecure 恒真);
MenuWriteOutletOperatorTest 4/4。
This commit is contained in:
+108
@@ -0,0 +1,108 @@
|
||||
package com.nanri.aiimage.modules.permission.service;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* 菜单写侧的「操作者只能是真人」护栏。
|
||||
*
|
||||
* <p>2026-10-07 数富AI 架构评审收口时发现:{@code PermissionMenuService} 上有四个不带操作者的重载
|
||||
* ({@code create(request)}/{@code update(id, request)}/{@code delete(id)}/
|
||||
* {@code updateUserColumnPermissions(userId, request)}),它们一律把 {@code operator = null}
|
||||
* 递给闸门,而三道闸门对 null 的处置都是 {@code return}(放行)。今天 src/main 里没人调用它们,
|
||||
* 但"调用方传 null 就等于跳过归属校验"这条路只要存在,下一支控制器接上去就是静默的跨公司改删——
|
||||
* 表现是别家菜单少一行,两边都不报错。</p>
|
||||
*
|
||||
* <p>本批把四个无操作者<b>写</b>出口删掉(删出口胜过写注释),并把它钉住:
|
||||
* 写方法各自只剩"第一个参数是操作者"的那一种形状,文件里不再出现把 null 当操作者递进去的委托。
|
||||
* <b>读侧的 {@code list(String menuType)} 故意保留</b>:它是登录态自读与内部代理用的
|
||||
* 无 tab 目录查询,{@code PermissionCompanyMenuHiddenTest} 已经把它当作口径钉过,
|
||||
* 删它等于改语义而不是收口子,所以这里只做点名,不许扩大。</p>
|
||||
*/
|
||||
class MenuWriteOutletOperatorTest {
|
||||
|
||||
private static final String SRC = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("PermissionMenuService.java"));
|
||||
|
||||
/**
|
||||
* 把 null 当操作者递进写方法:{@code delete(null, id);}/{@code return create(null, null, request);}
|
||||
*
|
||||
* <p>左边必须排掉 {@code .}:MyBatis-Plus 的 {@code mapper.update(null, wrapper)} 第一个参数是
|
||||
* entity 而不是操作者,撞上来就是假红(这个文件里真有两处)。同一条理由要求判据是"裸调用"。</p>
|
||||
*/
|
||||
private static final Pattern ANONYMOUS_WRITE_DELEGATION = Pattern.compile(
|
||||
"(?<![A-Za-z0-9_.])(?:create|update|delete|updateUserColumnPermissions)\\s*\\(\\s*null\\b");
|
||||
|
||||
@Test
|
||||
void noWriteMethodIsDelegatedWithANullOperator() {
|
||||
assertThat(ANONYMOUS_WRITE_DELEGATION.matcher(SRC).find())
|
||||
.as("菜单写侧不许再有「operator 传 null」的委托;读侧那条走 "
|
||||
+ "anonymousReadIsStillTheSingleNullOperatorPath")
|
||||
.isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void anonymousReadOutletIsStillExactlyOneAndNamed() {
|
||||
// 保留不等于放开:唯一的 null 操作者路径必须是 list(String),多的一个都不许有。
|
||||
Matcher read = Pattern.compile("\\blist\\s*\\(\\s*null\\b").matcher(SRC);
|
||||
int hits = 0;
|
||||
while (read.find()) {
|
||||
hits++;
|
||||
}
|
||||
assertThat(hits).as("无操作者的目录读只许 1 处").isEqualTo(1);
|
||||
assertThat(SourceScan.methodBody(SRC, "list"))
|
||||
.as("那 1 处必须还在 list(String menuType) 里,挪进写方法就红")
|
||||
.contains("return list(null, menuType, false);");
|
||||
}
|
||||
|
||||
@Test
|
||||
void eachWriteEntryPointKeepsItsSingleOperatorFirstShape() {
|
||||
assertThat(count(SRC, "public PermissionMenuItemVo create("))
|
||||
.as("新增菜单只留 (operator, requestedCompanyId, request) 一种形状").isEqualTo(1);
|
||||
assertThat(count(SRC, "public PermissionMenuItemVo update("))
|
||||
.as("编辑菜单只留 (operator, id, request) 一种形状").isEqualTo(1);
|
||||
assertThat(count(SRC, "public void delete("))
|
||||
.as("删除菜单只留 (operator, id) 一种形状").isEqualTo(1);
|
||||
assertThat(count(SRC, "public void updateUserColumnPermissions("))
|
||||
.as("授权落库三种形状都必须以 operator 开头").isEqualTo(3);
|
||||
assertThat(count(SRC, "public void reorder(")).isEqualTo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上面三支都是「不存在」与「等于 N」两形,都会被恒绿的扫描器喂出来:正则写错、剥注释把整段
|
||||
* 吃掉、sourceText 抓到另一份同名文件,读数一样是绿的。所以每条判据都配一次"能红"取样。
|
||||
*/
|
||||
@Test
|
||||
void thePatternsFireOnTheShapesTheyClaimToCatch() {
|
||||
assertThat(ANONYMOUS_WRITE_DELEGATION
|
||||
.matcher(" public void delete(Long id) {\n delete(null, id);\n }").find())
|
||||
.as("匿名写委托的判据必须抓得到 delete(null, id)")
|
||||
.isTrue();
|
||||
assertThat(ANONYMOUS_WRITE_DELEGATION.matcher(" permissionMenuMapper.update(null, wrapper);")
|
||||
.find())
|
||||
.as("MyBatis 的 update(null, wrapper) 不是操作者,不许被抓成假红")
|
||||
.isFalse();
|
||||
assertThat(count(" public void delete(AdminUserEntity operator, Long id) {\n"
|
||||
+ " public void delete(Long id) {\n", "public void delete("))
|
||||
.as("签名计数必须真数得出重载,两个就报两个")
|
||||
.isEqualTo(2);
|
||||
assertThat(count(SRC, "public void delete("))
|
||||
.as("取样自检与本文件对照:本文件只剩一种形状")
|
||||
.isEqualTo(1);
|
||||
}
|
||||
|
||||
private static int count(String haystack, String needle) {
|
||||
int n = 0;
|
||||
int i = haystack.indexOf(needle);
|
||||
while (i >= 0) {
|
||||
n++;
|
||||
i = haystack.indexOf(needle, i + needle.length());
|
||||
}
|
||||
return n;
|
||||
}
|
||||
}
|
||||
+11
-11
@@ -62,7 +62,7 @@ class PermissionMenuServiceTest {
|
||||
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(2L));
|
||||
service.updateUserColumnPermissions(7L, request);
|
||||
service.updateUserColumnPermissions(null, 7L, request);
|
||||
|
||||
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
|
||||
verify(permissionMapper, times(2)).insert(captor.capture());
|
||||
@@ -84,7 +84,7 @@ class PermissionMenuServiceTest {
|
||||
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(75L));
|
||||
service.updateUserColumnPermissions(8L, request);
|
||||
service.updateUserColumnPermissions(null, 8L, request);
|
||||
|
||||
verify(permissionMapper, times(0)).insert(any(UserColumnPermissionEntity.class));
|
||||
}
|
||||
@@ -102,7 +102,7 @@ class PermissionMenuServiceTest {
|
||||
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(2L));
|
||||
service.updateUserColumnPermissions(7L, request);
|
||||
service.updateUserColumnPermissions(null, 7L, request);
|
||||
|
||||
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
|
||||
verify(permissionMapper, times(3)).insert(captor.capture());
|
||||
@@ -346,7 +346,7 @@ class PermissionMenuServiceTest {
|
||||
when(menuMapper.selectById(7L)).thenReturn(parent);
|
||||
PermissionMenuCreateRequest request = createRequest(7L, "app");
|
||||
|
||||
assertThatThrownBy(() -> service.create(request))
|
||||
assertThatThrownBy(() -> service.create(user(1L, "super_admin", 1), null, request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("同一类型");
|
||||
verify(menuMapper, never()).insert(any(PermissionMenuEntity.class));
|
||||
@@ -373,7 +373,7 @@ class PermissionMenuServiceTest {
|
||||
request.setRoutePath("changed");
|
||||
request.setParentId(2L);
|
||||
|
||||
assertThatThrownBy(() -> service.update(1L, request))
|
||||
assertThatThrownBy(() -> service.update(user(1L, "super_admin", 1), 1L, request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("自己的子级");
|
||||
verify(menuMapper, never()).updateById(any(PermissionMenuEntity.class));
|
||||
@@ -394,7 +394,7 @@ class PermissionMenuServiceTest {
|
||||
request.setMenuType("admin");
|
||||
request.setRoutePath("changed");
|
||||
|
||||
assertThatThrownBy(() -> service.update(1L, request))
|
||||
assertThatThrownBy(() -> service.update(user(1L, "super_admin", 1), 1L, request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("子菜单");
|
||||
verify(menuMapper, never()).updateById(any(PermissionMenuEntity.class));
|
||||
@@ -410,7 +410,7 @@ class PermissionMenuServiceTest {
|
||||
when(menuMapper.selectById(1L)).thenReturn(menu(1L, null, "app", 1));
|
||||
when(menuMapper.selectCount(any())).thenReturn(1L);
|
||||
|
||||
assertThatThrownBy(() -> service.delete(1L))
|
||||
assertThatThrownBy(() -> service.delete(user(1L, "super_admin", 1), 1L))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("子菜单");
|
||||
verify(menuMapper, never()).deleteById(any(Long.class));
|
||||
@@ -658,7 +658,7 @@ class PermissionMenuServiceTest {
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(1L));
|
||||
|
||||
service.updateUserColumnPermissions(9L, request);
|
||||
service.updateUserColumnPermissions(null, 9L, request);
|
||||
|
||||
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
|
||||
verify(permissionMapper).insert(captor.capture());
|
||||
@@ -1144,7 +1144,7 @@ class PermissionMenuServiceTest {
|
||||
request.setColumnKey("new_admin_menu");
|
||||
request.setRoutePath("new-admin-menu");
|
||||
|
||||
service.create(request);
|
||||
service.create(user(1L, "super_admin", 1), null, request);
|
||||
|
||||
ArgumentCaptor<PermissionMenuEntity> inserted = ArgumentCaptor.forClass(PermissionMenuEntity.class);
|
||||
verify(menuMapper).insert(inserted.capture());
|
||||
@@ -1169,7 +1169,7 @@ class PermissionMenuServiceTest {
|
||||
request.setMenuType("admin");
|
||||
// 不传 columnKey / routePath:由后台自动生成。
|
||||
|
||||
service.create(request);
|
||||
service.create(user(1L, "super_admin", 1), null, request);
|
||||
|
||||
ArgumentCaptor<PermissionMenuEntity> inserted = ArgumentCaptor.forClass(PermissionMenuEntity.class);
|
||||
verify(menuMapper).insert(inserted.capture());
|
||||
@@ -1195,7 +1195,7 @@ class PermissionMenuServiceTest {
|
||||
request.setMenuType("admin");
|
||||
// 不传 columnKey / routePath:保持原值。
|
||||
|
||||
service.update(1L, request);
|
||||
service.update(user(1L, "super_admin", 1), 1L, request);
|
||||
|
||||
ArgumentCaptor<PermissionMenuEntity> updated = ArgumentCaptor.forClass(PermissionMenuEntity.class);
|
||||
verify(menuMapper).updateById(updated.capture());
|
||||
|
||||
+19
-2
@@ -35,6 +35,23 @@ class SimilarAsinTaskLightControllerTest {
|
||||
private SimilarAsinTaskService service;
|
||||
private MockMvc mockMvc;
|
||||
|
||||
/**
|
||||
* 进度端点从 2026-10-07 起把 body 里的 user_id 交给 {@code AdminAuthSupport#requireOwnershipUserId}
|
||||
* 绑到会话身份上(fail-closed)。这一支用例测的是<b>轻量响应的字段形状</b>,不是归属,
|
||||
* 所以这里给一把"参数与会话一致"的回显桩:原样返回第二个入参,等于已认证用户带着自己的 id。
|
||||
*
|
||||
* <p>⚠️ 别把它换成 {@code new AdminAuthSupport(...)} 的真身,也别删掉:真身会走 JWT 解析 ⇒ 用例
|
||||
* 变成鉴权用例;返回 null 则归属被放宽,恰好把这一支要钉的"绑定值要传下去"糊掉。
|
||||
* 归属接线本身由 {@code ProgressQueryOwnershipOutletTest} 钉。</p>
|
||||
*/
|
||||
private static com.nanri.aiimage.common.security.AdminAuthSupport sessionBoundAuth() {
|
||||
com.nanri.aiimage.common.security.AdminAuthSupport auth =
|
||||
mock(com.nanri.aiimage.common.security.AdminAuthSupport.class);
|
||||
when(auth.requireOwnershipUserId(any(), any()))
|
||||
.thenAnswer(invocation -> invocation.getArgument(1));
|
||||
return auth;
|
||||
}
|
||||
|
||||
private SimilarAsinTaskLightBatchVo lightBatch(SimilarAsinTaskLightVo... items) {
|
||||
SimilarAsinTaskLightBatchVo vo = new SimilarAsinTaskLightBatchVo();
|
||||
vo.getItems().addAll(List.of(items));
|
||||
@@ -57,7 +74,7 @@ class SimilarAsinTaskLightControllerTest {
|
||||
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
|
||||
// 故这里传 null mapper 即可,无需 mock
|
||||
mockMvc = MockMvcBuilders.standaloneSetup(
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), sessionBoundAuth())).build();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -117,7 +134,7 @@ class SimilarAsinTaskLightControllerTest {
|
||||
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
|
||||
// 故这里传 null mapper 即可,无需 mock
|
||||
mockMvc = MockMvcBuilders.standaloneSetup(
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), sessionBoundAuth())).build();
|
||||
mockMvc.perform(post("/api/similar-asin/tasks/progress/batch")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(request)))
|
||||
|
||||
+7
-4
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.task.contract;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.appearancepatent.controller.AppearancePatentController;
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
|
||||
@@ -16,6 +17,7 @@ import com.nanri.aiimage.modules.similarasin.controller.SimilarAsinController;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -107,10 +109,11 @@ class ResultSuccessTimingContractTest {
|
||||
doAnswer(invocation -> null)
|
||||
.when(publishTaskService).submitResult(eq(TASK_ID), any(PublishSubmitResultRequest.class));
|
||||
|
||||
// 第二个构造参数是 AdminAuthSupport(activateFile 取设备号用),本用例只测 submitResult,
|
||||
// 不经过该依赖,故传 null(同文件其它 controller 用例亦有传 null 的先例)。
|
||||
ApiResponse<Void> response = new PublishController(publishTaskService, null)
|
||||
.submitResult(TASK_ID, new PublishSubmitResultRequest());
|
||||
// 第二个构造参数是 AdminAuthSupport:submitResult 现在要把请求体里的 user_id 交给会话出口,
|
||||
// 桩返回 null 即「按会话身份改写归属」,本用例只测「service 提交成功后才回 success」。
|
||||
AdminAuthSupport adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
ApiResponse<Void> response = new PublishController(publishTaskService, adminAuthSupport)
|
||||
.submitResult(TASK_ID, new PublishSubmitResultRequest(), mock(HttpServletRequest.class));
|
||||
|
||||
assertTrue(response.isSuccess(), "success=true");
|
||||
verify(publishTaskService).submitResult(eq(TASK_ID), any(PublishSubmitResultRequest.class));
|
||||
|
||||
Reference in New Issue
Block a user