SONAR-7429 defaults of HTTPS proxy are values of HTTP proxy

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 1d700de06958e92c96dc449d6597452a55dba369..c4118f20895e638e8c31fdfb3c5b04c48286c371 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -188,8 +188,7 @@
 # HTTP proxy (default none)
 #http.proxyHost=
 #http.proxyPort=
-
-# HTTPS proxy (default none)
+# HTTPS proxy (defaults are values of http.proxyHost and http.proxyPort)
 #https.proxyHost=
 #https.proxyPort=
 

diff --git a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
index 9d7b87e1bd653256f21de0fb40949ecf2b96df8e..d7b343787ad63bcc84377e959c8a88f25989a53b 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
@@ -177,10 +177,14 @@ public class DefaultHttpDownloader extends HttpDownloader {
     private static final String GET = "GET";
     private static final String HTTP_PROXY_USER = "http.proxyUser";
     private static final String HTTP_PROXY_PASSWORD = "http.proxyPassword";
+    private static final String HTTP_PROXY_HOST = "http.proxyHost";
+    private static final String HTTPS_PROXY_HOST = "https.proxyHost";
+    private static final String HTTP_PROXY_PORT = "http.proxyPort";
+    private static final String HTTPS_PROXY_PORT = "https.proxyPort";
 
     private static final List<String> PROXY_SETTINGS = ImmutableList.of(
-      "http.proxyHost", "http.proxyPort", "http.nonProxyHosts",
-      "https.proxyHost", "https.proxyPort",
+      HTTP_PROXY_HOST, HTTP_PROXY_PORT, "http.nonProxyHosts",
+      HTTPS_PROXY_HOST, HTTPS_PROXY_PORT,
       "http.auth.ntlm.domain", "socksProxyHost", "socksProxyPort");
 
     private String userAgent;
@@ -197,6 +201,10 @@ public class DefaultHttpDownloader extends HttpDownloader {
           system.setProperty(key, settings.getString(key));
         }
       }
+      // defaults of HTTPS properties are the values of HTTP properties
+      setSystemPropertyToDefaultIfNotSet(system, settings, HTTPS_PROXY_HOST, HTTP_PROXY_HOST);
+      setSystemPropertyToDefaultIfNotSet(system, settings, HTTPS_PROXY_PORT, HTTP_PROXY_PORT);
+
       // register credentials
       String login = settings.getString(HTTP_PROXY_USER);
       if (isNotEmpty(login)) {
@@ -204,6 +212,12 @@ public class DefaultHttpDownloader extends HttpDownloader {
       }
     }
 
+    private static void setSystemPropertyToDefaultIfNotSet(SystemFacade system, Settings settings, String httpsProperty, String httpProperty) {
+      if (!settings.hasKey(httpsProperty) && settings.hasKey(httpProperty)) {
+        system.setProperty(httpsProperty, settings.getString(httpProperty));
+      }
+    }
+
     private void initUserAgent(@Nullable String sonarVersion) {
       userAgent = sonarVersion == null ? "SonarQube" : String.format("SonarQube %s", sonarVersion);
       System.setProperty("http.agent", userAgent);

diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
index 906c96a20132387ddb31e3eac96f3542c9d8baba..f9296bcd139c8a0037d33cb7088699edd27b6f3a 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
@@ -57,7 +57,9 @@ import org.sonar.api.utils.SonarException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -272,6 +274,21 @@ public class DefaultHttpDownloaderTest {
     verify(system, never()).setDefaultAuthenticator(any(Authenticator.class));
   }
 
+  @Test
+  public void https_defaults_are_http_properties() {
+    DefaultHttpDownloader.SystemFacade system = mock(DefaultHttpDownloader.SystemFacade.class);
+    Settings settings = new Settings();
+    settings.setProperty("http.proxyHost", "1.2.3.4");
+    settings.setProperty("http.proxyPort", "80");
+
+    new DefaultHttpDownloader.BaseHttpDownloader(system, settings, null);
+
+    verify(system).setProperty("http.proxyHost", "1.2.3.4");
+    verify(system).setProperty("http.proxyPort", "80");
+    verify(system).setProperty("https.proxyHost", "1.2.3.4");
+    verify(system).setProperty("https.proxyPort", "80");
+  }
+
   @Test
   public void configure_http_proxy_credentials() {
     DefaultHttpDownloader.SystemFacade system = mock(DefaultHttpDownloader.SystemFacade.class);
@@ -297,6 +314,19 @@ public class DefaultHttpDownloaderTest {
     }));
   }
 
+  @Test
+  public void no_http_proxy_settings_by_default() {
+    DefaultHttpDownloader.SystemFacade system = mock(DefaultHttpDownloader.SystemFacade.class);
+    Settings settings = new Settings();
+    new DefaultHttpDownloader.BaseHttpDownloader(system, settings, null);
+
+    verify(system, never()).setProperty(eq("http.proxyHost"), anyString());
+    verify(system, never()).setProperty(eq("https.proxyHost"), anyString());
+    verify(system, never()).setProperty(eq("http.proxyPort"), anyString());
+    verify(system, never()).setProperty(eq("https.proxyPort"), anyString());
+    verify(system, never()).setDefaultAuthenticator(any(Authenticator.class));
+  }
+
 }
 
 class FakeProxy extends Proxy {