Merge pull request #134 from gnongsie/master

Proxy Authentication fix - Additional scenarios

Author: kikmak42

src/main/java/net/authorize/util/Constants.java

@@ -6,7 +6,7 @@ public final class Constants {
 	public static final String HTTPS_USE_PROXY = "https.proxyUse";
 	public static final String HTTPS_PROXY_HOST = "https.proxyHost";
 	public static final String HTTPS_PROXY_PORT = "https.proxyPort";
-	public static final String HTTPS_PROXY_USERNAME = "https.proxyUser";
+	public static final String HTTPS_PROXY_USERNAME = "https.proxyUsername";
     public static final String HTTPS_PROXY_PASSWORD = "https.proxyPassword";
 
 	public static final String HTTP_USE_PROXY = "http.proxyUse";

src/main/java/net/authorize/util/HttpClient.java

@@ -344,7 +344,37 @@ static CloseableHttpClient getHttpsClient() throws Exception {
 
 			CloseableHttpClient httpClient;
 
-			if ( !UseProxy && ( ProxyHost == null || proxyUsername == null || proxyPassword == null ) ) {
+			if ( UseProxy && ProxyHost != null) {
+				
+				HttpClientBuilder hcBuilder;
+				if (proxyUsername != null && proxyPassword != null) {
+					LogHelper.info(logger, "Setting up proxy to URL with Authentication: '%s://%s@%s:%d'", Constants.PROXY_PROTOCOL, proxyUsername, ProxyHost, ProxyPort);
+					CredentialsProvider credsProvider = new BasicCredentialsProvider();
+					AuthScope proxyScope = new AuthScope(ProxyHost, ProxyPort);
+					Credentials proxyCreds = new UsernamePasswordCredentials(proxyUsername, proxyPassword);
+					credsProvider.setCredentials(proxyScope, proxyCreds);
+					hcBuilder = HttpClients.custom()
+								.setSSLSocketFactory(sslSocketFactory)
+								.setDefaultRequestConfig(requestConfig)
+								.setRedirectStrategy(new LaxRedirectStrategy())
+								.setDefaultCredentialsProvider(credsProvider);
+				}
+				else {
+					LogHelper.info(logger, "Setting up proxy to URL: '%s://%s:%d'", Constants.PROXY_PROTOCOL, ProxyHost, ProxyPort);
+					hcBuilder = HttpClients.custom()
+								.setSSLSocketFactory(sslSocketFactory)
+								.setDefaultRequestConfig(requestConfig)
+								.setRedirectStrategy(new LaxRedirectStrategy());
+				}
+				
+				HttpHost httpProxy = new HttpHost(ProxyHost, ProxyPort, Constants.PROXY_PROTOCOL);
+	            hcBuilder.setProxy(httpProxy);
+        
+	            httpClient = hcBuilder.build();
+
+				proxySet = true;
+			}
+			else {
 				LogHelper.warn(logger, "Defaulting to non-proxy environment");
 
 				httpClient =  HttpClients.custom()
@@ -353,30 +383,6 @@ static CloseableHttpClient getHttpsClient() throws Exception {
 						.setRedirectStrategy(new LaxRedirectStrategy())
 						.build();
 			} 
-			
-			else {
-
-				LogHelper.info(logger, "Setting up proxy to URL: '%s://%s:%d'", Constants.PROXY_PROTOCOL, ProxyHost, ProxyPort);
-				CredentialsProvider credsProvider = new BasicCredentialsProvider();
-
-				AuthScope proxyScope = new AuthScope(ProxyHost, ProxyPort);
-				Credentials proxyCreds = new UsernamePasswordCredentials(proxyUsername, proxyPassword);
-				credsProvider.setCredentials(proxyScope, proxyCreds);
-				
-				HttpClientBuilder hcBuilder = HttpClients.custom()
-						.setSSLSocketFactory(sslSocketFactory)
-						.setDefaultRequestConfig(requestConfig)
-						.setRedirectStrategy(new LaxRedirectStrategy())
-	                    .setDefaultCredentialsProvider(credsProvider);
-				
-				HttpHost httpProxy = new HttpHost(ProxyHost, ProxyPort, Constants.PROXY_PROTOCOL);
-	            DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(httpProxy);
-	            hcBuilder.setRoutePlanner(routePlanner);
-        
-	            httpClient = hcBuilder.build();
-
-				proxySet = true;
-			}			
 
 			return httpClient;
 		} catch (Exception e) {