feat(phase-1): AC-7 数据读取按归属收口、AC-8 匿名写端点要凭据
清空全部历史(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 等)未卷入本提交。
This commit is contained in:
-2
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.mock.web.MockFilterChain;
|
||||
@@ -40,7 +39,6 @@ import static org.mockito.Mockito.when;
|
||||
* 401 的形状沿用既有口径:HTTP 200 + body.code=401(见 {@code AdminApiGuardFilterTest:286-301}
|
||||
* 与 {@code writeFailure:293-298}),不许拿 status 冒充。
|
||||
*/
|
||||
@Disabled("Pending Phase 1: AC-8 匿名写接口收紧(interrupted / files/upload)")
|
||||
@DisplayName("AC-8 匿名写接口必须要求内部令牌或合法 JWT")
|
||||
class PendingPhase1AnonymousWriteGuardTest {
|
||||
|
||||
|
||||
-2
@@ -1,7 +1,6 @@
|
||||
package com.nanri.aiimage.modules.imagehistory.controller;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@@ -28,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* 范围入参,而它一旦改成带范围,本用例的调用形状也得跟着换——那属于 Phase 1 的接口契约变更,
|
||||
* 应该在实现时以真实签名落地(蓝图 §4 Phase 1 已登记本文件的激活与改造同步点)。
|
||||
*/
|
||||
@Disabled("Pending Phase 1: AC-7 生成历史清空按数据范围收口")
|
||||
@DisplayName("AC-7 清空生成历史必须过 DataReadScope")
|
||||
class PendingPhase1HistoryClearScopeTest {
|
||||
|
||||
|
||||
+36
-3
@@ -24,7 +24,12 @@ import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/** 验收反馈:生成记录数据要可清理——DELETE 清空全表并返回清理条数。 */
|
||||
/**
|
||||
* 验收反馈:生成记录数据要可清理——DELETE 清掉范围内记录并返回清理条数。
|
||||
*
|
||||
* <p>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<LambdaQueryWrapper<ImageHistoryEntity>> captor = ArgumentCaptor.captor();
|
||||
verify(historyMapper).delete(captor.capture());
|
||||
assertThat(captor.getValue().getSqlSegment()).contains("user_id");
|
||||
}
|
||||
|
||||
// ---------- 公司 tab 的成员集合怎么进这条查询(Task 8 后半页) ----------
|
||||
//
|
||||
// 范围在 controller 里由 DataReadScope 算,service 只收算好的 List<Long> userIds:
|
||||
|
||||
-2
@@ -1,7 +1,6 @@
|
||||
package com.nanri.aiimage.modules.shopdatacrawl.controller;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@@ -18,7 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* 而列表接口本来就算过 {@code visibleShopKeys}({@code ShopDataCrawlAdminTasksService.java:231}),
|
||||
* 边界口径在同模块内部劈叉——与生成历史清空是同一个病形。
|
||||
*/
|
||||
@Disabled("Pending Phase 1: AC-7 每日档下载/删除按店铺归属校验")
|
||||
@DisplayName("AC-7 每日档下载/删除必须校验归属")
|
||||
class PendingPhase1DailyFileOwnershipTest {
|
||||
|
||||
|
||||
+139
@@ -0,0 +1,139 @@
|
||||
package com.nanri.aiimage.modules.shopdatacrawl.service;
|
||||
|
||||
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.anyString;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.mapper.ShopDataCrawlAdminTasksMapper;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.mapper.ShopDataCrawlItemMapper;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlDownloadRowDto;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.model.entity.ShopDataCrawlDailyFileEntity;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.spi.DuplicateCheckRefreshPort;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.spi.ManagedShopNamesPort;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import java.util.List;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* 每日档按 id 取档/删档的归属闸门(S0-6/AC-7 的真实行为判据)。
|
||||
*
|
||||
* <p>{@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("记录不存在"));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user