251201_01_ENH : JWT 수정, RequestUserContext 추가, 엑셀 매퍼 및 유틸, Json 유틸, DateTime 유틸 추가
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
package com.kri.common.webmvc;
|
||||
|
||||
import com.kri.common.auth.jwt.JwtService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
@@ -34,11 +36,24 @@ public class KriWebMvcAutoConfiguration {
|
||||
// 선택 주입: 있으면 쓰고, 없으면 안 씀
|
||||
private final ObjectProvider<IpAccessControlInterceptor> ipAccessControlInterceptorProvider;
|
||||
|
||||
@Bean
|
||||
@ConditionalOnBean(JwtService.class)// JwtService 있을 때만 동작
|
||||
@ConditionalOnMissingBean
|
||||
public RequestUserContextArgumentResolver requestUserContextArgumentResolver(
|
||||
JwtService jwtService
|
||||
) {
|
||||
return new RequestUserContextArgumentResolver(jwtService);
|
||||
}
|
||||
|
||||
/**
|
||||
* 실제로 WebMvc 설정을 하는 WebMvcConfigurer Bean
|
||||
*/
|
||||
@Bean
|
||||
public WebMvcConfigurer kriCommonWebMvcConfigurer() {
|
||||
public WebMvcConfigurer kriCommonWebMvcConfigurer(
|
||||
KriIpAccessProperties properties,
|
||||
ObjectProvider<IpAccessControlInterceptor> ipAccessControlInterceptorProvider,
|
||||
ObjectProvider<RequestUserContextArgumentResolver> requestUserContextArgumentResolverProvider
|
||||
) {
|
||||
return new WebMvcConfigurer() {
|
||||
@Override
|
||||
public void addCorsMappings(CorsRegistry registry) {
|
||||
@@ -58,6 +73,11 @@ public class KriWebMvcAutoConfiguration {
|
||||
.addPathPatterns("/swagger-ui/**", "/v3/api-docs/**")
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addArgumentResolvers(java.util.List<org.springframework.web.method.support.HandlerMethodArgumentResolver> resolvers) {
|
||||
requestUserContextArgumentResolverProvider.ifAvailable(resolvers::add);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
21
src/main/java/com/kri/common/webmvc/RequestUserContext.java
Normal file
21
src/main/java/com/kri/common/webmvc/RequestUserContext.java
Normal file
@@ -0,0 +1,21 @@
|
||||
package com.kri.common.webmvc;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Value;
|
||||
|
||||
@Value
|
||||
@Builder
|
||||
public class RequestUserContext {
|
||||
|
||||
String userId;
|
||||
String userCmpn;
|
||||
String userTeam;
|
||||
String userName;
|
||||
Integer userRole;
|
||||
|
||||
String clientIp; // IpUtil 에서 가져온 값
|
||||
|
||||
public boolean isAuthenticated() {
|
||||
return userId != null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.kri.common.webmvc;
|
||||
|
||||
import com.kri.common.auth.jwt.JwtService;
|
||||
import com.kri.common.auth.jwt.JwtUserClaimsDto;
|
||||
import io.jsonwebtoken.JwtException;
|
||||
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;
|
||||
|
||||
@Override
|
||||
public boolean supportsParameter(MethodParameter parameter) {
|
||||
return RequestUserContext.class.isAssignableFrom(parameter.getParameterType());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object resolveArgument(
|
||||
MethodParameter parameter,
|
||||
@Nullable ModelAndViewContainer mavContainer,
|
||||
NativeWebRequest webRequest,
|
||||
@Nullable WebDataBinderFactory binderFactory
|
||||
) {
|
||||
HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
|
||||
|
||||
String clientIp = request != null ? IpUtil.getClientIp(request) : null;
|
||||
|
||||
JwtUserClaimsDto claims = null;
|
||||
|
||||
// 1) SecurityContext 에 이미 JwtUserClaimsDto 가 principal 로 들어있는 경우
|
||||
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
|
||||
if (auth != null && auth.getPrincipal() instanceof JwtUserClaimsDto jwtDto) {
|
||||
claims = jwtDto;
|
||||
}
|
||||
|
||||
// 2) 현재 공통 JwtService 는 principal 을 userId(String) 로 쓰고 있으니까,
|
||||
// 필요하면 Authorization 헤더에서 직접 토큰 파싱
|
||||
if (claims == null && request != null) {
|
||||
String authHeader = request.getHeader("Authorization");
|
||||
if (authHeader != null && authHeader.startsWith("Bearer ")) {
|
||||
String token = authHeader.substring(7);
|
||||
try {
|
||||
claims = jwtService.toUserClaimsDto(token);
|
||||
} catch (JwtException ex) {
|
||||
// 토큰 이상하면 그냥 anonymous 로 둠
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (claims == null) {
|
||||
// 비인증 상태: IP만 채운 빈 컨텍스트
|
||||
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();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user