From db1b6eef6a1e6a87567b6a33ef359f4deadf1068 Mon Sep 17 00:00:00 2001 From: overhyeon Date: Mon, 9 Nov 2026 03:04:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EC=B1=97=EB=B4=87=20=EC=A4=91?= =?UTF-8?q?=EA=B3=84=20=EC=8B=9C=20=ED=95=99=EC=83=9D=20JWT=EB=A5=BC=20X-U?= =?UTF-8?q?ser-Token=20=ED=97=A4=EB=8D=94=EB=A1=9C=20AI=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=EC=97=90=20=EC=A0=84=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infrastructure/client/build.gradle.kts | 2 ++ .../chat/streamai/StreamAiChatClient.java | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/infrastructure/client/build.gradle.kts b/infrastructure/client/build.gradle.kts index 618deda3f..af13cab35 100644 --- a/infrastructure/client/build.gradle.kts +++ b/infrastructure/client/build.gradle.kts @@ -15,6 +15,8 @@ dependencies { implementation(platform(libs.springBootDependenciesBom)) implementation(libs.springBootStarter) implementation(libs.springWeb) + // StreamAiChatClient가 중계 중인 학생 요청의 헤더(JWT)를 읽는다 + implementation(libs.jakartaServletApi) implementation(libs.jacksonDatabind) implementation(libs.jackson3Databind) 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..5de8570f4 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,5 +1,6 @@ package kr.ac.kookmin.stream.client.chat.streamai; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import kr.ac.kookmin.stream.welfare.domain.chat.client.ChatClient; import kr.ac.kookmin.stream.welfare.domain.chat.client.ChatEventListener; @@ -8,10 +9,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.web.client.RestClient; import org.springframework.web.client.RestClientException; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import tools.jackson.core.JacksonException; import tools.jackson.databind.JsonNode; import tools.jackson.databind.ObjectMapper; @@ -36,6 +40,8 @@ public class StreamAiChatClient implements ChatClient { private static final String EVENT_DONE = "done"; private static final String EVENT_ERROR = "error"; + private static final String BEARER_PREFIX = "Bearer "; + @Qualifier("streamAiRestClient") private final RestClient streamAiRestClient; @@ -51,6 +57,13 @@ 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)) + .headers(headers -> { + // AI 서버가 이 학생 권한으로 기존 학생 API를 조회(GET)한다. 예: 빌릴게 재고 + String userToken = currentUserToken(); + if (userToken != null) { + headers.set("X-User-Token", userToken); + } + }) .accept(MediaType.TEXT_EVENT_STREAM) .body(StreamAiChatRequest.from(history)) .exchange((request, response) -> { @@ -73,6 +86,27 @@ public void stream(Long memberId, List history, ChatEventListener list guard.onError(FALLBACK_ERROR_MESSAGE); } + /** + * 지금 처리 중인 학생 요청의 JWT를 꺼낸다. 없으면 {@code null}. + *

+ * 인자로 받지 않고 요청에서 직접 꺼내는 이유: 인자로 받으면 {@link ChatClient}(도메인)가 토큰을 알아야 한다. + * 도메인은 인증 개념을 모르게 둔다(config-and-auth.md 4-4절). 중계는 컨트롤러 스레드에서 끝까지 동기로 돌기 때문에 + * 여기서도 같은 요청이 보인다. 비동기로 바꾸면 요청이 보이지 않아 토큰 없이 나간다. + *

+ * 토큰 원문은 로그에 남기지 않는다. + */ + private static String currentUserToken() { + if (!(RequestContextHolder.getRequestAttributes() instanceof ServletRequestAttributes attributes)) { + return null; + } + HttpServletRequest request = attributes.getRequest(); + String header = request.getHeader(HttpHeaders.AUTHORIZATION); + if (header == null || !header.startsWith(BEARER_PREFIX)) { + return null; + } + return header.substring(BEARER_PREFIX.length()); + } + private void dispatch(SseEvent event, TerminalGuard guard) { switch (event.name()) { case EVENT_DELTA -> { From 3f048ee75bba4bea58893ade9bf3266ed061b70c Mon Sep 17 00:00:00 2001 From: overhyeon Date: Tue, 17 Nov 2026 19:08:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=ED=95=99=EC=83=9D=20JWT?= =?UTF-8?q?=EB=A5=BC=20=EC=9A=94=EC=B2=AD=EC=97=90=EC=84=9C=20=EC=A7=81?= =?UTF-8?q?=EC=A0=91=20=EC=9D=BD=EC=A7=80=20=EC=95=8A=EA=B3=A0=20Principal?= =?UTF-8?q?Provider=EB=A1=9C=20=EA=BA=BC=EB=82=B4=20AI=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=EC=97=90=20=EC=A0=84=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/common/PrincipalProvider.java | 4 ++ docs/conventions/config-and-auth.md | 1 + .../security/SecurityPrincipalProvider.java | 5 +++ .../stream/security/jwt/JwtAuthFilter.java | 2 +- .../security/jwt/UserAuthentication.java | 9 +++-- infrastructure/client/build.gradle.kts | 2 - .../chat/streamai/StreamAiChatClient.java | 40 +++---------------- 7 files changed, 23 insertions(+), 40 deletions(-) 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/build.gradle.kts b/infrastructure/client/build.gradle.kts index af13cab35..618deda3f 100644 --- a/infrastructure/client/build.gradle.kts +++ b/infrastructure/client/build.gradle.kts @@ -15,8 +15,6 @@ dependencies { implementation(platform(libs.springBootDependenciesBom)) implementation(libs.springBootStarter) implementation(libs.springWeb) - // StreamAiChatClient가 중계 중인 학생 요청의 헤더(JWT)를 읽는다 - implementation(libs.jakartaServletApi) implementation(libs.jacksonDatabind) implementation(libs.jackson3Databind) 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 5de8570f4..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,7 +1,7 @@ package kr.ac.kookmin.stream.client.chat.streamai; -import jakarta.servlet.http.HttpServletRequest; 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; @@ -9,13 +9,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.web.client.RestClient; import org.springframework.web.client.RestClientException; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import tools.jackson.core.JacksonException; import tools.jackson.databind.JsonNode; import tools.jackson.databind.ObjectMapper; @@ -40,13 +37,12 @@ public class StreamAiChatClient implements ChatClient { private static final String EVENT_DONE = "done"; private static final String EVENT_ERROR = "error"; - private static final String BEARER_PREFIX = "Bearer "; - @Qualifier("streamAiRestClient") private final RestClient streamAiRestClient; private final StreamAiProperties properties; private final ObjectMapper objectMapper; + private final PrincipalProvider principalProvider; @Override public void stream(Long memberId, List history, ChatEventListener listener) { @@ -57,13 +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)) - .headers(headers -> { - // AI 서버가 이 학생 권한으로 기존 학생 API를 조회(GET)한다. 예: 빌릴게 재고 - String userToken = currentUserToken(); - if (userToken != null) { - headers.set("X-User-Token", userToken); - } - }) + // 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) -> { @@ -86,27 +79,6 @@ public void stream(Long memberId, List history, ChatEventListener list guard.onError(FALLBACK_ERROR_MESSAGE); } - /** - * 지금 처리 중인 학생 요청의 JWT를 꺼낸다. 없으면 {@code null}. - *

- * 인자로 받지 않고 요청에서 직접 꺼내는 이유: 인자로 받으면 {@link ChatClient}(도메인)가 토큰을 알아야 한다. - * 도메인은 인증 개념을 모르게 둔다(config-and-auth.md 4-4절). 중계는 컨트롤러 스레드에서 끝까지 동기로 돌기 때문에 - * 여기서도 같은 요청이 보인다. 비동기로 바꾸면 요청이 보이지 않아 토큰 없이 나간다. - *

- * 토큰 원문은 로그에 남기지 않는다. - */ - private static String currentUserToken() { - if (!(RequestContextHolder.getRequestAttributes() instanceof ServletRequestAttributes attributes)) { - return null; - } - HttpServletRequest request = attributes.getRequest(); - String header = request.getHeader(HttpHeaders.AUTHORIZATION); - if (header == null || !header.startsWith(BEARER_PREFIX)) { - return null; - } - return header.substring(BEARER_PREFIX.length()); - } - private void dispatch(SseEvent event, TerminalGuard guard) { switch (event.name()) { case EVENT_DELTA -> {