Correctly handle proxy servers that require authentication (#278)

Author: jshum2479

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruUtil.java

@@ -18,7 +18,6 @@
 import com.oracle.weblogic.imagetool.util.XPathUtil;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.fluent.Executor;
 import org.apache.http.client.fluent.Request;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -437,8 +436,9 @@ public String downloadAruPatch(AruPatch aruPatch, String targetDir, String usern
         String filename = targetDir + File.separator + aruPatch.fileName();
         logger.info("IMG-0018", aruPatch.patchId());
         try {
-            Executor.newInstance(HttpUtil.getOraClient(username, password))
-                .execute(Request.Get(aruPatch.downloadUrl()).connectTimeout(30000).socketTimeout(30000))
+            HttpUtil.getHttpExecutor(username, password)
+                .execute(Request.Get(aruPatch.downloadUrl()).connectTimeout(30000)
+                    .socketTimeout(30000))
                 .saveContent(new File(filename));
         } catch (Exception ex) {
             String message = String.format("Failed to download and save file %s from %s: %s", filename,

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/HttpUtil.java

@@ -17,12 +17,10 @@
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CookieStore;
-import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.config.CookieSpecs;
@@ -33,10 +31,8 @@
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.cookie.BasicClientCookie;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -100,8 +96,8 @@ public static Document parseXmlString(String xmlString) throws ClientProtocolExc
      */
     public static Document getXMLContent(String url, String username, String password) throws IOException {
         logger.entering(url);
-        String xmlString = Executor.newInstance(getOraClient(username, password))
-                .execute(Request.Get(url).connectTimeout(30000).socketTimeout(30000))
+        String xmlString = getHttpExecutor(username,password).execute(Request.Get(url).connectTimeout(30000)
+                .socketTimeout(30000))
                 .returnContent().asString();
         logger.exiting(xmlString);
         return parseXmlString(xmlString);
@@ -120,25 +116,51 @@ public static HttpClient getOraClient(String userId, String password) {
         config.setCookieSpec(CookieSpecs.STANDARD);
 
         CookieStore cookieStore = new BasicCookieStore();
-        CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-
-        if (userId != null && password != null) {
-            BasicClientCookie cc = new BasicClientCookie("oraclelicense", "a");
-            cc.setDomain("edelivery.oracle.com");
-            cookieStore.addCookie(cc);
-            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(
-                    userId, password));
-        }
-        HttpClient result = HttpClientBuilder.create()
+
+        String proxyHost = System.getProperty("https.proxyHost");
+        String proxyPort  = System.getProperty("https.proxyPort");
+        HttpClient result;
+        result = HttpClientBuilder.create()
             .setDefaultRequestConfig(config.build())
             .setRetryHandler(retryHandler())
+            .setProxy(proxyHost != null ? new HttpHost(proxyHost, Integer.parseInt(proxyPort)) : null)
             .setUserAgent("Wget/1.10")
             .setDefaultCookieStore(cookieStore).useSystemProperties()
-            .setDefaultCredentialsProvider(credentialsProvider).build();
+            .build();
+
         logger.exiting();
         return result;
     }
 
+    /**
+     * Return a Executor for http access.
+     * @param supportUserName  oracle support username
+     * @param supportPassword oracle support password
+     * @return Executor
+     */
+
+    public static Executor getHttpExecutor(String supportUserName, String supportPassword) {
+
+        String proxyUser = System.getProperty("https.proxyUser");
+        String proxyPassword = System.getProperty("https.proxyPassword");
+        String proxyHost = System.getProperty("https.proxyHost");
+        String proxyPort  = System.getProperty("https.proxyPort");
+        Executor executor =  Executor.newInstance(getOraClient(supportUserName, supportPassword));
+
+
+        if (proxyHost != null) {
+            if (proxyPassword != null) {
+                executor.auth(new HttpHost(proxyHost, Integer.parseInt(proxyPort)), proxyUser, proxyPassword);
+            }
+
+            executor
+                .auth(new HttpHost("login.oracle.com", 443), supportUserName, supportPassword)
+                .auth(new HttpHost("updates.oracle.com", 443), supportUserName, supportPassword)
+                .authPreemptiveProxy(new HttpHost(proxyHost, Integer.parseInt(proxyPort)));
+        }
+        return executor;
+    }
+
     private static HttpRequestRetryHandler retryHandler() {
         return (exception, executionCount, context) -> {
 
@@ -202,16 +224,18 @@ public static Document postCheckConflictRequest(String url, String payload, Stri
                     .setUserAgent("Wget/1.10")
                     .useSystemProperties().build();
 
-        Executor httpExecutor = Executor.newInstance(client).auth(username, password);
+        Executor httpExecutor = HttpUtil.getHttpExecutor(username, password);
         httpExecutor.use(cookieStore);
 
+
         // Has to do search first, otherwise results in 302
         // MUST use the same httpExecutor to maintain session
 
 
         boolean complete = false;
         int count = 0;
         String xmlString = null;
+
         while (!complete) {
             try {
                 httpExecutor
@@ -223,7 +247,9 @@ public static Document postCheckConflictRequest(String url, String payload, Stri
                     .build();
 
                 xmlString =
-                    httpExecutor.execute(Request.Post(url).connectTimeout(30000).socketTimeout(30000).body(entity))
+                    httpExecutor.execute(Request.Post(url).connectTimeout(30000)
+                        .socketTimeout(30000)
+                        .body(entity))
                         .returnContent().asString();
                 complete = true;
             } catch (IOException ioe) {

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

@@ -172,7 +172,6 @@ private static void setSystemProxy(String proxyUrl, String protocolToSet) throws
         int port = url.getPort() == -1 ? url.getDefaultPort() : url.getPort();
         String userInfo = url.getUserInfo();
         String protocol = protocolToSet == null ? url.getProtocol() : protocolToSet;
-
         if (host != null && port != -1) {
             System.setProperty(String.format("%s.proxyHost", protocol), host);
             System.setProperty(String.format("%s.proxyPort", protocol), String.valueOf(port));