From 5b310986bb6516730dba36b8a06e753e0db7725f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 7 Oct 2026 23:47:57 +0800 Subject: [PATCH] =?UTF-8?q?docs(=E9=89=B4=E6=9D=83):=20=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=89=E5=A4=84=E4=B8=80=E8=B5=B7=E8=AE=A2?= =?UTF-8?q?=E6=AD=A3=E2=80=94=E2=80=94=E6=89=A7=E8=A1=8C=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=9D=A5=E8=87=AA=20Session.request=20?= =?UTF-8?q?=E9=92=A9=E5=AD=90=EF=BC=8C=E4=B8=8D=E6=98=AF=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PublishTaskService:1360 与 PublishOwnershipGuardrailTest 的立项理由都写成"执行器带 X-Internal-Token 不带 operatorId",AdminAuthSupport 的 resolve 注释写成"桌面客户端不带凭据"。 三处同源同错:add_product.py 那两条调用点 headers 只有 Content-Type,身份是 app_client/crawler_core/user_token.py 包 requests.Session.request 补的 Authorization: Bearer (main.py:2115 装钩子、窗口桥 set_user_token 交令牌、执行器与页面同进程且未登录即跳过本轮), 4.0.14(96cf19b) 起随包出厂。留在匿名分支里的只是 4.0.14 之前的存量装机, 翻 require 的时机因此由升级通道决定,不是"桌面端整体不能翻"。 守卫扫的那句 "GET /tasks/{id}/items 与 POST /tasks/{id}/result" 原样保留(计数回读=1)。 --- .../nanri/aiimage/common/security/AdminAuthSupport.java | 4 +++- .../modules/publish/service/PublishTaskService.java | 7 ++++--- .../publish/controller/PublishOwnershipGuardrailTest.java | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java b/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java index 0ab83f71c..106a2728d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java @@ -212,7 +212,9 @@ public class AdminAuthSupport { * *
解析得出身份时:参数缺省就用会话 id("省略 user_id 时由 taskId 反查"从此不再是无归属通道); * 参数与会话不一致直接 403(数据归属不再由请求参数说了算);管理角色豁免。 - * 解析不出身份时原样返回参数——桌面客户端不带凭据也不带 operatorId,这条给它们留滚动窗口, + * 解析不出身份时原样返回参数——留在这一支的不是"桌面端整体",而是不带登录 JWT 的存量装机 + * (4.0.14 之前;此后身份由 {@code app_client/crawler_core/user_token.py} 的 + * {@code requests.Session.request} 钩子统一注入),这条给它们留滚动窗口, * "必须带凭据"那一步由 aiimage.security.user-tool-guard-enabled 开关控制。
*/ public Long resolveOwnershipUserId(HttpServletRequest request, Long requestedUserId) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java index fa2fb1404..88ecb7ec0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java @@ -1357,9 +1357,10 @@ public class PublishTaskService { throw new BusinessException("taskId 不合法"); } // user_id 为空**不**等于跳过归属校验:这里留空只允许出现在桌面执行器的两个端点上 - // (GET /tasks/{id}/items 与 POST /tasks/{id}/result,它们带 X-Internal-Token 但不带 operatorId, - // 服务端解析不出身份)。其余端点一律由 PublishController 用 requireOwnershipUserId 传入会话身份, - // 缺失即 401、冒名即 403。 + // (GET /tasks/{id}/items 与 POST /tasks/{id}/result——执行器的身份由客户端 + // crawler_core/user_token.py 的 Session.request 钩子补 Authorization: Bearer,4.0.14 之前的 + // 存量装机不带,服务端才解析不出身份、userId 才落到 null)。其余端点一律由 PublishController + // 用 requireOwnershipUserId 传入会话身份,缺失即 401、冒名即 403。 FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || (userId != null && !userId.equals(task.getUserId()))) { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/publish/controller/PublishOwnershipGuardrailTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/publish/controller/PublishOwnershipGuardrailTest.java index 8faaa3baf..ccbcd23c8 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/publish/controller/PublishOwnershipGuardrailTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/publish/controller/PublishOwnershipGuardrailTest.java @@ -20,8 +20,11 @@ import static org.assertj.core.api.Assertions.assertThat; *