merge with branch issue-170

scm-core/src/main/java/sonia/scm/net/HttpRequest.java

@@ -174,7 +174,7 @@ public class HttpRequest
    *
    *
    * @return
-   * 
+   *
    * @since 1.14
    */
   public boolean isDecodeGZip()
@@ -182,6 +182,42 @@ public class HttpRequest
     return decodeGZip;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   * @since 1.17
+   */
+  public boolean isDisableCertificateValidation()
+  {
+    return disableCertificateValidation;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   * @since 1.17
+   */
+  public boolean isDisableHostnameValidation()
+  {
+    return disableHostnameValidation;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   * @since 1.17
+   */
+  public boolean isIgnoreProxySettings()
+  {
+    return ignoreProxySettings;
+  }
+
   //~--- set methods ----------------------------------------------------------
 
   /**
@@ -208,15 +244,41 @@ public class HttpRequest
    * @param decodeGZip
    *
    * @return
-   * 
+   *
    * @since 1.14
    */
   public HttpRequest setDecodeGZip(boolean decodeGZip)
   {
     this.decodeGZip = decodeGZip;
+
     return this;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param disableCertificateValidation
+   * @since 1.17
+   */
+  public void setDisableCertificateValidation(
+          boolean disableCertificateValidation)
+  {
+    this.disableCertificateValidation = disableCertificateValidation;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param disableHostnameValidation
+   * @since 1.17
+   */
+  public void setDisableHostnameValidation(boolean disableHostnameValidation)
+  {
+    this.disableHostnameValidation = disableHostnameValidation;
+  }
+
   /**
    * Method description
    *
@@ -232,6 +294,18 @@ public class HttpRequest
     return this;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param ignoreProxySettings
+   * @since 1.17
+   */
+  public void setIgnoreProxySettings(boolean ignoreProxySettings)
+  {
+    this.ignoreProxySettings = ignoreProxySettings;
+  }
+
   /**
    * Method description
    *
@@ -277,10 +351,19 @@ public class HttpRequest
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private boolean decodeGZip = false;
+  private Map<String, List<String>> headers;
 
   /** Field description */
-  private Map<String, List<String>> headers;
+  private boolean ignoreProxySettings = false;
+
+  /** Field description */
+  private boolean disableHostnameValidation = false;
+
+  /** Field description */
+  private boolean disableCertificateValidation = false;
+
+  /** Field description */
+  private boolean decodeGZip = false;
 
   /** Field description */
   private Map<String, List<String>> parameters;

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHookManager.java

@@ -36,6 +36,7 @@ package sonia.scm.repository;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
 import org.slf4j.Logger;
@@ -43,6 +44,9 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.ConfigChangedListener;
 import sonia.scm.config.ScmConfiguration;
+import sonia.scm.net.HttpClient;
+import sonia.scm.net.HttpRequest;
+import sonia.scm.net.HttpResponse;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 
@@ -81,12 +85,15 @@ public class HgHookManager implements ConfigChangedListener<ScmConfiguration>
    *
    *
    * @param configuration
+   * @param httpClientProvider
    */
   @Inject
-  public HgHookManager(ScmConfiguration configuration)
+  public HgHookManager(ScmConfiguration configuration,
+                       Provider<HttpClient> httpClientProvider)
   {
     this.configuration = configuration;
     this.configuration.addListener(this);
+    this.httpClientProvider = httpClientProvider;
   }
 
   //~--- methods --------------------------------------------------------------
@@ -292,10 +299,15 @@ public class HgHookManager implements ConfigChangedListener<ScmConfiguration>
         logger.trace("check hook url {}", url);
       }
 
-      HttpURLConnection connection =
-        (HttpURLConnection) new URL(url).openConnection();
+      HttpRequest request = new HttpRequest(url);
 
-      result = connection.getResponseCode() == 204;
+      request.setDisableCertificateValidation(true);
+      request.setDisableHostnameValidation(true);
+      request.setIgnoreProxySettings(true);
+
+      HttpResponse response = httpClientProvider.get().get(request);
+
+      result = response.getStatusCode() == 204;
     }
     catch (IOException ex)
     {
@@ -318,4 +330,7 @@ public class HgHookManager implements ConfigChangedListener<ScmConfiguration>
 
   /** Field description */
   private volatile String hookUrl;
+
+  /** Field description */
+  private Provider<HttpClient> httpClientProvider;
 }

scm-webapp/src/main/java/sonia/scm/net/TrustAllHostnameVerifier.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.net;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class TrustAllHostnameVerifier implements HostnameVerifier
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param hostname
+   * @param session
+   *
+   * @return
+   */
+  @Override
+  public boolean verify(String hostname, SSLSession session)
+  {
+    return true;
+  }
+}

scm-webapp/src/main/java/sonia/scm/net/TrustAllTrustManager.java

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.net;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.X509TrustManager;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class TrustAllTrustManager implements X509TrustManager
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param chain
+   * @param authType
+   *
+   * @throws CertificateException
+   */
+  @Override
+  public void checkClientTrusted(X509Certificate[] chain, String authType)
+          throws CertificateException {}
+
+  /**
+   * Method description
+   *
+   *
+   * @param chain
+   * @param authType
+   *
+   * @throws CertificateException
+   */
+  @Override
+  public void checkServerTrusted(X509Certificate[] chain, String authType)
+          throws CertificateException {}
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public X509Certificate[] getAcceptedIssuers()
+  {
+    return null;
+  }
+}

scm-webapp/src/main/java/sonia/scm/net/URLHttpClient.java

@@ -64,6 +64,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -383,6 +387,49 @@ public class URLHttpClient implements HttpClient
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param request
+   * @param connection
+   */
+  private void applySSLSettings(HttpRequest request,
+                                HttpsURLConnection connection)
+  {
+    if (request.isDisableCertificateValidation())
+    {
+      if (logger.isTraceEnabled())
+      {
+        logger.trace("disable certificate validation");
+      }
+
+      try
+      {
+        TrustManager[] trustAllCerts = new TrustManager[] {
+                                         new TrustAllTrustManager() };
+        SSLContext sc = SSLContext.getInstance("SSL");
+
+        sc.init(null, trustAllCerts, new java.security.SecureRandom());
+        connection.setSSLSocketFactory(sc.getSocketFactory());
+      }
+      catch (Exception ex)
+      {
+        logger.error("could not disable certificate validation", ex);
+      }
+    }
+
+    if (request.isDisableHostnameValidation())
+    {
+      if (logger.isTraceEnabled())
+      {
+        logger.trace("disable hostname validation");
+      }
+
+      connection.setHostnameVerifier(new TrustAllHostnameVerifier());
+    }
+  }
+
   /**
    * Method description
    *
@@ -486,7 +533,7 @@ public class URLHttpClient implements HttpClient
   {
     HttpURLConnection connection = null;
 
-    if (configuration.isEnableProxy())
+    if (!request.isIgnoreProxySettings() && configuration.isEnableProxy())
     {
       if (logger.isDebugEnabled())
       {
@@ -506,6 +553,11 @@ public class URLHttpClient implements HttpClient
     }
     else
     {
+      if (request.isIgnoreProxySettings() && logger.isTraceEnabled())
+      {
+        logger.trace("ignore proxy settings");
+      }
+
       if (logger.isDebugEnabled())
       {
         logger.debug("fetch '{}'", url.toExternalForm());
@@ -514,6 +566,11 @@ public class URLHttpClient implements HttpClient
       connection = (HttpURLConnection) url.openConnection();
     }
 
+    if (connection instanceof HttpsURLConnection)
+    {
+      applySSLSettings(request, (HttpsURLConnection) connection);
+    }
+
     connection.setReadTimeout(TIMEOUT_RAED);
     connection.setConnectTimeout(TIMEOUT_CONNECTION);