From 0e2af881849c5f3334d948f92c7972932da3d6a9 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, 28 Oct 2026 17:03:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(phase-1):=20AC-7=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=8C=89=E5=BD=92=E5=B1=9E=E6=94=B6=E5=8F=A3?= =?UTF-8?q?=E3=80=81AC-8=20=E5=8C=BF=E5=90=8D=E5=86=99=E7=AB=AF=E7=82=B9?= =?UTF-8?q?=E8=A6=81=E5=87=AD=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 清空全部历史(ImageHistoryController/Service)不再接受请求参数里的 user_id 当归属:改走 DataReadScope.readScope(...).userIdsOr(),scope 为空 集时 service 直接 log.warn + return 0,绝不退化成"不筛=全库"。每日档下载 (AdminShopDataCrawlTasksController/ShopDataCrawlAdminTasksService)同样按 可见店铺 key 校验,越权回 BusinessException(403) 而非静默返回别人的文件。 AdminApiGuardFilter 新增 CREDENTIALED_WRITE_PATHS:/api/files/upload 与 /api/tasks/{id}/interrupted 这两个此前带 X-Internal-Token 即可匿名的写端点 改为解析不出身份即 401——静态共享密钥能证明走了内部通道,证明不了是谁。 该判定不吃 user-tool-guard-enabled 总闸,纯令牌存量客户端行为不变。 激活 Phase 0 预置的 3 支 pending 契约(AnonymousWriteGuard / HistoryClearScope / DailyFileOwnership,去 @Disabled),另补 ImageHistoryServiceTest 迁移 + 2 例、 ShopDataCrawlAdminTasksDailyFileOwnershipTest 6 例行为判据。目标 127 例 0 失败。 他人的 collectdata in-flight 改动(CollectDataService/CollectDataHistoryItemVo/ BrandCollectDataTab/collect-data.ts 等)未卷入本提交。 --- .../aiimage/config/AdminApiGuardFilter.java | 45 ++++++ .../controller/ImageHistoryController.java | 11 +- .../service/ImageHistoryService.java | 28 +++- .../AdminShopDataCrawlTasksController.java | 30 +++- .../ShopDataCrawlAdminTasksService.java | 36 ++++- .../PendingPhase1AnonymousWriteGuardTest.java | 2 - .../PendingPhase1HistoryClearScopeTest.java | 2 - .../service/ImageHistoryServiceTest.java | 39 ++++- .../PendingPhase1DailyFileOwnershipTest.java | 2 - ...CrawlAdminTasksDailyFileOwnershipTest.java | 139 ++++++++++++++++++ 10 files changed, 307 insertions(+), 27 deletions(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlAdminTasksDailyFileOwnershipTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java b/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java index 94b59fef7..66bd39f8d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java @@ -51,6 +51,14 @@ import java.util.stream.Collectors; * doFilterInternal 里仍解析不出身份、行为不变,存量客户端零影响。"要求凭据"这一步只能等客户端铺开后再开 * (user-tool-guard-enabled,配合 user-tool-guard-prefixes 按前缀分批收)。 * + *
两条写端点不再等总闸(2026-10-28 补,S0-7/AC-8):{@code POST /api/files/upload} 与 + * {@code POST /api/tasks/{id}/interrupted} 收进 {@code CREDENTIALED_WRITE_PATHS}/ + * {@code TASK_INTERRUPTED_SUFFIX},{@code user-tool-guard-enabled=false}(出厂默认)不再是它们的 + * 豁免理由——匿名遍历 taskId 就能把别人的 RUNNING 任务置 FAILED,匿名上传能塞满临时盘。 + * 可信内部令牌照常放行(4.0.66 客户端带令牌;旧客户端在这一跳会拿到 body.code=401, + * 崩溃残留上报退回服务端 stale 兜底,最长 30 分钟)。同前缀的 {@code pull-pending} 与 + * {@code heartbeat} 不受影响:那条前缀下还有匿名直连的 worker 在用。 + * *
豁免项:OPTIONS 预检;以及 aiimage.security.admin-guard-exempt-prefixes 配置的前缀 * (逗号分隔,用于内部自动化/设备回调等确需匿名可达的端点)。紧急回退: * aiimage.security.admin-guard-enabled=false 关闭本过滤器。 @@ -127,6 +135,13 @@ public class AdminApiGuardFilter extends OncePerRequestFilter { "/api/user/cost-guard", }; + /** 必须解析得出身份才放行的确切写路径(S0-7/AC-8),不受 {@code user-tool-guard-enabled} 豁免。 */ + private static final String[] CREDENTIALED_WRITE_PATHS = {"/api/files/upload"}; + + /** 打断任务这条动作:只收 {@code /api/tasks/{id}/interrupted},不动同前缀的 pull-pending/heartbeat。 */ + private static final String TASK_PATH_PREFIX = "/api/tasks/"; + private static final String TASK_INTERRUPTED_SUFFIX = "/interrupted"; + private final AdminAuthSupport adminAuthSupport; private final ObjectMapper objectMapper; @@ -242,6 +257,14 @@ public class AdminApiGuardFilter extends OncePerRequestFilter { writeFailure(response, code, ex.getMessage()); return; } + if (identity == null && isCredentialRequiredWriteEndpoint(uri)) { + // 这两条写端点不接受"解析不出身份也照样往下走":requireUserOrInternal 对 + // 某些空凭据形状是返回 null 而不是抛(S0-7 取证),只靠上面的 catch 会漏成放行。 + log.warn("[admin-guard] {} {} 匿名写请求被拒:该端点不受 user-tool-guard-enabled 豁免", + request.getMethod(), uri); + writeFailure(response, 401, "未登录"); + return; + } } else { // 归属绑定只约束"能解析出身份"的请求:存量匿名客户端(不带 JWT)解析不出身份,行为不变。 try { @@ -308,6 +331,10 @@ public class AdminApiGuardFilter extends OncePerRequestFilter { if (matchesPrefix(uri, ADMIN_API_PREFIX) || matchesPrefix(uri, DEBUG_PREFIX)) { return true; } + if (isCredentialRequiredWriteEndpoint(uri)) { + // S0-7/AC-8:匿名能打断别人的任务、匿名能塞满临时盘,这两条不挂总闸 + return true; + } for (String prefix : SELF_SERVICE_PREFIXES) { if (matchesPrefix(uri, prefix)) { return true; @@ -316,6 +343,24 @@ public class AdminApiGuardFilter extends OncePerRequestFilter { return userToolGuardEnabled && isUserToolPrefix(uri) && listedForGuard(uri); } + /** + * 这两条写端点是否必须"解析得出身份"(或可信内部令牌)才放行——S0-7 收口。 + * + *
刻意不收整条 {@code /api/tasks}:同前缀的 {@code pull-pending} 与 heartbeat 有
+ * 匿名直连的 worker 在用,蓝图 §3.1 只点名 interrupted 与 {@code /api/files/upload}。
+ * 收的是**确切路径 / 前后缀都对得上**的那一条动作,多一个字符都不算。
+ */
+ static boolean isCredentialRequiredWriteEndpoint(String uri) {
+ String path = uri == null ? "" : uri;
+ for (String exact : CREDENTIALED_WRITE_PATHS) {
+ if (path.equals(exact)) {
+ return true;
+ }
+ }
+ return path.startsWith(TASK_PATH_PREFIX) && path.endsWith(TASK_INTERRUPTED_SUFFIX)
+ && path.length() > TASK_PATH_PREFIX.length() + TASK_INTERRUPTED_SUFFIX.length();
+ }
+
/** 未强制要求凭据的用户态前缀:只要带了 user_id 参数,归属就得和令牌身份对齐。 */
private boolean needsOwnershipBinding(HttpServletRequest request, String uri) {
if (!isUserToolPrefix(uri)) {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/imagehistory/controller/ImageHistoryController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/imagehistory/controller/ImageHistoryController.java
index 45b90c2a2..cf3934ad8 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/imagehistory/controller/ImageHistoryController.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/imagehistory/controller/ImageHistoryController.java
@@ -55,13 +55,18 @@ public class ImageHistoryController {
}
@DeleteMapping("/history")
- @Operation(summary = "清空全部生成记录")
- public ApiResponse {@code userIds} 的语义与 {@code listHistory} 逐字一致:{@code null} = 不筛
+ * (超管没选公司,保持既有行为),非 null = 只清这批账号。**空集直接返回 0**——
+ * 空集是"这个范围里一个成员账号都没有",退化成不筛就是去删别人的历史。
+ *
+ * 全清是不可逆操作,必须留下可查证的审计(谁、什么时候、清了哪个范围),
+ * 不能删完无声。返回清理条数。
+ */
+ public long clearAllHistory(String operatorName, List 超管没选公司 ⇒ {@code readScope} 不筛 ⇒ 返回 {@code null}(全量);
+ * 非超管 ⇒ 按他管的店铺分组推可见集,与他在这一页列表里看到的范围相同。
+ */
+ private List S0-6/AC-7:取档必须先过店铺归属。{@code visibleShopKeys} 与列表端点同一把尺子
+ * ({@code null} = 全量,非 null = 只认这批店铺名 key),归属判定写在这条路径内部,
+ * 不靠调用方自觉——过去两个按 id 的入口都只吃一个 id,任一有菜单的管理员
+ * 都能按 id 下载/真删别人公司的每日档。
+ */
+ public DailyDownload resolveDailyDownload(Long dailyFileId, List S0-6/AC-7:真删比下载更危险,同一把归属尺子必须在动手之前落。
+ */
+ public void deleteAdminDailyFile(Long dailyFileId, List 2026-10-28(AC-7/S0-6)起删除带数据范围:{@code userIds} 为 null 是不筛(超管没选公司,
+ * 保持既有全量语义),空集是"这个范围里没有成员账号"⇒ 一行都不许删,绝不退化成不筛。
+ */
class ImageHistoryServiceTest {
@BeforeEach
@@ -45,7 +50,7 @@ class ImageHistoryServiceTest {
when(historyMapper.selectCount(any())).thenReturn(42L);
- long removed = service.clearAllHistory("admin");
+ long removed = service.clearAllHistory("admin", null);
assertThat(removed).isEqualTo(42L);
verify(historyMapper).delete(any());
@@ -59,10 +64,38 @@ class ImageHistoryServiceTest {
when(historyMapper.selectCount(any())).thenReturn(0L);
- assertThat(service.clearAllHistory("admin")).isZero();
+ assertThat(service.clearAllHistory("admin", null)).isZero();
verify(historyMapper).delete(any());
}
+ @Test
+ void 空成员集必须一行都不删() {
+ // S0-6 的关键边界:空集="这家公司没有成员账号",退化成不筛就是去删别人公司的历史。
+ // 所以既不许 selectCount 也不许 delete——一次 DB 调用都不能有。
+ ImageHistoryMapper historyMapper = mock(ImageHistoryMapper.class);
+ AdminUserMapper userMapper = mock(AdminUserMapper.class);
+ ImageHistoryService service = new ImageHistoryService(historyMapper, userMapper, new ObjectMapper());
+
+ assertThat(service.clearAllHistory("admin", List.of())).isZero();
+ verify(historyMapper, never()).delete(any());
+ verify(historyMapper, never()).selectCount(any());
+ }
+
+ @Test
+ void 带范围时必须把成员集合写进删除条件() {
+ // 范围不能只在方法签名上存在:delete 的 wrapper 必须带上 user_id IN (...)。
+ ImageHistoryMapper historyMapper = mock(ImageHistoryMapper.class);
+ AdminUserMapper userMapper = mock(AdminUserMapper.class);
+ ImageHistoryService service = new ImageHistoryService(historyMapper, userMapper, new ObjectMapper());
+ when(historyMapper.selectCount(any())).thenReturn(3L);
+
+ assertThat(service.clearAllHistory("admin", List.of(7L, 8L))).isEqualTo(3L);
+
+ ArgumentCaptor {@code PendingPhase1DailyFileOwnershipTest} 钉的是源码连线(校验有没有写在取 URL 之前),
+ * 本类钉的是行为:越界必须 403 且**一次副作用都不许发生**(不许生成签名 URL、不许进分布式锁)。
+ * 范围口径与列表端点共用 {@code visibleShopKeys}:{@code null} = 全量(超管没选公司),
+ * 空集 = 一家都不可见,非空 = 只认这批店铺名 key(同一套 trim + 小写归一)。
+ */
+class ShopDataCrawlAdminTasksDailyFileOwnershipTest {
+
+ private ShopDataCrawlAdminTasksMapper adminTasksMapper;
+ private ShopDataCrawlDailyFileService dailyFileService;
+ private OssStorageService ossStorageService;
+ private ShopDataCrawlAdminTasksService service;
+
+ @BeforeEach
+ void setUp() {
+ adminTasksMapper = mock(ShopDataCrawlAdminTasksMapper.class);
+ dailyFileService = mock(ShopDataCrawlDailyFileService.class);
+ ossStorageService = mock(OssStorageService.class);
+ service = new ShopDataCrawlAdminTasksService(
+ adminTasksMapper, mock(ManagedShopNamesPort.class),
+ mock(ShopDataCrawlItemMapper.class),
+ mock(FileResultMapper.class),
+ dailyFileService,
+ ossStorageService,
+ mock(ShopDataCrawlTaskService.class),
+ mock(DuplicateCheckRefreshPort.class),
+ new ObjectMapper());
+ }
+
+ private void givenDailyFileOf(String shopName) {
+ ShopDataCrawlDailyFileEntity dailyFile = new ShopDataCrawlDailyFileEntity();
+ dailyFile.setId(9001L);
+ dailyFile.setShopName(shopName);
+ dailyFile.setShopKey("key-9001");
+ when(dailyFileService.findById(9001L)).thenReturn(dailyFile);
+ }
+
+ private void givenDownloadRow() {
+ ShopDataCrawlDownloadRowDto row = new ShopDataCrawlDownloadRowDto();
+ row.setResultFileUrl("nanri-image/versions/9001.xlsx");
+ row.setResultFilename("9001.xlsx");
+ when(adminTasksMapper.selectDownloadRowById(9001L)).thenReturn(row);
+ when(ossStorageService.generateFreshDownloadUrl(anyString())).thenReturn("https://oss/signed");
+ }
+
+ @Test
+ @DisplayName("全量范围(超管没选公司):照常取到签名地址")
+ void unfilteredScopeStillResolves() {
+ givenDailyFileOf(" company-a-shop ");
+ givenDownloadRow();
+
+ ShopDataCrawlAdminTasksService.DailyDownload daily = service.resolveDailyDownload(9001L, null);
+
+ assertThat(daily.url()).isEqualTo("https://oss/signed");
+ assertThat(daily.filename()).isEqualTo("9001.xlsx");
+ }
+
+ @Test
+ @DisplayName("可见集里的店铺:归一后命中就放行")
+ void visibleShopIsAllowed() {
+ givenDailyFileOf("Company-A-Shop");
+ givenDownloadRow();
+
+ assertThat(service.resolveDailyDownload(9001L, List.of("company-a-shop")).url())
+ .isEqualTo("https://oss/signed");
+ }
+
+ @Test
+ @DisplayName("别人公司的档:403 且不生成签名地址")
+ void foreignShopDownloadIsRefused() {
+ givenDailyFileOf("company-b-shop");
+ givenDownloadRow();
+
+ assertThatThrownBy(() -> service.resolveDailyDownload(9001L, List.of("company-a-shop")))
+ .isInstanceOfSatisfying(BusinessException.class,
+ ex -> assertThat(ex.getCode()).isEqualTo(403));
+ verify(ossStorageService, never()).generateFreshDownloadUrl(anyString());
+ }
+
+ @Test
+ @DisplayName("可见集为空=一家都不可见,不许退化成全量")
+ void emptyScopeRefusesInsteadOfShowingEverything() {
+ givenDailyFileOf("company-a-shop");
+ givenDownloadRow();
+
+ assertThatThrownBy(() -> service.resolveDailyDownload(9001L, List.of()))
+ .isInstanceOf(BusinessException.class);
+ }
+
+ @Test
+ @DisplayName("删别人公司的档:403 且不进分布式锁(副作用一次都不许发生)")
+ void foreignShopDeleteStopsBeforeLock() {
+ givenDailyFileOf("company-b-shop");
+
+ assertThatThrownBy(() -> service.deleteAdminDailyFile(9001L, List.of("company-a-shop")))
+ .isInstanceOfSatisfying(BusinessException.class,
+ ex -> assertThat(ex.getCode()).isEqualTo(403));
+ verify(dailyFileService, never()).acquireLock(any());
+ verify(dailyFileService, never()).deleteDailyFile(any());
+ }
+
+ @Test
+ @DisplayName("档不存在:报记录不存在,而不是当成越权放行")
+ void missingDailyFileIsNotFound() {
+ when(dailyFileService.findById(9001L)).thenReturn(null);
+
+ assertThatThrownBy(() -> service.resolveDailyDownload(9001L, List.of("company-a-shop")))
+ .isInstanceOfSatisfying(BusinessException.class,
+ ex -> assertThat(ex).hasMessageContaining("记录不存在"));
+ }
+}