From d2d4c5d4a21da9c3e50189e993bc86bec6160791 Mon Sep 17 00:00:00 2001 From: nhj Date: Mon, 11 Aug 2025 17:51:56 +0900 Subject: [PATCH 01/16] =?UTF-8?q?=EC=B5=9C=EC=B4=88=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 23 + .gitattributes | 6 + .gitignore | 5 + .project | 41 ++ .settings/org.eclipse.buildship.core.prefs | 13 + .settings/org.eclipse.jdt.core.prefs | 4 + .settings/org.eclipse.wst.common.component | 9 + ....eclipse.wst.common.project.facet.core.xml | 7 + .../org.springframework.ide.eclipse.prefs | 2 + bin/main/application-hpnote.yml | 37 ++ bin/main/application-infra_server.yml | 37 ++ bin/main/application-kic_dev.yml | 37 ++ bin/main/application-kic_rel.yml | 37 ++ bin/main/application-local.yml | 38 ++ bin/main/application-vmware.yml | 37 ++ .../urpsys/baseauth/Aes256UrpPortalAuth.class | Bin 0 -> 3609 bytes .../urpsys/baseauth/common/CommonUtil.class | Bin 0 -> 8854 bytes .../baseauth/common/DataSourceUtil.class | Bin 0 -> 4232 bytes .../baseauth/common/crypto/Aes256Cipher.class | Bin 0 -> 3043 bytes .../common/exception/CustomException.class | Bin 0 -> 1928 bytes .../baseauth/config/CustomTokenEnhancer.class | Bin 0 -> 4556 bytes .../baseauth/config/EncryptConfig.class | Bin 0 -> 817 bytes .../config/Oauth2AuthorizationConfig.class | Bin 0 -> 10253 bytes .../config/PasswordEncoderConfig$1.class | Bin 0 -> 1575 bytes .../config/PasswordEncoderConfig.class | Bin 0 -> 1239 bytes .../baseauth/config/PrimaryDbConfig.class | Bin 0 -> 3660 bytes .../baseauth/config/SecurityConfig.class | Bin 0 -> 4524 bytes .../com/urpsys/baseauth/dao/MemberDao.class | Bin 0 -> 676 bytes .../domain/MemberVO$AuthorityComparator.class | Bin 0 -> 1339 bytes .../com/urpsys/baseauth/domain/MemberVO.class | Bin 0 -> 5345 bytes .../baseauth/domain/TbGnlMemInfoVO.class | Bin 0 -> 17207 bytes .../inner/handler/CustomFailHandler.class | Bin 0 -> 2415 bytes .../inner/handler/CustomSuccessHandler.class | Bin 0 -> 1678 bytes .../CustomAuthenticationProvider.class | Bin 0 -> 4570 bytes .../baseauth/service/UserDetailService.class | Bin 0 -> 3191 bytes .../baseauth/urpBaseAuthApplication.class | Bin 0 -> 2165 bytes bin/main/jwtkey.jks | Bin 0 -> 2583 bytes bin/main/log4jdbc.log4j2.properties | 2 + bin/main/logback-spring.xml | 100 ++++ bin/main/logback.properties | 4 + .../mapper/primarydb/config/MybatisConfig.xml | 41 ++ .../mapper/primarydb/sqlmap/MemberMapper.xml | 69 +++ .../mapper/primarydb/sqlmap/TestMapper.xml | 14 + bin/main/secrets/UrpSystem.keystore | 1 + bin/test/UrpKeyMng/LibraryTest.class | Bin 0 -> 634 bytes build.gradle | 93 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 +++++++++ gradlew.bat | 89 ++++ settings.gradle | 11 + .../urpsys/baseauth/Aes256UrpPortalAuth.java | 142 ++++++ .../urpsys/baseauth/common/CommonUtil.java | 456 ++++++++++++++++++ .../baseauth/common/DataSourceUtil.java | 111 +++++ .../baseauth/common/crypto/Aes256Cipher.java | 142 ++++++ .../common/exception/CustomException.java | 114 +++++ .../baseauth/config/CustomTokenEnhancer.java | 90 ++++ .../urpsys/baseauth/config/EncryptConfig.java | 38 ++ .../config/Oauth2AuthorizationConfig.java | 206 ++++++++ .../config/PasswordEncoderConfig.java | 77 +++ .../baseauth/config/PrimaryDbConfig.java | 113 +++++ .../baseauth/config/SecurityConfig.java | 116 +++++ .../com/urpsys/baseauth/dao/MemberDao.java | 48 ++ .../com/urpsys/baseauth/domain/MemberVO.java | 171 +++++++ .../baseauth/domain/TbGnlMemInfoVO.java | 59 +++ .../inner/handler/CustomFailHandler.java | 69 +++ .../inner/handler/CustomSuccessHandler.java | 51 ++ .../CustomAuthenticationProvider.java | 127 +++++ .../baseauth/service/UserDetailService.java | 108 +++++ .../baseauth/urpBaseAuthApplication.java | 81 ++++ src/main/resources/application-hpnote.yml | 37 ++ .../resources/application-infra_server.yml | 37 ++ src/main/resources/application-kic_dev.yml | 37 ++ src/main/resources/application-kic_rel.yml | 37 ++ src/main/resources/application-local.yml | 38 ++ src/main/resources/application-vmware.yml | 37 ++ src/main/resources/jwtkey.jks | Bin 0 -> 2583 bytes src/main/resources/log4jdbc.log4j2.properties | 2 + src/main/resources/logback-spring.xml | 100 ++++ src/main/resources/logback.properties | 4 + .../mapper/primarydb/config/MybatisConfig.xml | 41 ++ .../mapper/primarydb/sqlmap/MemberMapper.xml | 69 +++ .../mapper/primarydb/sqlmap/TestMapper.xml | 14 + src/main/resources/secrets/UrpSystem.keystore | 1 + src/main/webapp/WEB-INF/tiles/tiles.xml | 26 + 85 files changed, 3795 insertions(+) create mode 100644 .classpath create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .project create mode 100644 .settings/org.eclipse.buildship.core.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 .settings/org.springframework.ide.eclipse.prefs create mode 100644 bin/main/application-hpnote.yml create mode 100644 bin/main/application-infra_server.yml create mode 100644 bin/main/application-kic_dev.yml create mode 100644 bin/main/application-kic_rel.yml create mode 100644 bin/main/application-local.yml create mode 100644 bin/main/application-vmware.yml create mode 100644 bin/main/com/urpsys/baseauth/Aes256UrpPortalAuth.class create mode 100644 bin/main/com/urpsys/baseauth/common/CommonUtil.class create mode 100644 bin/main/com/urpsys/baseauth/common/DataSourceUtil.class create mode 100644 bin/main/com/urpsys/baseauth/common/crypto/Aes256Cipher.class create mode 100644 bin/main/com/urpsys/baseauth/common/exception/CustomException.class create mode 100644 bin/main/com/urpsys/baseauth/config/CustomTokenEnhancer.class create mode 100644 bin/main/com/urpsys/baseauth/config/EncryptConfig.class create mode 100644 bin/main/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.class create mode 100644 bin/main/com/urpsys/baseauth/config/PasswordEncoderConfig$1.class create mode 100644 bin/main/com/urpsys/baseauth/config/PasswordEncoderConfig.class create mode 100644 bin/main/com/urpsys/baseauth/config/PrimaryDbConfig.class create mode 100644 bin/main/com/urpsys/baseauth/config/SecurityConfig.class create mode 100644 bin/main/com/urpsys/baseauth/dao/MemberDao.class create mode 100644 bin/main/com/urpsys/baseauth/domain/MemberVO$AuthorityComparator.class create mode 100644 bin/main/com/urpsys/baseauth/domain/MemberVO.class create mode 100644 bin/main/com/urpsys/baseauth/domain/TbGnlMemInfoVO.class create mode 100644 bin/main/com/urpsys/baseauth/inner/handler/CustomFailHandler.class create mode 100644 bin/main/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.class create mode 100644 bin/main/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.class create mode 100644 bin/main/com/urpsys/baseauth/service/UserDetailService.class create mode 100644 bin/main/com/urpsys/baseauth/urpBaseAuthApplication.class create mode 100644 bin/main/jwtkey.jks create mode 100644 bin/main/log4jdbc.log4j2.properties create mode 100644 bin/main/logback-spring.xml create mode 100644 bin/main/logback.properties create mode 100644 bin/main/mapper/primarydb/config/MybatisConfig.xml create mode 100644 bin/main/mapper/primarydb/sqlmap/MemberMapper.xml create mode 100644 bin/main/mapper/primarydb/sqlmap/TestMapper.xml create mode 100644 bin/main/secrets/UrpSystem.keystore create mode 100644 bin/test/UrpKeyMng/LibraryTest.class create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java create mode 100644 src/main/java/com/urpsys/baseauth/common/CommonUtil.java create mode 100644 src/main/java/com/urpsys/baseauth/common/DataSourceUtil.java create mode 100644 src/main/java/com/urpsys/baseauth/common/crypto/Aes256Cipher.java create mode 100644 src/main/java/com/urpsys/baseauth/common/exception/CustomException.java create mode 100644 src/main/java/com/urpsys/baseauth/config/CustomTokenEnhancer.java create mode 100644 src/main/java/com/urpsys/baseauth/config/EncryptConfig.java create mode 100644 src/main/java/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.java create mode 100644 src/main/java/com/urpsys/baseauth/config/PasswordEncoderConfig.java create mode 100644 src/main/java/com/urpsys/baseauth/config/PrimaryDbConfig.java create mode 100644 src/main/java/com/urpsys/baseauth/config/SecurityConfig.java create mode 100644 src/main/java/com/urpsys/baseauth/dao/MemberDao.java create mode 100644 src/main/java/com/urpsys/baseauth/domain/MemberVO.java create mode 100644 src/main/java/com/urpsys/baseauth/domain/TbGnlMemInfoVO.java create mode 100644 src/main/java/com/urpsys/baseauth/inner/handler/CustomFailHandler.java create mode 100644 src/main/java/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.java create mode 100644 src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java create mode 100644 src/main/java/com/urpsys/baseauth/service/UserDetailService.java create mode 100644 src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java create mode 100644 src/main/resources/application-hpnote.yml create mode 100644 src/main/resources/application-infra_server.yml create mode 100644 src/main/resources/application-kic_dev.yml create mode 100644 src/main/resources/application-kic_rel.yml create mode 100644 src/main/resources/application-local.yml create mode 100644 src/main/resources/application-vmware.yml create mode 100644 src/main/resources/jwtkey.jks create mode 100644 src/main/resources/log4jdbc.log4j2.properties create mode 100644 src/main/resources/logback-spring.xml create mode 100644 src/main/resources/logback.properties create mode 100644 src/main/resources/mapper/primarydb/config/MybatisConfig.xml create mode 100644 src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml create mode 100644 src/main/resources/mapper/primarydb/sqlmap/TestMapper.xml create mode 100644 src/main/resources/secrets/UrpSystem.keystore create mode 100644 src/main/webapp/WEB-INF/tiles/tiles.xml diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..36064bc1 --- /dev/null +++ b/.classpath @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..61793db4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c75f3c2c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/.project b/.project new file mode 100644 index 00000000..eb8dbae1 --- /dev/null +++ b/.project @@ -0,0 +1,41 @@ + + + urpItms_00_Auth + Project lib created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + org.springframework.ide.eclipse.boot.validation.springbootbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 00000000..7b8f9727 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home= +jvm.arguments= +offline.mode=false +override.workspace.settings=false +show.console.view=false +show.executions.view=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..7938522f --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=16 +org.eclipse.jdt.core.compiler.compliance=16 +org.eclipse.jdt.core.compiler.source=16 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 00000000..e6eb4db8 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..3d08c3f6 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.springframework.ide.eclipse.prefs b/.settings/org.springframework.ide.eclipse.prefs new file mode 100644 index 00000000..e587c651 --- /dev/null +++ b/.settings/org.springframework.ide.eclipse.prefs @@ -0,0 +1,2 @@ +boot.validation.initialized=true +eclipse.preferences.version=1 diff --git a/bin/main/application-hpnote.yml b/bin/main/application-hpnote.yml new file mode 100644 index 00000000..824363bd --- /dev/null +++ b/bin/main/application-hpnote.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.131:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/bin/main/application-infra_server.yml b/bin/main/application-infra_server.yml new file mode 100644 index 00000000..a14254f4 --- /dev/null +++ b/bin/main/application-infra_server.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://109.26.11.21:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/bin/main/application-kic_dev.yml b/bin/main/application-kic_dev.yml new file mode 100644 index 00000000..4eb0b150 --- /dev/null +++ b/bin/main/application-kic_dev.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.10.10.203:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/bin/main/application-kic_rel.yml b/bin/main/application-kic_rel.yml new file mode 100644 index 00000000..9f573676 --- /dev/null +++ b/bin/main/application-kic_rel.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 12000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.10.10.203:3306/ur_itms_rel_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: YvRZ5jyhmB6gwVSUGBOqNMQB00k6OZZSfUH5ZU4GEFs= + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/bin/main/application-local.yml b/bin/main/application-local.yml new file mode 100644 index 00000000..bce58e02 --- /dev/null +++ b/bin/main/application-local.yml @@ -0,0 +1,38 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.131:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true +# jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.138:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/bin/main/application-vmware.yml b/bin/main/application-vmware.yml new file mode 100644 index 00000000..824363bd --- /dev/null +++ b/bin/main/application-vmware.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.131:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/bin/main/com/urpsys/baseauth/Aes256UrpPortalAuth.class b/bin/main/com/urpsys/baseauth/Aes256UrpPortalAuth.class new file mode 100644 index 0000000000000000000000000000000000000000..97c3196d91efd9e7d477b91e55908a4d8e37e8b5 GIT binary patch literal 3609 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 K$S37fsQoqmlXf2f literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/common/DataSourceUtil.class b/bin/main/com/urpsys/baseauth/common/DataSourceUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..90e92362971d05062ea4fca660b7c7b6b73070e4 GIT binary patch literal 4232 zcmbtXX?qmM5q?`N+JiyJ3&vIs$JiKF64GE95zJz25MV@BLO}->Bu-kpjWlR?W|^6l zCCDAy2|1j^xtu%B<=lZBD;p(tLhgLezsZv)Z}+UUOC*uy$(Np)>Z-1)w~ns)$G>m9 z4&V^}9!HBnXWlE>6~7!T1oo5+l&pj^Hfbf#wU5bAj(Qb8uf{{C7)MN?{i2+cc2T<1 z_UWmMDjy289&%hKJS?yw(>Wm!8}JG$g$+nr*oanvEjh6pg>vZGM^w<)zkk3f&nQ3JX_U>|!KGpYT-iA861Y!$ za#_yLE8m`RX6ded(mVz{_kuH>LOYUahGLtAyRlv1o|2qZ+{?@GtP{@gEeNF>5|mwQ z_!Mc5LQ!*b6Yj;E;^+{_H0!X1H*3|Krd2rNdu8Q^3)-%?TDT8yW26EV9`l_!?7v zI%$4POTQhD#&JO4u6hm)x}lm@zJ-He#wE(q4-{$Z;4r8)J!auB9*^J~lJicfQX28R z;;3_(@WnENTHVIT*rOH(G;14;8e$=lb+AyRGp&061Wv~BBzNoP;O{Iq$S^Ml)-3v>i3J1jb0q%lwQQ z@l|;=EQLV=y4pj(!fJ2FQx+z1j&{gGphP*~}SQ8A<&oT!x{4P{#q=xV<0u#4tRLlM|}r!7d!nua29|NnAx2#BV7BhNP3ut0toA@92))vZXdH}&X^EwUno4sQtk!r`NjHTGl6qONa2Z#k zeo@aEfsS>6>YUJ0@3-&)e2_UDl^YwqzU{OJylgW~qGV3`u!WD{qsv{S%;vm&60d}= zOtXlav!1i?JU+&j!A8G)aod?Yi$)4p@yR$oA+WXHj#fan@F{$n0i%K;22@V7)or7O zI%};wQV8%FU3Bc)s4sG_p2nlZnj#7B$ay*8t)Q-rU?g8p{0akSv=KDvob*e9{+xljX(HENTX0^Fz{Q zz*e;Eh+pLOZtD<6O`u@{8uO(au(L4jYiDyN`i{U8YYirMa!d*@<9j-LuIRTP zSa?NW>AP8MPZqr?Sv=zvi&I49v^ygG&|z0KwRb`~#fs0AOonx5kN*EoF@>WE`Glh< z+pYCJp-1Lko&20qk9uAhguW~fsc^NaBQKh)?h#1z`uMmH;`&a49Fr! znowo8wBlz8{F*f*dJDHsiwRVTx#-m)<{+5Bt3*unR%$a_0yoTexi+RH@LO|A>DHks zf!CSsqPJ8ZkP`Sk;T9Yv|7)U2;HKeq>eGvWHAt>#hE=>s{w(m&D&W_GGLFA;j=w!C z@81Y_?BEEzfdf4_OA4lFE7v%`Y(52_8@m>fxXzarq`2yBa8};L)ruJS+{~{e+OUNb z3X8+skCAqB3GI`MNDudPciq5N;5FRSf-2r(zVBc8-qEv1GwfU;JXA$jMC)m!_4aJ2 z;$b7)U!%W@{Z$+?q$e6lM-1uM3h8(i?=Ym(jiiyD^k{m#inBfG^XYe+=X=tU&n4t1 zdlsRt(Tm9QgY*yRMS_F+y?7WI4(5lj4o>T+bEBS4afuY4d^#+F3CTaXvyqhkB~*y&GY4ZG zv92oSJ7V2cyssm+r-~1C#Hx69_!XoN#+DFF>d%ia;)OSQt{GK3i1Ae(qeHoiYQV`k ziBSe_jP*LsAFH#>h^NRk$^G+m@o8iHNn=1iK8w#$h9=-eeBPYck1ybhG<640{Sv;+ z^$~tWZ%G36623wgb}>c1im&nQ>y)<8Qi$W~zt9%PH>m$x_%_edS(l@H3!m*vczKeU z_uX7KBmVvFdKlWs0fLw$jBNx^C*t-%9IkcU$li{FKi=0{lx-e`VI+ gn03*tubFkptiLns8)p3j{z$nLW&VV};BV;o5C4Y6`v3p{ literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/common/crypto/Aes256Cipher.class b/bin/main/com/urpsys/baseauth/common/crypto/Aes256Cipher.class new file mode 100644 index 0000000000000000000000000000000000000000..4c4ad3f35af465047834cb1e2bd76f9658baad99 GIT binary patch literal 3043 zcmai0Yf~H78Ga6uSXo&xR(uIg+K@Q05sp~bwFv=-fMioETudz>A*7dOIYw)QR^DB( z)g(>QG>((F_p5u$M}JLc5@1Rv`PiBMjZXhXr|EOfE;3M>j%N1U-}64t`@HYb-~auW z&j4J&pA57J^g7;(wd&V{Mqn-2fwWh{ip9AVuVy)ZqaJ$Jhz!o2?<>0Xiu4U61v;+V zYqnLjYfILZh3nD@1&n3cDA%PU@W{AYy|sO~EFE8lW3n+Q(CV&5drs`$6Y!u_TAQ+c zdqsxQSDV!K3vSH~hXfMcxmkhCrCW}yhptx(473S6ti5nOt8}HgV&I^_6M7+#&Z_T* z4XadJv#ahRUD&bhkU-A!mn^$(I~5rN4%jZzm5WlfesjA(vdD=H5;$z)05WMD6*wBy zeYdvMTlc+dZdC@owiCK*-1P{K8|d6cQ@Ig@a>c}>cue4-B^gfnUS0ZOL*Qh$CL^M= z94eE8x&NNZ;H&5|@VLO!UlOsR4%|%WR!uyi?n>0wss>I7=aH&>b4GB-$D+0&5V}vSt4;BUu^a>o-;aepJD`v@+K?ZpoR-dn#IE$|{B2~{` zq}t-k_ZZ5}rg5HHVpttYIaM#<)&edXC<>hTpW<3@YqsC8F3VdcE@4#Q03}Ctae|uKkIVT& z8kZ@QSjb&O)77m$RasjKD_w5TRrA6wt@2z~2JJYdL^x(*922x}`@Y?9ygJ3!v(tW* zyMv`2V%wf7lVja({cFp07f#I%a;d|`*pZB5S}fWWMY z6j}|u9H(isPV83$GI$BED5LWvm_~Ej#J5ZsNHb33ZcR?Et}IA@+Fqzif$X^F*wtCv zchxwaOokOV5I8gbC26xyp=14NixQe5RQavUYh`ND#GnZNnzDW*TH2#Rav!D8m?ZZp z7K%Fe9*y?y5jgK_Q3{AH?N%li+nbgOjZo4|%Y1=l*IkQ;ZCbDsc3s0ZP~TmDbX_sv zZ;M#lpRV}cO+}S~Ds9P{<{^zWCLv>L6$?dcYOGj3KV>g2vMyzC3*R$9EIJdKv5TGt z6R+X*sJfMEL1@<;a+cdExNRk90`{C9RK~w=;!V88N58Dw zq2J33MHB}{vfddi7V4~W?KdWVtFMa+$b;+3yd&Nh-(f6JH2StoSr_{BLpY~p* zZoV4SH2)v8@W)KmJ*FGm1XuX>asDBW(j1#CH66$T;-h%)y`Bv`oISFMW1INOxR?-= zTX=FV`_u+bt|K?Gh5XzGtbt@_@|ks<=}czNt)p-9K8~xYbv(=23-{46kW!t_)aR9(f7a3U5!$xUK9~K*21=iIbo@0vkm^h(I#Y>`j!nGSvxUhy+ML?J)lV_Q;Y)L! zsSV71idX+kw-4bw>wiDn7ci;;eVg9}mP&9XiD%J<=Wq}M+%d%Gb{MBH!e^tv)gsSb znvU$;$?h@07n+ea{8FPQRLw|2 zqd$g3>lZkK#5Vj0dy>xmstNd?G2r1nfKxjFM|d~!>j-aN$?}P{7EqeLmEmjX%o!Y#pbi2&@{x5)QL@$IB`FuE(S9-6YLo}GbYKl zyZ(ZvyDnO>rBc&WT~z7{slTBAp=`S7u4;PTcrZ@ls8S{H%zO8~bI!f@y!q{)pML?c zidzBn2rN|1Mz(3~*^lh(mTGHi)7i;#uVETl?O|2hb9BDto3>*%Hcr+7^a>2!SNGLy zT{UXic0eFzYnHCoE1G5V;Jw1SfVd&hpEnKLQ4Ob})|;AtR-5_j_ixq{0wK+^Oe=40 zYXb4&DP-BPbfdN+5Ofntc1@sfRX23!vcQ>CN9Nrf%Y2}2)wPxBia@V~3d4uNDEbi> z@TI0JVF(OIk-&&Rw5BhOLuk}nxj`c@ZKWc zTrL;HMRxM|tHa|j4n3eCQj9Ijn8MgSW7jYr7)e)>Z;y)WvZGdaOX{AhA%KPF4AqgC=p2ye z3OP|9-jNet3}TrU%L$C63LV@XnX9-QzoN>Kcc6V8#_lu?M{j5a zV_&y*&T!2zOh=Wslp~B6>t8mS zVH~rVV)SkHdmal|!XiIvOSp&5B^i;$es-;83{l36ILWarVGJM5)^r~gg7=kY8+}446(X30u#=q>T#*AdQ_iy zRIwHnYv|5XANo{ zLf-)*@~w36?9a?0Q(7ZFPiFxtX{!ifn}9k?yidqF9a!V2_c~-uv}H_qBlR=udV8e& zH2f{UtMei0&JR$axEsWmKEBDPbZVCGQodjL0b^1~YmhPpIOmc@TL~VSVCVk}XyQen L$*w>pmu~Z4rGJa3 literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/config/CustomTokenEnhancer.class b/bin/main/com/urpsys/baseauth/config/CustomTokenEnhancer.class new file mode 100644 index 0000000000000000000000000000000000000000..46407de454fc1efc2cf7289783e3e36b85b11e9f GIT binary patch literal 4556 zcmbtYdwd*K75;9UW~Rxsr74sIN;Z^kH=A_JW>d1;q!cwyH`8RA-I*{m zTL_AX4}75FTR_3LRq;^}TiYs@s-UR#MSY_9#1}q5@r6*oJ2N}GX<~js|H$rs_k8!< zbIv{Yo^$iS(+BSX&@N^wm?5yTV3%TLXVe{YV>@)$(97O%tYBL^&7oMb?0R-7Z;u#O z${N|(eMiv{Xv)|Hz1XKaro`c3oi}W{0;@95%(u9JVg!B)+}oO&jz3(XWLvSGg!C>^ zC>XBm`xKwn>?j)Hd@3<4&n)PkXwny^f8rmhVAI+hQeD|l zS&xP-k~SwaEs&__r5$8SBXapf(vM(X!&b?iS2fU=spuC_$(D<(mWyAmVY_5D226ik z#q$E4scgqUK9vcad4Yz38l90$g-)ZS1wDPKD!rg#P|{BdO^Adlb_Q|k>fI8i;;;r& za>IBA0u>{nUV7G<*cOJNq`|7y8wpj6(%~=?sqV}`CBBXZSI%gv2BRWYQ4XWmk*S(~ zm4>V3gi7=(G8NYZnYFnmogL`N`?>I94cAI?n1vOQit7R|bE$0u!KPfV;boE;dKm~* zyduz<%4PGJFdjE(cvX$gib%z4f~?5&BrhFE_=n&|4X=~bFe^fdiZ=v)`8b;l4$K=h zyh(CHzap86w*-;PBy#zIoM;ZGVtQw07RD8r~`AEes-l zB1Oe*Jnv=KaB{3h&3Lzl_ei=t?_2#*74Ku7@|Lx(@zR5m^8pPXlpL9-J>j^DJyMTl zUKwycqT!>F9)DED$EZiHlw|=`@d^4OZPr~cXeZKU9DOWfx?ThBl9%f~0Z1!9qu~G!2FV~Rn9Wjc8Z4d7m7CqanUi+0$hBonYQ$%8 zkAlzf;;pK$$~Al*hv|ap8IJDR4r4k_Q#u@{o+J38f-lg)s-B8e!Y+|dM_q^F_ zM&w!GELn)6#9+v3%73`QJg`GPMPSX;zD=5iTw~$*4s~p_(xtAgv4{K9K5_Ayk)Y3x zucyM!nt9TX_W#8$sc25l(+eY9+Hac`{6V1o8RX}L#8mJnZbbDsOXCzgHtxL;gq39> zXP2FV(P_#izIl>|#!9J&Q#abS$6eA#yA9q?gKh)j#agZ@u}n`@7A$PN^4(yhUw;V#bD_DFd&UK8>#18PRbP0VvAC!t?a!w)yD z_TC6pB=ur3$4fFkuO3gR__yFwYz6Z%%}d@%7IoJ(Tm{FO{}Y^?%xpynfitJ3GLr)z z*+%n<;@>RZgfsZfrxibE6UF$=(tue@_oLxXU##)7-XC0qIsB~!1kA-eB5n}o^OKWj zZbqH_7EdkTho-}5&K|;Pm+!~3+Ui>Bn$B3U4`&^~qM7I?T0*oeLMw?@Md*B@wGmoJ z)E1$Oi7tuIMxu@gbrGc_lp)GS=rW>Qg!+iKMd%8m=SS#;L^~p65Di6W7f~@nHqn(4 z@`!dvXpHDZ5qb&HOC$7hqE|-f)kLq2(CdkAiqM;h-Ws8I5Zw}?cM;tlq4yHKKSCcO z`f!BqAgadf<3yhfWQTAUx99G*SxujAtLO0k12`nmrtZNRE$RW>D{vV1wJ9yi0eo5D zAifH;)l11Y1a3Y4Ft_nLE%kw_WruOBrEVX-w`?zyqK-)d+|IWau#~yAoGG#rXED20 zU=`vx4{5%H`f)xCtYNRa7T4nf+{72pZCHmpa1oo5Hr!9r>coaXw&-wq4z39e+v}+c1 zr}0btivRsMN*#~j*E~zVq27g@8SsA_@qfqj_It_}Va9QB1hW+g1&=CNprBd7Vg-Lx m@Mq3H0<>_s$4Q-mzu>R@mdEp7{Cg5l5jF7F(>$j$(DEP1hzDr^ literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/config/EncryptConfig.class b/bin/main/com/urpsys/baseauth/config/EncryptConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..d3f547a5a8a24cf6400af87c9acfdcc7bf991c7c GIT binary patch literal 817 zcma)4+fGwK6kWR%PN@|Tynz=a@u4M=Nt(zD!~`oQ#6}V|B*v%d>Cg`L%$&^3LHbwv zM52iw;71wv8Az>(Bs|PsvuCf__g}xi{{*m$CkZNqW@x$o5W{rro zSg|+thkexd&r+2KZH-T`OxTDOdX*MVhp{*?r*fqGZ`63gOK_X85^36sgTpDqT|&#c zfsnaOhl<-+2KJ17m5NuYL^q)mR^JsS=u91HuelR@#@HZZDuid<(vi=dHiKg)Gxf!~ z&*fl(ItxNhsN$uPhU=&r<|KGP*!q75uj)Y^YnbOgytjo*)oUFm^v~qC%32BA*Uji+ zUkVpX*}(>QH+bWK3g37qSSG9qMq-@ZJV)(YG}l>{W?&sRST-&Qj5k>$EMSpcE%Cj^ zcnd4IgL|wku7zMgRZ+ literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.class b/bin/main/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..2604d46d70e07fda46aa57956105e68e49f93650 GIT binary patch literal 10253 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 literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/config/PasswordEncoderConfig.class b/bin/main/com/urpsys/baseauth/config/PasswordEncoderConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..3a724686ae4aaeaccfca3dcae906534331560ebf GIT binary patch literal 1239 zcmb7DT~8B16g@)=rOPT2_6dN^XH8N=^2JhsC|Y)O-DYD!{+@1UemrW zqYA_9%S4%=CAZa45C@G=ZYZUVFo9OFEeUn2p%3{}sbnOK+@q4wsuu<-FzW0%fo4CA#x z$(^LtkkKnabi2p$L|7M5VDofyq}pZZAcM;;F2Ny|W_UUmmJSwF` z+fktWW+YmYSu|Ht5$ds7$yC+&@VXSnEV#2-tc zDx)YeY^?WJac!meS~hl5EZEMD#!jG8uIEsq@t$?M^J@+kv1CQM!|nYsAw26#h;GBO&#I1yOrbtCAp$_o~ra1gy3}fgr8gizmYg3}$BH%mhjQ^iQ9l zPttaERjq6F0s2r~{mx7-LoO6n7i%(eE_;9bzBhmW^XFdxZo*3&mF8 zq~jYUX$G!WGh~y%n5qWuOUqL$WSf@Czj)>9v{hMCp1}Ehcjau`bqv$1RRY(Ticyfm z-kX+V1)ox>vCOhS-?Y1;QrLq7X$&GQa3F6v>Os{mDsM?ra)F_|Ys&Jn^enxuZ}tUi z7F9XdLx679CHNs4FEqFeWWlX^CfSdUW%AnOn}+|QY|J!IczvR)q3F9nZ3b}@-J$Jx zzt5ppk~k_b)y-AwD@D^-A%Gu38+rLdjgEKdV>+gVJny-iwS71)Fi@9wr8oeA_tWUd zUj6l98UskBZ~~{2I4O|X#tkjLj{>Wl#>Y6#ATvEB1Jybc_-QOOLlk+1Ku1}whyGn6 zu7@9b20{;;r!b1MIugbh!jV87e$inwS~pDLMY*7SpXR$81+GA~2U!nYB418bDrL(I z6NDbo?#*RF0$Gvfnlh{+&wRs=u#65^IzKhLX{t(?Vo6L0T;9efs&UnruKIy%H%XH) z1P+H4z;ccI51R)9C%0zwywoKiP~QJZ?S-l=TO~_*l)ryNmaA$XE(=^T%hLBNGFZD| z%SuIgMl%i@m20jRS|qAllbd#V5La<6iBAM3yTyJZX*vy^#&z5f7+h7sqKYy@;6|5V zj2zOn{?S$q+T1?e6u7XB2268mWn{BPb}rN|+mQd$G;ZTFR=JogEHb%n!aVH}Pt1+D zG&)D`q%n;dfg@4Ubp(&V&%2A+HjEvLvb%sD#9iD=;&Xv3jG2Yv2WYpMp=u_5)5nEbLD{hyRT`9AD2rO@>ZHu5@oa;5!j%r6;jaV^l@Fn8W zjso8}OhO8r)@JxmJ}Eqdsk_MvEw@Wa>70Xg8J0HZq$5}Lz_ZjNQM=csz~e~8zQp!q z%+p{c*Rz*edv&f1!V_3a!@@eppQuK}AfN0CvVF#Ab@(p8jK3)M?pk`#dUt;7I6A5O zkigY#V=gu*Zpjn+@LpHKxKU!nvrahOwOgk?&PKCuo5N$&Q6Vpw;TU#=op&;txF;JE z_vDInsbNPhEUFT%&uNqsdxC!)u((QcrQiF)U5;99d;MHasWS0j9mJcaPNuNmIvO?`j(Ek+*?9n1cX_xOD9 z8XvvFnO}I2Knq|h1~A+N$RLY8jPveZ-ad!PE?^m)=lT8wu`ckrsNoR`@FQva_rxIzv?xi`3#z-vrBn0N!$*x&HwA6S@ZiF1rlzydifayl(gtOaVhO!Iynil_x5 z%esjA>nomUJx}2=o>0tTTH`6cp)&-&#dmziEp#!o(D$Lx{70cFbS4z}7H=oWYv3)O zJsy9BVoR{d5oRdFNOY+w!~ik`)Z7$GZGe$WR0m+>r0b;7fc@jIvDyyi#K0O}*Zz+* cPT)BS6DWuJ9Ve{KwZq5dZlq@gFMMSF1?18^2LJ#7 literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/config/SecurityConfig.class b/bin/main/com/urpsys/baseauth/config/SecurityConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..e8551bb7cd7d05cf0fea3a8c63d3c5562da6a113 GIT binary patch literal 4524 zcmcgvTX)n{6#mY%kZFj3EiEFo4l39SZ4?mEmX>L0DcE9Zp%oQ0lgUg2nPkkRrOG1@ z{sG=_EgyXIMS(SVSBIA`YMBMSC@*QMXY209ls^>E&T!4Li?UO;b+cHom6En@ z**9e;Tvy$vn5N|_u5Ov~x|R!PJv*3L(Q=Kro~_y0yi#^Go1x9HiVU4|z8Ir$;)XnD z6^oiZ%5ZSeGhMx;oj2EXN6#5rwkF2mTMVm|vu?`gG*cr{TAsG_s-ELor7YQ`(O%Wp zV8OQ5^gI`qol7!aHwi#4hpXhNEg(q5fl#aE1f5O=X2jUaX^QE{1x0l&dqa+JMQU2> zy6tP89#ak7)ZKBSq<>(Up?%8AYa(7pmw--&{c(b30z3)((9O_M)ZBnLhQs}HHfDpg3Td?@#2cNrdG*-5`%T@~rEYtI;*eX%nY!salzb zq9fp4hORmlwJ&KLX1Fq5`(>&KLEL9W+07{m}Urke$ep*!lNC70(H=`Ug!vVakW*%tCHkrfFa;6oCt zI(C8KQhyiYia3ss1e_pOwxIH}fhC;8#|%PVcY=_-(3DpFOMmN0{J47&@8ZcvQODrVl`<#(YOz5MXt zB-LxT+*rzI8W72k6FASMU0`_Bq>yYE`-Sr)n{!;7ige5Z-Jo+X5*(bdISKQ)NQ^n2 zs%nn&5*b@+K=c_~;Lrhj8TF0(V)-1x5dLtYvg9{cyX8h5H%Z+Tg>f5l60YMLzqW0&hQ?H?ncSGE zp>EXx8CXt(_bYXxGsi}%Q51MK(kE;M6=@fE6IPVa0a1jGn*weysIR~p2?k0GJ&jD% z8|7b{6w}6iF{f5xs$J*vw;D0n=W|RN)K1MuQmIw9)ICcn#8qL?5~Fg9W~n6$1W*fo z{MlEN)!+aPZzlW<3=aqqHhKlDF`Rtf-HkO{goj>gnwKokR<#+OxBgv?K|R77Xokz% zW#Z|J;IzpbxyW^p(*9&3Y(m;sYo~vs8^s|?oHn}Ersx_%R~Q-zG~&;+KT8=!@4Lb| ziJk&|c@4X1b`OmP=*fQ_o$L?neSn_dX^_Gj^q+(91qb{Y(1>n2;Wn9`{OgXvM>rVY za@5}<1q<*N`ebts&lM@ z@xcntRxtY*6ZH031)tMf1&jWQi}IlSMiWu$7M{U_N~`LS z9OgRBa31=&HTi&t!G|bRu<9FV#tiHv)j%qWq+S;kQal$iq_1X3AIkX7cNI0FBq6T; zF`8q9l>Qs`)kkpS78D~Eq(fAyF}S!jmPc6Yaja4TRtmRBdI}r9W+J_PPvake{{hn@ BgWmuE literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/dao/MemberDao.class b/bin/main/com/urpsys/baseauth/dao/MemberDao.class new file mode 100644 index 0000000000000000000000000000000000000000..82249ee1d326d7528b9cb11cbdf3d5aa04359a29 GIT binary patch literal 676 zcmb7CO)msN5UpO;vREv8aC8wO^jStELc}H`n^ z8R}FHqA|r@z%s^O86BEbX#vN3;aAAeTcy)rKb%?IFzb!@Dy=^g%^UwW0vQ0WOJSLjC9STKpDp-MIS(sJ+Ne{xTL z5B?2#S1UNJ#w?2jJ=H`*6Hm^PL_lv=t3KmDg3nRMlnH1LO=)AgR2lQ^d@kvz5=OxG zO{qQ0cc+|+GCI@Rc&xVMSkTbeRAPbgh@^@bb`rk=B+F2cWu6Chpew2!-doJ+(b$P} zo-7$ZElA!_VVv^DPJ;yj0_OOh0GfOzO;~{HTw1VL+a+kTf0?}vSYdn>IyJslS;p4u PcLTa?+x*{Ty9MwDi+{@^ literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/domain/MemberVO$AuthorityComparator.class b/bin/main/com/urpsys/baseauth/domain/MemberVO$AuthorityComparator.class new file mode 100644 index 0000000000000000000000000000000000000000..6b996eae59cd1b39437dfe55b7ea1a10ed3b24ed GIT binary patch literal 1339 zcmbVLO-~a+7=C8kvQQR5zEu1|L1_6}K#VaZB&0^IDR3zEJ}qNeXm^^~Sq&ci86Gv! z#1j`U7(EzoCjKbnJG%=aT(q0a&O6V{ywCG~%+Ft6zX4dqJsTFo{km+qp=t*Qfm`E& z;Gy1icVvruzPlk>HKD3olj{UZ<>`Z>Y_+-KS}Gf9hJii)g1b%bH{7k-o~UaZT@1q! z8fvfUo<84wyyHo?B9zCQ-YZ^f3UU)f%c@X;C;exohYai~Ltjz)f#$xh@@6P9B$_^J zk)dnV^F6)Bkjmw&4C$iW5m}@#=->kS8T!kfFE&FXemiCuEXz7?RynZ}V*;l2t`{&o zD0i5G0)tIgDIpZYey%K4!wuTX^Bd0iW!GugvRJ?}Ib!h6S&wGlIGyS~UNkD6f&NDB78p$d7zEH&`4+0U`pr|MQ zp(`1NPHI>@d72E}nuE&a{q*W@ro^VHlITw(ZujCDABY^D=4-aEq0Lpqs) z@jgn@fVU*<9m#r6EFTE_7_p7V9uqe5jXN}q#3@YEu#h7=4XZahuufX?iI#b~XSDRq s%znq%9E~H)7)mRmj02*cj}YTvF0$sa5X~+YX*PLcSi)VhRw8`qH*ncrZU6uP literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/domain/MemberVO.class b/bin/main/com/urpsys/baseauth/domain/MemberVO.class new file mode 100644 index 0000000000000000000000000000000000000000..02faf531efbae9aaef34ff1746035b731eb33289 GIT binary patch literal 5345 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 A?EnA( literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/inner/handler/CustomFailHandler.class b/bin/main/com/urpsys/baseauth/inner/handler/CustomFailHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..123a7c3915aa77ec127af558eb3a55c2a3707c3e GIT binary patch literal 2415 zcmbtW-%}e^6#gy&Hl(T4*p}96O$%)amM&P@3JFje%MS^l1X{KJ+9bEhlFi<@dzY4R zobka|-*m=4`0V(o&M5HUjIaJH;$Ps5W!H0fXqq8ni84bX z=bN`4j;!f9Q7&^Q&2VnnBXc!AXRn*CS+Mw&Z42pJca@4IY6Vf%XE>oZBrlOlG*h%p z+msVzxIcA|p*<@~Jci@w*6cdKYv_YB8W>rmL4@e#%l!I?NtBSt7? z#Uz(*L7Ci%Y#CWnG`8S3VFd^G`hP%Czt6VaMFMuw9-G zBJeC46otd}Rw#EL7kOO~BCXO9Yb;$2uTbdx5Sv1uTWaiRxWI5;ZS3L+(KgOR(aSJ7 z(Rh;kNSk~{Op=+#a}1YoMZ;x=6MJb9M?X>w9VK4yh@PjKxsaEt2*{l%US&w~rw%6n z`2MS%FE)3+`#kyQldpHa-As;8BtQKuhC%2Wt}%=rT0)1#E{-7#Q}l?Q3*2>$GI8r< zf2xU~At>e2^*BawgTQmg5e~zZ1HdRTvCm@`YO$B>J*DYP7BX2H6<@YrPkZq8w4mp?P(&8N!%tT*NiI93Y&V! zeN$Fw=1RksR2!EM@Z!J#+`$_fvZT<;p#8)T7#+u5mFc+4?b0$YnGOXbiWy>8gD07P z!L9})sRLCq&h&2i+>@%pvic2;HK%vQej|wTmG<{-8z1ItUJdoXsCGLBenHP(l|El39vr|~LZOt;;UzNsGR-?_ zJddRR{cXb2PO|wQkw{$JLSGxyY+&$bT;0NJ5zyr3;BOdxf~49=H#V-S**3<3EldSk z)4slf6Y)K`=sP?@sBhv7ZV`Y{@+Xa9`tNg_y33pNR^AN+5JIQ~2D6y+;m^~Vd4j8C qIV_OfMVfbj{Y9z~EYYG3Z{ckkqoi=3e(&HtTB$%izz6sUXa51_WxmY- literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.class b/bin/main/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..8ff155e02f121501d48268623d96cebfe2a6eb43 GIT binary patch literal 1678 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 D7W`C% literal 0 HcmV?d00001 diff --git a/bin/main/com/urpsys/baseauth/service/UserDetailService.class b/bin/main/com/urpsys/baseauth/service/UserDetailService.class new file mode 100644 index 0000000000000000000000000000000000000000..f7df58b3feb8fcf59931e28ebdc5cf2cd6838a2e GIT binary patch literal 3191 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 literal 0 HcmV?d00001 diff --git a/bin/main/log4jdbc.log4j2.properties b/bin/main/log4jdbc.log4j2.properties new file mode 100644 index 00000000..85d1ede9 --- /dev/null +++ b/bin/main/log4jdbc.log4j2.properties @@ -0,0 +1,2 @@ +log4jdbc.spylogdelegator.name = net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator +log4jdbc.dump.sql.maxlinelength=0 \ No newline at end of file diff --git a/bin/main/logback-spring.xml b/bin/main/logback-spring.xml new file mode 100644 index 00000000..c6ca64c0 --- /dev/null +++ b/bin/main/logback-spring.xml @@ -0,0 +1,100 @@ + + + ${HOSTNAME} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/main/logback.properties b/bin/main/logback.properties new file mode 100644 index 00000000..b54f5282 --- /dev/null +++ b/bin/main/logback.properties @@ -0,0 +1,4 @@ +ows.log.path=C://ode/logs/was +ows.log.level=debug +ows.log.filename=ows_adm_log +ows.log.err.filename=ows_adm_log_error diff --git a/bin/main/mapper/primarydb/config/MybatisConfig.xml b/bin/main/mapper/primarydb/config/MybatisConfig.xml new file mode 100644 index 00000000..f3cd1bf8 --- /dev/null +++ b/bin/main/mapper/primarydb/config/MybatisConfig.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/main/mapper/primarydb/sqlmap/MemberMapper.xml b/bin/main/mapper/primarydb/sqlmap/MemberMapper.xml new file mode 100644 index 00000000..9616221e --- /dev/null +++ b/bin/main/mapper/primarydb/sqlmap/MemberMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + UPDATE TB_TASK_USER_INFO + SET LOCK_AT = CASE WHEN LOCK_NCNT > 1 THEN 'Y' + ELSE '' + END + , LOCK_NCNT = IFNULL(LOCK_NCNT,0)+1 + , LAST_CHG_DTM = sysdate() + WHERE TASK_USER_ID = #{id} + + + + UPDATE TB_TASK_USER_INFO + SET LOCK_AT = NULL + , LOCK_NCNT = NULL + , LAST_CHG_DTM = sysdate() + WHERE TASK_USER_ID = #{id} + + + + + \ No newline at end of file diff --git a/bin/main/mapper/primarydb/sqlmap/TestMapper.xml b/bin/main/mapper/primarydb/sqlmap/TestMapper.xml new file mode 100644 index 00000000..45ee467b --- /dev/null +++ b/bin/main/mapper/primarydb/sqlmap/TestMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/bin/main/secrets/UrpSystem.keystore b/bin/main/secrets/UrpSystem.keystore new file mode 100644 index 00000000..39528f7c --- /dev/null +++ b/bin/main/secrets/UrpSystem.keystore @@ -0,0 +1 @@ +aes256.key=52f48aa1c7435bc11bf909d9d7d1d5932f4bacd8184ec5c1eed6d03ee17fe126 \ No newline at end of file diff --git a/bin/test/UrpKeyMng/LibraryTest.class b/bin/test/UrpKeyMng/LibraryTest.class new file mode 100644 index 0000000000000000000000000000000000000000..822d2ac96d90a0c8804306c2677ecff92324f83d GIT binary patch literal 634 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..aa991fce --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..1b6c7873 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..4a20eeba --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.4.2/userguide/multi_project_builds.html + */ + +rootProject.name = 'urpItms_00_Auth' + diff --git a/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java b/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java new file mode 100644 index 00000000..2539ae7c --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java @@ -0,0 +1,142 @@ +package com.urpsys.baseauth; + +import java.io.InputStream; +import java.security.InvalidKeyException; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; + +/** + * Hello world! + * + */ +public class Aes256UrpPortalAuth +{ + private static SecretKey keySpec; // keySpec + private static IvParameterSpec ivSpec; // ivSpec + + + public static void main( String[] args ) + { + InputStream fis = null; + String secretKey = null; + + System.out.println( "Hello World!" ); + + secretKey = "52f48aa1c7435bc11bf909d9d7d1d5932f4bacd8184ec5c1eed6d03ee17fe126"; + + + String strChgMethod = ""; + String strChgInput = ""; + + if(args.length !=2 ) + { + System.out.println("Invalid args , args length 2 input "); + + strChgMethod = "enc"; + strChgInput = "123456"; + + + // System.exit(0); + } + else + { + strChgMethod = args[0]; + strChgInput = args[1]; + } + + try + { + byte[] secretKeyBytes = Hex.decodeHex(secretKey); + + if (secretKeyBytes.length != 32) + { + System.out.println("Invalid key (key length is not valid) "); + System.exit(0); + } + + byte[] ivBytes = new byte[16]; + + System.arraycopy(secretKeyBytes, 0, ivBytes, 0, 16); + + keySpec = new SecretKeySpec(secretKeyBytes, "AES"); + ivSpec = new IvParameterSpec(ivBytes); + + if(strChgMethod.equals("enc")) + { + System.out.println( "암호로 변경" ); + + if (strChgInput == null) + { + System.out.println("변경할 문자열이 없습니다."); + } + + String encryptedStr = null; + + try + { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); + byte[] encrypted = cipher.doFinal(strChgInput.getBytes("UTF-8")); + encryptedStr = new String(Base64.encodeBase64(encrypted)); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + + System.out.println( "["+ strChgInput +"] 암호화로 변경 =============>"+ encryptedStr); + } + else if(strChgMethod.equals("dec")) + { + System.out.println( "평문으로 변경" ); + + if (strChgInput == null) + { + System.out.println("변경할 문자열이 없습니다."); + } + + String decryptedStr = null; + + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + + cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); + + if(strChgInput != null) + { + byte[] bChgInput = strChgInput.getBytes("UTF-8"); + byte[] byteStr = null; + + if(bChgInput != null) + { + byteStr = Base64.decodeBase64(bChgInput); + } + decryptedStr = new String(cipher.doFinal(byteStr), "UTF-8"); + } + + } + catch (Exception ex) + { + ex.printStackTrace(); + } + + System.out.println( "["+ strChgInput +"] 평문으로 변경 =============>"+ decryptedStr); + } + + + + } + catch(Exception e) + { + e.printStackTrace(); + } + + + } +} diff --git a/src/main/java/com/urpsys/baseauth/common/CommonUtil.java b/src/main/java/com/urpsys/baseauth/common/CommonUtil.java new file mode 100644 index 00000000..62e5ae74 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/common/CommonUtil.java @@ -0,0 +1,456 @@ +package com.urpsys.baseauth.common; + +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.SimpleTimeZone; +import java.util.Vector; + +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; + +import com.urpsys.baseauth.common.exception.CustomException; + +/** + * 공통 유틸리티를 모아둔 클래스 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자          수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28   나혁제           최초작성
+ *
+ *
+ */ + +public class CommonUtil +{ + /** + * nvl 메소드 + * @param inputStr + * @return + */ + public static String nvl(String inputStr) { + return (inputStr != null) ? inputStr.trim() : ""; + } + + /** + * nvl 메소드 + * @param inputStr + * @param defaultValue + * @return + */ + public static String nvl(String inputStr, String defaultValue) { + return nvl(inputStr).contentEquals("") ? defaultValue : inputStr.trim(); + } + + /** + * nvl 메소드 + * @param inputObj + * @return + */ + public static String nvl(Object inputObj) { + return (inputObj != null) ? String.valueOf(inputObj).trim() : ""; + } + + /** + * long 타입의 시간을 입력받아 날짜 형태로 변환해서 리턴해주는 함수 + * + * @param longTime long type 시간 + * @param dateFormat 변환할 포맷 + * @return 변환된 날짜 String + * @throws SystemException + */ + public static String getTimeString(long longTime, String dateFormat) throws CustomException { + SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, Locale.KOREA); + + if (longTime < 0) + { + return ""; + } + else { + try { + return sdf.format(new Date(longTime)); + } catch (Exception e) { + throw new CustomException("Date 변환 오류"); + } + } + } + + /** + * 현재(한국기준) 시간정보를 얻는다.
+ * (예) 입력파리미터인 format string에 "yyyyMMddhh"를 셋팅하면 1998121011과 같이 Return.
+ * (예) format string에 "yyyyMMddHHmmss"를 셋팅하면 19990114232121과 같이 + * 0~23시간 타입으로 Return.
+ * String CurrentDate = CtosUtil2.getKST("yyyyMMddHH");
+ * @param format 얻고자하는 현재시간의 Type + * @return str 현재 한국 시간. + */ + public static String getKST(String format) + { + //1hour(ms) = 60s * 60m * 1000ms + int millisPerHour = 60 * 60 * 1000; + SimpleDateFormat fmt= new SimpleDateFormat(format); + + SimpleTimeZone timeZone = new SimpleTimeZone(9*millisPerHour,"KST"); + fmt.setTimeZone(timeZone); + + long time=System.currentTimeMillis(); + String str=fmt.format(new java.util.Date(time)); + return str; + } + + /** + * 입력한 날짜 기준으로 몇일 전,후 (주의)입력날짜는 구분자가 없는 string형 + * + * @param date + * string date (19991002) + * @param Day + * 기준이 되는 시간 + * @return String + */ + public static String getDatewithSpan(String date, long Day) + { + /* + * int millisPerHour = 60 * 60 * 1000; SimpleDateFormat fmt= new + * SimpleDateFormat("yyyy/MM/dd"); SimpleTimeZone timeZone = new + * SimpleTimeZone(9*millisPerHour,"KST"); fmt.setTimeZone(timeZone); + * + * int year = Integer.valueOf(date.substring(0,4)).intValue(); int month + * = Integer.valueOf(date.substring(4,6)).intValue(); int day = + * Integer.valueOf(date.substring(6,8)).intValue(); + * + * java.util.Calendar aDay = Calendar.getInstance(); + * aDay.set(year+1900,month,day); java.util.Calendar bDay + * =Calendar.getInstance(); bDay.set(1970+1900,1,1); java.util.Date cDay + * = new java.util.Date((aDay.getTime()).getTime() - + * (bDay.getTime()).getTime() + ((Day+1)*86400000) ); + * + * return fmt.format(cDay); + */ + // 2006-09-04 7:03오후 오동원수정 + String vFORMAT = "yyyy/MM/dd"; + return getDatewithSpan(date, Day, "D", vFORMAT); + + } + + /** + * 입력한 날짜 기준으로 몇(일,시간,분) 전,후 (주의)입력날짜는 구분자가 없는 string형
+ * + * @param date + * string date (20000315/2000031509/200003150915) + * @param unit + * long unit: 몇(일,시간,분) 전, 몇(일,시간,분) 후 + * @param type + * String type: D:Day H:Hour M:Minute + * @return String 계산된 문자열의 값. + */ + public static String getDatewithSpan(String date, long unit, String type, String strFormatType) + { + /* + * String formatType = strFormatType; int ihour = 0; int itime = 0; + * + * long dhm = 24 * 60 * 60 * 1000; + * + * if (type.equals("D")) { dhm =dhm + unit * 24 * 60 * 60 * 1000; } else + * if (type.equals("H")){ dhm =dhm + unit * 60 * 60 * 1000; } else if + * (type.equals("M")){ dhm =dhm + unit * 60 * 1000; } else{ return type + * + "은 부적절한 Type값입니다"; } + * + * switch (date.length()){ case (8): if (type.equals("H") || + * type.equals("M")) { return "HM-ERROR"; } + * + * break; case (10): if (type.equals("M")) { return "M-ERROR"; } + * + * ihour = Integer.valueOf(date.substring(8,10)).intValue(); break; case + * (12): + * + * ihour = Integer.valueOf(date.substring(8,10)).intValue(); itime = + * Integer.valueOf(date.substring(10,12)).intValue(); break; default: + * return "date Length Error"; } + * + * int millisPerHour = 60 * 60 * 1000; SimpleDateFormat fmt= new + * SimpleDateFormat(formatType); SimpleTimeZone timeZone = new + * SimpleTimeZone(9*millisPerHour,"KST"); fmt.setTimeZone(timeZone); + * + * int iyear = Integer.valueOf(date.substring(0,4)).intValue(); int + * imonth = Integer.valueOf(date.substring(4,6)).intValue(); int iday = + * Integer.valueOf(date.substring(6,8)).intValue(); java.util.Calendar + * aDay = Calendar.getInstance(); + * aDay.set(iyear+1900,imonth,iday,ihour,itime); java.util.Calendar bDay + * = Calendar.getInstance(); bDay.set(1970+1900,1,1,9,0); java.util.Date + * cDay = new java.util.Date((aDay.getTime()).getTime() - + * (bDay.getTime()).getTime() + dhm); return fmt.format(cDay); + */ + // 2006-09-04 7:03오후 오동원수정 + String formatType = strFormatType; + int ihour = 0; + int itime = 0; + if(!(type.equals("D") || type.equals("H") || type.equals("M"))) + { + return type + "은 부적절한 Type값입니다"; + } + + switch(date.length()) + { + case (8): + if(type.equals("H") || type.equals("M")) + { + return "HM-ERROR"; + } + break; + case (10): + if(type.equals("M")) + { + return "M-ERROR"; + } + ihour = Integer.parseInt(date.substring(8, 10)); + // ihour = Integer.valueOf(date.substring(8, 10)).intValue(); + break; + case (12): + ihour = Integer.parseInt(date.substring(8, 10)); + itime = Integer.parseInt(date.substring(10, 12)); + + // ihour = Integer.valueOf(date.substring(8, 10)).intValue(); + // itime = Integer.valueOf(date.substring(10, 12)).intValue(); + break; + default: + return "date Length Error"; + } + int iyear = Integer.parseInt(date.substring(0, 4)); + int imonth = Integer.parseInt(date.substring(4, 6)); + int iday = Integer.parseInt(date.substring(6, 8)); + + /* + int iyear = Integer.valueOf(date.substring(0, 4)).intValue(); + int imonth = Integer.valueOf(date.substring(4, 6)).intValue(); + int iday = Integer.valueOf(date.substring(6, 8)).intValue(); + */ + + int imonth1 = imonth - 1; // 달은 0달부터 시작한다. + java.util.Calendar zDay = Calendar.getInstance(); + zDay.set(iyear, imonth1, iday, ihour, itime); + + if(type.equals("D")) + { + zDay.add(Calendar.DATE, (int) unit); + } + else if(type.equals("H")) + { + zDay.add(Calendar.HOUR_OF_DAY, (int) unit); + } + else if(type.equals("M")) + { + zDay.add(Calendar.MINUTE, (int) unit); + } + else + { + return type + "은 부적절한 Type값입니다"; + } + java.util.Date z1Day = zDay.getTime(); + java.text.SimpleDateFormat fmt2 = new java.text.SimpleDateFormat(formatType); + return fmt2.format(z1Day); + + } + + /** + * 현재 시간을 기준으로 몇 일후 시간 시간의 형태는 (yyyy/mm/dd) + * + * @param day + * 더하려는 날짜 + * @return str 현재 시간에 입력 시간을 더한 DATE형 시간 + */ + public static String getDatewithSpan(long day) + { + /* + * int millisPerHour = 60 * 60 * 1000; SimpleDateFormat fmt= new + * SimpleDateFormat("yyyy/MM/dd"); SimpleTimeZone timeZone = new + * SimpleTimeZone(9*millisPerHour,"KST"); fmt.setTimeZone(timeZone); + * + * long time = System.currentTimeMillis(); long span = ( 60 * 60 * 1000 + * * 24 ) * day; //하루에 대한 millisecond... long time2 = time + span; + * String str=fmt.format(new java.util.Date(time2)); + * + * return str; + */ + String strSYSDATE = CommonUtil.getKST("yyyyMMddHH"); // 지금 시간 + String vFORMAT = "yyyy/MM/dd"; + return getDatewithSpan(strSYSDATE, day, "D", vFORMAT); + + } + + public static long stol(String str) + { + if(str == null ) return 0; + return (Long.valueOf(str).longValue()); + } + + /** + 문자열을 중 특정 문자열을 변환시킨다. + @version 1.0 + @author Yoon Su-wan + @since JDK1.0 + @param targeter 대상문자열 + @param target_str 변환될 대상문자열 + @param replace_str 변환될 문자열 + @return target_str이 replace_str로 변환된 문자열 + */ + public static String getReplacedString(String targeter, String target_str, String replace_str) + { + if( targeter == null + || target_str == null + || replace_str == null ) + return "debug : parameter value is null"; + + if(target_str.length() == 0) + return targeter; + + StringBuffer str = new StringBuffer(); + int start_ptr = 0; + int current_ptr = 0; + int increment_size = replace_str.length(); + if(increment_size == 0 ) increment_size = 1; + + while((current_ptr = targeter.indexOf(target_str, start_ptr)) != -1) + { + str.append(targeter.substring(start_ptr, current_ptr)); + str.append(replace_str); + start_ptr = current_ptr + increment_size; + if(start_ptr >= targeter.length()) + break; + }//end while + + if(start_ptr == 0) + return targeter; + + if(start_ptr < targeter.length()) + str.append(targeter.substring(start_ptr)); + + return str.toString(); + }//getReplacedString(String targeter, String target_str, String replace_str) + + /** + 받은메세지에서 v_s1값을 찾아서 v_s2로 대치한다. + @version 1.0 + @author Yoon Su-wan + @since JDK1.0 + @param v_msg 대상문자열 + @param v_s1 변환될 대상문자열 + @param v_s2 변환될 문자열 + @return v_s1이 v_s2 변환된 문자열 + */ + + public static String getReplacedString2(String v_msg, String v_s1, String v_s2) + { + int idx = v_msg.indexOf(v_s1); + + if (idx == -1) return v_msg; + else + { + try + { + return v_msg.substring(0, idx) + v_s2 + v_msg.substring(idx+2); + } catch (Exception e) + { + return v_msg.substring(0, idx) + v_s2; + } + } + + } + + public static String getReplacedString3(String sStr, String n1, String n2) + { + int iTmp = 0; + if (sStr == null) return ""; + + String sTmp = sStr; + StringBuffer sbSave = new StringBuffer(); + sbSave.append(""); + while (sTmp.indexOf(n1) > -1) + { + iTmp = sTmp.indexOf(n1); + sbSave.append(sTmp.substring(0,iTmp)); + sbSave.append(n2); + sTmp = sTmp.substring(iTmp + n1.length()); + } + sbSave.append(sTmp); + return sbSave.toString(); + } + + public static Vector arrToDouVector(String strArray, String strDelimt) + { + String[] stArray = strArray.split(strDelimt); + + double[] dArray = Arrays.stream(stArray).mapToDouble(Double::parseDouble).toArray(); + Vector vReturn = new Vector(); + + if(dArray==null) return vReturn; + + for(double dTemp: dArray) + { + vReturn.add(dTemp); + } + + return vReturn; + + } + + public static String arrListToString(List list) + { + String strReturn=""; + + if(list == null ) return ""; + + for(int i=0; i"+strTemp); + // double dou = Double.parseDouble(strTemp); + // strReturn = strReturn+","+dou; + strReturn = strReturn+","+strTemp; + } + + strReturn = strReturn.substring(1); + + return strReturn; + + } + + /** + Map 데이터를 JSONObject로 변환. + @version 1.0 + @author Yoon Su-wan + @since JDK1.0 + @param v_msg Map + @return JSONObject + */ + public static JSONObject getJsonFromMap(Map map) throws JSONException + { + JSONObject jsonData = new JSONObject(); + + for (String key : map.keySet()) + { + Object value = map.get(key); + if (value instanceof Map) + { + value = getJsonFromMap((Map) value); + } + jsonData.put(key, value); + } + return jsonData; + } + + + +} diff --git a/src/main/java/com/urpsys/baseauth/common/DataSourceUtil.java b/src/main/java/com/urpsys/baseauth/common/DataSourceUtil.java new file mode 100644 index 00000000..d850aa45 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/common/DataSourceUtil.java @@ -0,0 +1,111 @@ +package com.urpsys.baseauth.common; + +import javax.sql.DataSource; + +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.springframework.core.env.Environment; +import org.springframework.core.io.Resource; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +import com.urpsys.baseauth.common.crypto.Aes256Cipher; +import com.urpsys.baseauth.common.exception.CustomException; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +/** + * Datasource 생성하는 유틸리티 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28   나혁제         최초작성
+ *
+ *
+ */ + +public class DataSourceUtil +{ + /** + * 데이터 소스 만드는 메소드 + * @param dataSourceName + * @param env + * @param cipher + * @return + */ + public static DataSource createDataSource(String dataSourceName, Environment env, Aes256Cipher cipher) + { + HikariConfig config = new HikariConfig(); + + config.setDriverClassName (env.getProperty(dataSourceName + ".driverClassName" )); + config.setJdbcUrl (env.getProperty(dataSourceName + ".jdbcUrl" )); + + config.setUsername (cipher.decrypt(env.getProperty(dataSourceName + ".username"))); + config.setPassword (cipher.decrypt(env.getProperty(dataSourceName + ".password"))); + + config.setAutoCommit(false); + + config.setMaximumPoolSize (Integer.parseInt(env.getProperty(dataSourceName + ".maximumPoolSize" ))); + config.setMinimumIdle (Integer.parseInt(env.getProperty(dataSourceName + ".minimumIdle" ))); + config.setConnectionTimeout (Long.parseLong (env.getProperty(dataSourceName + ".connectionTimeout" ))); + config.setIdleTimeout (Long.parseLong (env.getProperty(dataSourceName + ".idleTimeout" ))); + + config.addDataSourceProperty("cachePrepStmts" , "true"); + config.addDataSourceProperty("prepStmtCacheSize" , "250"); + config.addDataSourceProperty("prepStmtCacheSqlLimit" , "2048"); + + return new HikariDataSource(config); + } + + /** + * SqlSessionFactory 만드는 메소드 + * @param dataSource + * @param configLocation + * @param mapperLocation + * @return + * @throws CustomException + */ + public static SqlSessionFactory createSqlSessionFactory(DataSource dataSource, Resource configLocation, + Resource[] mapperLocation) throws CustomException + { + SqlSessionFactory sqlSessionFactory; + + try { + SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean(); + sessionFactoryBean.setDataSource(dataSource); + sessionFactoryBean.setConfigLocation(configLocation); + sessionFactoryBean.setMapperLocations(mapperLocation); + + sqlSessionFactory = sessionFactoryBean.getObject(); + } + catch (Exception ex) + { + throw new CustomException(ex.getMessage()); + } + + return sqlSessionFactory; + } + + /** + * 트랜잭션 처리 메소드 + * @param dataSource + * @return + */ + public static DataSourceTransactionManager createTxManager(DataSource dataSource) + { + DataSourceTransactionManager txManager = new DataSourceTransactionManager(dataSource); + txManager.setGlobalRollbackOnParticipationFailure(false); + + return txManager; + } + + //end method +} diff --git a/src/main/java/com/urpsys/baseauth/common/crypto/Aes256Cipher.java b/src/main/java/com/urpsys/baseauth/common/crypto/Aes256Cipher.java new file mode 100644 index 00000000..6407a4c8 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/common/crypto/Aes256Cipher.java @@ -0,0 +1,142 @@ +package com.urpsys.baseauth.common.crypto; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.InvalidKeyException; +import java.util.Properties; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; +import org.springframework.core.io.ClassPathResource; + +import com.urpsys.baseauth.common.CommonUtil; + +/** + * aes 256 암호화 클래스 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일         수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28     나혁제         최초작성
+ *
+ *
+ */ + +public class Aes256Cipher +{ + private SecretKey keySpec; // keySpec + private IvParameterSpec ivSpec; // ivSpec + + /** + * Aes256Cipher 생성자 + * + * @param keyFile 키 파일 위치를 입력 받음 + * @throws IOException 파일 io 시 발생하는 익셉션 + * @throws InvalidKeyException key가 잘못되었을 경우 발생하는 익셉션 + * @throws DecoderException 암호화된 문자열을 decoding할 때 발생하는 익셉션 + */ + public Aes256Cipher() throws IOException, InvalidKeyException, DecoderException { + + String activeProfile = (CommonUtil.nvl(System.getProperty("spring.profiles.active"))); + + InputStream fis = null; + String secretKey = null; + + try + { + fis = new ClassPathResource("secrets/UrpSystem.keystore").getInputStream(); + + Properties props = new Properties(); + props.load(fis); + secretKey = props.getProperty("aes256.key"); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + finally + { + fis.close(); + } + + byte[] secretKeyBytes = Hex.decodeHex(secretKey); + + if (secretKeyBytes.length != 32) { + throw new InvalidKeyException("Invalid key (key length is not valid) "); + } + + byte[] ivBytes = new byte[16]; + + System.arraycopy(secretKeyBytes, 0, ivBytes, 0, 16); + + keySpec = new SecretKeySpec(secretKeyBytes, "AES"); + ivSpec = new IvParameterSpec(ivBytes); + } + + /** + * encryption 하는 메소드 + * + * @param plainStr 평문을 입력 받음 + * @return 암호화된 문자열 + */ + public String encrypt(String plainStr) { + if (plainStr == null) { + return null; + } + + String encryptedStr = null; + + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); + byte[] encrypted = cipher.doFinal(plainStr.getBytes("UTF-8")); + encryptedStr = new String(Base64.encodeBase64(encrypted)); + } catch (Exception ex) { + ex.printStackTrace(); + } + + return encryptedStr; + } + + /** + * 암호화된 문자열을 복호화하는 메소드 + * + * @param encryptedStr 암호화된 문자열 + * @return 암호화가 해제된 문자열 + */ + public String decrypt(String encryptedStr) { + if (encryptedStr == null) + { + return null; + } + + String decryptedStr = null; + + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + + cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); + byte[] byteStr = Base64.decodeBase64(encryptedStr.getBytes("UTF-8")); + decryptedStr = new String(cipher.doFinal(byteStr), "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + + return decryptedStr; + } +} diff --git a/src/main/java/com/urpsys/baseauth/common/exception/CustomException.java b/src/main/java/com/urpsys/baseauth/common/exception/CustomException.java new file mode 100644 index 00000000..bcf20646 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/common/exception/CustomException.java @@ -0,0 +1,114 @@ +package com.urpsys.baseauth.common.exception; + +import java.sql.SQLSyntaxErrorException; + +import lombok.Getter; + +/** + * Custom exception 클래스 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28   나혁제         최초작성
+ *
+ *
+ */ + +public class CustomException extends Exception +{ + private static final long serialVersionUID = 3559302713942492181L; + + @Getter + private String errorCode; + + @Getter + private String errorMsg; + + /** + * 생성자(throwable를 받아서 exception 종류에 따라 에러 코드 정의하는 클래스) + * 에러코드 처리 부분은 향후 db에서 에러코드 읽어와서 매핑하는 것으로 + * 변경 가능성 있음 + * @param throwable + */ + public CustomException(Throwable throwable) { + Throwable rootThrowable = getRootCause(throwable); + + // TODO 에러 코드는 상세 정의해서 define 해야 함 + if(rootThrowable instanceof SQLSyntaxErrorException) { + this.errorCode = "100"; + this.errorMsg = "SQL 오류"; + } else if(rootThrowable instanceof ArithmeticException) { + this.errorCode = "200"; + this.errorMsg = "연산 오류"; + } else { + this.errorCode = "900"; + this.errorMsg = "Unknown Error"; + } + } + + /** + * 생성자(에러메시지만 받을 경우 에러코드를 0을 default로 세팅) + * @param errorMsg + */ + public CustomException(String errorMsg) { + super(errorMsg); + this.errorCode = "0"; + this.errorMsg = errorMsg; + } + + /** + * 생성자(errorcode, errmsg를 받아 세팅, 소스코드에서 편하게 사용하기 위해 + * 에러코드를 int 값으로 받으면 string으로 변환하여 저장) + * @param errorCode + * @param errorMsg + */ + public CustomException(int errorCode, String errorMsg) { + super(errorMsg); + this.errorCode = String.valueOf(errorCode); + this.errorMsg = errorMsg; + } + + /** + * 생성자(에러코드, 에러메시지를 받아 세팅) + * @param errorCode + * @param errorMsg + */ + public CustomException(String errorCode, String errorMsg) { + super(errorMsg); + this.errorCode = errorCode; + this.errorMsg = errorMsg; + } + + /** + * stack에서 에러코드 중 root cause를 찾아내는 메소드 + * @param throwable + * @return + */ + private Throwable getRootCause(Throwable throwable) { + Throwable cause = throwable.getCause(); + + if (cause == null) { + return throwable; + } + + while (true) { + + if(cause.getCause() == null) { + break; + } else { + cause = cause.getCause(); + } + } + + return cause; + } +} diff --git a/src/main/java/com/urpsys/baseauth/config/CustomTokenEnhancer.java b/src/main/java/com/urpsys/baseauth/config/CustomTokenEnhancer.java new file mode 100644 index 00000000..175b4eea --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/config/CustomTokenEnhancer.java @@ -0,0 +1,90 @@ +package com.urpsys.baseauth.config; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; +import org.springframework.security.oauth2.common.OAuth2AccessToken; +import org.springframework.security.oauth2.provider.OAuth2Authentication; +import org.springframework.security.oauth2.provider.token.TokenEnhancer; + +import com.urpsys.baseauth.domain.MemberVO; + +/** + * 토큰 형태 구성 클래스 + * + * @author 나혁제 + * @since 2025.01.03 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2025.01.03   나혁제         최초작성
+ *
+ *
+ */ + +public class CustomTokenEnhancer implements TokenEnhancer +{ + + // 필수생성 + @Override + public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) + { + MemberVO memberVo = (MemberVO) authentication.getPrincipal(); + + Map additionalInfo = new HashMap<>(); + + additionalInfo.put("strMEM_ID" , memberVo.getStrMEM_ID ()); + additionalInfo.put("strPWD" , memberVo.getStrPWD ()); + additionalInfo.put("strPWD_HINT" , memberVo.getStrPWD_HINT ()); + additionalInfo.put("strPWD_RANS" , memberVo.getStrPWD_RANS ()); + additionalInfo.put("strRRNO" , memberVo.getStrRRNO ()); + additionalInfo.put("strMEM_NM" , memberVo.getStrMEM_NM ()); + additionalInfo.put("strZIP_NO" , memberVo.getStrZIP_NO ()); + additionalInfo.put("strADDR" , memberVo.getStrADDR ()); + additionalInfo.put("strREGN_NO" , memberVo.getStrREGN_NO ()); + additionalInfo.put("strMEM_STACD" , memberVo.getStrMEM_STACD ()); + additionalInfo.put("strADDR2" , memberVo.getStrADDR2 ()); + additionalInfo.put("strEND_TELNO" , memberVo.getStrEND_TELNO ()); + additionalInfo.put("strMOVE_TELNO" , memberVo.getStrMOVE_TELNO ()); + additionalInfo.put("strGRP_ID" , memberVo.getStrGRP_ID ()); + additionalInfo.put("strMEM_FAX_NO" , memberVo.getStrMEM_FAX_NO ()); + additionalInfo.put("strMEM_EML_ADDR" , memberVo.getStrMEM_EML_ADDR ()); + additionalInfo.put("strMDL_TELNO" , memberVo.getStrMDL_TELNO ()); + additionalInfo.put("strJOIN_DTM" , memberVo.getStrJOIN_DTM ()); + additionalInfo.put("strSEX_CD" , memberVo.getStrSEX_CD ()); + additionalInfo.put("strESNTL_ID" , memberVo.getStrESNTL_ID ()); + additionalInfo.put("strLOCK_AT" , memberVo.getStrLOCK_AT ()); + additionalInfo.put("strLOCK_NCNT" , memberVo.getStrLOCK_NCNT ()); + additionalInfo.put("strLAST_CHG_DTM" , memberVo.getStrLAST_CHG_DTM ()); + additionalInfo.put("strLAST_PWD_CHG_DTM", memberVo.getStrLAST_PWD_CHG_DTM()); + additionalInfo.put("userSe" , memberVo.getUserSe ()); + additionalInfo.put("orgnztId" , memberVo.getOrgnztId ()); + additionalInfo.put("uniqId" , memberVo.getUniqId ()); + additionalInfo.put("userName" , memberVo.getStrMEM_NM ()); + additionalInfo.put("strLastConnectTime" , memberVo.getStrLastConnectTime ()); + + // 문자열로 변환 처리후 전송 + List authorities = new ArrayList(); + String strAuthority = ""; + for(GrantedAuthority grAuth : memberVo.getAuthorities()) + { + strAuthority = grAuth.getAuthority()+"-"; + } + additionalInfo.put("authorities", strAuthority); + + ((DefaultOAuth2AccessToken)accessToken).setAdditionalInformation(additionalInfo); + + return accessToken; + } + +} diff --git a/src/main/java/com/urpsys/baseauth/config/EncryptConfig.java b/src/main/java/com/urpsys/baseauth/config/EncryptConfig.java new file mode 100644 index 00000000..f2d7bf12 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/config/EncryptConfig.java @@ -0,0 +1,38 @@ +package com.urpsys.baseauth.config; + +import java.io.IOException; +import java.security.InvalidKeyException; +import org.apache.commons.codec.DecoderException; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.urpsys.baseauth.common.crypto.Aes256Cipher; + +/** + * 암호화 유틸리티를 등록하는 클래스 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28   나혁제         최초작성
+ *
+ *
+ */ + +@Configuration +public class EncryptConfig +{ + @Bean(name="aes256Cipher") + public Aes256Cipher aes256Cipher() throws InvalidKeyException, IOException, DecoderException + { + return new Aes256Cipher(); + } +} diff --git a/src/main/java/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.java b/src/main/java/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.java new file mode 100644 index 00000000..14817c0b --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/config/Oauth2AuthorizationConfig.java @@ -0,0 +1,206 @@ +package com.urpsys.baseauth.config; + +import java.util.Arrays; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.core.io.ClassPathResource; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.approval.ApprovalStore; +import org.springframework.security.oauth2.provider.approval.JdbcApprovalStore; +import org.springframework.security.oauth2.provider.token.TokenEnhancerChain; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore; +import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; +import org.springframework.security.oauth2.provider.token.store.KeyStoreKeyFactory; + +import com.urpsys.baseauth.common.crypto.Aes256Cipher; +import com.urpsys.baseauth.service.UserDetailService; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import lombok.extern.slf4j.Slf4j; + +/** + * 인증서버 기본세팅 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * @comment : + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28  나혁제         최초작성
+ *
+ *
+ */ + +@Slf4j +@EnableAuthorizationServer +@Configuration +public class Oauth2AuthorizationConfig extends AuthorizationServerConfigurerAdapter +{ + @Autowired + private UserDetailService userDetailService; + + @Autowired + private AuthenticationManager authenticationManager; + + /* DB 접속정보 */ + @Autowired + private DataSource dataSource; + + /* 환경정보 */ + @Autowired + private Environment env; + + /* aes256 암호화 유틸리티 */ + @Autowired + private Aes256Cipher aes256Cipher; + + @Autowired + private PasswordEncoder passwordEncoder; + + /** + * 인증허용범위 설정 (5번 설정등록) + * + * @param 인증 범위 객체 + * @return 인증 범위 상세객체 + */ + @Override + public void configure(AuthorizationServerSecurityConfigurer security) throws Exception + { + log.info(">>>>>>>>>> 5. Oauth2AuthorizationConfig | AuthorizationServerSecurityConfigurer | configure | 허용범위설정 <<<<<<<<<<"); + + security.tokenKeyAccess("permitAll()") + .checkTokenAccess("isAuthenticated()") + .allowFormAuthenticationForClients() + ; + + log.info("<<<<<<<<<< 5. Oauth2AuthorizationConfig | AuthorizationServerSecurityConfigurer | configure | 허용범위설정 >>>>>>>>>>"); + + } + + /** + * 접근 client 설정 (4번 설정등록) + * + * @param 클라이언트 접근정보 객체 + * @return 클라이언트 접근정보 상세 객체 + */ + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception + { + log.info(">>>>>>>>>> 4. Oauth2AuthorizationConfig | ClientDetailsServiceConfigurer | configure | 접근 클라이언트 설정 <<<<<<<<<<"); + + clients.inMemory() + .withClient("clientId") + .secret(passwordEncoder.encode("secretKey")) + .authorizedGrantTypes("authorization_code","password", "refresh_token", "client_credentials") // 가능한 토큰 발행 타입 + .scopes("read", "write") // 가능한 접근 범위 + .accessTokenValiditySeconds (60*60*24) // access 토큰 유효 시간 : 24시간 + .refreshTokenValiditySeconds(60*60*24) // refresh 토큰 유효 시간 : 24시간 + .redirectUris("http://localhost:9010/callback") // 가능한 redirect uri + .autoApprove(true); // 권한 동의는 자동으로 yes (false 로 할시 권한 동의 여부를 묻는다.) + + log.info("<<<<<<<<<< 4. Oauth2AuthorizationConfig | ClientDetailsServiceConfigurer | configure | 접근 클라이언트 설정 >>>>>>>>>>"); + } + + /** + * 인증, 토큰유형, 토큰발행처리등 토큰발행정보설정 (3번 설정등록) + * + * @param 인증,토큰정보 객체 + * @return 인증,토큰정보 상세객체 + */ + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception + { + log.info(">>>>>>>>>> 3. Oauth2AuthorizationConfig | AuthorizationServerEndpointsConfigurer | configure | 인증, 토큰 설정 <<<<<<<<<<"); + + TokenEnhancerChain tokenEnhancerChain = new TokenEnhancerChain(); + tokenEnhancerChain.setTokenEnhancers(Arrays.asList(new CustomTokenEnhancer(), jwtAccessTokenConverter())); // 토큰 enhancer 객체 생성 + + endpoints.authenticationManager(authenticationManager) // grant_type password를 사용하기 위함 + // (manager 지정 안할시 password type 으로 토큰 발행시 Unsupported grant type: password 오류 발생) + .userDetailsService(userDetailService) // refrash token 발행시 유저 정보 검사 하는데 사용하는 서비스 설정 + .tokenEnhancer(tokenEnhancerChain) // enhancer 설정 + .accessTokenConverter(jwtAccessTokenConverter()) + .approvalStore(approvalStore()) + ; + + log.info("<<<<<<<<<< 3. Oauth2AuthorizationConfig | AuthorizationServerEndpointsConfigurer | configure | 인증, 토큰 설정 >>>>>>>>>>"); + } + + + // 토큰 DB 저장 + public HikariDataSource datasource2() + { + HikariConfig config = new HikariConfig(); + + String dataSourceName = "primarydb"; + + config.setDriverClassName (env.getProperty(dataSourceName + ".driverClassName" )); + config.setJdbcUrl (env.getProperty(dataSourceName + ".jdbcUrl" )); + + config.setUsername (aes256Cipher.decrypt(env.getProperty(dataSourceName + ".username"))); + config.setPassword (aes256Cipher.decrypt(env.getProperty(dataSourceName + ".password"))); + + return new HikariDataSource(config); + } + + // 토큰 DB 저장 + @Bean + public TokenStore tokenStore() + { + DataSource ds2 = datasource2(); + return new JdbcTokenStore(ds2); + } + + // 권한 동의 DB 저장 + @Bean + public ApprovalStore approvalStore() + { + DataSource ds2 = datasource2(); + return new JdbcApprovalStore(ds2); + } + + + /** + * 자바토큰 발행 및 암호와 처리 + * + * @param 인증,토큰정보 객체 + * @return 인증,토큰정보 상세객체 + */ + @Bean + public JwtAccessTokenConverter jwtAccessTokenConverter() + { + // RSA 암호화 : 비 대칭키 암호화 : 공개키로 암호화 하면 개인키로 복호화 + KeyStoreKeyFactory keyStoreKeyFactory = new KeyStoreKeyFactory(new ClassPathResource("jwtkey.jks"), "corin1234".toCharArray()); + JwtAccessTokenConverter converter = new JwtAccessTokenConverter(); + converter.setKeyPair(keyStoreKeyFactory.getKeyPair("jwtkey")); + + return converter; + } + + + + + + + +} diff --git a/src/main/java/com/urpsys/baseauth/config/PasswordEncoderConfig.java b/src/main/java/com/urpsys/baseauth/config/PasswordEncoderConfig.java new file mode 100644 index 00000000..c55f66e4 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/config/PasswordEncoderConfig.java @@ -0,0 +1,77 @@ +package com.urpsys.baseauth.config; + +import java.util.Base64; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.password.PasswordEncoder; + +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +import lombok.extern.slf4j.Slf4j; + +/** + * 패스워드 암호화 정책 수립(접근 Client, 회원비미번호) + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * @comment : PasswordEncoder는 SpringSecurity5 이상에서는 필수 생성 처리 + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28  나혁제         최초작성
+ *
+ *
+ */ + +// +@Slf4j +@Configuration +public class PasswordEncoderConfig +{ + @Bean + public PasswordEncoder passwordEncoder() + { + // 1번설정 + log.info(">>>>>>>>>> 1. WebSecurityConfiguration passwordEncoder <<<<<<<<<<"); + + return new BCryptPasswordEncoder() + { + /** + * 입력정보을 암호화 하여 일치여부 확인 + * + * @param 입력pass, 등록pass + * @return 일치여부 + */ + @Override + public boolean matches(CharSequence rawPassword + , String encodedPassword) + { + log.info(">>>>>>>>>> WebSecurityConfiguration BCryptPasswordEncoder matches <<<<<<<<<<"); + + log.info("입력 rawPassword => {}", rawPassword ); + log.info("DB encodedPassword => {}", encodedPassword ); + log.info("변환 password => {}", super.encode(rawPassword) ); // 양방향 암호화 정책으로 print 부분이 다름 + + if (super.matches(rawPassword, encodedPassword)) + { + log.info("===> password match "); + return true; + } + else + { + log.info("===> password not match "); + return false; + } + } + }; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/urpsys/baseauth/config/PrimaryDbConfig.java b/src/main/java/com/urpsys/baseauth/config/PrimaryDbConfig.java new file mode 100644 index 00000000..c5d858c8 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/config/PrimaryDbConfig.java @@ -0,0 +1,113 @@ +package com.urpsys.baseauth.config; + +import java.io.IOException; +import java.sql.Connection; + +import javax.sql.DataSource; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import com.urpsys.baseauth.common.DataSourceUtil; +import com.urpsys.baseauth.common.crypto.Aes256Cipher; +import com.urpsys.baseauth.common.exception.CustomException; + +/** + * primary db config 클래스 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28  나혁제         최초작성
+ *
+ *
+ */ + +@Configuration +@EnableTransactionManagement +@MapperScan(value="com.urpsys.baseauth.dao", sqlSessionFactoryRef="primarySqlSessionFactory") +public class PrimaryDbConfig +{ + /* spring environment class */ + @Autowired + private Environment env; + + /* aes256 암호화 유틸리티 */ + @Autowired + private Aes256Cipher aes256Cipher; + + + /** + * 데이터소스 등록하는 메소드 + * @return + */ + @Bean(name="primaryDataSource") + public DataSource primaryDataSource() + { + return new LazyConnectionDataSourceProxy(DataSourceUtil.createDataSource("primarydb", env, aes256Cipher)); + } + + /** + * sqlsessionfactory 등록하는 메소드 + * + * @param dataSource + * @param context + * @return + * @throws SchedulerException + * @throws IOException + */ + @Bean(name="primarySqlSessionFactory") + public SqlSessionFactory primarySqlSessionFactory(@Qualifier("primaryDataSource") DataSource dataSource, ApplicationContext context) + throws CustomException, IOException + { + SqlSessionFactory sqlSessionFactory = DataSourceUtil.createSqlSessionFactory( dataSource + , context.getResource ("classpath:mapper/primarydb/config/MybatisConfig.xml") + , context.getResources("classpath:mapper/primarydb/sqlmap/**/*Mapper*.xml") + ); + + sqlSessionFactory.getConfiguration().setDefaultExecutorType(ExecutorType.SIMPLE); + + return sqlSessionFactory; + } + + /** + * sqlsessiontemplate 등록하는 메소드 + * @param primarySqlSessionFactory + * @return + */ + @Bean("primarySqlSessionTemplate") + public SqlSessionTemplate mainSqlSessionTemplate(@Qualifier("primarySqlSessionFactory") SqlSessionFactory primarySqlSessionFactory) + { + return new SqlSessionTemplate(primarySqlSessionFactory); + } + + /** + * 트랜잭션 매니저 등록하는 메소드 + * @param dataSource + * @return + */ + @Bean(name="primaryTxManager") + public PlatformTransactionManager primaryTxManager(@Qualifier("primaryDataSource") DataSource dataSource) + { + return DataSourceUtil.createTxManager(dataSource); + } +} + diff --git a/src/main/java/com/urpsys/baseauth/config/SecurityConfig.java b/src/main/java/com/urpsys/baseauth/config/SecurityConfig.java new file mode 100644 index 00000000..015643b8 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/config/SecurityConfig.java @@ -0,0 +1,116 @@ +package com.urpsys.baseauth.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.authentication.AuthenticationFailureHandler; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; + +import com.urpsys.baseauth.inner.handler.CustomFailHandler; +import com.urpsys.baseauth.inner.handler.CustomSuccessHandler; +import com.urpsys.baseauth.inner.provider.CustomAuthenticationProvider; + +import lombok.extern.slf4j.Slf4j; + +/** + * 웹설정에 스프링시큐리티 기본세팅 + * + * @author 나혁제 + * @since 2023.02.28 + * @version 1.0.0 + * @see + * @comment : + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일        수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28    나혁제         최초작성
+ *
+ *
+ */ + + +@Slf4j +@EnableWebSecurity +@Configuration +public class SecurityConfig extends WebSecurityConfigurerAdapter +{ + @Autowired + private CustomAuthenticationProvider customAuthenticationProvider; + + /** + * 서버보안 설정 (6번 설정등록) + * + * @param 웹서버 보안객체 + * @return 웹서버 보안 상세 객체 + */ + @Override + protected void configure(HttpSecurity http) throws Exception + { + log.info(">>>>>>>>>> SecurityConfig | HttpSecurity | configure | 서버보안설정 <<<<<<<<<<"); + + http.csrf().disable() // csrf 공격을 막기 위해 state 값을 전달 받지 않는다 + .formLogin() // 기본 제공하는 로그인 화면 사용 + .loginPage("/oauth/login") // 커스텀 로그인 페이지 설정 + .failureHandler(failureHandler()) // 로그인 실패 custom + .successHandler(successHandler()) // 로그인 성공 custom + .and() + .httpBasic(); // http 통신으로 basic auth를 사용 할 수 있다. (ex: Authorization: Basic bzFbdGfmZrptWY30YQ==) + + log.info("<<<<<<<<<< SecurityConfig | HttpSecurity | configure | 서버보안설정 >>>>>>>>>>"); + } + + /** + * authenticationManager bean 생성 하여 셋팅 안할시 grant_type : password 지원 안함 + * @return + * @throws Exception + */ + @Bean + @Override + protected AuthenticationManager authenticationManager() throws Exception + { + return super.authenticationManager(); + } + + /** + * 사용자를 인증하는 방법이 담긴 객체 (2번 설정등록) + * + * @param 인증객체 + * @return 상세인증처리 방법 세팅 + */ + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception + { + // 2번 설정등록 + log.info(">>>>>>>>>> 2.SecurityConfig configure AuthenticationManagerBuilder <<<<<<<<<<"); + + auth.authenticationProvider(customAuthenticationProvider); + + log.info("<<<<<<<<<< 2.SecurityConfig configure AuthenticationManagerBuilder >>>>>>>>>>"); + } + + @Bean + public AuthenticationFailureHandler failureHandler() + { + return new CustomFailHandler(); + } + + @Bean + public AuthenticationSuccessHandler successHandler() + { + return new CustomSuccessHandler(); + } + + + + + +} diff --git a/src/main/java/com/urpsys/baseauth/dao/MemberDao.java b/src/main/java/com/urpsys/baseauth/dao/MemberDao.java new file mode 100644 index 00000000..42eb6f3b --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/dao/MemberDao.java @@ -0,0 +1,48 @@ +package com.urpsys.baseauth.dao; + +import java.util.LinkedHashMap; + +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +import com.urpsys.baseauth.domain.MemberVO; + +/** + * 회원정보 추출 Mapper + * + * @author urp 인프라본부 나혁제 + * @since 2025.01.23 + * @version 1.0.0 + * @see + * @comment : + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일        수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2025.01.23    나혁제         최초작성
+ *
+ *
+ */ + +@Mapper +@Repository +public interface MemberDao +{ + public MemberVO actionLogin(String strId); // 회원정보 추출 + + // 최종접속시간 획득 + public String getLastConnectTime(String strUniqId); + + // 회원 lock 정보 확인 + public LinkedHashMap selectLoginIncorrect(String strId); + + // 회원 lock Count 처리 + public int updateLoginLockAdd(String strId); + + // 회원 lock 해제 처리 + public int updateLoginLockCancel(String strId); + +} diff --git a/src/main/java/com/urpsys/baseauth/domain/MemberVO.java b/src/main/java/com/urpsys/baseauth/domain/MemberVO.java new file mode 100644 index 00000000..3cb96d04 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/domain/MemberVO.java @@ -0,0 +1,171 @@ +package com.urpsys.baseauth.domain; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.SpringSecurityCoreVersion; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.util.Assert; + +import lombok.Data; + +/** + * 사용자 정보 VO + * + * @author 나혁제 + * @since 2025.01.03 + * @version 1.0.0 + * @see + * @comment : UserDetails 상속처리해야 userDetailService 사용가능 + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일         수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2025.01.03     나혁제         최초작성
+ *
+ *
+ */ + +@Data +public class MemberVO extends TbGnlMemInfoVO implements UserDetails +{ + /** + * + */ + private String login; + private String passwordHash; + private Set authorities; // 계정이 가지고 있는 권한 목록 + + public void setAuthorities(Collection authorities) + { + this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities)); + } + + private static SortedSet sortAuthorities(Collection authorities) + { + Assert.notNull(authorities, "Cannot pass a null GrantedAuthority collection"); + // Ensure array iteration order is predictable (as per UserDetails.getAuthorities() contract and SEC-717) + SortedSet sortedAuthorities = + new TreeSet(new AuthorityComparator()); + + for (GrantedAuthority grantedAuthority : authorities) + { + Assert.notNull(grantedAuthority, "GrantedAuthority list cannot contain any null elements"); + sortedAuthorities.add(grantedAuthority); + } + + return sortedAuthorities; + } + + + /** + * Returns the authorities granted to the user(필수) + * + * @return 웹서버 보안 상세 객체 + */ + @Override + public Collection getAuthorities() + { + return authorities; + } + + /** + * Returns the password used to authenticate the user(필수) + * + * @return 패스워드 + */ + @Override + public String getPassword() + { + return this.passwordHash; + } + + /** + * Returns the username used to authenticate the user.(필수) + * + * @return ID + */ + @Override + public String getUsername() + { + return this.login; + } + + /** + * Indicates whether the user's account has expired.(필수) + * + * @return id 만료여부 + */ + @Override + public boolean isAccountNonExpired() + { + return true; + } + + /** + * Indicates whether the user is locked or unlocked.(필수) + * + * @return id 잠금여부 + */ + @Override + public boolean isAccountNonLocked() + { + return true; + } + + /** + * Indicates whether the user's credentials (password) has expired.(필수) + * + * @return password 잠금여부 + */ + @Override + public boolean isCredentialsNonExpired() + { + return true; + } + + /** + * Indicates whether the user is enabled or disabled.(필수) + * + * @return ID 사용여부 + */ + @Override + public boolean isEnabled() + { + return true; + } + + private static class AuthorityComparator implements Comparator, Serializable + { + private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + + public int compare(GrantedAuthority g1, GrantedAuthority g2) + { + // Neither should ever be null as each entry is checked before adding it to the set. + // If the authority is null, it is a custom authority and should precede others. + if (g2.getAuthority() == null) { + return -1; + } + + if (g1.getAuthority() == null) { + return 1; + } + + return g1.getAuthority().compareTo(g2.getAuthority()); + } + } + + +} diff --git a/src/main/java/com/urpsys/baseauth/domain/TbGnlMemInfoVO.java b/src/main/java/com/urpsys/baseauth/domain/TbGnlMemInfoVO.java new file mode 100644 index 00000000..577028b7 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/domain/TbGnlMemInfoVO.java @@ -0,0 +1,59 @@ +package com.urpsys.baseauth.domain; + +import lombok.Data; + +/** + * 사용자 정보 VO + * + * @author 나혁제 + * @since 2025.01.03 + * @version 1.0.0 + * @see + * @comment : UserDetails 상속처리해야 userDetailService 사용가능 + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일         수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2025.01.03     나혁제         최초작성
+ *
+ *
+ */ + + +@Data +public class TbGnlMemInfoVO +{ + private String strMEM_ID; + private String strPWD; + private String strPWD_HINT; + private String strPWD_RANS; + private String strRRNO; + private String strMEM_NM; + private String strZIP_NO; + private String strADDR; + private String strREGN_NO; + private String strMEM_STACD; + private String strADDR2; + private String strEND_TELNO; + private String strMOVE_TELNO; + private String strGRP_ID; + private String strMEM_FAX_NO; + private String strMEM_EML_ADDR; + private String strMDL_TELNO; + private String strJOIN_DTM; + private String strSEX_CD; + private String strESNTL_ID; + private String strLOCK_AT; + private String strLOCK_NCNT; + private String strLAST_CHG_DTM; + private String strLAST_PWD_CHG_DTM; + + private String userSe; + private String orgnztId; + private String uniqId; + private String strAuthCd; + private String strLastConnectTime; +} diff --git a/src/main/java/com/urpsys/baseauth/inner/handler/CustomFailHandler.java b/src/main/java/com/urpsys/baseauth/inner/handler/CustomFailHandler.java new file mode 100644 index 00000000..c2fcf3a8 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/inner/handler/CustomFailHandler.java @@ -0,0 +1,69 @@ +package com.urpsys.baseauth.inner.handler; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; + +import lombok.extern.slf4j.Slf4j; + +/** + * 회원인증 실패시 처리 handler + * + * @author urp 인프라본부 나혁제 + * @since 2025.01.23 + * @version 1.0.0 + * @see + * @comment : + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28   나혁제         최초작성
+ *
+ *
+ */ + +@Slf4j +public class CustomFailHandler extends SimpleUrlAuthenticationFailureHandler +{ + /** + * 회원인증 실패시 처리 + * + * @param HttpServletRequest + * , HttpServletResponse + * , AuthenticationException // 실패 Exception + * @return + * @throw + */ + @Override + public void onAuthenticationFailure(HttpServletRequest request + , HttpServletResponse response + , AuthenticationException exception) throws IOException, ServletException + { + log.debug(">>>>>>>>>> CustomFailHandler onAuthenticationFailure <<<<<<<<<<"); + + log.error("exception 메세지 확인 => {}", exception.getMessage()); + exception.printStackTrace(); + + if(exception instanceof UsernameNotFoundException) + { + log.error("### => {}", exception.getMessage()); + response.sendRedirect("http://localhost:9010/oauth/login?error="+exception.getMessage()); + } + + log.debug("<<<<<<<<<< CustomFailHandler onAuthenticationFailure >>>>>>>>>>"); + } + + + + +} diff --git a/src/main/java/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.java b/src/main/java/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.java new file mode 100644 index 00000000..82c1c973 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/inner/handler/CustomSuccessHandler.java @@ -0,0 +1,51 @@ +package com.urpsys.baseauth.inner.handler; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.Authentication; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; + +import lombok.extern.slf4j.Slf4j; + +/** + * 회원인증 성공시 처리 handler + * + * @author urp 인프라본부 나혁제 + * @since 2025.01.23 + * @version 1.0.0 + * @see + * @comment : + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일       수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2023.02.28   나혁제         최초작성
+ *
+ *
+ */ + + +@Slf4j +public class CustomSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler +{ + @Override + public void onAuthenticationSuccess(HttpServletRequest request + , HttpServletResponse response + , Authentication authentication) throws ServletException, IOException + { + log.debug(">>>>>>>>>> CustomSuccessHandler onAuthenticationSuccess <<<<<<<<<<"); + + log.info("### login success => {}", authentication.getAuthorities()); + super.onAuthenticationSuccess(request, response, authentication); + + log.debug("<<<<<<<<<< CustomSuccessHandler onAuthenticationSuccess >>>>>>>>>>"); + + } +} diff --git a/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java b/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java new file mode 100644 index 00000000..a5be8e70 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java @@ -0,0 +1,127 @@ +package com.urpsys.baseauth.inner.provider; + +import java.util.LinkedHashMap; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; + +import com.urpsys.baseauth.service.UserDetailService; + +import lombok.extern.slf4j.Slf4j; + +/** + * Urp 기본 회원 인증수행처리 + * + * @author urp 인프라본부 나혁제 + * @since 2025.01.23 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일        수정자         수정내용
+ * -----------  ---------    ------------------------
+ * 2025.01.23    나혁제         최초작성
+ *
+ *
+ */ + +@Slf4j +@Component +public class CustomAuthenticationProvider implements AuthenticationProvider +{ + @Autowired + private UserDetailService userDetailService; + + @Autowired + PasswordEncoder passwordEncoder; + + /** + * 인증수행처리(필수생성) + * + * @param 인증 입력정보 + * @return 인증정보 + */ + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException + { + log.info(">>>>>>>>>> CustomAuthenticationProvider authenticate <<<<<<<<<<"); + + String username = (String) authentication.getPrincipal(); + String password = (String) authentication.getCredentials(); + + // 사용자 Lock 체크 + LinkedHashMap returnMap = userDetailService.selectLoginIncorrect(username); + + // 해당 회원 ID Lock 상태 + if(returnMap != null) + { + log.info(" 확인해보자 => {}", returnMap.toString()); + + if(returnMap.get("lockAt") != null && returnMap.get("lockAt").equals("Y")) + { + throw new UsernameNotFoundException("-1:id is locked"); + } + } + + log.info("## => username:{} | password:{} ", username, password); + log.info("## => 또다른 정보1 : [{}] ", authentication.getDetails()); + log.info("## => 또다른 정보2 : [{}] ", authentication.toString()); + + UserDetails info = userDetailService.loadUserByUsername(username); // 사용자 정보 추출 + + if(ObjectUtils.isEmpty(info)) + { + throw new UsernameNotFoundException("-2:user not found"); + } + + // 패스워드 일치 여부 확인 + log.info("입력 username => {} ", username); + log.info("입력 password => {} ", password); + + log.info("입력 변환 password => {} ", passwordEncoder.encode(password)); + + if (passwordEncoder.matches(password, info.getPassword())) + { + log.debug("패스워드 일치"); + + userDetailService.updateLoginLockCancel(username); // lock count 해제 + } + else + { + log.debug("패스워드 불일치"); + + userDetailService.updateLoginLockAdd(username); // lock count 추가 + + throw new UsernameNotFoundException("-3:please password check"); + } + + log.error("## => {}", info.getAuthorities()); + log.info("<<<<<<<<<< CustomAuthenticationProvider authenticate >>>>>>>>>>"); + + // principal 정보는 jwt 토큰 생성시 추가정보 넣는데 사용하오니 필요한 정보는 여기서 넣어주세요. + return new UsernamePasswordAuthenticationToken(info, password, info.getAuthorities()); + + } + + @Override + public boolean supports(Class authentication) + { + log.debug(">>>>>>>>>> CustomAuthenticationProvider supports <<<<<<<<<<"); + return authentication.equals(UsernamePasswordAuthenticationToken.class); + } + + + + +} diff --git a/src/main/java/com/urpsys/baseauth/service/UserDetailService.java b/src/main/java/com/urpsys/baseauth/service/UserDetailService.java new file mode 100644 index 00000000..6ba1f1a4 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/service/UserDetailService.java @@ -0,0 +1,108 @@ +package com.urpsys.baseauth.service; + +import lombok.extern.slf4j.Slf4j; + +import java.util.Arrays; +import java.util.LinkedHashMap; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +// import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import com.urpsys.baseauth.dao.MemberDao; +import com.urpsys.baseauth.domain.MemberVO; + +/** + * 회원정보 추출 서비스 + * + * @author urp 인프라본부 나혁제 + * @since 2025.01.23 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일        수정자       수정내용
+ * -----------  ---------  ------------------------
+ * 2025.01.23    나혁제       최초작성
+ *
+ *
+ */ + +@Slf4j +@Service +public class UserDetailService implements UserDetailsService +{ + + @Autowired + private MemberDao memberDao; + + /** + * 회원정보 추출 + * 필수생성 + */ + @Override + public UserDetails loadUserByUsername(String strUserId) throws UsernameNotFoundException + { + log.info(">>>>>>>>>> UserDetailService loadUserByUsername <<<<<<<<<<"); + log.info("strUserId=>{}", strUserId); + + MemberVO memberVo = memberDao.actionLogin(strUserId); + + + if(memberVo == null) + { + log.info("사용자가 존재하지 않음"); + } + else + { + memberVo.setPasswordHash(memberVo.getStrPWD()); + memberVo.setLogin(memberVo.getStrMEM_ID()); + + // memberVo.setAuthorities (Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"))); + + memberVo.setAuthorities (Arrays.asList(new SimpleGrantedAuthority( memberVo.getStrAuthCd() ))); + + log.info("memberVo getPASSWORD_HASH =>{}", memberVo.getPasswordHash()); + log.info("memberVo getPassword =>{}", memberVo.getPassword()); + log.info("memberVo getlogin =>{}", memberVo.getLogin()); + + // 최종접속시간 추가 + String strLastConnectTime = memberDao.getLastConnectTime(memberVo.getUniqId()); + memberVo.setStrLastConnectTime(strLastConnectTime); + } + + log.info("<<<<<<<<<< UserDetailService loadUserByUsername >>>>>>>>>>"); + + return memberVo; + } + + // 회원 lock 정보 확인 + public LinkedHashMap selectLoginIncorrect(String strId) + { + return memberDao.selectLoginIncorrect(strId); + } + + // 회원 lock Count 처리 + public int updateLoginLockAdd(String strId) + { + return memberDao.updateLoginLockAdd(strId); + } + + // 회원 lock 해제 처리 + public int updateLoginLockCancel(String strId) + { + return memberDao.updateLoginLockCancel(strId); + } + + + + +} diff --git a/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java b/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java new file mode 100644 index 00000000..08abf750 --- /dev/null +++ b/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java @@ -0,0 +1,81 @@ +package com.urpsys.baseauth; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +import com.urpsys.baseauth.common.CommonUtil; + +/** + * 인증서버 기본 실행 클래스 + * + * @author 나혁제 + * @since 2025.01.02 + * @version 1.0.0 + * @see + * + * 
+ *
+ * << 개정이력(Modification information) >>
+ *
+ *   수정일     수정자      수정내용
+ * -----------  ---------    ------------------------
+ * 2025.01.02   나혁제      최초작성
+ *
+ *
+ */ + +@SpringBootApplication +@ComponentScan(basePackages = {"com.urpsys.baseauth"}) +public class urpBaseAuthApplication +{ + public static void main(String[] args) + { + String activeProfile = (CommonUtil.nvl(System.getProperty("spring.profiles.active"))); + + if(activeProfile.equals("local")) + { + System.out.println("################################################"); + System.out.println("############# local Env ########################"); + System.out.println("################################################"); + } + else if(activeProfile.equals("hpnote")) + { + System.out.println("################################################"); + System.out.println("############# hpnote Env ########################"); + System.out.println("################################################"); + } + else if(activeProfile.equals("vmware")) + { + System.out.println("################################################"); + System.out.println("############# vmware Env ########################"); + System.out.println("################################################"); + } + else if(activeProfile.equals("infra_server")) + { + System.out.println("################################################"); + System.out.println("############# infra_server Env #################"); + System.out.println("################################################"); + } + else if(activeProfile.equals("kic_dev")) + { + System.out.println("################################################"); + System.out.println("############# kic_dev Env ######################"); + System.out.println("################################################"); + } + else if(activeProfile.equals("kic_rel")) + { + System.out.println("################################################"); + System.out.println("############# kic_rel Env ######################"); + System.out.println("################################################"); + } + else + { + System.out.println("################################################"); + System.out.println("############# No Define ########################"); + System.out.println("################################################"); + } + + SpringApplication.run(urpBaseAuthApplication.class, args); + } +} diff --git a/src/main/resources/application-hpnote.yml b/src/main/resources/application-hpnote.yml new file mode 100644 index 00000000..824363bd --- /dev/null +++ b/src/main/resources/application-hpnote.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.131:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/src/main/resources/application-infra_server.yml b/src/main/resources/application-infra_server.yml new file mode 100644 index 00000000..a14254f4 --- /dev/null +++ b/src/main/resources/application-infra_server.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://109.26.11.21:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/src/main/resources/application-kic_dev.yml b/src/main/resources/application-kic_dev.yml new file mode 100644 index 00000000..4eb0b150 --- /dev/null +++ b/src/main/resources/application-kic_dev.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.10.10.203:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/src/main/resources/application-kic_rel.yml b/src/main/resources/application-kic_rel.yml new file mode 100644 index 00000000..9f573676 --- /dev/null +++ b/src/main/resources/application-kic_rel.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 12000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.10.10.203:3306/ur_itms_rel_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: YvRZ5jyhmB6gwVSUGBOqNMQB00k6OZZSfUH5ZU4GEFs= + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 00000000..bce58e02 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,38 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.131:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true +# jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.138:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/src/main/resources/application-vmware.yml b/src/main/resources/application-vmware.yml new file mode 100644 index 00000000..824363bd --- /dev/null +++ b/src/main/resources/application-vmware.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.8.131:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false diff --git a/src/main/resources/jwtkey.jks b/src/main/resources/jwtkey.jks new file mode 100644 index 0000000000000000000000000000000000000000..9fa37e6f5c8f8eff515e067f8702e27b035a0b7c GIT binary patch literal 2583 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/log4jdbc.log4j2.properties b/src/main/resources/log4jdbc.log4j2.properties new file mode 100644 index 00000000..85d1ede9 --- /dev/null +++ b/src/main/resources/log4jdbc.log4j2.properties @@ -0,0 +1,2 @@ +log4jdbc.spylogdelegator.name = net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator +log4jdbc.dump.sql.maxlinelength=0 \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..c6ca64c0 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,100 @@ + + + ${HOSTNAME} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/logback.properties b/src/main/resources/logback.properties new file mode 100644 index 00000000..b54f5282 --- /dev/null +++ b/src/main/resources/logback.properties @@ -0,0 +1,4 @@ +ows.log.path=C://ode/logs/was +ows.log.level=debug +ows.log.filename=ows_adm_log +ows.log.err.filename=ows_adm_log_error diff --git a/src/main/resources/mapper/primarydb/config/MybatisConfig.xml b/src/main/resources/mapper/primarydb/config/MybatisConfig.xml new file mode 100644 index 00000000..f3cd1bf8 --- /dev/null +++ b/src/main/resources/mapper/primarydb/config/MybatisConfig.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml new file mode 100644 index 00000000..9616221e --- /dev/null +++ b/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + UPDATE TB_TASK_USER_INFO + SET LOCK_AT = CASE WHEN LOCK_NCNT > 1 THEN 'Y' + ELSE '' + END + , LOCK_NCNT = IFNULL(LOCK_NCNT,0)+1 + , LAST_CHG_DTM = sysdate() + WHERE TASK_USER_ID = #{id} + + + + UPDATE TB_TASK_USER_INFO + SET LOCK_AT = NULL + , LOCK_NCNT = NULL + , LAST_CHG_DTM = sysdate() + WHERE TASK_USER_ID = #{id} + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/primarydb/sqlmap/TestMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/TestMapper.xml new file mode 100644 index 00000000..45ee467b --- /dev/null +++ b/src/main/resources/mapper/primarydb/sqlmap/TestMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/secrets/UrpSystem.keystore b/src/main/resources/secrets/UrpSystem.keystore new file mode 100644 index 00000000..39528f7c --- /dev/null +++ b/src/main/resources/secrets/UrpSystem.keystore @@ -0,0 +1 @@ +aes256.key=52f48aa1c7435bc11bf909d9d7d1d5932f4bacd8184ec5c1eed6d03ee17fe126 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/tiles.xml b/src/main/webapp/WEB-INF/tiles/tiles.xml new file mode 100644 index 00000000..7cd3e45f --- /dev/null +++ b/src/main/webapp/WEB-INF/tiles/tiles.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c449c8c28bec1208f8cd7c9e076bb03db0ce0c99 Mon Sep 17 00:00:00 2001 From: nhj Date: Mon, 11 Aug 2025 17:53:28 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=EB=B0=98=EC=98=81=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java b/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java index 2539ae7c..9c6e5985 100644 --- a/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java +++ b/src/main/java/com/urpsys/baseauth/Aes256UrpPortalAuth.java @@ -12,7 +12,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; /** - * Hello world! + * Hello world!1 * */ public class Aes256UrpPortalAuth From 15549cd73c74a4efbe816abe458f95306b7a1866 Mon Sep 17 00:00:00 2001 From: nhj Date: Mon, 11 Aug 2025 18:01:21 +0900 Subject: [PATCH 03/16] =?UTF-8?q?path=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.classpath b/.classpath index 36064bc1..a50c6c85 100644 --- a/.classpath +++ b/.classpath @@ -12,7 +12,11 @@ - + + + + + From e5637f99801ac9ff042ba5579d157ec6d0817dd9 Mon Sep 17 00:00:00 2001 From: urp Date: Fri, 29 Aug 2025 13:10:45 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=ED=95=9C=EA=B5=AD=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EA=B8=B0=EC=88=A0=EC=9B=90=20=EC=84=A4=EC=B9=98=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 6 +-- .../baseauth/urpBaseAuthApplication.java | 6 +++ src/main/resources/application-keiti_prod.yml | 37 +++++++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/application-keiti_prod.yml diff --git a/.classpath b/.classpath index a50c6c85..36064bc1 100644 --- a/.classpath +++ b/.classpath @@ -12,11 +12,7 @@ - - - - - + diff --git a/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java b/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java index 08abf750..efb059a8 100644 --- a/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java +++ b/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java @@ -69,6 +69,12 @@ public class urpBaseAuthApplication System.out.println("############# kic_rel Env ######################"); System.out.println("################################################"); } + else if(activeProfile.equals("keiti_prod")) + { + System.out.println("################################################"); + System.out.println("############# keiti_prod Env ###################"); + System.out.println("################################################"); + } else { System.out.println("################################################"); diff --git a/src/main/resources/application-keiti_prod.yml b/src/main/resources/application-keiti_prod.yml new file mode 100644 index 00000000..e9656e54 --- /dev/null +++ b/src/main/resources/application-keiti_prod.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.100.76:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false From 94154a92c552e505ccaeed818ee1d058c08eb1be Mon Sep 17 00:00:00 2001 From: nhj Date: Mon, 1 Sep 2025 18:20:15 +0900 Subject: [PATCH 05/16] =?UTF-8?q?kic=20=EC=B6=94=EA=B0=80=EC=9A=94?= =?UTF-8?q?=EA=B5=AC=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/urpsys/baseauth/service/UserDetailService.java | 2 +- src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/urpsys/baseauth/service/UserDetailService.java b/src/main/java/com/urpsys/baseauth/service/UserDetailService.java index 6ba1f1a4..77fa57f3 100644 --- a/src/main/java/com/urpsys/baseauth/service/UserDetailService.java +++ b/src/main/java/com/urpsys/baseauth/service/UserDetailService.java @@ -84,7 +84,7 @@ public class UserDetailService implements UserDetailsService return memberVo; } - // 회원 lock 정보 확인 + // 회원 lock 정보 확인 public LinkedHashMap selectLoginIncorrect(String strId) { return memberDao.selectLoginIncorrect(strId); diff --git a/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml index 9616221e..e92cc861 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml @@ -46,9 +46,10 @@ WHERE TASK_USER_ID = #{id} + UPDATE TB_TASK_USER_INFO - SET LOCK_AT = CASE WHEN LOCK_NCNT > 1 THEN 'Y' + SET LOCK_AT = CASE WHEN LOCK_NCNT > 3 THEN 'Y' ELSE '' END , LOCK_NCNT = IFNULL(LOCK_NCNT,0)+1 From 07519ac507cd07425fabcd2645ae543357188fec Mon Sep 17 00:00:00 2001 From: urp Date: Fri, 19 Sep 2025 14:43:24 +0900 Subject: [PATCH 06/16] =?UTF-8?q?=EB=A1=9C=EA=B7=BC=EC=9D=B8=20lock=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseauth/urpBaseAuthApplication.java | 7 ++++ .../resources/application-kintex_prod.yml | 37 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 src/main/resources/application-kintex_prod.yml diff --git a/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java b/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java index efb059a8..e00e66e4 100644 --- a/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java +++ b/src/main/java/com/urpsys/baseauth/urpBaseAuthApplication.java @@ -75,6 +75,13 @@ public class urpBaseAuthApplication System.out.println("############# keiti_prod Env ###################"); System.out.println("################################################"); } + // 2025.09.12 나혁제 킨텍스 추가 + else if(activeProfile.equals("kintex_prod")) + { + System.out.println("################################################"); + System.out.println("############# kintex_prod Env ##################"); + System.out.println("################################################"); + } else { System.out.println("################################################"); diff --git a/src/main/resources/application-kintex_prod.yml b/src/main/resources/application-kintex_prod.yml new file mode 100644 index 00000000..3b71d399 --- /dev/null +++ b/src/main/resources/application-kintex_prod.yml @@ -0,0 +1,37 @@ + # Service port + server: + port: 11000 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://10.2.11.37:3307/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false From 78f31798be31eb63c0d0e2c0681f1a2e8699f3ef Mon Sep 17 00:00:00 2001 From: nhj Date: Thu, 25 Sep 2025 11:36:22 +0900 Subject: [PATCH 07/16] =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EB=AF=B8=EB=B6=80?= =?UTF-8?q?=EC=97=AC=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=A9=94=EC=84=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B3=B4=EA=B0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 6 +++++- .../java/com/urpsys/baseauth/dao/MemberDao.java | 3 +++ .../provider/CustomAuthenticationProvider.java | 13 ++++++++++++- .../urpsys/baseauth/service/UserDetailService.java | 6 ++++++ .../mapper/primarydb/sqlmap/MemberMapper.xml | 10 ++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.classpath b/.classpath index 36064bc1..a50c6c85 100644 --- a/.classpath +++ b/.classpath @@ -12,7 +12,11 @@ - + + + + + diff --git a/src/main/java/com/urpsys/baseauth/dao/MemberDao.java b/src/main/java/com/urpsys/baseauth/dao/MemberDao.java index 42eb6f3b..24857ee3 100644 --- a/src/main/java/com/urpsys/baseauth/dao/MemberDao.java +++ b/src/main/java/com/urpsys/baseauth/dao/MemberDao.java @@ -36,6 +36,9 @@ public interface MemberDao // 최종접속시간 획득 public String getLastConnectTime(String strUniqId); + // 2025.09.22 나혁제 사용자정보 등록여부 + public String userExistYn(String strUniqId); + // 회원 lock 정보 확인 public LinkedHashMap selectLoginIncorrect(String strId); diff --git a/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java b/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java index a5be8e70..639932fd 100644 --- a/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java +++ b/src/main/java/com/urpsys/baseauth/inner/provider/CustomAuthenticationProvider.java @@ -82,7 +82,18 @@ public class CustomAuthenticationProvider implements AuthenticationProvider if(ObjectUtils.isEmpty(info)) { - throw new UsernameNotFoundException("-2:user not found"); + String strExist = userDetailService.userExistYn(username); + + log.info("한번보시다. => strExist : [{}] ", strExist); + + if(strExist == null || strExist.equals("")) + { + throw new UsernameNotFoundException("-2:user not found"); + } + else + { + throw new UsernameNotFoundException("-4:user role not found"); + } } // 패스워드 일치 여부 확인 diff --git a/src/main/java/com/urpsys/baseauth/service/UserDetailService.java b/src/main/java/com/urpsys/baseauth/service/UserDetailService.java index 77fa57f3..c56fbd20 100644 --- a/src/main/java/com/urpsys/baseauth/service/UserDetailService.java +++ b/src/main/java/com/urpsys/baseauth/service/UserDetailService.java @@ -84,6 +84,12 @@ public class UserDetailService implements UserDetailsService return memberVo; } + public String userExistYn(String strUniqId) + { + return memberDao.userExistYn(strUniqId); + } + + // 회원 lock 정보 확인 public LinkedHashMap selectLoginIncorrect(String strId) { diff --git a/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml index e92cc861..6a05c2d2 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/MemberMapper.xml @@ -24,6 +24,16 @@ ]]> + + + +