diff --git a/README.md b/README.md index 32a34c5..92bd1bc 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ public class AuthService { private final com.kri.common.auth.jwt.JwtService jwtService; public String login(String username) { - var claims = com.kri.common.auth.jwt.JwtUserClaimsDto.builder() + var claims = com.kri.common.auth.dto.JwtUserClaimsDto.builder() .userId(username) .userTeam("IT") .userName("홍길동") @@ -213,10 +213,10 @@ curl -H "Authorization: Bearer $TOKEN" http://localhost:8080/api/secure @org.springframework.stereotype.Component public class ExampleApiKeyUserClaimsProvider implements com.kri.common.auth.apikey.ApiKeyUserClaimsProvider { @Override - public java.util.Optional findUserByApiKey(String apiKey) { + public java.util.Optional findUserByApiKey(String apiKey) { if ("DEMO-KEY-1234".equals(apiKey)) { return java.util.Optional.of( - com.kri.common.auth.jwt.JwtUserClaimsDto.builder() + com.kri.common.auth.dto.JwtUserClaimsDto.builder() .userId("external") .userCmpn("outbound") .userTeam("EXT") diff --git a/build.gradle b/build.gradle index c1abeb0..7e5f23e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } //버전 변경은 여기서 -def commonVer = "beta.1.0.32" +def commonVer = "beta.1.0.53" group = 'com.kri.common' version = commonVer @@ -45,7 +45,7 @@ dependencies { compileOnly 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' // JPA AttributeConverter, Entity 등 인터페이스용 - compileOnly "jakarta.persistence:jakarta.persistence-api:3.1.0" + compileOnly "org.springframework.boot:spring-boot-starter-data-jpa" // Lombok compileOnly 'org.projectlombok:lombok' diff --git a/src/main/java/com/kri/common/auth/apikey/ApiKeyAdminAutoConfiguration.java b/src/main/java/com/kri/common/auth/apikey/ApiKeyAdminAutoConfiguration.java new file mode 100644 index 0000000..b686c08 --- /dev/null +++ b/src/main/java/com/kri/common/auth/apikey/ApiKeyAdminAutoConfiguration.java @@ -0,0 +1,13 @@ +package com.kri.common.auth.apikey; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Import; + +@AutoConfiguration +@ConditionalOnClass(ApiKeyAdminController.class) +@ConditionalOnProperty(prefix = "kri.auth.apikey", name = "admin-api-enabled", havingValue = "true") +@Import(ApiKeyAdminController.class) // ✅ 컴포넌트 스캔 없이도 Bean 등록 +public class ApiKeyAdminAutoConfiguration { +} diff --git a/src/main/java/com/kri/common/auth/apikey/ApiKeyAdminController.java b/src/main/java/com/kri/common/auth/apikey/ApiKeyAdminController.java new file mode 100644 index 0000000..ffeb8de --- /dev/null +++ b/src/main/java/com/kri/common/auth/apikey/ApiKeyAdminController.java @@ -0,0 +1,64 @@ +package com.kri.common.auth.apikey; + +import com.kri.common.auth.dto.JwtUserClaimsDto; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.HttpStatus; +import org.springframework.security.web.util.matcher.IpAddressMatcher; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/internal/apikey") +@ConditionalOnProperty(prefix="kri.auth.apikey", name="admin-api-enabled", havingValue="true") +public class ApiKeyAdminController { + private final ApiKeyProperties props; + private final PreloadedApiKeyUserClaimsProvider provider; + private final List allow; + + public ApiKeyAdminController(ApiKeyProperties props, PreloadedApiKeyUserClaimsProvider provider) { + this.props = props; + this.provider = provider; + this.allow = props.getAdminAllowIps().stream().map(IpAddressMatcher::new).toList(); + } + + @PostMapping("/reload") + public ReloadResult reload(HttpServletRequest req) { + assertAllowed(req); + int count = provider.reloadFromDb(); + return new ReloadResult(count); + } + + /** 현재 캐시 상태(키는 마스킹) */ + @GetMapping("/cache") + public List cache(HttpServletRequest req) { + assertAllowed(req); + Map snap = provider.snapshot(); + return snap.entrySet().stream() + .map(e -> new CachedKeyView(mask(e.getKey()), e.getValue())) + .toList(); + } + + private void assertAllowed(HttpServletRequest req) { + if (!props.isAdminApiEnabled()) throw new ResponseStatusException(HttpStatus.NOT_FOUND); + String remote = req.getRemoteAddr(); + boolean ok = allow.stream().anyMatch(m -> m.matches(remote)); + if (!ok) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "IP not allowed: " + remote); + } + + private String mask(String raw) { + if (raw == null) return ""; + int n = raw.length(); + if (n <= 8) return raw.charAt(0) + "****"; + return raw.substring(0, 4) + "****" + raw.substring(n - 4); + } + + public record ReloadResult(int cachedKeyCount) {} + public record CachedKeyView(String maskedApiKey, JwtUserClaimsDto claims) {} +} diff --git a/src/main/java/com/kri/common/auth/apikey/ApiKeyJpaAutoConfiguration.java b/src/main/java/com/kri/common/auth/apikey/ApiKeyJpaAutoConfiguration.java new file mode 100644 index 0000000..34185bf --- /dev/null +++ b/src/main/java/com/kri/common/auth/apikey/ApiKeyJpaAutoConfiguration.java @@ -0,0 +1,115 @@ +package com.kri.common.auth.apikey; + +import com.zaxxer.hikari.HikariDataSource; +import jakarta.persistence.EntityManagerFactory; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.jpa.repository.config.JpaMetamodelMappingContextFactoryBean; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.persistenceunit.PersistenceUnitManager; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; + +import javax.sql.DataSource; +import java.util.HashMap; +import java.util.Map; + +/* + * @Primary 절대 금지 + * 메인 JPA와 완전히 분리 + */ +@AutoConfiguration( + afterName = { + // 메인 JPA가 있는 서비스에서는 메인 auto-config 이후에 올라와도 되고, + // 메인 JPA를 exclude한 서비스에서는 afterName이 무시되어도 동작해야 함. + "org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration", + "org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + } +) +@ConditionalOnClass(name = { + "org.springframework.data.jpa.repository.JpaRepository", + "jakarta.persistence.EntityManagerFactory", + "com.zaxxer.hikari.HikariDataSource" +}) +@ConditionalOnProperty(prefix = "kri.auth.apikey", name = "enabled", havingValue = "true") +@EnableJpaRepositories( + basePackages = "com.kri.common.auth.persistence.repository", + entityManagerFactoryRef = "apiKeyEntityManagerFactory", + transactionManagerRef = "apiKeyTransactionManager" +) +@EnableConfigurationProperties(ApiKeyProperties.class) +public class ApiKeyJpaAutoConfiguration { + + @Bean(name = "apiKeyDataSource") + public DataSource apiKeyDataSource(ApiKeyProperties props) { + var db = props.getDb(); + HikariDataSource ds = new HikariDataSource(); + ds.setJdbcUrl(db.getUrl()); + ds.setUsername(db.getUsername()); + ds.setPassword(db.getPassword()); + ds.setDriverClassName(db.getDriverClassName()); + return ds; + } + /** + * ✅ EntityManagerFactoryBuilder에 의존하지 않는 방식 + * - intranet-extension처럼 HibernateJpaAutoConfiguration을 exclude 해도 동작 + */ + @Bean(name = "apiKeyEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean apiKeyEntityManagerFactory( + @Qualifier("apiKeyDataSource") DataSource ds, + ObjectProvider pumProvider, + ApiKeyProperties props + ) { + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + vendorAdapter.setShowSql(props.getJpa().isShowSql()); + vendorAdapter.setGenerateDdl(false); + + LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean(); + emf.setDataSource(ds); + emf.setJpaVendorAdapter(vendorAdapter); + emf.setPackagesToScan("com.kri.common.auth.persistence.entity"); + emf.setPersistenceUnitName("apikey"); + + PersistenceUnitManager pum = pumProvider.getIfAvailable(); + if (pum != null) { + emf.setPersistenceUnitManager(pum); + } + + // 최소 JPA 속성들 (원하면 yml로 확장 가능) + Map jpaProps = new HashMap<>(); + jpaProps.put("hibernate.show_sql", Boolean.toString(props.getJpa().isShowSql())); + jpaProps.put("hibernate.format_sql", Boolean.toString(props.getJpa().isFormatSql())); + + emf.setJpaPropertyMap(jpaProps); + return emf; + } + + @Bean(name = "apiKeyTransactionManager") + public PlatformTransactionManager apiKeyTransactionManager( + @Qualifier("apiKeyEntityManagerFactory") EntityManagerFactory emf + ) { + return new JpaTransactionManager(emf); + } + + /** + * ✅ intranet-extension처럼 메인 JPA auto-config를 exclude해서 + * 'jpaMappingContext'가 없을 때만 보완해준다. + * + * 메인 JPA가 있는 서비스에서는 이미 jpaMappingContext가 있으므로 이 빈은 생성되지 않아 영향이 없다. + */ + @Bean(name = "jpaMappingContext") + @ConditionalOnMissingBean(name = "jpaMappingContext") + public JpaMetamodelMappingContextFactoryBean jpaMappingContext(ApplicationContext ctx) { + // FactoryBean으로 등록하면 내부에서 EntityManagerFactory들을 찾아 Metamodel을 구성함 + return new JpaMetamodelMappingContextFactoryBean(); + } +} diff --git a/src/main/java/com/kri/common/auth/apikey/ApiKeyPreloadAutoConfiguration.java b/src/main/java/com/kri/common/auth/apikey/ApiKeyPreloadAutoConfiguration.java new file mode 100644 index 0000000..00deb38 --- /dev/null +++ b/src/main/java/com/kri/common/auth/apikey/ApiKeyPreloadAutoConfiguration.java @@ -0,0 +1,25 @@ +package com.kri.common.auth.apikey; + +import com.kri.common.auth.persistence.repository.ApiKeyRepository; +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; +import org.springframework.context.annotation.Bean; + +@AutoConfiguration +@EnableConfigurationProperties(ApiKeyProperties.class) +@ConditionalOnProperty(prefix = "kri.auth.apikey", name = "enabled", havingValue = "true") +public class ApiKeyPreloadAutoConfiguration { + + @Bean + @ConditionalOnBean(ApiKeyRepository.class) // ✅ apikey JPA 컨텍스트가 repo를 만들었을 때만 + @ConditionalOnMissingBean(ApiKeyUserClaimsProvider.class) + public PreloadedApiKeyUserClaimsProvider apiKeyUserClaimsProvider( + ApiKeyProperties props, + ApiKeyRepository repo + ) { + return new PreloadedApiKeyUserClaimsProvider(props, repo); + } +} diff --git a/src/main/java/com/kri/common/auth/apikey/ApiKeyProperties.java b/src/main/java/com/kri/common/auth/apikey/ApiKeyProperties.java index fc68f7b..f8ace3b 100644 --- a/src/main/java/com/kri/common/auth/apikey/ApiKeyProperties.java +++ b/src/main/java/com/kri/common/auth/apikey/ApiKeyProperties.java @@ -4,13 +4,15 @@ import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; +import java.util.List; + @Getter @Setter @ConfigurationProperties(prefix = "kri.auth.apikey") public class ApiKeyProperties { /** - * API Key 인증 사용 여부 + * API Key 인증 허용 여부 */ private boolean enabled = false; @@ -19,4 +21,42 @@ public class ApiKeyProperties { * 예: X-API-Key, X-EXTERNAL-KEY 등 */ private String headerName = "X-API-Key"; + + /** 이 서비스의 코드 (서비스별 preload 범위 결정) */ + private String serviceCode; + + /** 기동 시 preload 할지 */ + private boolean preloadOnStartup = false; + + /** 내부 관리 API(리로드/조회) 노출 여부 */ + private boolean adminApiEnabled = false; + + /** 내부 관리 API 접근 허용 IP(CIDR) */ + private List adminAllowIps = List.of("127.0.0.1/32"); + + /** apikey 전용 DB 설정(기본값 포함) */ + private Db db = new Db(); + + /** apikey 전용 JPA 옵션 */ + private Jpa jpa = new Jpa(); + + @Getter @Setter + public static class Jpa { + /** hibernate.show_sql */ + private boolean showSql = false; + + /** hibernate.format_sql */ + private boolean formatSql = false; + } + + + @Getter @Setter + public static class Db { + //내부 통신용 url + private String url = + "jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8"; + private String username = "kriit"; + private String password = "it#51304"; + private String driverClassName = "com.mysql.cj.jdbc.Driver"; + } } \ No newline at end of file diff --git a/src/main/java/com/kri/common/auth/apikey/ApiKeyUserClaimsProvider.java b/src/main/java/com/kri/common/auth/apikey/ApiKeyUserClaimsProvider.java index 5165bd7..b926038 100644 --- a/src/main/java/com/kri/common/auth/apikey/ApiKeyUserClaimsProvider.java +++ b/src/main/java/com/kri/common/auth/apikey/ApiKeyUserClaimsProvider.java @@ -1,6 +1,6 @@ package com.kri.common.auth.apikey; -import com.kri.common.auth.jwt.JwtUserClaimsDto; +import com.kri.common.auth.dto.JwtUserClaimsDto; import java.util.Optional; /** diff --git a/src/main/java/com/kri/common/auth/apikey/PreloadedApiKeyUserClaimsProvider.java b/src/main/java/com/kri/common/auth/apikey/PreloadedApiKeyUserClaimsProvider.java new file mode 100644 index 0000000..f2803bf --- /dev/null +++ b/src/main/java/com/kri/common/auth/apikey/PreloadedApiKeyUserClaimsProvider.java @@ -0,0 +1,75 @@ +package com.kri.common.auth.apikey; + +import com.kri.common.auth.dto.JwtUserClaimsDto; +import com.kri.common.auth.persistence.entity.TApiKeyEntity; +import com.kri.common.auth.persistence.repository.ApiKeyRepository; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.util.StringUtils; + +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicReference; + + +public class PreloadedApiKeyUserClaimsProvider implements ApiKeyUserClaimsProvider, ApplicationRunner { + + private final ApiKeyProperties props; + private final ApiKeyRepository repo; + + /** 캐시를 통째로 교체(swap)하기 위한 AtomicReference */ + private final AtomicReference> cacheRef = + new AtomicReference<>(Collections.emptyMap()); + + public PreloadedApiKeyUserClaimsProvider(ApiKeyProperties props, ApiKeyRepository repo) { + this.props = props; + this.repo = repo; + } + + /** 런타임에는 DB 조회 금지: 캐시만 조회 */ + @Override + public Optional findUserByApiKey(String apiKey) { + if (!StringUtils.hasText(apiKey)) return Optional.empty(); + return Optional.ofNullable(cacheRef.get().get(apiKey)); + } + + /** 기동 시 preload */ + @Override + public void run(ApplicationArguments args) { + if (!props.isEnabled()) return; + if (!props.isPreloadOnStartup()) return; + reloadFromDb(); + } + + /** 운영용: DB에서 다시 읽어 캐시 전체 교체 */ + public synchronized int reloadFromDb() { + if (!StringUtils.hasText(props.getServiceCode())) { + // serviceCode 없으면 preload 불가 → 안전하게 빈 캐시 + cacheRef.set(Collections.emptyMap()); + return 0; + } + + var list = repo.findActiveKeysForService(props.getServiceCode()); + + Map next = new ConcurrentHashMap<>(Math.max(16, list.size())); + for (TApiKeyEntity e : list) { + next.put(e.getApiKey(), JwtUserClaimsDto.builder() + .userId(e.getUserId()) + .userCmpn(e.getUserCmpn()) + .userTeam(e.getUserTeam()) + .userName(e.getUserName()) + .userRole(e.getUserRole()) + .build()); + } + + cacheRef.set(Collections.unmodifiableMap(next)); + return next.size(); + } + + /** Admin 조회용(마스킹은 컨트롤러에서) */ + public Map snapshot() { + return cacheRef.get(); + } +} diff --git a/src/main/java/com/kri/common/auth/jwt/JwtUserClaimsDto.java b/src/main/java/com/kri/common/auth/dto/JwtUserClaimsDto.java similarity index 94% rename from src/main/java/com/kri/common/auth/jwt/JwtUserClaimsDto.java rename to src/main/java/com/kri/common/auth/dto/JwtUserClaimsDto.java index 307778f..9bf0ae1 100644 --- a/src/main/java/com/kri/common/auth/jwt/JwtUserClaimsDto.java +++ b/src/main/java/com/kri/common/auth/dto/JwtUserClaimsDto.java @@ -1,4 +1,4 @@ -package com.kri.common.auth.jwt; +package com.kri.common.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/kri/common/auth/jwt/JwtProperties.java b/src/main/java/com/kri/common/auth/jwt/JwtProperties.java index 2e83897..1e44967 100644 --- a/src/main/java/com/kri/common/auth/jwt/JwtProperties.java +++ b/src/main/java/com/kri/common/auth/jwt/JwtProperties.java @@ -5,7 +5,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @Getter @Setter -@Builder @NoArgsConstructor @AllArgsConstructor @ConfigurationProperties(prefix = "kri.auth.jwt") diff --git a/src/main/java/com/kri/common/auth/jwt/JwtService.java b/src/main/java/com/kri/common/auth/jwt/JwtService.java index feb3175..35ee34d 100644 --- a/src/main/java/com/kri/common/auth/jwt/JwtService.java +++ b/src/main/java/com/kri/common/auth/jwt/JwtService.java @@ -1,5 +1,6 @@ package com.kri.common.auth.jwt; +import com.kri.common.auth.dto.JwtUserClaimsDto; import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyEntity.java b/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyEntity.java new file mode 100644 index 0000000..d2c9c5e --- /dev/null +++ b/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyEntity.java @@ -0,0 +1,54 @@ +package com.kri.common.auth.persistence.entity; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; + +import java.time.LocalDateTime; +import java.util.Map; + +@Getter +@Setter +@Entity +@Table(name = "t_api_key") +public class TApiKeyEntity { + @Id + @Column(name = "api_key", nullable = false, length = 256) + private String apiKey; + + /** 1=ACTIVE, 0=REVOKED */ + @Column(name = "status", nullable = false) + @ColumnDefault("1") + private Short status; + + @Column(name = "user_id", nullable = false, length = 32) + private String userId; + + @Column(name = "user_cmpn", length = 64) + private String userCmpn; + + @Column(name = "user_team", length = 64) + private String userTeam; + + @Column(name = "user_name", length = 64) + private String userName; + + @Column(name = "user_role", nullable = false) + private Integer userRole; + + /*기본 정보 외*/ + @Column(name = "user_json") + @JdbcTypeCode(SqlTypes.JSON) + private Map userJson; + + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @Column(name = "reg_dt", nullable = false) + @ColumnDefault("CURRENT_TIMESTAMP") + private LocalDateTime regDt; + +} diff --git a/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyServiceMapEntity.java b/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyServiceMapEntity.java new file mode 100644 index 0000000..ab022bf --- /dev/null +++ b/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyServiceMapEntity.java @@ -0,0 +1,20 @@ +package com.kri.common.auth.persistence.entity; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "t_api_key_service_map") +public class TApiKeyServiceMapEntity { + @EmbeddedId + private TApiKeyServiceMapEntityId id; + + public String getApiKey() { return id.getApiKey(); } + + public String getServiceCode() { return id.getServiceCode(); } +} diff --git a/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyServiceMapEntityId.java b/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyServiceMapEntityId.java new file mode 100644 index 0000000..5cbc34b --- /dev/null +++ b/src/main/java/com/kri/common/auth/persistence/entity/TApiKeyServiceMapEntityId.java @@ -0,0 +1,38 @@ +package com.kri.common.auth.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.Hibernate; + +import java.io.Serializable; +import java.util.Objects; + +@Getter +@Setter +@Embeddable +public class TApiKeyServiceMapEntityId implements Serializable { + @NotNull + @Column(name = "api_key", nullable = false, length = 256) + private String apiKey; + + @NotNull + @Column(name = "service_code", nullable = false, length = 64) + private String serviceCode; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; + TApiKeyServiceMapEntityId entity = (TApiKeyServiceMapEntityId) o; + return Objects.equals(this.apiKey, entity.apiKey) && + Objects.equals(this.serviceCode, entity.serviceCode); + } + + @Override + public int hashCode() { + return Objects.hash(apiKey, serviceCode); + } +} diff --git a/src/main/java/com/kri/common/auth/persistence/repository/ApiKeyRepository.java b/src/main/java/com/kri/common/auth/persistence/repository/ApiKeyRepository.java new file mode 100644 index 0000000..229a38a --- /dev/null +++ b/src/main/java/com/kri/common/auth/persistence/repository/ApiKeyRepository.java @@ -0,0 +1,19 @@ +package com.kri.common.auth.persistence.repository; + +import com.kri.common.auth.persistence.entity.TApiKeyEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface ApiKeyRepository extends JpaRepository { + /** ✅ preload: serviceCode에 허용된 ACTIVE 키들의 user claims를 한 번에 */ + @Query(""" + select a + from TApiKeyEntity a + join TApiKeyServiceMapEntity m on m.id.apiKey = a.apiKey + where a.status = 1 and m.id.serviceCode = :serviceCode + """) + List findActiveKeysForService(@Param("serviceCode")String serviceCode); +} diff --git a/src/main/java/com/kri/common/jpa/BaseUuidEntity.java b/src/main/java/com/kri/common/jpa/BaseUuidEntity.java new file mode 100644 index 0000000..51112d9 --- /dev/null +++ b/src/main/java/com/kri/common/jpa/BaseUuidEntity.java @@ -0,0 +1,37 @@ +package com.kri.common.jpa; + +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; + +import java.util.UUID; + +@MappedSuperclass +public abstract class BaseUuidEntity { + protected abstract String getId(); + protected abstract void setId(String id); + + /** 엔티티마다 컬럼 길이에 맞춰 오버라이드 */ + protected int idLength() { return 32; } + + @PrePersist + protected void prePersistId() { + if (getId() == null || getId().isBlank()) { + setId(generateId(idLength())); + } + } + + private static String generateId(int length) { + String base = UUID.randomUUID().toString().replace("-", ""); // 32 chars + + if (length <= 32) { + return base.substring(0, length); + } + + StringBuilder sb = new StringBuilder(length); + sb.append(base); + while (sb.length() < length) { + sb.append(UUID.randomUUID().toString().replace("-", "")); + } + return sb.substring(0, length); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/common/swagger/KriSwaggerAutoConfiguration.java b/src/main/java/com/kri/common/swagger/KriSwaggerAutoConfiguration.java index 0e9d789..cd2f21e 100644 --- a/src/main/java/com/kri/common/swagger/KriSwaggerAutoConfiguration.java +++ b/src/main/java/com/kri/common/swagger/KriSwaggerAutoConfiguration.java @@ -57,14 +57,21 @@ public class KriSwaggerAutoConfiguration { ); } - @Bean - @ConditionalOnMissingBean + @Bean(name = "kriGroupedOpenApi") + @ConditionalOnMissingBean(name = "kriGroupedOpenApi") public GroupedOpenApi kriGroupedOpenApi() { GroupedOpenApi.Builder builder = GroupedOpenApi.builder() - .group("kri-api"); - if (properties.getBasePackage() != null) { - builder.packagesToScan(properties.getBasePackage()); + .group("kri-api") + .pathsToMatch("/api/**", "/internal/**"); + + String base = properties.getBasePackage(); + if (base != null && !base.isBlank()) { + builder.packagesToScan( + base, + "com.kri.common.auth.apikey" + ); } + return builder.build(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java b/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java index 4b00207..a7f83e2 100644 --- a/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java +++ b/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java @@ -1,7 +1,7 @@ package com.kri.common.webmvc; import com.kri.common.auth.jwt.JwtService; -import com.kri.common.auth.jwt.JwtUserClaimsDto; +import com.kri.common.auth.dto.JwtUserClaimsDto; import io.jsonwebtoken.JwtException; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 73042cc..9197816 100644 --- a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,8 @@ com.kri.common.auth.jwt.JwtAutoConfiguration +com.kri.common.auth.apikey.ApiKeyJpaAutoConfiguration +com.kri.common.auth.apikey.ApiKeyPreloadAutoConfiguration +com.kri.common.auth.apikey.ApiKeyAdminAutoConfiguration + com.kri.common.security.KriSecurityAutoConfiguration com.kri.common.web.CommonWebAutoConfiguration com.kri.common.webmvc.KriWebMvcAutoConfiguration