refactor(租户): 站点超管判定收成唯一静态出口,看板补第四道门
"super_admin 才算平台超管"这句判断此前在 src/main 里被手抄过 19 遍,2026-10-07 定的 「company_super_admin 在业务数据面同权、只在管理动作收窄」要落地就得一次改到每一处, 漏一处的表现是某一页静默 403 或静默多放行,两边都不报错。现在口径只在 DeviceSessionPolicy.isSuper 比一次: - 出口做成静态谓词而不是 AdminAuthSupport 实例方法——那 18 支测试里 mock 的是 AdminAuthSupport,新增实例方法不会被桩到,默认 false 会把范围静默改窄; - 12 个文件的 15 处调用点改为 DeviceSessionPolicy.isSuper(currentRole(...)), DataReadScope/AdminAuthSupport 只留一个委托包装; - 「客户端任务管理」五个 handler 的成员集计算折进 DataReadScope.superAdminScopedUserIds, 并在 CompanyIdParamGoesThroughReadScopeTest 里补成第四道门(正反探针各一, 判据不会因"抽进私有方法"而失明); - 护栏 SuperAdminPredicateSingleOutletTest 双向钉:出口定义==1、包装==1、调用点==16, 且 banned 掉实例方法形状(自检断言保证它真能红)。 今天口径仍只认 super_admin,这一层是接缝不是开关。Java 全量在本批收口后的那棵树实测 4032 例 0 红 7 skip(7 支是要本地凭据/夹具的回放与实况探测类,历来 skip)。 一并落在这支的文件(同一文件只能进一次提交,故与同批的归属收口混装):ImageVideo/InvalidAsin/ AdminDeviceLog/AdminTaskCenter/DedupeTotalData/AdminShopDataCrawlTasks/AdminShopDataDuplicateCheck/ QueryAsin/ShopManage/SkipPriceAsin 这 10 支控制器的请求身份改走会话出口见 cp-item7 的说明; PermissionMenuService 还删掉了 create/update/delete 三个"operator 传 null 即跳过归属闸门"的 无操作者写重载(src/main 无人调用),判据在 MenuWriteOutletOperatorTest。
This commit is contained in:
+30
-10
@@ -4,6 +4,7 @@ import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
|
||||
import com.nanri.aiimage.modules.imagevideo.model.dto.DouyinCopyRequest;
|
||||
import com.nanri.aiimage.modules.imagevideo.model.dto.ImageVideoSecretSaveRequest;
|
||||
import com.nanri.aiimage.modules.imagevideo.model.dto.ImageVideoVoiceCloneRequest;
|
||||
@@ -47,7 +48,9 @@ public class ImageVideoController {
|
||||
@GetMapping("/secrets")
|
||||
@Operation(summary = "查询视频密钥配置状态")
|
||||
public ApiResponse<ImageVideoSecretStatusVo> secretStatus(@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest request) {
|
||||
HttpServletRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(imageVideoSecretService.status(resolveSelfUserId(request, userId)));
|
||||
}
|
||||
|
||||
@@ -55,6 +58,7 @@ public class ImageVideoController {
|
||||
@Operation(summary = "保存视频密钥配置")
|
||||
public ApiResponse<ImageVideoSecretStatusVo> saveSecrets(@Valid @RequestBody ImageVideoSecretSaveRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
resolveSelfUserId(httpRequest, request.getUserId());
|
||||
return ApiResponse.success(imageVideoSecretService.save(request));
|
||||
}
|
||||
@@ -69,7 +73,7 @@ public class ImageVideoController {
|
||||
if (requestedUserId == null || requestedUserId <= 0) {
|
||||
throw new BusinessException("用户 id 不合法");
|
||||
}
|
||||
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(me));
|
||||
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(me));
|
||||
if (!superAdmin && !requestedUserId.equals(me.getId())) {
|
||||
throw new BusinessException(403, "只能操作自己的视频密钥配置");
|
||||
}
|
||||
@@ -78,19 +82,25 @@ public class ImageVideoController {
|
||||
|
||||
@PostMapping("/douyin-copy")
|
||||
@Operation(summary = "抖音文案识别和仿写")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> douyinCopy(@Valid @RequestBody DouyinCopyRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> douyinCopy(@Valid @RequestBody DouyinCopyRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitDouyinCopy(request));
|
||||
}
|
||||
|
||||
@PostMapping("/workflow/run")
|
||||
@Operation(summary = "提交图生/复刻视频工作流")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> runWorkflow(@Valid @RequestBody ImageVideoWorkflowRunRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> runWorkflow(@Valid @RequestBody ImageVideoWorkflowRunRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitWorkflow(request));
|
||||
}
|
||||
|
||||
@PostMapping("/workflow/result")
|
||||
@Operation(summary = "查询图生/复刻视频工作流异步结果")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> workflowResult(@Valid @RequestBody ImageVideoWorkflowResultRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> workflowResult(@Valid @RequestBody ImageVideoWorkflowResultRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitWorkflowResult(request));
|
||||
}
|
||||
|
||||
@@ -102,25 +112,33 @@ public class ImageVideoController {
|
||||
|
||||
@PostMapping("/voice/list")
|
||||
@Operation(summary = "查看音色")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> listVoices(@Valid @RequestBody ImageVideoVoiceListRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> listVoices(@Valid @RequestBody ImageVideoVoiceListRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceList(request));
|
||||
}
|
||||
|
||||
@PostMapping("/voice/delete")
|
||||
@Operation(summary = "删除音色")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> deleteVoice(@Valid @RequestBody ImageVideoVoiceDeleteRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> deleteVoice(@Valid @RequestBody ImageVideoVoiceDeleteRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceDelete(request));
|
||||
}
|
||||
|
||||
@PostMapping("/voice/clone")
|
||||
@Operation(summary = "音色克隆")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> cloneVoice(@Valid @RequestBody ImageVideoVoiceCloneRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> cloneVoice(@Valid @RequestBody ImageVideoVoiceCloneRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceClone(request));
|
||||
}
|
||||
|
||||
@PostMapping("/voice/synthesis")
|
||||
@Operation(summary = "语音合成")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> synthesizeVoice(@Valid @RequestBody ImageVideoVoiceSynthesisRequest request) {
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> synthesizeVoice(@Valid @RequestBody ImageVideoVoiceSynthesisRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceSynthesis(request));
|
||||
}
|
||||
|
||||
@@ -128,7 +146,9 @@ public class ImageVideoController {
|
||||
@Operation(summary = "查询图生视频异步任务")
|
||||
public ApiResponse<ImageVideoAsyncTaskVo> getTask(
|
||||
@PathVariable Long taskId,
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(imageVideoAsyncTaskService.getTask(taskId, userId));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user