diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/security/JwtService.java b/backend-java/src/main/java/com/nanri/aiimage/common/security/JwtService.java index 0559dff57..e62c591fc 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/security/JwtService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/security/JwtService.java @@ -98,19 +98,73 @@ public class JwtService { .compact(); } - public Claims parse(String token) { + public enum Verdict { VALID, EXPIRED_SIGNED, INVALID } + + /** + * 三态解析结果。此前 {@link #parse(String)} 只回「能用 / null」,于是"签名有效但已过期" + * 与"签名对不上"在调用方是同一个读数——而会话容忍只需要前者。 + */ + public static final class ParseResult { + private final Verdict verdict; + private final Claims claims; + + ParseResult(Verdict verdict, Claims claims) { + this.verdict = verdict; + this.claims = claims; + } + + public Verdict verdict() { + return verdict; + } + + public Claims claims() { + return claims; + } + + public boolean isValid() { + return verdict == Verdict.VALID; + } + + public boolean isExpiredSigned() { + return verdict == Verdict.EXPIRED_SIGNED; + } + } + + /** + * 过期与伪造必须分家:{@code ExpiredJwtException} 要在通用 {@code JwtException} 之前捕获, + * 否则被后一个 catch 整段吞掉,三态永远读不出 EXPIRED_SIGNED(恒等于今天的两态)。 + * jj 先验签再校验 exp,故过期分支里的 {@code e.getClaims()} 是签名有效的那份 claims。 + */ + public ParseResult parseWithVerdict(String token) { try { - return Jwts.parser() + Claims claims = Jwts.parser() .verifyWith(signingKey()) .build() .parseSignedClaims(token) .getPayload(); + return new ParseResult(Verdict.VALID, claims); + } catch (io.jsonwebtoken.ExpiredJwtException e) { + return new ParseResult(Verdict.EXPIRED_SIGNED, e.getClaims()); } catch (JwtException | IllegalArgumentException e) { log.debug("[auth] jwt parse failed: {}", e.getMessage()); - return null; + return new ParseResult(Verdict.INVALID, null); } } + /** + * 语义与改造前逐字一致:过期令牌照样回 null。三处消费者 + * (requireUser、currentDeviceId、checkLogin)都按 null 判,不许被本次改造改变行为。 + */ + public Claims parse(String token) { + ParseResult result = parseWithVerdict(token); + return result.isValid() ? result.claims() : null; + } + + /** 仅供用例签发过期令牌(生产代码不许调)。 */ + SecretKey signingKeyForTest() { + return signingKey(); + } + public long ttlSeconds() { return Duration.ofHours(props.getJwtTtlHours()).toSeconds(); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/security/JwtVerdictTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/security/JwtVerdictTest.java new file mode 100644 index 000000000..099f24709 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/common/security/JwtVerdictTest.java @@ -0,0 +1,73 @@ +package com.nanri.aiimage.common.security; + +import io.jsonwebtoken.Jwts; +import org.junit.jupiter.api.Test; + +import java.util.Date; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * 容忍设计要区分「只是过期」与「签名不对」,而 {@code parse()} 今天把所有 JwtException 压成同一个 + * null——两者在现网读数是同一个「登录已过期」。拆三态的前提就是这几条。 + */ +class JwtVerdictTest { + + private static final String SECRET = "0123456789012345678901234567890123456789"; + + private JwtService service(String secret) { + AuthProperties props = new AuthProperties(); + props.setJwtSecret(secret); + props.setJwtTtlHours(168L); + return new JwtService(props); + } + + /** 用同一把密钥手工签一张 exp 已过的令牌(不改 issue 的 TTL,也不等 168 小时)。 */ + private String expiredToken(JwtService s) { + return Jwts.builder() + .subject("7") + .claim("username", "小魏16") + .claim("deviceId", "dev-1") + .issuedAt(new Date(System.currentTimeMillis() - 8_000L)) + .expiration(new Date(System.currentTimeMillis() - 1_000L)) + .signWith(s.signingKeyForTest()) + .compact(); + } + + @Test + void freshTokenIsValidAndParseStillReturnsClaims() { + JwtService s = service(SECRET); + String token = s.issue(7L, "小魏16", "dev-1"); + JwtService.ParseResult result = s.parseWithVerdict(token); + assertThat(result.verdict()).isEqualTo(JwtService.Verdict.VALID); + assertThat(result.isValid()).isTrue(); + assertThat(s.parse(token)).isNotNull(); + } + + @Test + void expiredButWellSignedIsDistinguishableAndKeepsClaims() { + JwtService s = service(SECRET); + String token = expiredToken(s); + JwtService.ParseResult result = s.parseWithVerdict(token); + assertThat(result.verdict()).isEqualTo(JwtService.Verdict.EXPIRED_SIGNED); + assertThat(result.isExpiredSigned()).isTrue(); + assertThat(result.claims().get("deviceId")).isEqualTo("dev-1"); + // 旧语义不许变:三处消费者(requireUser / currentDeviceId / checkLogin)都按 null 判 + assertThat(s.parse(token)).isNull(); + } + + @Test + void wrongKeyIsInvalidNotExpired() { + String forged = service("9999999999012345678901234567890123456789") + .issue(7L, "小魏16", "dev-1"); + JwtService.ParseResult result = service(SECRET).parseWithVerdict(forged); + assertThat(result.verdict()).isEqualTo(JwtService.Verdict.INVALID); + assertThat(result.claims()).isNull(); + } + + @Test + void garbageTokenIsInvalid() { + assertThat(service(SECRET).parseWithVerdict("not-a-jwt").verdict()) + .isEqualTo(JwtService.Verdict.INVALID); + } +}