260327_01_ENH: 프로젝트 구조 리펙토링 및 README.md 갱신
This commit is contained in:
11
build.gradle
11
build.gradle
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//버전 변경은 여기서
|
//버전 변경은 여기서
|
||||||
def commonVer = "beta.1.0.70"
|
def commonVer = "beta.1.1.01"
|
||||||
|
|
||||||
group = 'com.kri.common'
|
group = 'com.kri.common'
|
||||||
version = commonVer
|
version = commonVer
|
||||||
@@ -13,6 +13,10 @@ java {
|
|||||||
toolchain { languageVersion = JavaLanguageVersion.of(17) }
|
toolchain { languageVersion = JavaLanguageVersion.of(17) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.encoding = 'UTF-8'
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
@@ -30,7 +34,7 @@ dependencies {
|
|||||||
|
|
||||||
// JWT
|
// JWT
|
||||||
api 'io.jsonwebtoken:jjwt-api:0.11.5'
|
api 'io.jsonwebtoken:jjwt-api:0.11.5'
|
||||||
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
|
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
|
||||||
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
|
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
|
||||||
|
|
||||||
// Security Core
|
// Security Core
|
||||||
@@ -54,11 +58,10 @@ dependencies {
|
|||||||
//Json Util
|
//Json Util
|
||||||
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
|
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
|
||||||
//Excel Util
|
//Excel Util
|
||||||
implementation 'org.apache.poi:poi-ooxml:5.2.5'
|
implementation 'org.apache.poi:poi-ooxml:5.4.0'
|
||||||
|
|
||||||
// ConfigurationProperties 메타데이터
|
// ConfigurationProperties 메타데이터
|
||||||
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
|
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
|
||||||
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
|
|
||||||
|
|
||||||
// 자동구성/웹/검증/AOP/Redis는 컴파일만 (전이 방지)
|
// 자동구성/웹/검증/AOP/Redis는 컴파일만 (전이 방지)
|
||||||
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
|
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.autoconfigure.auth.apikey;
|
||||||
|
|
||||||
|
import com.kri.common.endpoint.auth.apikey.ApiKeyAdminController;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
@@ -8,7 +9,7 @@ import org.springframework.context.annotation.Import;
|
|||||||
@AutoConfiguration
|
@AutoConfiguration
|
||||||
@ConditionalOnClass(ApiKeyAdminController.class)
|
@ConditionalOnClass(ApiKeyAdminController.class)
|
||||||
@ConditionalOnProperty(prefix = "kri.auth.apikey", name = "admin-api-enabled", havingValue = "true")
|
@ConditionalOnProperty(prefix = "kri.auth.apikey", name = "admin-api-enabled", havingValue = "true")
|
||||||
@Import(ApiKeyAdminController.class) // ✅ 컴포넌트 스캔 없이도 Bean 등록
|
@Import(ApiKeyAdminController.class) // 컴포넌트 스캔 없이도 Bean 등록
|
||||||
public class ApiKeyAdminAutoConfiguration {
|
public class ApiKeyAdminAutoConfiguration {
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.autoconfigure.auth.apikey;
|
||||||
|
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import jakarta.persistence.EntityManagerFactory;
|
import jakarta.persistence.EntityManagerFactory;
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.autoconfigure.auth.apikey;
|
||||||
|
|
||||||
import com.kri.common.auth.persistence.repository.ApiKeyRepository;
|
import com.kri.common.feature.auth.apikey.ApiKeyUserClaimsProvider;
|
||||||
|
import com.kri.common.runtime.auth.apikey.PreloadedApiKeyUserClaimsProvider;
|
||||||
|
import com.kri.common.runtime.auth.apikey.persistence.repository.ApiKeyRepository;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
@@ -14,7 +16,7 @@ import org.springframework.context.annotation.Bean;
|
|||||||
public class ApiKeyPreloadAutoConfiguration {
|
public class ApiKeyPreloadAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnBean(ApiKeyRepository.class) // ✅ apikey JPA 컨텍스트가 repo를 만들었을 때만
|
@ConditionalOnBean(ApiKeyRepository.class)
|
||||||
@ConditionalOnMissingBean(ApiKeyUserClaimsProvider.class)
|
@ConditionalOnMissingBean(ApiKeyUserClaimsProvider.class)
|
||||||
public PreloadedApiKeyUserClaimsProvider apiKeyUserClaimsProvider(
|
public PreloadedApiKeyUserClaimsProvider apiKeyUserClaimsProvider(
|
||||||
ApiKeyProperties props,
|
ApiKeyProperties props,
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.autoconfigure.auth.apikey;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
package com.kri.common.auth.jwt;
|
package com.kri.common.autoconfigure.auth.jwt;
|
||||||
|
|
||||||
import com.kri.common.auth.apikey.ApiKeyAuthFilter;
|
import com.kri.common.runtime.auth.apikey.ApiKeyAuthFilter;
|
||||||
import com.kri.common.auth.apikey.ApiKeyProperties;
|
import com.kri.common.autoconfigure.auth.apikey.ApiKeyProperties;
|
||||||
import com.kri.common.auth.apikey.ApiKeyUserClaimsProvider;
|
import com.kri.common.feature.auth.apikey.ApiKeyUserClaimsProvider;
|
||||||
|
import com.kri.common.feature.auth.jwt.JwtService;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
@@ -19,16 +20,14 @@ public class JwtAutoConfiguration {
|
|||||||
return new JwtService(properties);
|
return new JwtService(properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ApiKeyUserClaimsProvider 구현체가 존재할 때만 API Key 필터 자동 생성. (실제 필터 체인에 넣는 건 각 서비스의 SecurityConfig 에서
|
|
||||||
* addFilterBefore 로 수행)
|
|
||||||
*/
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnBean(ApiKeyUserClaimsProvider.class)
|
@ConditionalOnBean(ApiKeyUserClaimsProvider.class)
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
public ApiKeyAuthFilter apiKeyAuthFilter(ApiKeyProperties apiKeyProperties,
|
public ApiKeyAuthFilter apiKeyAuthFilter(
|
||||||
|
ApiKeyProperties apiKeyProperties,
|
||||||
ApiKeyUserClaimsProvider provider,
|
ApiKeyUserClaimsProvider provider,
|
||||||
JwtService jwtService) {
|
JwtService jwtService
|
||||||
|
) {
|
||||||
return new ApiKeyAuthFilter(apiKeyProperties, provider, jwtService);
|
return new ApiKeyAuthFilter(apiKeyProperties, provider, jwtService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.jwt;
|
package com.kri.common.autoconfigure.auth.jwt;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
package com.kri.common.redis;
|
package com.kri.common.autoconfigure.redis;
|
||||||
|
|
||||||
|
import com.kri.common.feature.redis.RedisQueueHelper;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
import org.springframework.data.redis.core.RedisTemplate;
|
||||||
@@ -12,7 +13,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
|
|||||||
|
|
||||||
@AutoConfiguration
|
@AutoConfiguration
|
||||||
@ConditionalOnClass(RedisTemplate.class)
|
@ConditionalOnClass(RedisTemplate.class)
|
||||||
@ConditionalOnProperty(prefix = "common.redis", name = "enabled", havingValue = "true", matchIfMissing = false)
|
@ConditionalOnExpression("${kri.redis.enabled:false}")
|
||||||
@ConditionalOnBean(RedisConnectionFactory.class)
|
@ConditionalOnBean(RedisConnectionFactory.class)
|
||||||
public class CommonRedisAutoConfiguration {
|
public class CommonRedisAutoConfiguration {
|
||||||
|
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
package com.kri.common.scheduling;
|
package com.kri.common.autoconfigure.scheduling;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
|
|
||||||
@AutoConfiguration
|
@AutoConfiguration
|
||||||
@EnableScheduling
|
@EnableScheduling
|
||||||
@ConditionalOnProperty(prefix = "common.scheduling", name = "enabled", havingValue = "true", matchIfMissing = false)
|
@ConditionalOnExpression("${kri.scheduling.enabled:false}")
|
||||||
public class CommonSchedulingAutoConfiguration {
|
public class CommonSchedulingAutoConfiguration {
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
package com.kri.common.security;
|
package com.kri.common.autoconfigure.security;
|
||||||
|
|
||||||
import com.kri.common.auth.apikey.ApiKeyAuthFilter;
|
import com.kri.common.runtime.auth.apikey.ApiKeyAuthFilter;
|
||||||
import com.kri.common.auth.jwt.JwtProperties;
|
import com.kri.common.autoconfigure.auth.jwt.JwtProperties;
|
||||||
import com.kri.common.auth.jwt.JwtService;
|
import com.kri.common.feature.auth.jwt.JwtService;
|
||||||
|
import com.kri.common.runtime.security.JwtAuthenticationFilter;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.ObjectProvider;
|
import org.springframework.beans.factory.ObjectProvider;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.security;
|
package com.kri.common.autoconfigure.security;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.kri.common.swagger;
|
package com.kri.common.autoconfigure.swagger;
|
||||||
|
|
||||||
import com.kri.common.auth.apikey.ApiKeyProperties;
|
import com.kri.common.autoconfigure.auth.apikey.ApiKeyProperties;
|
||||||
|
import com.kri.common.runtime.swagger.SwaggerIpFilter;
|
||||||
import io.swagger.v3.oas.models.Components;
|
import io.swagger.v3.oas.models.Components;
|
||||||
import io.swagger.v3.oas.models.OpenAPI;
|
import io.swagger.v3.oas.models.OpenAPI;
|
||||||
import io.swagger.v3.oas.models.info.Info;
|
import io.swagger.v3.oas.models.info.Info;
|
||||||
@@ -24,13 +25,12 @@ import org.springframework.context.annotation.Bean;
|
|||||||
public class KriSwaggerAutoConfiguration {
|
public class KriSwaggerAutoConfiguration {
|
||||||
|
|
||||||
private final KriSwaggerProperties properties;
|
private final KriSwaggerProperties properties;
|
||||||
private final ApiKeyProperties apiKeyProperties; // apikey.header-name 읽어오기 위해
|
private final ApiKeyProperties apiKeyProperties; // apikey.header-name 읽기용
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
public OpenAPI kriOpenAPI() {
|
public OpenAPI kriOpenAPI() {
|
||||||
|
// JWT Bearer + API Key 스키마 정의
|
||||||
// 🔐 JWT Bearer + API-Key 스키마 정의
|
|
||||||
Components components = new Components()
|
Components components = new Components()
|
||||||
.addSecuritySchemes("BearerAuth",
|
.addSecuritySchemes("BearerAuth",
|
||||||
new SecurityScheme()
|
new SecurityScheme()
|
||||||
@@ -41,9 +41,9 @@ public class KriSwaggerAutoConfiguration {
|
|||||||
new SecurityScheme()
|
new SecurityScheme()
|
||||||
.type(SecurityScheme.Type.APIKEY)
|
.type(SecurityScheme.Type.APIKEY)
|
||||||
.in(SecurityScheme.In.HEADER)
|
.in(SecurityScheme.In.HEADER)
|
||||||
.name(apiKeyProperties.getHeaderName())); // 예: X-API-Key
|
.name(apiKeyProperties.getHeaderName())); // 예: X-API-Key
|
||||||
|
|
||||||
// 🔐 기본적으로 두 보안 스키마를 전역에 적용
|
// 두 보안 스키마를 기본 보안 요구사항으로 등록
|
||||||
SecurityRequirement securityRequirement = new SecurityRequirement()
|
SecurityRequirement securityRequirement = new SecurityRequirement()
|
||||||
.addList("BearerAuth")
|
.addList("BearerAuth")
|
||||||
.addList("ApiKeyAuth");
|
.addList("ApiKeyAuth");
|
||||||
@@ -54,8 +54,7 @@ public class KriSwaggerAutoConfiguration {
|
|||||||
.info(new Info()
|
.info(new Info()
|
||||||
.title(properties.getTitle())
|
.title(properties.getTitle())
|
||||||
.description(properties.getDescription())
|
.description(properties.getDescription())
|
||||||
.version(properties.getVersion())
|
.version(properties.getVersion()));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean(name = "kriGroupedOpenApi")
|
@Bean(name = "kriGroupedOpenApi")
|
||||||
@@ -67,10 +66,7 @@ public class KriSwaggerAutoConfiguration {
|
|||||||
|
|
||||||
String base = properties.getBasePackage();
|
String base = properties.getBasePackage();
|
||||||
if (base != null && !base.isBlank()) {
|
if (base != null && !base.isBlank()) {
|
||||||
builder.packagesToScan(
|
builder.packagesToScan(base, "com.kri.common.feature.auth.apikey");
|
||||||
base,
|
|
||||||
"com.kri.common.auth.apikey"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return builder.build();
|
return builder.build();
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.swagger;
|
package com.kri.common.autoconfigure.swagger;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -19,12 +19,12 @@ public class KriSwaggerProperties {
|
|||||||
private String version = "v1";
|
private String version = "v1";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 문서화할 base package (null 이면 전체)
|
* 臾몄꽌?뷀븷 base package (null ?대㈃ ?꾩껜)
|
||||||
*/
|
*/
|
||||||
private String basePackage;
|
private String basePackage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Swagger 접근 허용 IP 목록 (127.0.0.1, localhost, 0:0:0:0:0:0:0:1은 기본 허용)
|
* Swagger ?묎렐 ?덉슜 IP 紐⑸줉 (127.0.0.1, localhost, 0:0:0:0:0:0:0:1? 湲곕낯 ?덉슜)
|
||||||
*/
|
*/
|
||||||
private List<String> allowedIps = new ArrayList<>();
|
private List<String> allowedIps = new ArrayList<>();
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package com.kri.common.autoconfigure.web;
|
||||||
|
|
||||||
|
import com.kri.common.runtime.web.ErrorAdvice;
|
||||||
|
import com.kri.common.runtime.web.MdcHandlerConfig;
|
||||||
|
import com.kri.common.runtime.web.ServiceMdcAspect;
|
||||||
|
import com.kri.common.runtime.web.TraceFilter;
|
||||||
|
import org.aspectj.lang.annotation.Aspect;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
|
||||||
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Import;
|
||||||
|
import org.springframework.core.Ordered;
|
||||||
|
|
||||||
|
@AutoConfiguration
|
||||||
|
@ConditionalOnExpression("${kri.web.enabled:true}")
|
||||||
|
@Import(MdcHandlerConfig.class)
|
||||||
|
public class CommonWebAutoConfiguration {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public ErrorAdvice errorAdvice() {
|
||||||
|
return new ErrorAdvice();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public FilterRegistrationBean<TraceFilter> traceFilter() {
|
||||||
|
var reg = new FilterRegistrationBean<>(new TraceFilter());
|
||||||
|
reg.setOrder(Ordered.HIGHEST_PRECEDENCE);
|
||||||
|
return reg;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnClass(Aspect.class)
|
||||||
|
@ConditionalOnExpression("${kri.web.mdc.enabled:true}")
|
||||||
|
public ServiceMdcAspect serviceMdcAspect() {
|
||||||
|
return new ServiceMdcAspect();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.autoconfigure.webmvc;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.autoconfigure.webmvc;
|
||||||
|
|
||||||
import com.kri.common.auth.jwt.JwtService;
|
import com.kri.common.feature.auth.jwt.JwtService;
|
||||||
|
import com.kri.common.runtime.webmvc.IpAccessControlInterceptor;
|
||||||
|
import com.kri.common.runtime.webmvc.IpAccessControlService;
|
||||||
|
import com.kri.common.runtime.webmvc.RequestUserContextArgumentResolver;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.ObjectProvider;
|
import org.springframework.beans.factory.ObjectProvider;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
@@ -15,7 +18,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|||||||
|
|
||||||
@AutoConfiguration
|
@AutoConfiguration
|
||||||
@EnableConfigurationProperties(KriIpAccessProperties.class)
|
@EnableConfigurationProperties(KriIpAccessProperties.class)
|
||||||
@ConditionalOnProperty(name = "common.webmvc.enabled", matchIfMissing = true)
|
@ConditionalOnProperty(name = "kri.webmvc.enabled", matchIfMissing = true)
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class KriWebMvcAutoConfiguration {
|
public class KriWebMvcAutoConfiguration {
|
||||||
|
|
||||||
@@ -81,7 +84,7 @@ public class KriWebMvcAutoConfiguration {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addFormatters(org.springframework.format.FormatterRegistry registry) {
|
public void addFormatters(org.springframework.format.FormatterRegistry registry) {
|
||||||
registry.addConverterFactory(new com.kri.common.webmvc.CodeEnumConverter());
|
registry.addConverterFactory(new com.kri.common.runtime.webmvc.CodeEnumConverter());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.endpoint.auth.apikey;
|
||||||
|
|
||||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
import com.kri.common.autoconfigure.auth.apikey.ApiKeyProperties;
|
||||||
|
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||||
|
import com.kri.common.runtime.auth.apikey.PreloadedApiKeyUserClaimsProvider;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -36,7 +38,7 @@ public class ApiKeyAdminController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 현재 캐시 상태(키는 마스킹)
|
* 현재 메모리에 적재된 API Key 캐시를 확인합니다.
|
||||||
*/
|
*/
|
||||||
@GetMapping("/cache")
|
@GetMapping("/cache")
|
||||||
public List<CachedKeyView> cache(HttpServletRequest req) {
|
public List<CachedKeyView> cache(HttpServletRequest req) {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.feature.auth.apikey;
|
||||||
|
|
||||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.dto;
|
package com.kri.common.feature.auth.dto;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.kri.common.auth.jwt;
|
package com.kri.common.feature.auth.jwt;
|
||||||
|
|
||||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
import com.kri.common.autoconfigure.auth.jwt.JwtProperties;
|
||||||
|
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||||
import io.jsonwebtoken.Claims;
|
import io.jsonwebtoken.Claims;
|
||||||
import io.jsonwebtoken.Jws;
|
import io.jsonwebtoken.Jws;
|
||||||
import io.jsonwebtoken.JwtException;
|
import io.jsonwebtoken.JwtException;
|
||||||
@@ -44,10 +45,6 @@ public class JwtService {
|
|||||||
this.key = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
|
this.key = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================
|
|
||||||
// 내부 공통 빌더
|
|
||||||
// ======================================================
|
|
||||||
|
|
||||||
private String buildToken(Map<String, Object> claims, String subject, long validitySeconds) {
|
private String buildToken(Map<String, Object> claims, String subject, long validitySeconds) {
|
||||||
Date now = new Date();
|
Date now = new Date();
|
||||||
Date expiry = new Date(now.getTime() + validitySeconds * 1000);
|
Date expiry = new Date(now.getTime() + validitySeconds * 1000);
|
||||||
@@ -64,7 +61,6 @@ public class JwtService {
|
|||||||
|
|
||||||
private Map<String, Object> buildClaims(JwtUserClaimsDto dto) {
|
private Map<String, Object> buildClaims(JwtUserClaimsDto dto) {
|
||||||
Map<String, Object> claims = new HashMap<>();
|
Map<String, Object> claims = new HashMap<>();
|
||||||
// 필요한 항목만 골라서 claim에 넣어줌
|
|
||||||
claims.put("userId", dto.getUserId());
|
claims.put("userId", dto.getUserId());
|
||||||
claims.put("userCmpn", dto.getUserCmpn());
|
claims.put("userCmpn", dto.getUserCmpn());
|
||||||
claims.put("userTeam", dto.getUserTeam());
|
claims.put("userTeam", dto.getUserTeam());
|
||||||
@@ -73,41 +69,15 @@ public class JwtService {
|
|||||||
return claims;
|
return claims;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================
|
|
||||||
// 토큰 생성 (DTO 기반)
|
|
||||||
// ======================================================
|
|
||||||
|
|
||||||
/**
|
|
||||||
* JwtUserClaimsDto 기반 Access Token 생성 - subject = userId - claims: userId, userCmpn, userTeam,
|
|
||||||
* userName, role
|
|
||||||
*/
|
|
||||||
public String generateAccessToken(JwtUserClaimsDto userClaims) {
|
public String generateAccessToken(JwtUserClaimsDto userClaims) {
|
||||||
Map<String, Object> claims = buildClaims(userClaims);
|
Map<String, Object> claims = buildClaims(userClaims);
|
||||||
return buildToken(
|
return buildToken(claims, userClaims.getUserId(), properties.getAccessTokenValiditySeconds());
|
||||||
claims,
|
|
||||||
userClaims.getUserId(),
|
|
||||||
properties.getAccessTokenValiditySeconds()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Refresh Token은 보통 userId만 넣고 심플하게 사용
|
|
||||||
*/
|
|
||||||
public String generateRefreshToken(String userId) {
|
public String generateRefreshToken(String userId) {
|
||||||
return buildToken(
|
return buildToken(Collections.emptyMap(), userId, properties.getRefreshTokenValiditySeconds());
|
||||||
Collections.emptyMap(),
|
|
||||||
userId,
|
|
||||||
properties.getRefreshTokenValiditySeconds()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================
|
|
||||||
// 토큰 파싱
|
|
||||||
// ======================================================
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 토큰 파싱 + 서명/만료 검증
|
|
||||||
*/
|
|
||||||
public Jws<Claims> parseToken(String token) throws JwtException {
|
public Jws<Claims> parseToken(String token) throws JwtException {
|
||||||
return Jwts.parserBuilder()
|
return Jwts.parserBuilder()
|
||||||
.requireIssuer(properties.getIssuer())
|
.requireIssuer(properties.getIssuer())
|
||||||
@@ -116,18 +86,11 @@ public class JwtService {
|
|||||||
.parseClaimsJws(token);
|
.parseClaimsJws(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 토큰에서 Claims만 추출 (검증 포함)
|
|
||||||
*/
|
|
||||||
public Claims getClaims(String token) throws JwtException {
|
public Claims getClaims(String token) throws JwtException {
|
||||||
return parseToken(token).getBody();
|
return parseToken(token).getBody();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Claims → JwtUserClaimsDto 변환
|
|
||||||
*/
|
|
||||||
public JwtUserClaimsDto toUserClaimsDto(Claims claims) {
|
public JwtUserClaimsDto toUserClaimsDto(Claims claims) {
|
||||||
// userId는 subject와 별도 claim 둘 다에서 시도
|
|
||||||
String userId = claims.get("userId", String.class);
|
String userId = claims.get("userId", String.class);
|
||||||
if (userId == null) {
|
if (userId == null) {
|
||||||
userId = claims.getSubject();
|
userId = claims.getSubject();
|
||||||
@@ -136,8 +99,6 @@ public class JwtService {
|
|||||||
String userCmpn = claims.get("userCmpn", String.class);
|
String userCmpn = claims.get("userCmpn", String.class);
|
||||||
String userTeam = claims.get("userTeam", String.class);
|
String userTeam = claims.get("userTeam", String.class);
|
||||||
String userName = claims.get("userName", String.class);
|
String userName = claims.get("userName", String.class);
|
||||||
|
|
||||||
// 숫자는 Integer / Long 등으로 들어올 수 있으니 Number로 받았다가 intValue()
|
|
||||||
Number roleNumber = claims.get("role", Number.class);
|
Number roleNumber = claims.get("role", Number.class);
|
||||||
Integer userRole = roleNumber != null ? roleNumber.intValue() : null;
|
Integer userRole = roleNumber != null ? roleNumber.intValue() : null;
|
||||||
|
|
||||||
@@ -150,43 +111,26 @@ public class JwtService {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 토큰 → JwtUserClaimsDto 바로 추출
|
|
||||||
*/
|
|
||||||
public JwtUserClaimsDto toUserClaimsDto(String token) throws JwtException {
|
public JwtUserClaimsDto toUserClaimsDto(String token) throws JwtException {
|
||||||
Claims claims = getClaims(token);
|
Claims claims = getClaims(token);
|
||||||
return toUserClaimsDto(claims);
|
return toUserClaimsDto(claims);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================
|
|
||||||
// Authentication 변환 (Spring Security 연동용)
|
|
||||||
// ======================================================
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO → Spring Security Authentication 변환 여기서는 간단하게 "ROLE_{role값}" 형태로 Authority를 구성. ex) role =
|
|
||||||
* 1 → "ROLE_1" 실제 프로젝트에서 0/1/2 같은 값에 대한 의미 매핑이 명확하다면, 이 메서드 안의 매핑 로직만 교체해서 쓰면 됨.
|
|
||||||
*/
|
|
||||||
public Authentication toAuthentication(JwtUserClaimsDto dto) {
|
public Authentication toAuthentication(JwtUserClaimsDto dto) {
|
||||||
String principal = dto.getUserId();
|
String principal = dto.getUserId();
|
||||||
|
|
||||||
List<GrantedAuthority> authorities = new ArrayList<>();
|
List<GrantedAuthority> authorities = new ArrayList<>();
|
||||||
if (dto.getUserRole() != null) {
|
if (dto.getUserRole() != null) {
|
||||||
String authority = "ROLE_" + dto.getUserRole();
|
authorities.add(new SimpleGrantedAuthority("ROLE_" + dto.getUserRole()));
|
||||||
authorities.add(new SimpleGrantedAuthority(authority));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UsernamePasswordAuthenticationToken auth =
|
UsernamePasswordAuthenticationToken auth =
|
||||||
new UsernamePasswordAuthenticationToken(principal, null, authorities);
|
new UsernamePasswordAuthenticationToken(principal, null, authorities);
|
||||||
|
auth.setDetails(dto);
|
||||||
auth.setDetails(dto); // 핵심: claims를 details에 보관
|
|
||||||
return auth;
|
return auth;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 토큰 → Authentication 변환 (JWT 파싱 + DTO 변환까지 한 번에)
|
|
||||||
*/
|
|
||||||
public Authentication toAuthentication(String token) throws JwtException {
|
public Authentication toAuthentication(String token) throws JwtException {
|
||||||
JwtUserClaimsDto dto = toUserClaimsDto(token);
|
return toAuthentication(toUserClaimsDto(token));
|
||||||
return toAuthentication(dto);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.cache;
|
package com.kri.common.feature.cache;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -81,7 +81,7 @@ public abstract class AbstractListCache<T> {
|
|||||||
lock.writeLock().lock();
|
lock.writeLock().lock();
|
||||||
try {
|
try {
|
||||||
ArrayList<T> next = new ArrayList<>(this.list);
|
ArrayList<T> next = new ArrayList<>(this.list);
|
||||||
int i = Math.max(0, Math.min(index, next.size())); // 0 ~ size로 보정
|
int i = Math.max(0, Math.min(index, next.size())); // 0 ~ size濡?蹂댁젙
|
||||||
next.addAll(i, new ArrayList<>(items));
|
next.addAll(i, new ArrayList<>(items));
|
||||||
this.list = List.copyOf(next);
|
this.list = List.copyOf(next);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -105,7 +105,7 @@ public abstract class AbstractListCache<T> {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
ArrayList<T> next = new ArrayList<>(this.list);
|
ArrayList<T> next = new ArrayList<>(this.list);
|
||||||
int i = Math.max(0, Math.min(index, next.size())); // 0 ~ size로 보정
|
int i = Math.max(0, Math.min(index, next.size())); // 0 ~ size濡?蹂댁젙
|
||||||
next.add(i, item);
|
next.add(i, item);
|
||||||
this.list = List.copyOf(next);
|
this.list = List.copyOf(next);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.cache;
|
package com.kri.common.feature.cache;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -116,4 +116,3 @@ public abstract class AbstractMapCache<K, V> {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.datetime;
|
package com.kri.common.feature.datetime;
|
||||||
|
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.datetime;
|
package com.kri.common.feature.datetime;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
|
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
|
||||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.datetime;
|
package com.kri.common.feature.datetime;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonParser;
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
import com.fasterxml.jackson.databind.BeanProperty;
|
import com.fasterxml.jackson.databind.BeanProperty;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.enums;
|
package com.kri.common.feature.enums;
|
||||||
|
|
||||||
public interface CodeEnum<T> {
|
public interface CodeEnum<T> {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.enums;
|
package com.kri.common.feature.enums;
|
||||||
|
|
||||||
public final class CodeEnumUtils {
|
public final class CodeEnumUtils {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.excel;
|
package com.kri.common.feature.excel;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.excel;
|
package com.kri.common.feature.excel;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.excel;
|
package com.kri.common.feature.excel;
|
||||||
|
|
||||||
import org.apache.poi.ss.usermodel.Cell;
|
import org.apache.poi.ss.usermodel.Cell;
|
||||||
import org.apache.poi.ss.usermodel.DateUtil;
|
import org.apache.poi.ss.usermodel.DateUtil;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.file;
|
package com.kri.common.feature.file;
|
||||||
|
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.http;
|
package com.kri.common.feature.http;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.http;
|
package com.kri.common.feature.http;
|
||||||
|
|
||||||
import java.net.http.HttpHeaders;
|
import java.net.http.HttpHeaders;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.kri.common.jpa;
|
package com.kri.common.feature.jpa;
|
||||||
|
|
||||||
import com.kri.common.enums.CodeEnum;
|
import com.kri.common.feature.enums.CodeEnum;
|
||||||
import com.kri.common.enums.CodeEnumUtils;
|
import com.kri.common.feature.enums.CodeEnumUtils;
|
||||||
import jakarta.persistence.AttributeConverter;
|
import jakarta.persistence.AttributeConverter;
|
||||||
|
|
||||||
public abstract class AbstractCodeEnumConverter<
|
public abstract class AbstractCodeEnumConverter<
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.jpa;
|
package com.kri.common.feature.jpa;
|
||||||
|
|
||||||
import jakarta.persistence.MappedSuperclass;
|
import jakarta.persistence.MappedSuperclass;
|
||||||
import jakarta.persistence.PrePersist;
|
import jakarta.persistence.PrePersist;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.json;
|
package com.kri.common.feature.json;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.redis;
|
package com.kri.common.feature.redis;
|
||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.util;
|
package com.kri.common.feature.util;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.util;
|
package com.kri.common.feature.util;
|
||||||
|
|
||||||
public final class NumericUtil {
|
public final class NumericUtil {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.util;
|
package com.kri.common.feature.util;
|
||||||
|
|
||||||
public final class StringUtil {
|
public final class StringUtil {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.web;
|
package com.kri.common.feature.web;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.feature.web;
|
||||||
|
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Value;
|
import lombok.Value;
|
||||||
@@ -13,7 +13,7 @@ public class RequestUserContext {
|
|||||||
String userName;
|
String userName;
|
||||||
Integer userRole;
|
Integer userRole;
|
||||||
|
|
||||||
String clientIp; // IpUtil 에서 가져온 값
|
String clientIp; // IpUtil ?먯꽌 媛?몄삩 媛?
|
||||||
|
|
||||||
public boolean isAuthenticated() {
|
public boolean isAuthenticated() {
|
||||||
return userId != null;
|
return userId != null;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc.page;
|
package com.kri.common.feature.web.page;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc.page;
|
package com.kri.common.feature.web.page;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc.page;
|
package com.kri.common.feature.web.page;
|
||||||
|
|
||||||
|
|
||||||
import java.beans.Introspector;
|
import java.beans.Introspector;
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.runtime.auth.apikey;
|
||||||
|
|
||||||
import com.kri.common.auth.jwt.JwtService;
|
import com.kri.common.autoconfigure.auth.apikey.ApiKeyProperties;
|
||||||
|
import com.kri.common.feature.auth.apikey.ApiKeyUserClaimsProvider;
|
||||||
|
import com.kri.common.feature.auth.jwt.JwtService;
|
||||||
import jakarta.servlet.FilterChain;
|
import jakarta.servlet.FilterChain;
|
||||||
import jakarta.servlet.ServletException;
|
import jakarta.servlet.ServletException;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
@@ -12,10 +14,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
|
|||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.filter.OncePerRequestFilter;
|
import org.springframework.web.filter.OncePerRequestFilter;
|
||||||
|
|
||||||
/**
|
|
||||||
* X-API-Key (또는 설정된 헤더) 기반 API Key 인증 필터. - API Key를 검증하는 로직은 ApiKeyUserClaimsProvider 구현체에 위임. -
|
|
||||||
* 유효하면 JwtUserClaimsDto → Authentication 으로 변환해서 SecurityContext에 세팅.
|
|
||||||
*/
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ApiKeyAuthFilter extends OncePerRequestFilter {
|
public class ApiKeyAuthFilter extends OncePerRequestFilter {
|
||||||
|
|
||||||
@@ -24,26 +22,22 @@ public class ApiKeyAuthFilter extends OncePerRequestFilter {
|
|||||||
private final JwtService jwtService;
|
private final JwtService jwtService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doFilterInternal(HttpServletRequest request,
|
protected void doFilterInternal(
|
||||||
|
HttpServletRequest request,
|
||||||
HttpServletResponse response,
|
HttpServletResponse response,
|
||||||
FilterChain filterChain)
|
FilterChain filterChain
|
||||||
throws ServletException, IOException {
|
) throws ServletException, IOException {
|
||||||
|
|
||||||
// API Key 기능이 꺼져 있으면 아무 것도 안 함
|
|
||||||
if (!apiKeyProperties.isEnabled()) {
|
if (!apiKeyProperties.isEnabled()) {
|
||||||
filterChain.doFilter(request, response);
|
filterChain.doFilter(request, response);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 이미 다른 방식(JWT 등)으로 인증되어 있으면 패스
|
|
||||||
if (SecurityContextHolder.getContext().getAuthentication() != null) {
|
if (SecurityContextHolder.getContext().getAuthentication() != null) {
|
||||||
filterChain.doFilter(request, response);
|
filterChain.doFilter(request, response);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String headerName = apiKeyProperties.getHeaderName();
|
String apiKey = request.getHeader(apiKeyProperties.getHeaderName());
|
||||||
String apiKey = request.getHeader(headerName);
|
|
||||||
|
|
||||||
if (StringUtils.hasText(apiKey)) {
|
if (StringUtils.hasText(apiKey)) {
|
||||||
apiKeyUserClaimsProvider.findUserByApiKey(apiKey).ifPresent(dto -> {
|
apiKeyUserClaimsProvider.findUserByApiKey(apiKey).ifPresent(dto -> {
|
||||||
Authentication auth = jwtService.toAuthentication(dto);
|
Authentication auth = jwtService.toAuthentication(dto);
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
package com.kri.common.auth.apikey;
|
package com.kri.common.runtime.auth.apikey;
|
||||||
|
|
||||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
import com.kri.common.autoconfigure.auth.apikey.ApiKeyProperties;
|
||||||
import com.kri.common.auth.persistence.entity.TApiKeyEntity;
|
import com.kri.common.feature.auth.apikey.ApiKeyUserClaimsProvider;
|
||||||
import com.kri.common.auth.persistence.repository.ApiKeyRepository;
|
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||||
|
import com.kri.common.runtime.auth.apikey.persistence.entity.TApiKeyEntity;
|
||||||
|
import com.kri.common.runtime.auth.apikey.persistence.repository.ApiKeyRepository;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -12,16 +14,10 @@ import org.springframework.boot.ApplicationArguments;
|
|||||||
import org.springframework.boot.ApplicationRunner;
|
import org.springframework.boot.ApplicationRunner;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
|
public class PreloadedApiKeyUserClaimsProvider implements ApiKeyUserClaimsProvider, ApplicationRunner {
|
||||||
public class PreloadedApiKeyUserClaimsProvider implements ApiKeyUserClaimsProvider,
|
|
||||||
ApplicationRunner {
|
|
||||||
|
|
||||||
private final ApiKeyProperties props;
|
private final ApiKeyProperties props;
|
||||||
private final ApiKeyRepository repo;
|
private final ApiKeyRepository repo;
|
||||||
|
|
||||||
/**
|
|
||||||
* 캐시를 통째로 교체(swap)하기 위한 AtomicReference
|
|
||||||
*/
|
|
||||||
private final AtomicReference<Map<String, JwtUserClaimsDto>> cacheRef =
|
private final AtomicReference<Map<String, JwtUserClaimsDto>> cacheRef =
|
||||||
new AtomicReference<>(Collections.emptyMap());
|
new AtomicReference<>(Collections.emptyMap());
|
||||||
|
|
||||||
@@ -30,9 +26,6 @@ public class PreloadedApiKeyUserClaimsProvider implements ApiKeyUserClaimsProvid
|
|||||||
this.repo = repo;
|
this.repo = repo;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 런타임에는 DB 조회 금지: 캐시만 조회
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<JwtUserClaimsDto> findUserByApiKey(String apiKey) {
|
public Optional<JwtUserClaimsDto> findUserByApiKey(String apiKey) {
|
||||||
if (!StringUtils.hasText(apiKey)) {
|
if (!StringUtils.hasText(apiKey)) {
|
||||||
@@ -41,40 +34,29 @@ public class PreloadedApiKeyUserClaimsProvider implements ApiKeyUserClaimsProvid
|
|||||||
return Optional.ofNullable(cacheRef.get().get(apiKey));
|
return Optional.ofNullable(cacheRef.get().get(apiKey));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 기동 시 preload
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public void run(ApplicationArguments args) {
|
public void run(ApplicationArguments args) {
|
||||||
if (!props.isEnabled()) {
|
if (!props.isEnabled() || !props.isPreloadOnStartup()) {
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!props.isPreloadOnStartup()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
reloadFromDb();
|
reloadFromDb();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 운영용: DB에서 다시 읽어 캐시 전체 교체
|
|
||||||
*/
|
|
||||||
public synchronized int reloadFromDb() {
|
public synchronized int reloadFromDb() {
|
||||||
if (!StringUtils.hasText(props.getServiceCode())) {
|
if (!StringUtils.hasText(props.getServiceCode())) {
|
||||||
// serviceCode 없으면 preload 불가 → 안전하게 빈 캐시
|
|
||||||
cacheRef.set(Collections.emptyMap());
|
cacheRef.set(Collections.emptyMap());
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
var list = repo.findActiveKeysForService(props.getServiceCode());
|
var list = repo.findActiveKeysForService(props.getServiceCode());
|
||||||
|
|
||||||
Map<String, JwtUserClaimsDto> next = new ConcurrentHashMap<>(Math.max(16, list.size()));
|
Map<String, JwtUserClaimsDto> next = new ConcurrentHashMap<>(Math.max(16, list.size()));
|
||||||
for (TApiKeyEntity e : list) {
|
for (TApiKeyEntity entity : list) {
|
||||||
next.put(e.getApiKey(), JwtUserClaimsDto.builder()
|
next.put(entity.getApiKey(), JwtUserClaimsDto.builder()
|
||||||
.userId(e.getUserId())
|
.userId(entity.getUserId())
|
||||||
.userCmpn(e.getUserCmpn())
|
.userCmpn(entity.getUserCmpn())
|
||||||
.userTeam(e.getUserTeam())
|
.userTeam(entity.getUserTeam())
|
||||||
.userName(e.getUserName())
|
.userName(entity.getUserName())
|
||||||
.userRole(e.getUserRole())
|
.userRole(entity.getUserRole())
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,9 +64,6 @@ public class PreloadedApiKeyUserClaimsProvider implements ApiKeyUserClaimsProvid
|
|||||||
return next.size();
|
return next.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Admin 조회용(마스킹은 컨트롤러에서)
|
|
||||||
*/
|
|
||||||
public Map<String, JwtUserClaimsDto> snapshot() {
|
public Map<String, JwtUserClaimsDto> snapshot() {
|
||||||
return cacheRef.get();
|
return cacheRef.get();
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.persistence.entity;
|
package com.kri.common.runtime.auth.apikey.persistence.entity;
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
@@ -44,7 +44,7 @@ public class TApiKeyEntity {
|
|||||||
@Column(name = "user_role", nullable = false)
|
@Column(name = "user_role", nullable = false)
|
||||||
private Integer userRole;
|
private Integer userRole;
|
||||||
|
|
||||||
/*기본 정보 외*/
|
/* 기본 정보 외 */
|
||||||
@Column(name = "user_json")
|
@Column(name = "user_json")
|
||||||
@JdbcTypeCode(SqlTypes.JSON)
|
@JdbcTypeCode(SqlTypes.JSON)
|
||||||
private Map<String, Object> userJson;
|
private Map<String, Object> userJson;
|
||||||
@@ -55,5 +55,4 @@ public class TApiKeyEntity {
|
|||||||
@Column(name = "reg_dt", nullable = false)
|
@Column(name = "reg_dt", nullable = false)
|
||||||
@ColumnDefault("CURRENT_TIMESTAMP")
|
@ColumnDefault("CURRENT_TIMESTAMP")
|
||||||
private LocalDateTime regDt;
|
private LocalDateTime regDt;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.persistence.entity;
|
package com.kri.common.runtime.auth.apikey.persistence.entity;
|
||||||
|
|
||||||
import jakarta.persistence.EmbeddedId;
|
import jakarta.persistence.EmbeddedId;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.auth.persistence.entity;
|
package com.kri.common.runtime.auth.apikey.persistence.entity;
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Embeddable;
|
import jakarta.persistence.Embeddable;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.kri.common.auth.persistence.repository;
|
package com.kri.common.runtime.auth.apikey.persistence.repository;
|
||||||
|
|
||||||
import com.kri.common.auth.persistence.entity.TApiKeyEntity;
|
import com.kri.common.runtime.auth.apikey.persistence.entity.TApiKeyEntity;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.Query;
|
import org.springframework.data.jpa.repository.Query;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.kri.common.security;
|
package com.kri.common.runtime.security;
|
||||||
|
|
||||||
import com.kri.common.auth.jwt.JwtService;
|
import com.kri.common.feature.auth.jwt.JwtService;
|
||||||
import io.jsonwebtoken.JwtException;
|
import io.jsonwebtoken.JwtException;
|
||||||
import jakarta.servlet.FilterChain;
|
import jakarta.servlet.FilterChain;
|
||||||
import jakarta.servlet.ServletException;
|
import jakarta.servlet.ServletException;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.swagger;
|
package com.kri.common.runtime.swagger;
|
||||||
|
|
||||||
import jakarta.servlet.Filter;
|
import jakarta.servlet.Filter;
|
||||||
import jakarta.servlet.FilterChain;
|
import jakarta.servlet.FilterChain;
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.kri.common.web;
|
package com.kri.common.runtime.web;
|
||||||
|
|
||||||
|
import com.kri.common.feature.web.BusinessException;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.validation.ConstraintViolationException;
|
import jakarta.validation.ConstraintViolationException;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
@@ -33,9 +34,9 @@ public class ErrorAdvice {
|
|||||||
private static final Logger log = LoggerFactory.getLogger(ErrorAdvice.class);
|
private static final Logger log = LoggerFactory.getLogger(ErrorAdvice.class);
|
||||||
|
|
||||||
// 기본값은 모두 false → 외부 응답엔 노출 안 함
|
// 기본값은 모두 false → 외부 응답엔 노출 안 함
|
||||||
@Value("${common.error.expose.handler:false}")
|
@Value("${kri.error.expose.handler:false}")
|
||||||
private boolean exposeHandler;
|
private boolean exposeHandler;
|
||||||
@Value("${common.error.expose.service:false}")
|
@Value("${kri.error.expose.service:false}")
|
||||||
private boolean exposeService;
|
private boolean exposeService;
|
||||||
|
|
||||||
private static String resolveSupportedMethods(HttpRequestMethodNotSupportedException e) {
|
private static String resolveSupportedMethods(HttpRequestMethodNotSupportedException e) {
|
||||||
@@ -1,13 +1,17 @@
|
|||||||
package com.kri.common.web;
|
package com.kri.common.runtime.web;
|
||||||
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import org.slf4j.MDC;
|
import org.slf4j.MDC;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.web.method.HandlerMethod;
|
import org.springframework.web.method.HandlerMethod;
|
||||||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||||
|
|
||||||
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@ConditionalOnExpression("${kri.web.mdc.enabled:true}")
|
||||||
public class MdcHandlerConfig {
|
public class MdcHandlerConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@@ -1,13 +1,11 @@
|
|||||||
package com.kri.common.web;
|
package com.kri.common.runtime.web;
|
||||||
|
|
||||||
import org.aspectj.lang.ProceedingJoinPoint;
|
import org.aspectj.lang.ProceedingJoinPoint;
|
||||||
import org.aspectj.lang.annotation.Around;
|
import org.aspectj.lang.annotation.Around;
|
||||||
import org.aspectj.lang.annotation.Aspect;
|
import org.aspectj.lang.annotation.Aspect;
|
||||||
import org.slf4j.MDC;
|
import org.slf4j.MDC;
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Aspect
|
@Aspect
|
||||||
@Component
|
|
||||||
public class ServiceMdcAspect {
|
public class ServiceMdcAspect {
|
||||||
|
|
||||||
@Around("within(@org.springframework.stereotype.Service *)")
|
@Around("within(@org.springframework.stereotype.Service *)")
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.web;
|
package com.kri.common.runtime.web;
|
||||||
|
|
||||||
import jakarta.servlet.Filter;
|
import jakarta.servlet.Filter;
|
||||||
import jakarta.servlet.FilterChain;
|
import jakarta.servlet.FilterChain;
|
||||||
@@ -28,7 +28,7 @@ public class TraceFilter implements Filter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try (MDC.MDCCloseable ignored = MDC.putCloseable(MDC_KEY, id)) {
|
try (MDC.MDCCloseable ignored = MDC.putCloseable(MDC_KEY, id)) {
|
||||||
httpRes.setHeader(REQ_HEADER, id); // 응답에도 echo
|
httpRes.setHeader(REQ_HEADER, id); // ?묐떟?먮룄 echo
|
||||||
chain.doFilter(req, res);
|
chain.doFilter(req, res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.runtime.webmvc;
|
||||||
|
|
||||||
import com.kri.common.enums.CodeEnum;
|
import com.kri.common.feature.enums.CodeEnum;
|
||||||
import org.springframework.core.convert.converter.Converter;
|
import org.springframework.core.convert.converter.Converter;
|
||||||
import org.springframework.core.convert.converter.ConverterFactory;
|
import org.springframework.core.convert.converter.ConverterFactory;
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@ public class CodeEnumConverter implements ConverterFactory<String, CodeEnum> {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1) enum name으로 먼저 시도 (EMAIL, SMS 등)
|
// 1) enum name 먼저 비교합니다. (EMAIL, SMS 등)
|
||||||
if (targetType.isEnum()) {
|
if (targetType.isEnum()) {
|
||||||
for (T e : targetType.getEnumConstants()) {
|
for (T e : targetType.getEnumConstants()) {
|
||||||
if (((Enum<?>) e).name().equalsIgnoreCase(source)) {
|
if (((Enum<?>) e).name().equalsIgnoreCase(source)) {
|
||||||
@@ -25,7 +25,7 @@ public class CodeEnumConverter implements ConverterFactory<String, CodeEnum> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2) code로 시도 ("11" 등)
|
// 2) code 값도 비교합니다. ("11" 등)
|
||||||
for (T e : targetType.getEnumConstants()) {
|
for (T e : targetType.getEnumConstants()) {
|
||||||
Object code = e.getCode();
|
Object code = e.getCode();
|
||||||
if (code != null && source.equals(String.valueOf(code))) {
|
if (code != null && source.equals(String.valueOf(code))) {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.runtime.webmvc;
|
||||||
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.runtime.webmvc;
|
||||||
|
|
||||||
|
import com.kri.common.autoconfigure.webmvc.KriIpAccessProperties;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.security.web.util.matcher.IpAddressMatcher;
|
import org.springframework.security.web.util.matcher.IpAddressMatcher;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.runtime.webmvc;
|
||||||
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
package com.kri.common.webmvc;
|
package com.kri.common.runtime.webmvc;
|
||||||
|
|
||||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||||
import com.kri.common.auth.jwt.JwtService;
|
import com.kri.common.feature.auth.jwt.JwtService;
|
||||||
|
import com.kri.common.feature.web.RequestUserContext;
|
||||||
import io.jsonwebtoken.JwtException;
|
import io.jsonwebtoken.JwtException;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -32,12 +33,9 @@ public class RequestUserContextArgumentResolver implements HandlerMethodArgument
|
|||||||
@Nullable WebDataBinderFactory binderFactory
|
@Nullable WebDataBinderFactory binderFactory
|
||||||
) {
|
) {
|
||||||
HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
|
HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
|
||||||
|
|
||||||
String clientIp = request != null ? IpUtil.getClientIp(request) : null;
|
String clientIp = request != null ? IpUtil.getClientIp(request) : null;
|
||||||
|
|
||||||
JwtUserClaimsDto claims = null;
|
JwtUserClaimsDto claims = null;
|
||||||
|
|
||||||
// 1) SecurityContext 에 이미 JwtUserClaimsDto 가 principal 로 들어있는 경우
|
|
||||||
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
|
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
|
||||||
if (auth != null) {
|
if (auth != null) {
|
||||||
Object principal = auth.getPrincipal();
|
Object principal = auth.getPrincipal();
|
||||||
@@ -51,25 +49,18 @@ public class RequestUserContextArgumentResolver implements HandlerMethodArgument
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2) 현재 공통 JwtService 는 principal 을 userId(String) 로 쓰고 있으니까,
|
|
||||||
// 필요하면 Authorization 헤더에서 직접 토큰 파싱
|
|
||||||
if (claims == null && request != null) {
|
if (claims == null && request != null) {
|
||||||
String authHeader = request.getHeader("Authorization");
|
String authHeader = request.getHeader("Authorization");
|
||||||
if (authHeader != null && authHeader.startsWith("Bearer ")) {
|
if (authHeader != null && authHeader.startsWith("Bearer ")) {
|
||||||
String token = authHeader.substring(7);
|
|
||||||
try {
|
try {
|
||||||
claims = jwtService.toUserClaimsDto(token);
|
claims = jwtService.toUserClaimsDto(authHeader.substring(7));
|
||||||
} catch (JwtException ex) {
|
} catch (JwtException ignored) {
|
||||||
// 토큰 이상하면 그냥 anonymous 로 둠
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (claims == null) {
|
if (claims == null) {
|
||||||
// 비인증 상태: IP만 채운 빈 컨텍스트
|
return RequestUserContext.builder().clientIp(clientIp).build();
|
||||||
return RequestUserContext.builder()
|
|
||||||
.clientIp(clientIp)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return RequestUserContext.builder()
|
return RequestUserContext.builder()
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package com.kri.common.web;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.core.Ordered;
|
|
||||||
|
|
||||||
@AutoConfiguration
|
|
||||||
@ConditionalOnProperty(name = "common.web.enabled", matchIfMissing = true)
|
|
||||||
public class CommonWebAutoConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ErrorAdvice errorAdvice() {
|
|
||||||
return new ErrorAdvice();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public FilterRegistrationBean<TraceFilter> traceFilter() {
|
|
||||||
var reg = new FilterRegistrationBean<>(new TraceFilter());
|
|
||||||
reg.setOrder(Ordered.HIGHEST_PRECEDENCE);
|
|
||||||
return reg;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
com.kri.common.auth.jwt.JwtAutoConfiguration
|
com.kri.common.autoconfigure.auth.jwt.JwtAutoConfiguration
|
||||||
com.kri.common.auth.apikey.ApiKeyJpaAutoConfiguration
|
com.kri.common.autoconfigure.auth.apikey.ApiKeyJpaAutoConfiguration
|
||||||
com.kri.common.auth.apikey.ApiKeyPreloadAutoConfiguration
|
com.kri.common.autoconfigure.auth.apikey.ApiKeyPreloadAutoConfiguration
|
||||||
com.kri.common.auth.apikey.ApiKeyAdminAutoConfiguration
|
com.kri.common.autoconfigure.auth.apikey.ApiKeyAdminAutoConfiguration
|
||||||
|
|
||||||
com.kri.common.security.KriSecurityAutoConfiguration
|
com.kri.common.autoconfigure.security.KriSecurityAutoConfiguration
|
||||||
com.kri.common.web.CommonWebAutoConfiguration
|
com.kri.common.autoconfigure.web.CommonWebAutoConfiguration
|
||||||
com.kri.common.webmvc.KriWebMvcAutoConfiguration
|
com.kri.common.autoconfigure.webmvc.KriWebMvcAutoConfiguration
|
||||||
com.kri.common.swagger.KriSwaggerAutoConfiguration
|
com.kri.common.autoconfigure.swagger.KriSwaggerAutoConfiguration
|
||||||
com.kri.common.redis.CommonRedisAutoConfiguration
|
com.kri.common.autoconfigure.redis.CommonRedisAutoConfiguration
|
||||||
com.kri.common.scheduling.CommonSchedulingAutoConfiguration
|
com.kri.common.autoconfigure.scheduling.CommonSchedulingAutoConfiguration
|
||||||
|
|||||||
Reference in New Issue
Block a user