fix some small bugs in SL2.0 module

3 files changed, 80 insertions, 24 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java
index 356744e8..f35b6032 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java
@@ -59,7 +59,7 @@ public class ModuleRegistration {
 
 	private static ModuleRegistration instance = new ModuleRegistration();
 
-	private List<AuthModule> priorizedModules = new ArrayList<>();
+	private final List<AuthModule> priorizedModules = new ArrayList<>();
 
 	@Autowired
 	private ApplicationContext ctx;
@@ -67,7 +67,7 @@ public class ModuleRegistration {
 	@Autowired
 	private ProcessEngine processEngine;
 
-	private Logger log = LoggerFactory.getLogger(getClass());
+	private final Logger log = LoggerFactory.getLogger(getClass());
 
 	public static ModuleRegistration getInstance() {
 		return instance;
@@ -86,6 +86,8 @@ public class ModuleRegistration {
 
 		// order modules according to their priority
 		sortModules();
+		
+		instance = this;
 	}
 	
 	/**
@@ -93,10 +95,10 @@ public class ModuleRegistration {
 	 */
 	private void initServiceLoaderModules() {
 		log.info("Looking for auth modules.");
-		ServiceLoader<AuthModule> loader = ServiceLoader.load(AuthModule.class);
-		Iterator<AuthModule> modules = loader.iterator();
+		final ServiceLoader<AuthModule> loader = ServiceLoader.load(AuthModule.class);
+		final Iterator<AuthModule> modules = loader.iterator();
 		while (modules.hasNext()) {
-			AuthModule module = modules.next();
+			final AuthModule module = modules.next();
 			log.info("Detected module {}", module.getClass().getName());
 			registerModuleProcessDefinitions(module);
 			priorizedModules.add(module);
@@ -108,8 +110,8 @@ public class ModuleRegistration {
 	 */
 	private void initSpringModules() {
 		log.debug("Discovering Spring modules.");
-		Map<String, AuthModule> modules = ctx.getBeansOfType(AuthModule.class);
-		for (AuthModule module : modules.values()) {
+		final Map<String, AuthModule> modules = ctx.getBeansOfType(AuthModule.class);
+		for (final AuthModule module : modules.values()) {
 			registerModuleProcessDefinitions(module);
 			priorizedModules.add(module);
 		}
@@ -122,15 +124,15 @@ public class ModuleRegistration {
 	 *            the module.
 	 */
 	private void registerModuleProcessDefinitions(AuthModule module) {
-		for (String uri : module.getProcessDefinitions()) {
-			Resource resource = ctx.getResource(uri);
+		for (final String uri : module.getProcessDefinitions()) {
+			final Resource resource = ctx.getResource(uri);
 			if (resource.isReadable()) {
 				log.info("Registering process definition '{}'.", uri);
 				try (InputStream processDefinitionInputStream = resource.getInputStream()) {
 					processEngine.registerProcessDefinition(processDefinitionInputStream);
-				} catch (IOException e) {
+				} catch (final IOException e) {
 					log.error("Process definition '{}' could NOT be read.", uri, e);
-				} catch (ProcessDefinitionParserException e) {
+				} catch (final ProcessDefinitionParserException e) {
 					log.error("Error while parsing process definition '{}'", uri, e);
 				}
 			} else {
@@ -146,8 +148,8 @@ public class ModuleRegistration {
 		Collections.sort(priorizedModules, new Comparator<AuthModule>() {
 			@Override
 			public int compare(AuthModule thisAuthModule, AuthModule otherAuthModule) {
-				int thisOrder = thisAuthModule.getPriority();
-				int otherOrder = otherAuthModule.getPriority();
+				final int thisOrder = thisAuthModule.getPriority();
+				final int otherOrder = otherAuthModule.getPriority();
 				return (thisOrder < otherOrder ? 1 : (thisOrder == otherOrder ? 0 : -1));
 			}
 		});
@@ -162,8 +164,8 @@ public class ModuleRegistration {
 	 * @return the process id or {@code null}
 	 */
 	public String selectProcess(ExecutionContext context) {
-		for (AuthModule module : priorizedModules) {
-			String id = module.selectProcess(context);
+		for (final AuthModule module : priorizedModules) {
+			final String id = module.selectProcess(context);
 			if (StringUtils.isNotEmpty(id)) {
 				log.debug("Process with id '{}' selected, for context '{}'.", id, context);
 				return id;
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java
index 926b2bd5..ee12b9e4 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java
@@ -6,14 +6,21 @@ import javax.annotation.PostConstruct;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.ProtocolException;
+import org.apache.http.client.RedirectStrategy;
 import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultRedirectStrategy;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.protocol.HttpContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +29,7 @@ import org.springframework.stereotype.Service;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 
 @Service
-public class HttpClientFactory {
+public class HttpClientFactory implements IHttpClientFactory {
 	private static final Logger log = LoggerFactory.getLogger(HttpClientFactory.class);	
 	@Autowired(required=true) private IConfiguration basicConfig;
 	
@@ -35,24 +42,47 @@ public class HttpClientFactory {
 	public static final String PROP_CONFIG_CLIENT_HTTP_SSL_HOSTNAMEVERIFIER_TRUSTALL = "client.http.ssl.hostnameverifier.trustall";
 	
 	// default configuration values
-	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET = "300";
-	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION = "300";
-	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_REQUEST = "1500";
+	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET = "15";
+	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION = "15";
+	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_REQUEST = "30";
 	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL = "500";
 	public static final String DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE = "100";
 	
 	private HttpClientBuilder httpClientBuilder = null;
 	
-	/**
-	 * Return an instance of a Apache HTTP client
-	 * 
-	 * @return
+	/* (non-Javadoc)
+	 * @see at.gv.egiz.eaaf.core.impl.utils.IHttpClientFactory#getHttpClient()
 	 */
+	@Override
 	public CloseableHttpClient getHttpClient() {
-		return httpClientBuilder.build();
+		return getHttpClient(true);
 		
 	}
 	
+	@Override
+	public CloseableHttpClient getHttpClient(boolean followRedirects) {
+		RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); 
+		if (!followRedirects)
+			redirectStrategy = new RedirectStrategy() {
+				
+				@Override
+				public boolean isRedirected(HttpRequest request, HttpResponse response, HttpContext context)
+						throws ProtocolException {
+					return false;
+				}
+				
+				@Override
+				public HttpUriRequest getRedirect(HttpRequest request, HttpResponse response, HttpContext context)
+						throws ProtocolException {
+					return null;
+				}
+			};
+		 
+		return httpClientBuilder
+				.setRedirectStrategy(redirectStrategy)
+				.build();			
+									
+	}
 	
 	@PostConstruct
 	private void initalize() {
@@ -116,6 +146,9 @@ public class HttpClientFactory {
 		log.info("HTTP client-builder successfuly initialized");
 		
 	}
+
+
+
 	
 	
 }
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/IHttpClientFactory.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/IHttpClientFactory.java
new file mode 100644
index 00000000..1975fb52
--- /dev/null
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/IHttpClientFactory.java
@@ -0,0 +1,21 @@
+package at.gv.egiz.eaaf.core.impl.utils;
+
+import org.apache.http.impl.client.CloseableHttpClient;
+
+public interface IHttpClientFactory {
+
+	/**
+	 * Return an instance of a Apache HTTP client that follows http redirects automatically
+	 * 
+	 * @return
+	 */
+	CloseableHttpClient getHttpClient();
+
+	/**
+	 * Return an instance of a Apache HTTP client
+	 * @param followRedirects 
+	 * @return
+	 */
+	CloseableHttpClient getHttpClient(boolean followRedirects);
+	
+}
\ No newline at end of file