Allow specifying a proxy for http API connections via mirthApi.http.proxyHost

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

server/src/com/mirth/connect/client/core/ServerConnection.java

@@ -36,6 +36,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.StatusLine;
@@ -134,7 +135,20 @@ public ServerConnection(int timeout, String[] httpsProtocols, String[] httpsCiph
 
         cookieStore = new BasicCookieStore();
         socketConfig = SocketConfig.custom().setSoTimeout(timeout).build();
-        requestConfig = RequestConfig.custom().setConnectTimeout(CONNECT_TIMEOUT).setSocketTimeout(timeout).build();
+
+        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom()
+            .setConnectTimeout(CONNECT_TIMEOUT)
+            .setSocketTimeout(timeout);
+
+        // If HTTP Proxy is set, configure it
+        String httpProxyHost = System.getProperty("mirthApi.http.proxyHost");
+        if (allowHTTP && StringUtils.isNotBlank(httpProxyHost)) {
+            String httpProxyPort = System.getProperty("mirthApi.http.proxyPort");
+            int proxyPort = StringUtils.isNotBlank(httpProxyPort) ? Integer.parseInt(httpProxyPort) : 8888;
+            requestConfigBuilder.setProxy(new HttpHost(httpProxyHost, proxyPort));
+        }
+
+        requestConfig = requestConfigBuilder.build();
         keepAliveStrategy = new CustomKeepAliveStrategy();
 
         createClient();