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:
+2
-2
@@ -287,7 +287,7 @@ public class AppearancePatentTaskService {
|
||||
@Transactional
|
||||
public void activateTask(Long taskId, Long userId) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || userId != null && !Objects.equals(userId, task.getUserId())) {
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
// 2026-09-30 起外观专利已整体迁移 Linux 后台执行(无浏览器抓取):
|
||||
@@ -3158,7 +3158,7 @@ public class AppearancePatentTaskService {
|
||||
|
||||
public AppearancePatentParsedPayloadDto queuePayload(Long taskId, Long userId) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || userId != null && !Objects.equals(userId, task.getUserId())) {
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
ensureTaskOwnedByCurrentInstance(task, "queue payload");
|
||||
|
||||
+54
-33
@@ -44,25 +44,28 @@ public class PublishController {
|
||||
description = "按文件名(去扩展名)先匹配已管理店铺,再查询紫鸟索引;解析每个非空 Sheet。源文件前五列表头必须依次为 id、ASIN、国家、品牌、价格,第六列及以后不解析;状态、同步状态、同步国家由 Python 回传并写入最终结果文件。匹配并解析成功的文件为 PENDING,失败文件为 FAILED;只要存在可处理文件,任务为 PENDING,否则任务为 FAILED。")
|
||||
public ApiResponse<PublishParseVo> parse(@Valid @RequestBody PublishParseRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(publishTaskService.parseAndCreateTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/activate")
|
||||
@Operation(summary = "激活上架任务", description = "按 taskId 激活上架任务,将状态从 PENDING 修改为 RUNNING。user_id 可省略;如传入则校验任务归属。文件仍需通过单文件激活接口逐个激活。")
|
||||
@Operation(summary = "激活上架任务", description = "按 taskId 激活上架任务,将状态从 PENDING 修改为 RUNNING。user_id 可省略,省略时按当前登录身份归属;与登录账号不一致即拒绝(管理角色可代客操作)。文件仍需通过单文件激活接口逐个激活。")
|
||||
public ApiResponse<Void> activateTask(
|
||||
@Parameter(description = "上架任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "可选的任务所属用户 ID;省略时由 taskId 反查", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId) {
|
||||
publishTaskService.activateTask(taskId, userId);
|
||||
@Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
publishTaskService.activateTask(taskId,
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId));
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/files/{fileId}/activate")
|
||||
@Operation(
|
||||
summary = "激活任务中的单个文件",
|
||||
description = "前端派发 Python 队列前调用。taskId 和 fileId 用于定位文件,user_id 可省略;如传入则校验任务归属。同一任务同一时间只允许一个 RUNNING 文件;重复激活当前 RUNNING 文件为幂等操作。"
|
||||
description = "前端派发 Python 队列前调用。taskId 和 fileId 用于定位文件,user_id 可省略,省略时按当前登录身份归属;与登录账号不一致即拒绝(管理角色可代客操作)。同一任务同一时间只允许一个 RUNNING 文件;重复激活当前 RUNNING 文件为幂等操作。"
|
||||
+ "店铺互斥按 (发起方设备, 店铺) 判定:同一台机器上同一店铺只允许一个任务在跑(该机器上该店铺只有一个紫鸟浏览器会话,并发会互相切换国家);不同设备各自持有独立会话,允许同一店铺并行跑不同国家。"
|
||||
+ "设备号取自 JWT 签名的 deviceId claim,缺失时退回按店铺全局互斥。")
|
||||
public ApiResponse<Void> activateFile(
|
||||
@@ -70,29 +73,33 @@ public class PublishController {
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "任务内文件 ID", required = true, example = "9101")
|
||||
@PathVariable Long fileId,
|
||||
@Parameter(description = "可选的任务所属用户 ID;省略时由 taskId 反查", required = false, example = "1")
|
||||
@Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId,
|
||||
HttpServletRequest request) {
|
||||
publishTaskService.activateFile(taskId, fileId, userId, adminAuthSupport.currentDeviceId(request));
|
||||
HttpServletRequest httpRequest) {
|
||||
publishTaskService.activateFile(taskId, fileId,
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId),
|
||||
adminAuthSupport.currentDeviceId(httpRequest));
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@GetMapping("/tasks/{taskId}/items")
|
||||
@Operation(
|
||||
summary = "按文件分页获取上架原始数据,供 Python 拉取",
|
||||
description = "Python 只需提供 taskId、file_id、page 和 page_size;后端按 taskId 反查任务所属用户并返回原 Excel 行序数据,同时携带店铺信息、发布国家和同步国家。user_id 仅作为旧客户端的可选归属校验。页码从 1 开始,每页最多 200 行。")
|
||||
description = "Python 只需提供 taskId、file_id、page 和 page_size;后端按 taskId 反查任务所属用户并返回原 Excel 行序数据,同时携带店铺信息、发布国家和同步国家。user_id 仅作为旧客户端的可选归属校验:不带凭据的执行器照旧按 taskId 取数,带 JWT 的请求必须与登录身份一致。页码从 1 开始,每页最多 200 行。")
|
||||
public ApiResponse<PublishItemsPageVo> items(
|
||||
@Parameter(description = "上架任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "可选的任务所属用户 ID;省略时由 taskId 反查", required = false, example = "1")
|
||||
@Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId,
|
||||
@Parameter(description = "任务内文件 ID", required = true, example = "9101")
|
||||
@RequestParam("file_id") Long fileId,
|
||||
@Parameter(description = "页码,从 1 开始", example = "1")
|
||||
@RequestParam(value = "page", defaultValue = "1") Integer page,
|
||||
@Parameter(description = "每页条数,默认 50,最大 200", example = "50")
|
||||
@RequestParam(value = "page_size", defaultValue = "50") Integer pageSize) {
|
||||
return ApiResponse.success(publishTaskService.getItemsPage(taskId, userId, fileId, page, pageSize));
|
||||
@RequestParam(value = "page_size", defaultValue = "50") Integer pageSize,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(publishTaskService.getItemsPage(taskId,
|
||||
adminAuthSupport.resolveOwnershipUserId(httpRequest, userId), fileId, page, pageSize));
|
||||
}
|
||||
|
||||
@GetMapping("/tasks/{taskId}")
|
||||
@@ -100,26 +107,30 @@ public class PublishController {
|
||||
public ApiResponse<PublishTaskDetailVo> task(
|
||||
@Parameter(description = "上架任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "可选的任务所属用户 ID;省略时由 taskId 反查", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId) {
|
||||
return ApiResponse.success(publishTaskService.getTaskDetail(taskId, userId));
|
||||
@Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(publishTaskService.getTaskDetail(taskId,
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId)));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(
|
||||
summary = "批量获取任务、文件进度和最终结果",
|
||||
description = "按 task_ids 批量返回任务、文件进度和最终结果。task_ids 会过滤空值和非正数、去重并最多处理前 50 个;user_id 可省略,省略时按任务 ID 查询,传入时仅返回该用户的任务,未找到的 ID 放入 missingTaskIds。")
|
||||
description = "按 task_ids 批量返回任务、文件进度和最终结果。task_ids 会过滤空值和非正数、去重并最多处理前 50 个;必须携带登录身份(网页端/后台);user_id 可省略,省略时按当前登录身份过滤,未找到的 ID 放入 missingTaskIds。")
|
||||
public ApiResponse<PublishTaskBatchVo> progressBatch(
|
||||
@Valid @RequestBody PublishTaskBatchRequest request) {
|
||||
@Valid @RequestBody PublishTaskBatchRequest request, HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(publishTaskService.getTaskProgress(request.getUserId(), request.getTaskIds()));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。user_id 可省略,传入时仅返回该用户的任务。")
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。必须携带登录身份(网页端/后台);user_id 可省略,省略时按当前登录身份过滤。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(
|
||||
@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
@Valid @RequestBody TaskProgressLightRequest request, HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(publishTaskService.progressLight(request.getUserId(), request.getTaskIds()));
|
||||
}
|
||||
|
||||
@@ -130,7 +141,9 @@ public class PublishController {
|
||||
public ApiResponse<Void> submitResult(
|
||||
@Parameter(description = "上架任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Valid @RequestBody PublishSubmitResultRequest request) {
|
||||
@Valid @RequestBody PublishSubmitResultRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
publishTaskService.submitResult(taskId, request);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -138,31 +151,37 @@ public class PublishController {
|
||||
@GetMapping("/dashboard")
|
||||
@Operation(summary = "获取上架任务总览", description = "返回当前用户各状态任务数量和最近任务详情。")
|
||||
public ApiResponse<PublishDashboardVo> dashboard(
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
return ApiResponse.success(publishTaskService.dashboard(userId));
|
||||
@Parameter(description = "当前登录用户 ID;服务端按会话身份校验,与登录账号不一致即拒绝", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(publishTaskService.dashboard(
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId)));
|
||||
}
|
||||
|
||||
@GetMapping("/history")
|
||||
@Operation(summary = "获取上架任务历史", description = "按创建时间倒序返回当前用户的任务详情,最多返回 100 条。")
|
||||
public ApiResponse<PublishHistoryVo> history(
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@Parameter(description = "当前登录用户 ID;服务端按会话身份校验,与登录账号不一致即拒绝", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "返回数量上限,默认 50,最大 100", example = "50")
|
||||
@RequestParam(value = "limit", defaultValue = "50") Integer limit) {
|
||||
@RequestParam(value = "limit", defaultValue = "50") Integer limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
// 上限钳制(2026-09):文档写"最多返回 100 条"但此前无实际校验
|
||||
int safeLimit = limit == null ? 100 : Math.min(Math.max(1, limit), 100);
|
||||
return ApiResponse.success(publishTaskService.history(userId, safeLimit));
|
||||
return ApiResponse.success(publishTaskService.history(
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId), safeLimit));
|
||||
}
|
||||
|
||||
@DeleteMapping("/tasks/{taskId}")
|
||||
@Operation(summary = "删除上架任务", description = "按 taskId 删除任务、文件明细、解析行、结果记录和关联结果文件 Job。user_id 可省略;如传入则校验任务归属。")
|
||||
@Operation(summary = "删除上架任务", description = "按 taskId 删除任务、文件明细、解析行、结果记录和关联结果文件 Job。user_id 可省略,省略时按当前登录身份归属;与登录账号不一致即拒绝(管理角色可代客操作)。")
|
||||
public ApiResponse<Void> deleteTask(
|
||||
@Parameter(description = "上架任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "可选的任务所属用户 ID;省略时由 taskId 反查", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId) {
|
||||
publishTaskService.deleteTask(taskId, userId);
|
||||
@Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
publishTaskService.deleteTask(taskId,
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId));
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@@ -171,9 +190,11 @@ public class PublishController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "上架结果记录 ID", required = true, example = "9201")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(description = "结果所属用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
publishTaskService.deleteHistory(resultId, userId);
|
||||
@Parameter(description = "结果所属用户 ID;必须与登录账号一致(管理角色可代客操作)", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
publishTaskService.deleteHistory(resultId,
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId));
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
}
|
||||
|
||||
+4
@@ -1356,6 +1356,10 @@ public class PublishTaskService {
|
||||
if (taskId == null || taskId <= 0) {
|
||||
throw new BusinessException("taskId 不合法");
|
||||
}
|
||||
// user_id 为空**不**等于跳过归属校验:这里留空只允许出现在桌面执行器的两个端点上
|
||||
// (GET /tasks/{id}/items 与 POST /tasks/{id}/result,它们带 X-Internal-Token 但不带 operatorId,
|
||||
// 服务端解析不出身份)。其余端点一律由 PublishController 用 requireOwnershipUserId 传入会话身份,
|
||||
// 缺失即 401、冒名即 403。
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType())
|
||||
|| (userId != null && !userId.equals(task.getUserId()))) {
|
||||
|
||||
+2
-2
@@ -543,7 +543,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
public void activateTask(Long taskId, Long userId) {
|
||||
try (TaskDistributedLockService.LockHandle ignored = ownershipSupport().requireTaskLock(taskId, TASK_LOCK_WAIT_MILLIS)) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || userId != null && !Objects.equals(userId, task.getUserId())) {
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
ownershipSupport().ensureTaskOwnedByCurrentInstance(task, "activate");
|
||||
@@ -1726,7 +1726,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
|
||||
public SimilarAsinParsedPayloadDto parsedPayload(Long taskId, Long userId) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || userId != null && !Objects.equals(userId, task.getUserId())) {
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
ownershipSupport().ensureTaskOwnedByCurrentInstance(task, "parsed payload");
|
||||
|
||||
Reference in New Issue
Block a user