Resolve "Extract SAML info"

Closes #243 (closed)

Extracts all the saml information into the application.properties file such that other institutions can use their own paths for SSO. The following parameters are need to be set by them:

sso.metadataUrl =
sso.metadataTrustCheck =
sso.metadataRequirementSignature = 

src/main/java/nl/tudelft/ewi/queue/SamlWebSecurityConfig.java

@@ -105,6 +105,16 @@ public class SamlWebSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Value("${saml.contextProvider.port}")
 	private int contextProviderPort;
 
+	@Value("${sso.metadataUrl")
+	private String metadataProductionUrl;
+
+	@Value("${sso.metadataTrustCheck}")
+	private boolean metadataProductionTrustCheck;
+
+	@Value("${sso.metadataRequirementSignature}")
+	private boolean metadataProductionRequirementSignature;
+
+
 	protected HttpSecurity samlizedConfig(HttpSecurity http) throws Exception {
 		//@formatter:off
         http
@@ -311,57 +321,19 @@ public class SamlWebSecurityConfig extends WebSecurityConfigurerAdapter {
 	}
 
 	@Bean
-	@Qualifier("production-TUD")
+	@Qualifier("SSO-metadata")
 	public ExtendedMetadataDelegate loginProductionTudelftMetadataProvider()
 			throws MetadataProviderException {
-		String metadataUrl = "https://gatekeeper2.tudelft.nl/openaselect/profiles/saml2";
 		Timer backgroundTaskTimer = new Timer(true);
 
 		HTTPMetadataProvider httpMetadataProvider = new HTTPMetadataProvider(backgroundTaskTimer,
-				httpClient(), metadataUrl);
+				httpClient(), metadataProductionUrl);
 		httpMetadataProvider.setParserPool(parserPool());
 
 		ExtendedMetadataDelegate extendedMetadataDelegate = new ExtendedMetadataDelegate(httpMetadataProvider,
 				extendedMetadata());
-		extendedMetadataDelegate.setMetadataTrustCheck(true);
-		extendedMetadataDelegate.setMetadataRequireSignature(false);
-
-		return extendedMetadataDelegate;
-	}
-
-	@Bean
-	@Qualifier("test-TUD")
-	public ExtendedMetadataDelegate loginTestTudelftMetadataProvider() throws MetadataProviderException {
-		String metadataUrl = "https://gatekeepert.tudelft.nl/openaselect/profiles/saml2";
-		Timer backgroundTaskTimer = new Timer(true);
-
-		HTTPMetadataProvider httpMetadataProvider = new HTTPMetadataProvider(backgroundTaskTimer,
-				httpClient(), metadataUrl);
-		httpMetadataProvider.setParserPool(parserPool());
-
-		ExtendedMetadataDelegate extendedMetadataDelegate = new ExtendedMetadataDelegate(httpMetadataProvider,
-				extendedMetadata());
-		extendedMetadataDelegate.setMetadataTrustCheck(false);
-		extendedMetadataDelegate.setMetadataRequireSignature(false);
-
-		return extendedMetadataDelegate;
-	}
-
-	@Bean
-	@Qualifier("test-testSHIB")
-	public ExtendedMetadataDelegate loginTestSHIBMetadataProvider() throws MetadataProviderException {
-		String metadataUrl = "https://www.testshib.org/metadata/testshib-providers.xml";
-		Timer backgroundTaskTimer = new Timer(true);
-
-		HTTPMetadataProvider httpMetadataProvider = new HTTPMetadataProvider(backgroundTaskTimer,
-				httpClient(), metadataUrl);
-		httpMetadataProvider.setParserPool(parserPool());
-
-		ExtendedMetadataDelegate extendedMetadataDelegate = new ExtendedMetadataDelegate(httpMetadataProvider,
-				extendedMetadata());
-		extendedMetadataDelegate.setMetadataTrustCheck(true);
-		extendedMetadataDelegate.setMetadataRequireSignature(false);
-
+		extendedMetadataDelegate.setMetadataTrustCheck(metadataProductionTrustCheck);
+		extendedMetadataDelegate.setMetadataRequireSignature(metadataProductionRequirementSignature);
 		return extendedMetadataDelegate;
 	}
 
@@ -373,8 +345,6 @@ public class SamlWebSecurityConfig extends WebSecurityConfigurerAdapter {
 	public CachingMetadataManager metadata() throws MetadataProviderException {
 		List<MetadataProvider> providers = new ArrayList<>();
 		providers.add(loginProductionTudelftMetadataProvider());
-		//        providers.add(loginTestTudelftMetadataProvider());
-		//        providers.add(loginTestSHIBMetadataProvider());
 
 		return new CachingMetadataManager(providers);
 	}