Fix proxy scheme problem to only add scheme when no scheme is provided. (#149)

jshum2479 · web-flow · commit 5771ab25974a · 2020-03-24T16:53:31.000-05:00
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java
@@ -156,8 +156,11 @@ public static void setProxyIfRequired(String httpProxyUrl, String httpsProxyUrl,
     }
 
     private static void setSystemProxy(String proxyUrl, String protocolToSet) throws IOException {
-        if (!proxyUrl.toLowerCase().startsWith(protocolToSet)) {
-            proxyUrl = protocolToSet + "://" + proxyUrl;
+
+        // If no scheme is set then default to http://
+        if (!proxyUrl.toLowerCase().startsWith(Constants.HTTP + "://")
+            && !proxyUrl.toLowerCase().startsWith(Constants.HTTPS + "://")) {
+            proxyUrl =  Constants.HTTP + "://" + proxyUrl;
         }
         URL url = new URL(proxyUrl);
         String host = url.getHost();

Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,11 @@ public static void setProxyIfRequired(String httpProxyUrl, String httpsProxyUrl,`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`private static void setSystemProxy(String proxyUrl, String protocolToSet) throws IOException {`
`159`		`- if (!proxyUrl.toLowerCase().startsWith(protocolToSet)) {`
`160`		`- proxyUrl = protocolToSet + "://" + proxyUrl;`
	`159`	`+`
	`160`	`+ // If no scheme is set then default to http://`
	`161`	`+ if (!proxyUrl.toLowerCase().startsWith(Constants.HTTP + "://")`
	`162`	`+ && !proxyUrl.toLowerCase().startsWith(Constants.HTTPS + "://")) {`
	`163`	`+ proxyUrl = Constants.HTTP + "://" + proxyUrl;`
`161`	`164`	`}`
`162`	`165`	`URL url = new URL(proxyUrl);`
`163`	`166`	`String host = url.getHost();`