feat(安全): 内部令牌支持过渡期新旧两把并行接受

换 AIIMAGE_INTERNAL_TOKEN 会让没升级的老客户端立刻全部失败(这把令牌有 4 个客户端字面量
点位并已分发到用户机器)。照仓内 shop-credential-key-previous 的惯例加 internal-token-previous:
逗号分隔的旧值与当前值并入同一接受集合,置空即关窗。

原先 8 处各自持有 @Value 字段并重复实现比较,其中 2 处用的是 equals 而非常量时间比较;
判断收进 AdminAuthSupport.isTrustedSuppliedToken 一处,controller 改为委派。
This commit is contained in:
2026-10-03 01:49:13 +08:00
parent 005cda9379
commit 4f03ea1808
13 changed files with 191 additions and 371 deletions
@@ -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);