feat(安全): 内部令牌支持过渡期新旧两把并行接受
换 AIIMAGE_INTERNAL_TOKEN 会让没升级的老客户端立刻全部失败(这把令牌有 4 个客户端字面量 点位并已分发到用户机器)。照仓内 shop-credential-key-previous 的惯例加 internal-token-previous: 逗号分隔的旧值与当前值并入同一接受集合,置空即关窗。 原先 8 处各自持有 @Value 字段并重复实现比较,其中 2 处用的是 equals 而非常量时间比较; 判断收进 AdminAuthSupport.isTrustedSuppliedToken 一处,controller 改为委派。
This commit is contained in:
+105
@@ -8,6 +8,10 @@ import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
@@ -90,6 +94,107 @@ class AdminAuthSupportTest {
|
||||
assertThatCode(() -> support.requireUser(requestWithBearer("t"))).doesNotThrowAnyException();
|
||||
}
|
||||
|
||||
// ---------- 内部令牌:轮换过渡期新旧两把同时接受 ----------
|
||||
|
||||
@Test
|
||||
void internalTokenAcceptsConfiguredValueOnly(@TempDir Path tempDir) {
|
||||
AdminAuthSupport support = tokenSupport("new-token", "", tempDir.resolve("unused").toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("new-token")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken("old-token")).isFalse();
|
||||
assertThat(support.isTrustedSuppliedToken("")).isFalse();
|
||||
assertThat(support.isTrustedSuppliedToken(null)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenAcceptsPreviousValueDuringRotationWindow(@TempDir Path tempDir) {
|
||||
AdminAuthSupport support = tokenSupport("new-token", "old-token", tempDir.resolve("unused").toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("new-token")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken("old-token")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken("stale-token")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenRejectsPreviousValueOnceWindowIsClosed(@TempDir Path tempDir) {
|
||||
AdminAuthSupport support = tokenSupport("new-token", "", tempDir.resolve("unused").toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("old-token")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenIgnoresBlankEntriesInPreviousList(@TempDir Path tempDir) {
|
||||
AdminAuthSupport support = tokenSupport("new-token", " , old-a ,,old-b, "
|
||||
, tempDir.resolve("unused").toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("old-a")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken("old-b")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken(" , ")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenWithNothingConfiguredRejectsEverySuppliedValue(@TempDir Path tempDir) {
|
||||
// 属性漂成空串时不能"空对空"放行,否则内部端点变成匿名可达
|
||||
AdminAuthSupport support = tokenSupport("", "", tempDir.resolve("unused").toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("anything")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenFallsBackToTokenFileWhenPropertyIsBlank(@TempDir Path tempDir) throws Exception {
|
||||
Path tokenFile = tempDir.resolve("internal-token");
|
||||
Files.writeString(tokenFile, "file-token\n");
|
||||
AdminAuthSupport support = tokenSupport("", "", tokenFile.toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("file-token")).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenPropertyTakesPrecedenceOverTokenFile(@TempDir Path tempDir) throws Exception {
|
||||
// 属性有值就不读文件:否则轮换后残留的旧文件会把旧令牌一直续命
|
||||
Path tokenFile = tempDir.resolve("internal-token");
|
||||
Files.writeString(tokenFile, "file-token\n");
|
||||
AdminAuthSupport support = tokenSupport("configured-token", "", tokenFile.toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("configured-token")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken("file-token")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenRejectsWhenTokenFileIsMissing(@TempDir Path tempDir) {
|
||||
AdminAuthSupport support = tokenSupport("", "", tempDir.resolve("missing-token").toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("guessed-token")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenKeepsFileValueAndPreviousListBothAcceptedDuringWindow(@TempDir Path tempDir) throws Exception {
|
||||
Path tokenFile = tempDir.resolve("internal-token");
|
||||
Files.writeString(tokenFile, "file-token\n");
|
||||
AdminAuthSupport support = tokenSupport("", "old-token", tokenFile.toString());
|
||||
|
||||
assertThat(support.isTrustedSuppliedToken("file-token")).isTrue();
|
||||
assertThat(support.isTrustedSuppliedToken("old-token")).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void isTrustedInternalTokenReadsTheInternalHeader() {
|
||||
AdminAuthSupport support = tokenSupport("new-token", "old-token", "");
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("old-token");
|
||||
|
||||
assertThat(support.isTrustedInternalToken(request)).isTrue();
|
||||
}
|
||||
|
||||
private AdminAuthSupport tokenSupport(String current, String previous, String tokenFile) {
|
||||
AdminAuthSupport support = new AdminAuthSupport(
|
||||
mock(JwtService.class), mock(AdminUserMapper.class), mock(AuthProperties.class));
|
||||
ReflectionTestUtils.setField(support, "internalToken", current);
|
||||
ReflectionTestUtils.setField(support, "internalTokenPrevious", previous);
|
||||
ReflectionTestUtils.setField(support, "internalTokenFile", tokenFile);
|
||||
return support;
|
||||
}
|
||||
|
||||
private AdminAuthSupport support(AdminUserEntity user, String claimDeviceId, boolean singleDeviceEnabled) {
|
||||
JwtService jwtService = mock(JwtService.class);
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
|
||||
+5
-2
@@ -14,7 +14,6 @@ import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.mock.web.MockHttpServletRequest;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -24,6 +23,8 @@ import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyNoInteractions;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
@@ -40,7 +41,9 @@ class InvalidAsinDataControllerTest {
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "test-internal-token");
|
||||
// 令牌比较已经收进 AdminAuthSupport:这里按真实语义打桩(只对正确的值返回 true)
|
||||
lenient().when(adminAuthSupport.isTrustedSuppliedToken(any()))
|
||||
.thenAnswer(call -> "test-internal-token".equals(call.getArgument(0)));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+3
-73
@@ -11,7 +11,6 @@ import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
@@ -59,7 +58,7 @@ class PermissionMenuControllerTest {
|
||||
PermissionMenuService service = mock(PermissionMenuService.class);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
PermissionMenuController controller = new PermissionMenuController(authSupport, service);
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "shared-token");
|
||||
when(authSupport.isTrustedSuppliedToken("shared-token")).thenReturn(true);
|
||||
AdminUserEntity currentUser = new AdminUserEntity();
|
||||
currentUser.setId(9L);
|
||||
currentUser.setRole("normal");
|
||||
@@ -117,7 +116,7 @@ class PermissionMenuControllerTest {
|
||||
PermissionMenuService service = mock(PermissionMenuService.class);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
PermissionMenuController controller = new PermissionMenuController(authSupport, service);
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "shared-token");
|
||||
when(authSupport.isTrustedSuppliedToken("shared-token")).thenReturn(true);
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(12L);
|
||||
operator.setRole("admin");
|
||||
@@ -141,7 +140,7 @@ class PermissionMenuControllerTest {
|
||||
PermissionMenuService service = mock(PermissionMenuService.class);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
PermissionMenuController controller = new PermissionMenuController(authSupport, service);
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "shared-token");
|
||||
// mock 的 isTrustedSuppliedToken 对任何值都返回 false,正是"令牌不匹配"要演的场景
|
||||
BusinessException authFailure = new BusinessException(401, "未登录");
|
||||
|
||||
when(authSupport.requireAdmin(request)).thenThrow(authFailure);
|
||||
@@ -153,75 +152,6 @@ class PermissionMenuControllerTest {
|
||||
verify(service, never()).list(any(AdminUserEntity.class), eq("app"), eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalProxyUsesSharedTokenFileWhenEnvironmentTokenIsUnconfigured(@TempDir Path tempDir) throws Exception {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService service = mock(PermissionMenuService.class);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
PermissionMenuController controller = new PermissionMenuController(authSupport, service);
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "");
|
||||
Path tokenFile = tempDir.resolve("internal-token");
|
||||
Files.writeString(tokenFile, "file-token\n");
|
||||
ReflectionTestUtils.setField(controller, "internalTokenFile", tokenFile.toString());
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(12L);
|
||||
operator.setRole("admin");
|
||||
|
||||
when(authSupport.requireAdmin(request)).thenThrow(new BusinessException(401, "未登录"));
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("file-token");
|
||||
when(request.getParameter("operatorId")).thenReturn("12");
|
||||
when(service.requireAdminOperator(12L)).thenReturn(operator);
|
||||
when(service.list(operator, "admin", false)).thenReturn(List.of());
|
||||
|
||||
controller.listMenus(request, "admin", false);
|
||||
|
||||
verify(service).requireAdminOperator(12L);
|
||||
verify(service).list(operator, "admin", false);
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalProxyRejectsMissingSharedTokenFileWhenEnvironmentTokenIsUnconfigured(@TempDir Path tempDir) {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService service = mock(PermissionMenuService.class);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
PermissionMenuController controller = new PermissionMenuController(authSupport, service);
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "");
|
||||
ReflectionTestUtils.setField(controller, "internalTokenFile", tempDir.resolve("missing-token").toString());
|
||||
BusinessException authFailure = new BusinessException(401, "未登录");
|
||||
|
||||
when(authSupport.requireAdmin(request)).thenThrow(authFailure);
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("guessed-token");
|
||||
when(request.getRemoteAddr()).thenReturn("127.0.0.1");
|
||||
when(request.getParameter("operatorId")).thenReturn("12");
|
||||
|
||||
assertThatThrownBy(() -> controller.listMenus(request, "admin", false))
|
||||
.isSameAs(authFailure);
|
||||
verify(service, never()).requireAdminOperator(anyLong());
|
||||
verify(service, never()).list("admin");
|
||||
}
|
||||
|
||||
@Test
|
||||
void configuredInternalTokenTakesPrecedenceOverTokenFile(@TempDir Path tempDir) throws Exception {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService service = mock(PermissionMenuService.class);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
PermissionMenuController controller = new PermissionMenuController(authSupport, service);
|
||||
Path tokenFile = tempDir.resolve("internal-token");
|
||||
Files.writeString(tokenFile, "file-token\n");
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "configured-token");
|
||||
ReflectionTestUtils.setField(controller, "internalTokenFile", tokenFile.toString());
|
||||
BusinessException authFailure = new BusinessException(401, "未登录");
|
||||
|
||||
when(authSupport.requireAdmin(request)).thenThrow(authFailure);
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("file-token");
|
||||
when(request.getParameter("operatorId")).thenReturn("12");
|
||||
|
||||
assertThatThrownBy(() -> controller.listMenus(request, "admin", false))
|
||||
.isSameAs(authFailure);
|
||||
verify(service, never()).requireAdminOperator(anyLong());
|
||||
verify(service, never()).list("admin");
|
||||
}
|
||||
|
||||
@Test
|
||||
void imageVideoPermissionEndpointsDelegateAuthenticatedOperator() {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
|
||||
+1
-2
@@ -7,7 +7,6 @@ import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.Mockito.mock;
|
||||
@@ -42,7 +41,7 @@ class AdminShopDataCrawlTaskControllerTest {
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
AdminShopDataCrawlTaskController controller = new AdminShopDataCrawlTaskController(
|
||||
taskService, authSupport, permissionService);
|
||||
ReflectionTestUtils.setField(controller, "internalToken", "shared-token");
|
||||
when(authSupport.isTrustedSuppliedToken("shared-token")).thenReturn(true);
|
||||
AdminUserEntity operator = admin(8L);
|
||||
when(authSupport.requireAdmin(request)).thenThrow(new BusinessException(401, "not logged in"));
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("shared-token");
|
||||
|
||||
Reference in New Issue
Block a user