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:
+8
-3
@@ -55,13 +55,18 @@ public class ImageHistoryController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/history")
|
||||
@Operation(summary = "清空全部生成记录")
|
||||
public ApiResponse<Long> clearHistory(HttpServletRequest request) {
|
||||
@Operation(summary = "清空所选范围内的生成记录")
|
||||
public ApiResponse<Long> clearHistory(HttpServletRequest request,
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
if (!permissionMenuService.hasAnyAdminMenu(operator, List.of("admin_history"))) {
|
||||
throw new BusinessException(403, "无权访问生成记录模块");
|
||||
}
|
||||
long removed = imageHistoryService.clearAllHistory(operator.getUsername());
|
||||
// S0-6(AC-7):清空必须走与上面列表**同一把**读范围。过去这一支只认菜单就把
|
||||
// delete 全表交出去,任一管理员都能把别人公司的生成历史一次清光;
|
||||
// 范围算不出来(空集)时 service 侧直接返回 0,绝不退化成"不筛"。
|
||||
List<Long> scoped = dataReadScope.readScope(operator, companyId).userIdsOr(null);
|
||||
long removed = imageHistoryService.clearAllHistory(operator.getUsername(), scoped);
|
||||
return ApiResponse.success(removed);
|
||||
}
|
||||
}
|
||||
|
||||
+23
-5
@@ -92,12 +92,30 @@ public class ImageHistoryService {
|
||||
return vo;
|
||||
}
|
||||
|
||||
/** 清空全部生成记录(验收反馈:生成记录数据要可清理)。返回清理条数。 */
|
||||
public long clearAllHistory(String operatorName) {
|
||||
Long count = imageHistoryMapper.selectCount(new LambdaQueryWrapper<>());
|
||||
/**
|
||||
* 清空生成记录,删除范围由调用方经 {@code DataReadScope} 算好传入(S0-6/AC-7)。
|
||||
*
|
||||
* <p>{@code userIds} 的语义与 {@code listHistory} 逐字一致:{@code null} = 不筛
|
||||
* (超管没选公司,保持既有行为),非 null = 只清这批账号。**空集直接返回 0**——
|
||||
* 空集是"这个范围里一个成员账号都没有",退化成不筛就是去删别人的历史。
|
||||
*
|
||||
* <p>全清是不可逆操作,必须留下可查证的审计(谁、什么时候、清了哪个范围),
|
||||
* 不能删完无声。返回清理条数。
|
||||
*/
|
||||
public long clearAllHistory(String operatorName, List<Long> userIds) {
|
||||
String operator = operatorName == null ? "unknown" : operatorName;
|
||||
if (userIds != null && userIds.isEmpty()) {
|
||||
log.warn("[image-history] 管理员 {} 请求清空生成记录,但所选范围内没有任何成员账号 ⇒ 未删除任何行",
|
||||
operator);
|
||||
return 0L;
|
||||
}
|
||||
LambdaQueryWrapper<ImageHistoryEntity> scope = new LambdaQueryWrapper<>();
|
||||
scope.in(userIds != null, ImageHistoryEntity::getUserId, userIds);
|
||||
Long count = imageHistoryMapper.selectCount(scope);
|
||||
long removed = count == null ? 0L : count;
|
||||
imageHistoryMapper.delete(new LambdaQueryWrapper<>());
|
||||
log.info("[image-history] 管理员 {} 清空生成记录,共清理 {} 条", operatorName == null ? "unknown" : operatorName, removed);
|
||||
imageHistoryMapper.delete(scope);
|
||||
log.info("[image-history] 管理员 {} 清空生成记录,共清理 {} 条,范围={}",
|
||||
operator, removed, userIds == null ? "全部成员(超管未选公司)" : "指定成员 " + userIds.size() + " 人");
|
||||
return removed;
|
||||
}
|
||||
|
||||
|
||||
+24
-6
@@ -108,13 +108,17 @@ public class AdminShopDataCrawlTasksController {
|
||||
}
|
||||
|
||||
@GetMapping("/daily-files/{dailyFileId}/download")
|
||||
@Operation(summary = "下载该店最新一次采集的数据文件(按累计档 id)")
|
||||
@Operation(summary = "下载该店最新一次采集的数据文件(按累计档 id,限可见店铺)")
|
||||
public void downloadDailyFile(
|
||||
@PathVariable Long dailyFileId,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
requireShopDataCrawlTaskAccess(request);
|
||||
ShopDataCrawlAdminTasksService.DailyDownload daily = adminTasksService.resolveDailyDownload(dailyFileId);
|
||||
// S0-6(AC-7):过去这两支都调了 requireShopDataCrawlTaskAccess 却把返回值丢掉,
|
||||
// 于是只判到"有没有这张菜单",任何管理员按 id 就能下载/真删别人公司的档。
|
||||
// 归属尺子与上面列表端点同一把(visibleShopKeys)。
|
||||
AdminUserEntity operator = requireShopDataCrawlTaskAccess(request);
|
||||
ShopDataCrawlAdminTasksService.DailyDownload daily =
|
||||
adminTasksService.resolveDailyDownload(dailyFileId, resolveOwnershipKeys(operator));
|
||||
try {
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
DownloadHeaderUtil.setAttachment(response, daily.filename());
|
||||
@@ -128,15 +132,29 @@ public class AdminShopDataCrawlTasksController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/daily-files/{dailyFileId}")
|
||||
@Operation(summary = "删除该店这条店铺数据记录(累计档 + 文件 + 明细,管理端显式操作)")
|
||||
@Operation(summary = "删除该店这条店铺数据记录(累计档 + 文件 + 明细,限可见店铺)")
|
||||
public ApiResponse<Void> deleteDailyFile(
|
||||
@PathVariable Long dailyFileId,
|
||||
HttpServletRequest request) {
|
||||
requireShopDataCrawlTaskAccess(request);
|
||||
adminTasksService.deleteAdminDailyFile(dailyFileId);
|
||||
AdminUserEntity operator = requireShopDataCrawlTaskAccess(request);
|
||||
adminTasksService.deleteAdminDailyFile(dailyFileId, resolveOwnershipKeys(operator));
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按 id 操作单档时的归属范围:口径与列表端点逐字一致,只是没有公司 tab(传 null)。
|
||||
*
|
||||
* <p>超管没选公司 ⇒ {@code readScope} 不筛 ⇒ 返回 {@code null}(全量);
|
||||
* 非超管 ⇒ 按他管的店铺分组推可见集,与他在这一页列表里看到的范围相同。
|
||||
*/
|
||||
private List<String> resolveOwnershipKeys(AdminUserEntity operator) {
|
||||
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
|
||||
List<Long> companyMemberIds = superAdmin
|
||||
? dataReadScope.readScope(operator, null).userIdsOr(null)
|
||||
: null;
|
||||
return adminTasksService.resolveVisibleShopKeys(operator.getId(), superAdmin, companyMemberIds);
|
||||
}
|
||||
|
||||
@PostMapping("/download-zip")
|
||||
@Operation(summary = "批量下载选中结果文件为 zip(文件部分失败经响应头 X-Archive-Error-Count 提示)")
|
||||
public void downloadZip(
|
||||
|
||||
+32
-4
@@ -59,8 +59,20 @@ public class ShopDataCrawlAdminTasksService {
|
||||
public record DailyDownload(String url, String filename) {
|
||||
}
|
||||
|
||||
/** 按累计档 id 解析可下载地址(生成新鲜签名 URL)与文件名。 */
|
||||
public DailyDownload resolveDailyDownload(Long dailyFileId) {
|
||||
/**
|
||||
* 按累计档 id 解析可下载地址(生成新鲜签名 URL)与文件名。
|
||||
*
|
||||
* <p>S0-6/AC-7:取档必须先过店铺归属。{@code visibleShopKeys} 与列表端点同一把尺子
|
||||
* ({@code null} = 全量,非 null = 只认这批店铺名 key),归属判定写在这条路径内部,
|
||||
* 不靠调用方自觉——过去两个按 id 的入口都只吃一个 id,任一有菜单的管理员
|
||||
* 都能按 id 下载/真删别人公司的每日档。
|
||||
*/
|
||||
public DailyDownload resolveDailyDownload(Long dailyFileId, List<String> visibleShopKeys) {
|
||||
ShopDataCrawlDailyFileEntity owned = dailyFileService.findById(dailyFileId);
|
||||
if (owned == null) {
|
||||
throw new BusinessException("记录不存在");
|
||||
}
|
||||
requireShopVisible(owned.getShopName(), visibleShopKeys);
|
||||
ShopDataCrawlDownloadRowDto row = adminTasksMapper.selectDownloadRowById(dailyFileId);
|
||||
if (row == null || row.getResultFileUrl() == null || row.getResultFileUrl().isBlank()) {
|
||||
throw new BusinessException("记录不存在或文件未就绪");
|
||||
@@ -73,8 +85,23 @@ public class ShopDataCrawlAdminTasksService {
|
||||
return new DailyDownload(url, filename);
|
||||
}
|
||||
|
||||
/** 管理端真删该店这条店铺数据记录(累计档 + 文件 + 明细),仅允许删除已生成文件的终态记录。 */
|
||||
public void deleteAdminDailyFile(Long dailyFileId) {
|
||||
/** 该档归属的店铺是否在这个操作人可见范围内({@code visibleShopKeys == null} = 全量,直接通过)。 */
|
||||
private void requireShopVisible(String shopName, List<String> visibleShopKeys) {
|
||||
if (visibleShopKeys == null) {
|
||||
return;
|
||||
}
|
||||
if (!visibleShopKeys.contains(normalizeShopKey(shopName))) {
|
||||
// 拒到 403 而不是"返回一个空下载地址":空壳会让用户以为自己的档案丢了
|
||||
throw new BusinessException(403, "无权访问其他公司的店铺数据");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 管理端真删该店这条店铺数据记录(累计档 + 文件 + 明细),仅允许删除已生成文件的终态记录。
|
||||
*
|
||||
* <p>S0-6/AC-7:真删比下载更危险,同一把归属尺子必须在动手之前落。
|
||||
*/
|
||||
public void deleteAdminDailyFile(Long dailyFileId, List<String> visibleShopKeys) {
|
||||
if (dailyFileId == null || dailyFileId <= 0) {
|
||||
throw new BusinessException("参数不合法");
|
||||
}
|
||||
@@ -82,6 +109,7 @@ public class ShopDataCrawlAdminTasksService {
|
||||
if (dailyFile == null) {
|
||||
throw new BusinessException("记录不存在");
|
||||
}
|
||||
requireShopVisible(dailyFile.getShopName(), visibleShopKeys);
|
||||
TaskDistributedLockService.LockHandle lockHandle = dailyFileService.acquireLock(dailyFile.getShopKey());
|
||||
if (lockHandle == null) {
|
||||
throw new BusinessException("店铺数据正在处理中,请稍后重试");
|
||||
|
||||
Reference in New Issue
Block a user