migrate web server to sechub server #3648

mercedes-benz · Dec 3, 2024 · 55bc730 · 55bc730
1 parent 0771c7b
commit 55bc730
Show file tree

Hide file tree

Showing 102 changed files with 1,259 additions and 2,350 deletions.
diff --git a/...ava/com/mercedesbenz/sechub/commons/security/login/spring/LoginSecurityConfiguration.java b/...ava/com/mercedesbenz/sechub/commons/security/login/spring/LoginSecurityConfiguration.java
diff --git a/sechub-commons-security-spring/build.gradle b/sechub-commons-security-spring/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 
     implementation project(':sechub-commons-core')
     implementation project(':sechub-testframework-spring')
+    implementation library.springboot_starter_web
     implementation library.springboot_starter_security
     implementation library.springboot_starter_oauth2_client
     implementation library.springboot_starter_oauth2_resource_server

diff --git a/...curity-spring/src/main/java/com/mercedesbenz/sechub/spring/security/AES256Encryption.java b/...curity-spring/src/main/java/com/mercedesbenz/sechub/spring/security/AES256Encryption.java
@@ -10,14 +10,11 @@
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import com.mercedesbenz.sechub.commons.core.security.CryptoAccess;
 
-// TODO: move to a central place
 @Component
-@EnableConfigurationProperties(AES256EncryptionProperties.class)
 public class AES256Encryption {
 
     private static final String TRANSFORMATION = "AES";
@@ -27,8 +24,8 @@ public class AES256Encryption {
     private final Cipher decrypt;
     private final SealedObject sealedSecretKey;
 
-    AES256Encryption(AES256EncryptionProperties properties) throws GeneralSecurityException {
-        SecretKey secretKey = new SecretKeySpec(properties.getSecretKeyBytes(), TRANSFORMATION);
+    AES256Encryption(SecurityProperties securityProperties) throws GeneralSecurityException {
+        SecretKey secretKey = new SecretKeySpec(securityProperties.getEncryption().getSecretKey().getBytes(StandardCharsets.UTF_8), TRANSFORMATION);
         this.sealedSecretKey = secretKeyCryptoAccess.seal(secretKey);
 
         this.encrypt = Cipher.getInstance(TRANSFORMATION);

diff --git a/...ing/src/main/java/com/mercedesbenz/sechub/spring/security/AES256EncryptionProperties.java b/...ing/src/main/java/com/mercedesbenz/sechub/spring/security/AES256EncryptionProperties.java