Merge pull request 'Fix #24152: make sure that authenticationManagerBean is available for SAML and Kerberos' (#26) from bugfix/24152 into develop

Author: fmichielssen

src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java

@@ -25,10 +25,13 @@
 import javax.inject.Inject;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.security.authentication.AuthenticationEventPublisher;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.authentication.configuration.GlobalAuthenticationConfigurerAdapter;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -162,5 +165,12 @@ public void init(AuthenticationManagerBuilder amb) throws Exception {
 			}
 		};
 	}
-	
+
+	@Bean(name="authenticationManager")
+	@ConditionalOnExpression("'${proxy.authentication}' == 'kerberos' || '${proxy.authentication}' == 'saml'")
+	@Override
+	public AuthenticationManager authenticationManagerBean() throws Exception {
+		return super.authenticationManagerBean();
+	}
+
 }