fix(鉴权): 任务归属身份从会话推导,user_id 与不符即 403
客户端任务接口原先把"这单是谁的"交给调用方自报:请求体/查询串带 user_id,服务端拿它当范围 条件。身份应只信会话(JWT),桌面执行器与内部代理通道也不例外: - AdminAuthSupport 增加 mayActForOtherUsers / resolveOwnershipUserId / requireOwnershipUserId / bindOwnershipUserId:会话身份与请求 user_id 不一致直接 403, 只有平台超管与被授权管理员能代他人; - 上架(PublishController/PublishTaskService)先接:user_id 缺失即 401, 仅两个桌面执行器端点允许留空;外观专利/相似 ASIN 的归属谓词补上 Objects.equals(userId, task.getUserId()),不再只比 moduleType; - AdminApiGuardFilter 把入口口径与新helper 对齐,护栏测试 AdminAuthSupportOwnershipTest + PublishOwnershipGuardrailTest 双向钉(放行面与拒绝面都有样本)。 同族的进度类模块(原先仍以请求体 user_id 为范围)在 cp-item7 一次接完;这一支只管会改状态/花钱的出口。 另外 resolveOwnershipUserId 的 [ownership-anonymous] 日志按 URI 限流也在这支——桌面执行器 4.0.44 不带凭据,只有分得清是哪个端点在打匿名请求,才敢逐支把它们从 resolve 换成 require。
This commit is contained in:
+134
@@ -0,0 +1,134 @@
|
||||
package com.nanri.aiimage.modules.publish.controller;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* 上架(publish)归属绑定的绊线(2026-10-07)。
|
||||
*
|
||||
* <p>publish 此前的形状:12 个端点没有一个在兜底守卫名单里,控制器不调 require*,
|
||||
* {@code user_id} 要么可选要么由前端从 localStorage 取——也就是"数据属于谁"完全由请求说了算。
|
||||
* 本轮收口后的形状必须是可证的,否则下次有人"顺手"改回参数判定不会有任何东西变红:</p>
|
||||
*
|
||||
* <ol>
|
||||
* <li>带 user_id 的端点分母钉死(查询参数 8 个 + 请求体 4 个 = 12 个走会话推导)。
|
||||
* 其中 10 个走 {@code requireOwnershipUserId}(解析不出登录身份即 401,网页端/后台专用),
|
||||
* 2 个走 {@code resolveOwnershipUserId}——只有执行器可达的 {@code items}(取数)和
|
||||
* {@code result}(回传):桌面端只带 X-Internal-Token、不带 operatorId,给它俩加 require
|
||||
* 等于把上架整条链路挡在 401。resolve 对匿名请求是原样透传,对带凭据的请求仍然冒名即 403。</li>
|
||||
* <li>"null 即跳过归属校验"这个形状在服务层只能剩 1 处(publish 的 requireTaskRecord,
|
||||
* 为执行器留的口子),外观专利与货源的 4 处已改为无条件比对。</li>
|
||||
* </ol>
|
||||
*
|
||||
* <p>数字判据一律打在 {@link SourceScan#withoutComments} 上:javadoc 里提一句 {@code requireOwnershipUserId}
|
||||
* 就能把"次数等于 N"喂成假绿。只有"豁免必须写明理由"那支刻意吃原文,因为它要钉的就是注释本身。</p>
|
||||
*/
|
||||
class PublishOwnershipGuardrailTest {
|
||||
|
||||
private static final Pattern QUERY_USER_ID = Pattern.compile(
|
||||
"@RequestParam\\(\\s*(?:value\\s*=\\s*)?\"user_id\"[^)]*\\)\\s+Long\\s+\\w+");
|
||||
|
||||
@Test
|
||||
void everyUserIdCarryingPublishEndpointIsDerivedFromSession() {
|
||||
String controller = SourceScan.withoutComments(SourceScan.sourceText("PublishController.java"));
|
||||
|
||||
Matcher query = QUERY_USER_ID.matcher(controller);
|
||||
int queryBindings = 0;
|
||||
while (query.find()) {
|
||||
queryBindings++;
|
||||
}
|
||||
assertThat(queryBindings)
|
||||
.as("publish 控制器里 user_id 查询参数绑定数")
|
||||
.isEqualTo(8);
|
||||
|
||||
// 请求体里带 user_id 的四个:parse / progress/batch / progress/light / result
|
||||
long bodyBindings = Stream.of("PublishParseRequest request",
|
||||
"PublishTaskBatchRequest request",
|
||||
"TaskProgressLightRequest request",
|
||||
"PublishSubmitResultRequest request")
|
||||
.filter(controller::contains)
|
||||
.count();
|
||||
assertThat(bodyBindings).as("publish 控制器里请求体带 user_id 的端点数").isEqualTo(4);
|
||||
|
||||
int require = count(controller, "adminAuthSupport.requireOwnershipUserId(");
|
||||
int resolve = count(controller, "adminAuthSupport.resolveOwnershipUserId(");
|
||||
assertThat(require)
|
||||
.as("requireOwnershipUserId 调用数(网页端/后台专用,解析不出身份即 401)")
|
||||
.isEqualTo(10);
|
||||
assertThat(resolve)
|
||||
.as("resolveOwnershipUserId 调用数(执行器可达的两条:items 取数、result 回传)")
|
||||
.isEqualTo(2);
|
||||
assertThat(require + resolve)
|
||||
.as("12 个带归属的端点必须逐个接上会话推导,一个都不能只靠请求参数")
|
||||
.isEqualTo(queryBindings + bodyBindings);
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行器回传端点是刻意的例外:给它加 require 等于把上架整条链路挡在 401。
|
||||
*
|
||||
* <p>反向钉必须配一条正向取样,否则"方法体切不到"和"方法体真的没调用"这两种情况都是绿的。</p>
|
||||
*/
|
||||
@Test
|
||||
void resultSubmissionStaysReachableWithoutLoginIdentity() {
|
||||
String controller = SourceScan.withoutComments(SourceScan.sourceText("PublishController.java"));
|
||||
String body = SourceScan.methodBody(controller, "submitResult");
|
||||
|
||||
assertThat(body)
|
||||
.as("submitResult 只能走透传的 resolve(带凭据时依旧校验归属,匿名执行器不被 401)")
|
||||
.contains("adminAuthSupport.resolveOwnershipUserId(");
|
||||
assertThat(body)
|
||||
.as("给 submitResult 加 require 会把无登录身份的桌面执行器挡在 401")
|
||||
.doesNotContain("requireOwnershipUserId");
|
||||
}
|
||||
|
||||
/** 同理,items 是执行器唯一的取数口,也只能透传、不能 require。 */
|
||||
@Test
|
||||
void executorReadPathStaysReachableWithoutLoginIdentity() {
|
||||
String controller = SourceScan.withoutComments(SourceScan.sourceText("PublishController.java"));
|
||||
String body = SourceScan.methodBody(controller, "items");
|
||||
|
||||
assertThat(body).contains("adminAuthSupport.resolveOwnershipUserId(");
|
||||
assertThat(body).doesNotContain("requireOwnershipUserId");
|
||||
}
|
||||
|
||||
/**
|
||||
* "userId != null 才校验归属"在服务层只剩一处出口,且那一处必须带写明理由的注释
|
||||
* (匿名执行器 items/result 走 requireTaskRecord)。
|
||||
*/
|
||||
@Test
|
||||
void nullSkipsOwnershipCheckOnlyOnTheExecutorReadPath() {
|
||||
String publishService = SourceScan.sourceText("PublishTaskService.java");
|
||||
String publishCode = SourceScan.withoutComments(publishService);
|
||||
String appearanceCode = SourceScan.withoutComments(SourceScan.sourceText("AppearancePatentTaskService.java"));
|
||||
String similarAsinCode = SourceScan.withoutComments(SourceScan.sourceText("SimilarAsinTaskService.java"));
|
||||
|
||||
assertThat(count(appearanceCode, "userId != null && !Objects.equals(userId, task.getUserId())"))
|
||||
.as("外观专利的两处条件归属校验必须已改成无条件比对")
|
||||
.isZero();
|
||||
assertThat(count(similarAsinCode, "userId != null && !Objects.equals(userId, task.getUserId())"))
|
||||
.as("货源的两处条件归属校验必须已改成无条件比对")
|
||||
.isZero();
|
||||
assertThat(count(publishCode, "userId != null && !userId.equals(task.getUserId())"))
|
||||
.as("publish 保留的那一处是唯一登记在册的口子,多一处就是有人新开了免校验通道")
|
||||
.isEqualTo(1);
|
||||
assertThat(publishService)
|
||||
.as("保留口子必须写明它只服务于哪个匿名执行器路径(这支刻意扫原文:要钉的就是注释)")
|
||||
.contains("GET /tasks/{id}/items 与 POST /tasks/{id}/result");
|
||||
}
|
||||
|
||||
private static int count(String haystack, String needle) {
|
||||
int index = 0;
|
||||
int total = 0;
|
||||
while ((index = haystack.indexOf(needle, index)) >= 0) {
|
||||
total++;
|
||||
index += needle.length();
|
||||
}
|
||||
return total;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user