261102_01_ENH: 요청 사용자 Context Provider 공용화 및 beta.1.7.1 버전 상향

This commit is contained in:
2026-11-02 13:59:34 +09:00
parent 59a4281cea
commit 2bbda10eb5
10 changed files with 116 additions and 49 deletions

View File

@@ -1,6 +1,8 @@
package com.kri.common.autoconfigure.web;
import com.kri.common.feature.auth.jwt.JwtService;
import com.kri.common.feature.web.RequestUserContextProvider;
import com.kri.common.runtime.web.DefaultRequestUserContextProvider;
import com.kri.common.runtime.web.CodeEnumConverter;
import com.kri.common.runtime.web.ErrorAdvice;
import com.kri.common.runtime.web.ServiceMdcAspect;
@@ -78,13 +80,21 @@ public class CommonWebAutoConfiguration {
};
}
@Bean
@ConditionalOnClass(HttpServletRequest.class)
@ConditionalOnBean(JwtService.class)
@ConditionalOnMissingBean(RequestUserContextProvider.class)
public RequestUserContextProvider requestUserContextProvider(JwtService jwtService) {
return new DefaultRequestUserContextProvider(jwtService);
}
@Bean
@ConditionalOnBean(JwtService.class)
@ConditionalOnMissingBean
public RequestUserContextArgumentResolver requestUserContextArgumentResolver(
JwtService jwtService
RequestUserContextProvider requestUserContextProvider
) {
return new RequestUserContextArgumentResolver(jwtService);
return new RequestUserContextArgumentResolver(requestUserContextProvider);
}
@Bean

View File

@@ -0,0 +1,11 @@
package com.kri.common.feature.web;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.lang.Nullable;
/** Provides the same user context used by controller argument resolution. */
public interface RequestUserContextProvider {
/** Resolves existing authentication or a verified Bearer token; otherwise returns an empty context. */
RequestUserContext resolve(@Nullable HttpServletRequest request);
}

View File

@@ -0,0 +1,60 @@
package com.kri.common.runtime.web;
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
import com.kri.common.feature.auth.jwt.JwtService;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.common.feature.web.RequestUserContextProvider;
import io.jsonwebtoken.JwtException;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.lang.Nullable;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@RequiredArgsConstructor
public class DefaultRequestUserContextProvider implements RequestUserContextProvider {
private final JwtService jwtService;
@Override
public RequestUserContext resolve(@Nullable HttpServletRequest request) {
String clientIp = request != null ? IpUtil.getClientIp(request) : null;
JwtUserClaimsDto claims = null;
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth != null) {
Object principal = auth.getPrincipal();
if (principal instanceof JwtUserClaimsDto jwtDto) {
claims = jwtDto;
} else {
Object details = auth.getDetails();
if (details instanceof JwtUserClaimsDto jwtDto) {
claims = jwtDto;
}
}
}
if (claims == null && request != null) {
String authHeader = request.getHeader("Authorization");
if (authHeader != null && authHeader.startsWith("Bearer ")) {
try {
claims = jwtService.toUserClaimsDto(authHeader.substring(7));
} catch (JwtException ignored) {
}
}
}
if (claims == null) {
return RequestUserContext.builder().clientIp(clientIp).build();
}
return RequestUserContext.builder()
.userId(claims.getUserId())
.userCmpn(claims.getUserCmpn())
.userTeam(claims.getUserTeam())
.userName(claims.getUserName())
.userRole(claims.getUserRole())
.clientIp(clientIp)
.build();
}
}

View File

@@ -1,24 +1,27 @@
package com.kri.common.runtime.web;
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
import com.kri.common.feature.auth.jwt.JwtService;
import com.kri.common.feature.web.RequestUserContext;
import io.jsonwebtoken.JwtException;
import com.kri.common.feature.web.RequestUserContextProvider;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.core.MethodParameter;
import org.springframework.lang.Nullable;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
@RequiredArgsConstructor
public class RequestUserContextArgumentResolver implements HandlerMethodArgumentResolver {
private final JwtService jwtService;
private final RequestUserContextProvider requestUserContextProvider;
public RequestUserContextArgumentResolver(JwtService jwtService) {
this(new DefaultRequestUserContextProvider(jwtService));
}
public RequestUserContextArgumentResolver(RequestUserContextProvider requestUserContextProvider) {
this.requestUserContextProvider = requestUserContextProvider;
}
@Override
public boolean supportsParameter(MethodParameter parameter) {
@@ -32,44 +35,7 @@ public class RequestUserContextArgumentResolver implements HandlerMethodArgument
NativeWebRequest webRequest,
@Nullable WebDataBinderFactory binderFactory
) {
HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
String clientIp = request != null ? IpUtil.getClientIp(request) : null;
JwtUserClaimsDto claims = null;
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth != null) {
Object principal = auth.getPrincipal();
if (principal instanceof JwtUserClaimsDto jwtDto) {
claims = jwtDto;
} else {
Object details = auth.getDetails();
if (details instanceof JwtUserClaimsDto jwtDto) {
claims = jwtDto;
}
}
}
if (claims == null && request != null) {
String authHeader = request.getHeader("Authorization");
if (authHeader != null && authHeader.startsWith("Bearer ")) {
try {
claims = jwtService.toUserClaimsDto(authHeader.substring(7));
} catch (JwtException ignored) {
}
}
}
if (claims == null) {
return RequestUserContext.builder().clientIp(clientIp).build();
}
return RequestUserContext.builder()
.userId(claims.getUserId())
.userCmpn(claims.getUserCmpn())
.userTeam(claims.getUserTeam())
.userName(claims.getUserName())
.userRole(claims.getUserRole())
.clientIp(clientIp)
.build();
return requestUserContextProvider.resolve(
webRequest.getNativeRequest(HttpServletRequest.class));
}
}