Merge branch 'v2.1-dev' into 'v2.x-master'

18: Adapt according to needs of first actual implementation (CR)

See merge request !5

build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
 	group = 'eu.dariah.de'
-	version = '2.1.1-SNAPSHOT'
+	version = '2.1.2-SNAPSHOT'
 
 	apply plugin: 'eclipse'
 

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/config/SecurityConfig.java

@@ -7,6 +7,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.pac4j.core.client.Client;
 import org.pac4j.core.client.Clients;
@@ -34,27 +35,31 @@ import eu.dariah.de.dariahsp.helpers.SAMLMetadataHelper;
 import eu.dariah.de.dariahsp.profiles.LocalProfileCreator;
 import eu.dariah.de.dariahsp.profiles.SamlProfileCreator;
 import eu.dariah.de.dariahsp.web.AuthInfoHelper;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-@Data
 @Slf4j
 @Configuration
 @ComponentScan
 @Import({ComponentConfig.class, AnnotationConfig.class})
 public class SecurityConfig {
-	private final LocalSecurity local = new LocalSecurity();
-	private final SAMLSecurity saml = new SAMLSecurity();
+	@Getter private final LocalSecurity local = new LocalSecurity();
+	@Getter private final SAMLSecurity saml = new SAMLSecurity();
 
-	private String salt;
-	private String permissionHierarchy = "";
-	private List<PermissionDefinition> permissionDefinitions;
-	private String baseUrl = "http://localhost:8080";
-	private String defaultLoginUrl = null;
-	private String defaultLogoutUrl = null;
+	@Getter @Setter private String salt;
+	@Getter @Setter private String permissionHierarchy = "";
+	@Getter @Setter private List<PermissionDefinition> permissionDefinitions;
+	@Getter @Setter private String baseUrl = "http://localhost:8080";
+	
+	@Setter private String defaultLoginUrl = null;
+	@Setter private String defaultLogoutUrl = null;
+	
+	@Getter private List<String> enabledClientNames = null;
 	
 	public String getDefaultLoginUrl() { return defaultLoginUrl==null ? baseUrl : defaultLoginUrl; }
 	public String getDefaultLogoutUrl() { return defaultLogoutUrl==null ? baseUrl : defaultLogoutUrl; }
+		
 	
 	@Bean
 	public Optional<LocalUsernamePasswordAuthenticator> localUsernamePasswordAuthenticator() {
@@ -94,8 +99,8 @@ public class SecurityConfig {
 	@Bean
     public RoleHierarchyVoter roleVoter() {     
         return new RoleHierarchyVoter(roleHierarchy());
-    }
-		
+    }	
+
 	@Bean
 	@SuppressWarnings("rawtypes")
 	public Config config(Optional<ProfileActionHandler> profileActionHandler) throws URISyntaxException {
@@ -110,7 +115,13 @@ public class SecurityConfig {
 			clients.add(formClient);
 		}
 		Config.setProfileManagerFactory("customizableProfileManager", ctx -> new CustomizableProfileManager(ctx, profileActionHandler.orElse(null)));
-        return new Config(new Clients(baseUrl().getAbsoluteUrl("/callback"), clients));
+        Config c = new Config(new Clients(baseUrl().getAbsoluteUrl("/callback"), clients));
+        
+        enabledClientNames = c.getClients().findAllClients().stream()
+				.map(Client::getName)
+				.collect(Collectors.toList());
+        
+        return c;
 	}
 	
 	

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/config/web/BaseSecurityConfigurerAdapter.java

-package eu.dariah.de.dariahsp.config.web;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.pac4j.core.client.Client;
-import org.pac4j.core.config.Config;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-import eu.dariah.de.dariahsp.config.BaseUrl;
-
-public abstract class BaseSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
-	@Autowired protected Config config;
-    @Autowired protected BaseUrl baseUrl;
-    
-    protected List<String> getEnabledClientNames() {
-    	 return config.getClients().findAllClients().stream()
-				.map(Client::getName)
-				.collect(Collectors.toList());
-    }
-}

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/config/web/DefaultFiltersConfigurerAdapter.java

@@ -2,22 +2,26 @@ package eu.dariah.de.dariahsp.config.web;
 
 import java.util.List;
 
+import org.pac4j.core.config.Config;
 import org.pac4j.springframework.security.web.CallbackFilter;
 import org.pac4j.springframework.security.web.LogoutFilter;
 import org.pac4j.springframework.security.web.Pac4jEntryPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
+import eu.dariah.de.dariahsp.config.BaseUrl;
 import eu.dariah.de.dariahsp.config.SecurityConfig;
 
-public class DefaultFiltersConfigurerAdapter extends BaseSecurityConfigurerAdapter {
+public class DefaultFiltersConfigurerAdapter extends WebSecurityConfigurerAdapter {
     @Autowired private SecurityConfig securityConfig;
-	
+	@Autowired protected Config config;
+	@Autowired private BaseUrl baseUrl;
 	
     @Override
     protected void configure(final HttpSecurity http) throws Exception {
-    	List<String> enabledClientNames = this.getEnabledClientNames();
+    	List<String> enabledClientNames = securityConfig.getEnabledClientNames();
     	
         final CallbackFilter callbackFilter = new CallbackFilter(config);
         callbackFilter.setMultiProfile(false);

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/config/web/SecurityConfigurerAdapter.java

@@ -3,24 +3,29 @@ package eu.dariah.de.dariahsp.config.web;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.pac4j.core.config.Config;
 import org.pac4j.springframework.security.web.Pac4jEntryPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.expression.SecurityExpressionHandler;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 import eu.dariah.de.dariahsp.SecurityFilter;
+import eu.dariah.de.dariahsp.config.SecurityConfig;
 
-public class SecurityConfigurerAdapter extends BaseSecurityConfigurerAdapter {    
-    @Autowired private RoleHierarchy roleHierarchy;
+public class SecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {    
+	@Autowired protected Config config;
+	@Autowired private RoleHierarchy roleHierarchy;
+    @Autowired private SecurityConfig securityConfig;
     
     @Override
     protected void configure(final HttpSecurity http) throws Exception {
-    	List<String> enabledClientNames = this.getEnabledClientNames();
+    	List<String> enabledClientNames = securityConfig.getEnabledClientNames();
     	final SecurityFilter filter = new SecurityFilter(config, enabledClientNames.stream().collect(Collectors.joining(",")));
     	
         http