Merge pull request #124 from depromeet/feature/#94-re

feat(#94): add jasypt
depromeet · Jan 16, 2024 · d3bb490 · d3bb490
2 parents ca6f3c7 + a372e86
commit d3bb490
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 238 deletions.
diff --git a/backend/application/admin/src/main/kotlin/io/raemian/admin/config/JasyptConfig.kt b/backend/application/admin/src/main/kotlin/io/raemian/admin/config/JasyptConfig.kt
@@ -0,0 +1,22 @@
+package io.raemian.admin.config
+
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@EnableEncryptableProperties
+class JasyptConfig(
+    @Value("\${JASYPT_ENCRYPTION_PASSWORD}") val password: String,
+) {
+
+    @Bean
+    fun jasyptStringEncryptor(): StandardPBEStringEncryptor {
+        val encryptor = StandardPBEStringEncryptor()
+        encryptor.setAlgorithm("PBEWithMD5AndDES")
+        encryptor.setPassword(password)
+        return encryptor
+    }
+}
diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/config/JasyptConfig.kt b/backend/application/api/src/main/kotlin/io/raemian/api/config/JasyptConfig.kt
@@ -0,0 +1,22 @@
+package io.raemian.api.config
+
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@EnableEncryptableProperties
+class JasyptConfig(
+    @Value("\${JASYPT_ENCRYPTION_PASSWORD}") val password: String,
+) {
+
+    @Bean
+    fun jasyptStringEncryptor(): StandardPBEStringEncryptor {
+        val encryptor = StandardPBEStringEncryptor()
+        encryptor.setAlgorithm("PBEWithMD5AndDES")
+        encryptor.setPassword(password)
+        return encryptor
+    }
+}
diff --git a/backend/application/api/src/main/resources/application-security-dev.yml b/backend/application/api/src/main/resources/application-security-dev.yml
@@ -23,26 +23,26 @@ spring:
             user_name_attribute: id
         registration:
           naver:
-            redirect-uri: ${NAVER-REDIRECT-URI}
-            client-id: ${NAVER-CLIENT-ID}
-            client-secret: ${NAVER-CLIENT-SECRET}
+            redirect-uri: ENC(4+bYmAkIEVrVaxN+PJN45Yw4OX+7ic6kI++xBfdUrAQue4vWC1apiXgr+jIHrd1/IIFxyyNHSzDYjxMT89gBjaIGUPuhX3lZ)
+            client-id: ENC(qFYukOWHaCGpavvnBwIIe5MfIbMaETjo8ABJPEvKL1o=)
+            client-secret: ENC(sJK/TYU3PJj1+d6mB1OXjZTrmUFdALuC)
             authorization-grant-type: authorization_code
             scope:
               - email
               - name
             client-name: naver
           kakao:
-            redirect-uri: ${KAKAO-REDIRECT-URI}
-            client-id: ${KAKAO-CLIENT-ID}
+            redirect-uri: ENC(cNaBf93iYsA00MQEQfTGWEsp7iDqUMwuMKzYg6XHjZ9X8CfegTlRidbSrMC67R73zy3BnKfjBmTtJzin8iowfaww+J8WqD6n)
+            client-id: ENC(LzuIWpuN7JG7pwbU87S4DvColRj57LtcnRb0qfDdyGpnNUpI2+FHgCyJs0p2Wn7/)
             authorization-grant-type: authorization_code
             scope:
-              - account_email
+              - profile_nickname
               - profile_image
             client-name: kakao
           google:
-            redirect-uri: ${GOOGLE-REDIRECT-URI}
-            client-id: ${GOOGLE-CLIENT-ID}
-            client-secret: ${GOOGLE-CLIENT-SECRET}
+            redirect-uri: ENC(+n1rnKqq7yRkybeNRGFstgM1rZcE84mn/3eHn86kNkjcZYmOtHO4h0CYCAsnIeA1aw8TaGRpqAIDSKx0F0ah7PeiUD+Shkr9)
+            client-id: ENC(v6CCXncJwOS8W6YizTBkDskIbDrBV/DM+1WpJvERtF6YUahSyevhaoxPQxkdy3DXK++9NZMP7OeqRi7qhgRizQNjXD+u2hNIxIcWu6B71fATnGojMqiDEg==)
+            client-secret: ENC(Sv6L3GpxMxJA7s93BGorm6DclzLwJYSg8rezWXhkAi0PY85zzA/d7ulKspstKMY/)
             scope:
               - email
               - profile
diff --git a/backend/application/api/src/main/resources/application-security-live.yml b/backend/application/api/src/main/resources/application-security-live.yml
@@ -22,26 +22,26 @@ spring:
             user_name_attribute: id
         registration:
           naver:
-            client-id: ${NAVER-CLIENT-ID}
-            client-secret: ${NAVER-CLIENT-SECRET}
-            redirect-uri: ${NAVER-REDIRECT-URI}
+            redirect-uri: ENC(MQq1obaTDXs7LryM3+BOdHMrQcs/zibSLKHoPst/H6swX8Dpvl7Wo+XBW+SGaMq37aJZyQ9+pqcyYuUIPABg4l/4I2JBKQ4V)
+            client-id: ENC(hArDuXel6XL2BYuka4j5o+PuFa9OYb1kIs9ZWjiRCYs=)
+            client-secret: ENC(eJBwzFm1mur/BHJjlPHw2Gh9vLP/6RY4)
             authorization-grant-type: authorization_code
             scope:
               - email
               - name
             client-name: naver
           kakao:
-            redirect-uri: ${KAKAO-REDIRECT-URI}
-            client-id: ${KAKAO-CLIENT-ID}
+            redirect-uri: ENC(ZWbt0nXnT8j9h3IkHegdUWlFq/4ar6fxHgcNbZc616y/XE6mxkk5c3uLI7/1SaeRQzvwrauIQHXFat/u/juy6AfRQ9fMqQMP)
+            client-id: ENC(LrGVNrjoOZPgrTU6Kva5mxPqJp1yGblEy8myObS2ePs+hebnve6u+l+Xrm1YavEo)
             authorization-grant-type: authorization_code
             scope:
               - profile_nickname
               - profile_image
             client-name: kakao
           google:
-            redirect-uri: ${GOOGLE-REDIRECT-URI}
-            client-id: ${GOOGLE-CLIENT-ID}
-            client-secret: ${GOOGLE-CLIENT-SECRET}
+            redirect-uri: ENC(S1UGPrXcnpwpjOsa4copqhtLQFReKF9JvPhh3PqImrWxj7BRS6DBAvwkhv80pJrW6NK+nGVGLcZC4sdCPqvdn7dhgXHegEwn)
+            client-id: ENC(KNctPOIqjyR4vPOkN2pJtdu4P70tiAnOHndfQp9HC+qZLx/XdBXLMNNKvjlLBJ4Yh0D6UI5z7RFP83MsfLW16o0K5LFDDmchCsyW2ShmQiAoeNN29W7Ptw==)
+            client-secret: ENC(3+GdJBjiGpBabKBY1/Ipw57ddI30By/3LYMoQzjbDbnp3dsiTsvvndEJRZXRQpTk)
             scope:
               - email
               - profile

diff --git a/backend/application/api/src/main/resources/application-security-local.yml b/backend/application/api/src/main/resources/application-security-local.yml
@@ -1,4 +1,5 @@
 # local
+spring.config.activate.on-profile: local
 server:
   port: 8080
   servlet:
@@ -22,25 +23,25 @@ spring:
         registration:
           naver:
             redirect-uri: http://localhost:8080/dev/api/login/oauth2/code/naver
-            client-id: ${NAVER-CLIENT-ID}
-            client-secret: ${NAVER-CLIENT-SECRET}
+            client-id: ENC(qFYukOWHaCGpavvnBwIIe5MfIbMaETjo8ABJPEvKL1o=)
+            client-secret: ENC(sJK/TYU3PJj1+d6mB1OXjZTrmUFdALuC)
             authorization-grant-type: authorization_code
             scope:
               - email
               - name
             client-name: naver
           kakao:
             redirect-uri: http://localhost:8080/dev/api/login/oauth2/code/kakao
-            client-id: ${KAKAO-CLIENT-ID}
+            client-id: ENC(LzuIWpuN7JG7pwbU87S4DvColRj57LtcnRb0qfDdyGpnNUpI2+FHgCyJs0p2Wn7/)
             authorization-grant-type: authorization_code
             scope:
-              - account_email
+              - profile_nickname
               - profile_image
             client-name: kakao
           google:
             redirect-uri: http://localhost:8080/dev/api/login/oauth2/code/google
-            client-id: ${GOOGLE-CLIENT-ID}
-            client-secret: ${GOOGLE-CLIENT-SECRET}
+            client-id: ENC(v6CCXncJwOS8W6YizTBkDskIbDrBV/DM+1WpJvERtF6YUahSyevhaoxPQxkdy3DXK++9NZMP7OeqRi7qhgRizQNjXD+u2hNIxIcWu6B71fATnGojMqiDEg==)
+            client-secret: ENC(Sv6L3GpxMxJA7s93BGorm6DclzLwJYSg8rezWXhkAi0PY85zzA/d7ulKspstKMY/)
             scope:
               - email
               - profile
diff --git a/backend/application/api/src/main/resources/application-security-test.yml b/backend/application/api/src/main/resources/application-security-test.yml
@@ -24,25 +24,25 @@ spring:
         registration:
           naver:
             redirect-uri: http://localhost:8080/dev/api/login/oauth2/code/naver
-            client-id: ${NAVER-CLIENT-ID}
-            client-secret: ${NAVER-CLIENT-SECRET}
+            client-id: ENC(qFYukOWHaCGpavvnBwIIe5MfIbMaETjo8ABJPEvKL1o=)
+            client-secret: ENC(sJK/TYU3PJj1+d6mB1OXjZTrmUFdALuC)
             authorization-grant-type: authorization_code
             scope:
               - email
               - name
             client-name: naver
           kakao:
             redirect-uri: http://localhost:8080/dev/api/login/oauth2/code/kakao
-            client-id: ${KAKAO-CLIENT-ID}
+            client-id: ENC(LzuIWpuN7JG7pwbU87S4DvColRj57LtcnRb0qfDdyGpnNUpI2+FHgCyJs0p2Wn7/)
             authorization-grant-type: authorization_code
             scope:
-              - account_email
+              - profile_nickname
               - profile_image
             client-name: kakao
           google:
             redirect-uri: http://localhost:8080/dev/api/login/oauth2/code/google
-            client-id: ${GOOGLE-CLIENT-ID}
-            client-secret: ${GOOGLE-CLIENT-SECRET}
+            client-id: ENC(v6CCXncJwOS8W6YizTBkDskIbDrBV/DM+1WpJvERtF6YUahSyevhaoxPQxkdy3DXK++9NZMP7OeqRi7qhgRizQNjXD+u2hNIxIcWu6B71fATnGojMqiDEg==)
+            client-secret: ENC(Sv6L3GpxMxJA7s93BGorm6DclzLwJYSg8rezWXhkAi0PY85zzA/d7ulKspstKMY/)
             scope:
               - email
               - profile
diff --git a/backend/application/api/src/main/resources/application-security.yml b/backend/application/api/src/main/resources/application-security.yml