feat(A1/A3+C8): 客户端令牌链路打通(按人鉴权就绪)+ 快照 JSON 写入节流

A1/A3 客户端令牌链路(服务端守卫已能按 JWT 鉴权,缺口在客户端不带身份)
- 前端:新增 user-token-bridge(纯逻辑,值变化才推送)+ user-token-sync(启动安装,
  pywebviewready/storage/60s 轮询补推),main.ts 接入;桥接口补 set_user_token
- 客户端:新增 crawler_core/user_token.py(持有 + 对自家 Java 端点注入
  Authorization: Bearer <jwt>,Session.request 包装,第三方域名不注入、已有头不覆盖、
  登出清空、SHUFUAI_DISABLE_USER_TOKEN_HOOK 可关);main.py 暴露桥方法并在启动安装钩子
- 服务端:守卫契约测试补 5 个用户态前缀用例(开关关闭放行 / 打开后匿名 401 /
  用户令牌通过 / 内部令牌仍放行 / /api/ziniao 第二层)
- 翻开关的前置条件(客户端铺开后置 aiimage.security.user-tool-guard-enabled=true)写入报告

C8 快照 JSON 写入节流
- 读端改以 biz_task_result_item 行为准、JSON 仅兜底(历史任务 JSON 仍是唯一副本时可用)
- 整档 JSON 改 30s 节流写,终态路径 force 立即写;新增 2 个契约测试钉住语义

验证:mvn test 2888 全绿;npm test 741 全绿;user_token 钩子自测(注入/归一/第三方跳过/不覆盖/登出)通过
This commit is contained in:
2026-09-14 10:20:15 +08:00
parent 96800a2c88
commit d538935146
10 changed files with 423 additions and 9 deletions
@@ -29,9 +29,15 @@ class AdminApiGuardFilterTest {
private final ObjectMapper objectMapper = new ObjectMapper();
private AdminApiGuardFilter newFilter(AdminAuthSupport adminAuthSupport, boolean enabled, String exemptPrefixes) {
return newFilter(adminAuthSupport, enabled, exemptPrefixes, false);
}
private AdminApiGuardFilter newFilter(AdminAuthSupport adminAuthSupport, boolean enabled, String exemptPrefixes,
boolean userToolGuardEnabled) {
AdminApiGuardFilter filter = new AdminApiGuardFilter(adminAuthSupport, objectMapper);
ReflectionTestUtils.setField(filter, "enabled", enabled);
ReflectionTestUtils.setField(filter, "exemptPrefixes", exemptPrefixes);
ReflectionTestUtils.setField(filter, "userToolGuardEnabled", userToolGuardEnabled);
return filter;
}
@@ -251,4 +257,82 @@ class AdminApiGuardFilterTest {
}
verify(authSupport, never()).requireUserOrInternal(any());
}
}
// ---- 用户态工具前缀(A1/A3):开关默认关闭,打开后按"用户令牌或内部令牌"鉴权 ----
@Test
void userToolPrefixesAreOpenWhileGuardDisabled() throws Exception {
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
AdminApiGuardFilter filter = newFilter(authSupport, true, "", false);
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/patrol-delete/tasks/submit");
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
filter.doFilter(request, response, chain);
verify(authSupport, never()).requireUserOrInternal(any());
assertThat(chain.getRequest()).isNotNull();
}
@Test
void enabledUserToolGuardRejectsAnonymous() throws Exception {
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
when(authSupport.requireUserOrInternal(any())).thenThrow(new BusinessException(401, "未登录"));
AdminApiGuardFilter filter = newFilter(authSupport, true, "", true);
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/patrol-delete/tasks/submit");
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
filter.doFilter(request, response, chain);
assertThat(chain.getRequest()).isNull();
assertThat(response.getStatus()).isEqualTo(200);
JsonNode body = objectMapper.readTree(response.getContentAsString());
assertThat(body.path("success").asBoolean()).isFalse();
assertThat(body.path("code").asInt()).isEqualTo(401);
}
@Test
void enabledUserToolGuardAcceptsUserToken() throws Exception {
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
when(authSupport.requireUserOrInternal(any())).thenReturn(new AdminUserEntity());
AdminApiGuardFilter filter = newFilter(authSupport, true, "", true);
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/withdraw/tasks/submit");
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
filter.doFilter(request, response, chain);
assertThat(chain.getRequest()).isNotNull();
verify(authSupport).requireUserOrInternal(any());
}
@Test
void enabledUserToolGuardStillLetsTrustedInternalTokenThrough() throws Exception {
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
when(authSupport.isTrustedInternalToken(any())).thenReturn(true);
AdminApiGuardFilter filter = newFilter(authSupport, true, "", true);
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/collect-data/tasks/submit");
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
filter.doFilter(request, response, chain);
verify(authSupport, never()).requireUserOrInternal(any());
assertThat(chain.getRequest()).isNotNull();
}
@Test
void enabledUserToolGuardCoversZiniaoPrefixAsSecondLayer() throws Exception {
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
when(authSupport.requireUserOrInternal(any())).thenThrow(new BusinessException(401, "未登录"));
AdminApiGuardFilter filter = newFilter(authSupport, true, "", true);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/api/ziniao/staff");
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
filter.doFilter(request, response, chain);
assertThat(chain.getRequest()).isNull();
assertThat(response.getContentAsString()).contains("401");
}
}
@@ -0,0 +1,95 @@
package com.nanri.aiimage.modules.queryasin.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinResultItemVo;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
/**
* 快照 JSON 整档写入的节流语义(2026-09 审查 C8)。
*
* <p>读端已改为"以 biz_task_result_item 行为准、JSON 兜底",因此允许 JSON 短时滞后:
* 节流窗口内只同步行表、不重写整档 JSON;终态路径传 force=true 立即重写。
* 本测试直接钉住这两条契约(其余依赖与本次语义无关,传 null/mock)。
*/
class QueryAsinSnapshotJsonThrottleTest {
private final ObjectMapper objectMapper = new ObjectMapper();
private final TaskResultItemService taskResultItemService = mock(TaskResultItemService.class);
private final TaskProgressSnapshotService taskProgressSnapshotService = mock(TaskProgressSnapshotService.class);
private QueryAsinTaskService service() {
// 构造顺序:mapper/resultMapper/resolve/excel/cache/oss/resultDownloadResolver/ziniaoSwitch/
// objectMapper/pressure/jobService/resultItemService/snapshot/lock/lightAssembler
return new QueryAsinTaskService(
null, null, null, null, null, null, null, null,
objectMapper, null, null, taskResultItemService, taskProgressSnapshotService, null, null);
}
private static void persist(QueryAsinTaskService service, FileTaskEntity task,
List<QueryAsinResultItemVo> snapshots, boolean force) throws Exception {
Method method = QueryAsinTaskService.class.getDeclaredMethod(
"persistSnapshotJson", FileTaskEntity.class, List.class, boolean.class);
method.setAccessible(true);
method.invoke(service, task, snapshots, force);
}
private static QueryAsinResultItemVo item(long resultId, String shopName) {
QueryAsinResultItemVo vo = new QueryAsinResultItemVo();
vo.setResultId(resultId);
vo.setShopName(shopName);
vo.setSuccess(true);
return vo;
}
@Test
void firstWriteGoesThroughThenThrottledUntilForced() throws Exception {
QueryAsinTaskService service = service();
FileTaskEntity task = new FileTaskEntity();
task.setId(9001L);
List<QueryAsinResultItemVo> first = List.of(item(1L, "店铺A"));
persist(service, task, first, false);
String afterFirst = task.getResultJson();
assertTrue(afterFirst != null && afterFirst.contains("店铺A"), "首次写入立即生效(无历史写入时间)");
// 节流窗口内:行表仍同步,但 JSON 不重写(新数据要等窗口结束或 force)
List<QueryAsinResultItemVo> second = List.of(item(1L, "店铺A"), item(2L, "店铺B"));
persist(service, task, second, false);
assertEquals(afterFirst, task.getResultJson(), "窗口内不重写整档 JSON");
verify(taskResultItemService, times(2))
.replaceTaskSnapshots(anyLong(), anyString(), any(), any());
// 终态:force 立即重写
persist(service, task, second, true);
assertTrue(task.getResultJson().contains("店铺B"), "force 立即重写整档 JSON");
}
@Test
void emptySnapshotStillSyncsRowTable() throws Exception {
QueryAsinTaskService service = service();
FileTaskEntity task = new FileTaskEntity();
task.setId(9002L);
persist(service, task, new ArrayList<>(), false);
verify(taskResultItemService).replaceTaskSnapshots(anyLong(), anyString(), any(), any());
assertEquals("[]", task.getResultJson(), "空快照序列化为空数组");
}
}