diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/PrincipalProvider.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/PrincipalProvider.java index ae97287ca..010fd2520 100644 --- a/core/common/src/main/java/kr/ac/kookmin/stream/common/PrincipalProvider.java +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/PrincipalProvider.java @@ -6,4 +6,8 @@ public interface PrincipalProvider { Long userId(); Set roles(); Set councilDepartments(); + + // 지금 요청이 들고 온 JWT 원문. 이 사용자 권한으로 다른 서버가 학생 API를 대신 부를 때만 쓴다(AI 서버 중계). + // 로그·응답에 남기지 않는다 + String accessToken(); } diff --git a/docs/conventions/config-and-auth.md b/docs/conventions/config-and-auth.md index 573237ab0..50ef1fc08 100644 --- a/docs/conventions/config-and-auth.md +++ b/docs/conventions/config-and-auth.md @@ -103,6 +103,7 @@ public interface PrincipalProvider { Long userId(); Set roles(); Set departments(); // STUDENT면 빈 Set + String accessToken(); // 요청의 JWT 원문. AI 서버 중계처럼 학생 권한으로 대신 부를 때만 쓴다 } ``` diff --git a/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/SecurityPrincipalProvider.java b/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/SecurityPrincipalProvider.java index ae308fb75..b609c26bf 100644 --- a/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/SecurityPrincipalProvider.java +++ b/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/SecurityPrincipalProvider.java @@ -29,6 +29,11 @@ public Set councilDepartments() { return currentAuthentication().councilDepartments(); } + @Override + public String accessToken() { + return currentAuthentication().accessToken(); + } + private UserAuthentication currentAuthentication() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (!(authentication instanceof UserAuthentication userAuthentication)) { diff --git a/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/JwtAuthFilter.java b/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/JwtAuthFilter.java index 8bf8a8b17..658c978d5 100644 --- a/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/JwtAuthFilter.java +++ b/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/JwtAuthFilter.java @@ -30,7 +30,7 @@ protected void doFilterInternal( ) throws ServletException, IOException { String token = resolveToken(request); if (token != null) { - SecurityContextHolder.getContext().setAuthentication(UserAuthentication.from(jwtProvider.parse(token))); + SecurityContextHolder.getContext().setAuthentication(UserAuthentication.of(jwtProvider.parse(token), token)); } filterChain.doFilter(request, response); } diff --git a/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/UserAuthentication.java b/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/UserAuthentication.java index 5c631ff0a..b9a9f9fc1 100644 --- a/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/UserAuthentication.java +++ b/gateway/auth/src/main/java/kr/ac/kookmin/stream/security/jwt/UserAuthentication.java @@ -20,17 +20,20 @@ public class UserAuthentication extends AbstractAuthenticationToken { private final Long userId; private final Set roles; private final Set councilDepartments; + // 검증을 마친 JWT 원문. Bearer 파싱은 JwtAuthFilter 한 곳에서만 하고, 다른 모듈은 PrincipalProvider로 꺼낸다 + private final String accessToken; - private UserAuthentication(JwtPayload payload) { + private UserAuthentication(JwtPayload payload, String accessToken) { super(toAuthorities(payload)); this.userId = payload.userId(); this.roles = payload.roles(); this.councilDepartments = payload.councilDepartments(); + this.accessToken = accessToken; setAuthenticated(true); } - public static UserAuthentication from(JwtPayload payload) { - return new UserAuthentication(payload); + public static UserAuthentication of(JwtPayload payload, String accessToken) { + return new UserAuthentication(payload, accessToken); } @Override diff --git a/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/chat/streamai/StreamAiChatClient.java b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/chat/streamai/StreamAiChatClient.java index 6815770d6..c24adb7bc 100644 --- a/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/chat/streamai/StreamAiChatClient.java +++ b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/chat/streamai/StreamAiChatClient.java @@ -1,6 +1,7 @@ package kr.ac.kookmin.stream.client.chat.streamai; import java.util.List; +import kr.ac.kookmin.stream.common.PrincipalProvider; import kr.ac.kookmin.stream.welfare.domain.chat.client.ChatClient; import kr.ac.kookmin.stream.welfare.domain.chat.client.ChatEventListener; import kr.ac.kookmin.stream.welfare.domain.chat.domain.ChatTurn; @@ -41,6 +42,7 @@ public class StreamAiChatClient implements ChatClient { private final StreamAiProperties properties; private final ObjectMapper objectMapper; + private final PrincipalProvider principalProvider; @Override public void stream(Long memberId, List history, ChatEventListener listener) { @@ -51,6 +53,10 @@ public void stream(Long memberId, List history, ChatEventListener list .uri(properties.chatPath()) .header("X-Internal-Token", properties.internalToken()) .header("X-User-Id", String.valueOf(memberId)) + // AI 서버가 이 학생 권한으로 기존 학생 API를 조회(GET)한다. 예: 빌릴게 재고, 내 대여. + // 토큰은 인자로 받지 않는다 — 받으면 ChatClient(도메인)가 인증 개념을 알아야 한다(config-and-auth.md 4-4절). + // PrincipalProvider는 요청 스레드 기준이라, 중계를 비동기로 바꾸면 토큰을 꺼낼 수 없다. 토큰 원문은 로그에 남기지 않는다 + .header("X-User-Token", principalProvider.accessToken()) .accept(MediaType.TEXT_EVENT_STREAM) .body(StreamAiChatRequest.from(history)) .exchange((request, response) -> {