From b2d620ffa787b95074d7cf479b6610b7327dd388 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Thu, 4 Jul 2019 12:51:23 +0200
Subject: fix some small bugs in SL2.0 module

---
 .../eaaf/core/impl/utils/HttpClientFactory.java    | 51 ++++++++++++++++++----
 .../eaaf/core/impl/utils/IHttpClientFactory.java   | 21 +++++++++
 2 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/IHttpClientFactory.java

(limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils')

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
-- 
cgit v1.2.3