Fix spotify#1118 System property http.nonProxyHosts is processed improperly (spotify#1119)

* Fix spotify#1118 System property http.nonProxyHosts is not processed properly when quotes are used

* Fix spotify#1118 System property http.nonProxyHosts is not processed properly when quotes are used

Modify unit test to cover changed code

* Fix spotify#1118 System property http.nonProxyHosts is not processed properly when quotes are used

Modify unit test to cover the case, where proxy.nonProxyHosts property is double quoted.

* Fix spotify#1118 System property http.nonProxyHosts is not processed properly when quotes are used

Fix checkstyle issues.

Author: alrega

src/main/java/com/spotify/docker/client/DefaultDockerClient.java

@@ -175,6 +175,7 @@
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -497,8 +498,10 @@ private ClientConfig updateProxy(ClientConfig config, Builder builder) {
       final String proxyHost = System.getProperty("http.proxyHost");
       if (proxyHost != null) {
         boolean skipProxy = false;
-        final String nonProxyHosts = System.getProperty("http.nonProxyHosts");
+        String nonProxyHosts = System.getProperty("http.nonProxyHosts");
         if (nonProxyHosts != null) {
+          // Remove quotes, if any. Refer to https://docs.oracle.com/javase/8/docs/technotes/guides/net/proxies.html
+          nonProxyHosts = StringUtils.strip(nonProxyHosts, "\"");
           String host = getHost();
           for (String nonProxyHost : nonProxyHosts.split("\\|")) {
             if (host.matches(toRegExp(nonProxyHost))) {

src/test/java/com/spotify/docker/client/DefaultDockerClientUnitTest.java

@@ -93,6 +93,7 @@
 import java.nio.file.Paths;
 import java.sql.Date;
 import java.time.Instant;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -203,12 +204,27 @@ public void testHostWithNonProxyHost() {
     try {
       System.setProperty("http.proxyHost", "gmodules.com");
       System.setProperty("http.proxyPort", "80");
-      System.setProperty("http.nonProxyHosts", "127.0.0.1|localhost|192.168.*");
-      final DefaultDockerClient client = DefaultDockerClient.builder()
-              .uri("https://192.168.53.103:2375").build();
-      assertThat((String) client.getClient().getConfiguration()
-                      .getProperty("jersey.config.client.proxy.uri"),
-              isEmptyOrNullString());
+      final String nonProxyHostsPropertyValue = "127.0.0.1|localhost|192.168.*";
+      final List<String> nonProxyHostsPropertyValues = Arrays.asList(
+              nonProxyHostsPropertyValue, "\"" + nonProxyHostsPropertyValue + "\"");
+      for (String value : nonProxyHostsPropertyValues) {
+        System.setProperty("http.nonProxyHosts", value);
+        final DefaultDockerClient client = DefaultDockerClient.builder()
+                .uri("https://192.168.53.103:2375").build();
+        assertThat((String) client.getClient().getConfiguration()
+                        .getProperty("jersey.config.client.proxy.uri"),
+                isEmptyOrNullString());
+        final DefaultDockerClient client1 = DefaultDockerClient.builder()
+                .uri("https://127.0.0.1:2375").build();
+        assertThat((String) client1.getClient().getConfiguration()
+                        .getProperty("jersey.config.client.proxy.uri"),
+                isEmptyOrNullString());
+        final DefaultDockerClient client2 = DefaultDockerClient.builder()
+                .uri("https://localhost:2375").build();
+        assertThat((String) client2.getClient().getConfiguration()
+                        .getProperty("jersey.config.client.proxy.uri"),
+                isEmptyOrNullString());
+      }
     } finally {
       System.clearProperty("http.proxyHost");
       System.clearProperty("http.proxyPort");