add HTTP Proxy support to MIS and SZR-GW webservice request methods

4 files changed, 65 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
index e1cd59c26..61b26b59a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
@@ -65,6 +65,7 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;

 

 import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;

+import at.gv.egovernment.moa.id.commons.utils.HttpClientWithProxySupport;

 import at.gv.egovernment.moa.util.Constants;

 import at.gv.egovernment.moa.util.DOMUtils;

 

@@ -137,7 +138,7 @@ public class SZRGWClient {
       if (address == null) {

         throw new NullPointerException("Address (SZR-gateway ServiceURL) must not be null.");

       }

-      HttpClient client = new HttpClient();

+      HttpClient client = HttpClientWithProxySupport.getHttpClient();

       PostMethod method = new PostMethod(address);

       method.setRequestHeader("SOAPAction", "");

 

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
index ab8d19803..24c96a78f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
@@ -71,6 +71,7 @@ import org.xml.sax.SAXException;
 

 import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;

 import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWSecureSocketFactory;

+import at.gv.egovernment.moa.id.commons.utils.HttpClientWithProxySupport;

 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.DOMUtils;

 import at.gv.egovernment.moa.util.StringUtils;

@@ -301,7 +302,7 @@ public class MISSimpleClient {
 			throw new NullPointerException("Argument request must not be null.");

 		}

 		try {

-			HttpClient httpclient = new HttpClient();

+			HttpClient httpclient = HttpClientWithProxySupport.getHttpClient();

 			PostMethod post = new PostMethod(webServiceURL);

 			StringRequestEntity re = new StringRequestEntity(DOMUtils.serializeNode(packIntoSOAP(request)),"text/xml", "UTF-8");

 			post.setRequestEntity(re);

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java
new file mode 100644
index 000000000..733c03bf0
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.commons.utils;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
+
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class HttpClientWithProxySupport {
+		
+	public static HttpClient getHttpClient() {
+		HttpClient client = new HttpClient();
+	
+		String host = System.getProperty("http.proxyHost"); //$NON-NLS-1$
+		String port = System.getProperty("http.proxyPort"); //$NON-NLS-1$
+		if (MiscUtil.isNotEmpty(host) &&
+				MiscUtil.isNotEmpty(port)) {
+			int p = Integer.parseInt(port);
+			client.getHostConfiguration().setProxy(host, p);
+			Logger.info("Initial HTTPClient with proxy usage. " +
+					"ProxyHost=" + host +
+					" ProxyPort=" + port);
+						
+			String user = System.getProperty("http.proxyUser"); //$NON-NLS-1$
+			String pass = System.getProperty("http.proxyPassword"); //$NON-NLS-1$
+			if (MiscUtil.isNotEmpty(user) && pass != null) {
+				client.getState().setProxyCredentials(new AuthScope(host, p),
+				new UsernamePasswordCredentials(user, pass));
+				
+			}			
+		}	 
+		return client;
+	}
+}
diff --git a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java
index d708c2603..758209193 100644
--- a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java
+++ b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java
@@ -26,16 +26,8 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodDirector;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
 
 import at.gv.egovernment.moa.id.commons.ex.MOAHttpProtocolSocketFactoryException;