From 892f9410046cbd305530fdeabc0cb8f8b2d8c412 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 29 Nov 2021 16:08:08 +0100
Subject: [PATCH] Securityconfig is not productive
---
.../main/java/at/tuwien/config/SamlConfig.java | 13 ++++++-------
.../java/at/tuwien/config/SecurityConfig.java | 16 ----------------
2 files changed, 6 insertions(+), 23 deletions(-)
delete mode 100644 fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SecurityConfig.java
diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
index d4a86e3efe..3a4a2f7e07 100644
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
@@ -1,5 +1,6 @@
package at.tuwien.config;
+import at.tuwien.service.AuthenticationService;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
@@ -106,13 +107,6 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
return new HttpClient(multiThreadedHttpConnectionManager());
}
- @Bean
- public SAMLAuthenticationProvider samlAuthenticationProvider() {
- final SAMLAuthenticationProvider samlAuthenticationProvider = new SAMLAuthenticationProvider();
- samlAuthenticationProvider.setForcePrincipalAsString(false);
- return samlAuthenticationProvider;
- }
-
@Bean
public WebSSOProfileConsumer webSSOprofileConsumer() {
return new WebSSOProfileConsumerImpl();
@@ -353,6 +347,11 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
return new JKSKeyManager(storeFile, samlKeystorePassword, passwords, samlKeystoreAlias);
}
+ @Bean
+ public SAMLAuthenticationProvider samlAuthenticationProvider() {
+ return new AuthenticationService();
+ }
+
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.authenticationProvider(samlAuthenticationProvider());
diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SecurityConfig.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SecurityConfig.java
deleted file mode 100644
index aaa72f6a2f..0000000000
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SecurityConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package at.tuwien.config;
-
-import at.tuwien.service.AuthenticationService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.saml.SAMLAuthenticationProvider;
-
-@Configuration
-public class SecurityConfig {
-
- @Bean
- public SAMLAuthenticationProvider samlAuthenticationProvider() {
- return new AuthenticationService();
- }
-
-}
--
GitLab