fix(phase-6.1): CR 消项——分页锚点、分片鉴权、中断归属
- 任务中心 keyset 锚点取 offset-1(上一页最后一行),修复第 2 页首行永久丢失
- /api/files/chunk/** 纳入必须凭据的写端点,并按解码路径再判一次堵住百分号编码绕过
- /api/tasks/{id}/interrupted 增加归属闸:普通账号只能打断自己名下任务,
内部令牌/管理角色保持原语义;品牌任务经 BrandTaskHeartbeatSpi.findOwnerUserId 比对
- 新增 TaskInterruptOwnershipTest 3 例,守卫测试扩到 6 例
This commit is contained in:
+38
@@ -92,6 +92,44 @@ class PendingPhase1AnonymousWriteGuardTest {
|
||||
assertThat(bodyOf(response).path("code").asInt()).isEqualTo(401);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 匿名分片上传必须被拒() throws Exception {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
when(authSupport.isTrustedInternalToken(any())).thenReturn(false);
|
||||
AdminApiGuardFilter filter = factoryDefaults(authSupport);
|
||||
|
||||
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/files/chunk/init");
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
MockFilterChain chain = new MockFilterChain();
|
||||
|
||||
filter.doFilter(request, response, chain);
|
||||
|
||||
assertThat(chain.getRequest())
|
||||
.as("AC-17 分片通道与整包上传同口径:匿名 init 能占临时盘、complete 能写公开桶").isNull();
|
||||
assertThat(bodyOf(response).path("code").asInt()).isEqualTo(401);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 分片前缀只吃自己的段落且内部令牌放行() throws Exception {
|
||||
assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunk/init")).isTrue();
|
||||
assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunk/u1/part/0")).isTrue();
|
||||
assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunk/u1/complete")).isTrue();
|
||||
assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunked-legacy"))
|
||||
.as("相邻前缀不许误伤").isFalse();
|
||||
assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/%75pload"))
|
||||
.as("百分号编码不能绕过凭据要求(容器会解码后路由到 /api/files/upload)").isTrue();
|
||||
assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/tasks/7001/%69nterrupted"))
|
||||
.as("中断端点的编码变体同样必须要求凭据").isTrue();
|
||||
|
||||
AdminAuthSupport internal = mock(AdminAuthSupport.class);
|
||||
when(internal.isTrustedInternalToken(any())).thenReturn(true);
|
||||
MockFilterChain chain = new MockFilterChain();
|
||||
factoryDefaults(internal).doFilter(
|
||||
new MockHttpServletRequest("POST", "/api/files/chunk/init"),
|
||||
new MockHttpServletResponse(), chain);
|
||||
assertThat(chain.getRequest()).as("内部令牌(4.0.66 桌面端/服务端转存)必须照常放行").isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 坏令牌同样必须被拒() throws Exception {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
|
||||
+104
@@ -0,0 +1,104 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.spi.BrandTaskHeartbeatSpi;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.mockito.junit.jupiter.MockitoSettings;
|
||||
import org.mockito.quality.Strictness;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.catchThrowableOfType;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 中断上报的归属闸(Phase 6 CR 补)。
|
||||
*
|
||||
* <p>AC-8 把 {@code /api/tasks/{id}/interrupted} 从匿名抬到"必须带凭据",但任何登录账号
|
||||
* 仍可遍历 taskId 把别人的 RUNNING 任务置 FAILED。这里钉住三条:
|
||||
* 普通账号只能打断自己名下的任务、管理角色/内部令牌(requesterUid=null)按原语义放行、
|
||||
* 品牌任务的归属同样比对。</p>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
@MockitoSettings(strictness = Strictness.LENIENT)
|
||||
class TaskInterruptOwnershipTest {
|
||||
|
||||
private static final Long TASK_ID = 8801L;
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), "");
|
||||
TableInfoHelper.initTableInfo(assistant, FileTaskEntity.class);
|
||||
}
|
||||
|
||||
@Mock private FileTaskMapper fileTaskMapper;
|
||||
@Mock private TaskProgressSnapshotService snapshotService;
|
||||
@Mock private BrandTaskHeartbeatSpi brandSpi;
|
||||
@Mock private TaskHeartbeatLivenessService livenessService;
|
||||
|
||||
private TaskHeartbeatService service() {
|
||||
return new TaskHeartbeatService(fileTaskMapper, snapshotService, brandSpi, livenessService, List.of());
|
||||
}
|
||||
|
||||
private static FileTaskEntity runningTaskOwnedBy(Long userId) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(TASK_ID);
|
||||
task.setModuleType("PUBLISH");
|
||||
task.setStatus("RUNNING");
|
||||
task.setUserId(userId);
|
||||
return task;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("普通账号打断别人的任务必须 403,且不许写库")
|
||||
void foreignRequesterCannotInterruptFileTask() {
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(runningTaskOwnedBy(7L));
|
||||
|
||||
BusinessException ex = catchThrowableOfType(
|
||||
() -> service().markInterrupted(TASK_ID, "客户端崩溃重启", 8L), BusinessException.class);
|
||||
|
||||
assertThat(ex.getCode()).isEqualTo(403);
|
||||
verify(fileTaskMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("任务归属人本人(或管理角色/内部令牌的 requesterUid=null)照常打断")
|
||||
void ownerAndPrivilegedCallersStillInterrupt() {
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(runningTaskOwnedBy(7L));
|
||||
when(fileTaskMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1);
|
||||
|
||||
assertThat(service().markInterrupted(TASK_ID, "本人重启", 7L).isAlive()).isFalse();
|
||||
assertThat(service().markInterrupted(TASK_ID, "内部令牌", null).isAlive()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("品牌任务按 owner 比对:外人 403 且不许调用 SPI 改写终态")
|
||||
void foreignRequesterCannotInterruptBrandTask() {
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(null);
|
||||
when(brandSpi.findOwnerUserId(TASK_ID)).thenReturn(9L);
|
||||
|
||||
BusinessException ex = catchThrowableOfType(
|
||||
() -> service().markInterrupted(TASK_ID, "客户端崩溃重启", 8L), BusinessException.class);
|
||||
|
||||
assertThat(ex.getCode()).isEqualTo(403);
|
||||
verify(brandSpi, never()).markInterrupted(any(), any());
|
||||
}
|
||||
}
|
||||
+4
-2
@@ -356,9 +356,11 @@ class TaskCenterQueryServiceTest {
|
||||
|
||||
verify(queryMapper).countTaskPage(isNull(), eq("PUBLISH"), eq(List.of("RUNNING")),
|
||||
eq("旗舰店"), eq(start), eq(end));
|
||||
// (page-1)*pageSize 这条算术还在,只是它的去向从 OFFSET 变成了锚点行号
|
||||
// (page-1)*pageSize 这条算术还在,只是它的去向从 OFFSET 变成了锚点行号;
|
||||
// 锚点落在 offset-1(上一页最后一行)——取 offset 那行会让本页首行在同一对
|
||||
// (createdAt,id) 严格比较下被跳过,第 2 页从此少一行。
|
||||
verify(queryMapper).selectTaskPageAnchor(isNull(), eq("PUBLISH"), eq(List.of("RUNNING")),
|
||||
eq("旗舰店"), eq(start), eq(end), eq(200L));
|
||||
eq("旗舰店"), eq(start), eq(end), eq(199L));
|
||||
verify(queryMapper).selectTaskPage(isNull(), eq("PUBLISH"), eq(List.of("RUNNING")),
|
||||
eq("旗舰店"), eq(start), eq(end), eq(100L), eq(anchorTime), eq(anchorId));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user