merge with branch 1.x

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

@@ -37,8 +37,11 @@ package sonia.scm.repository;
 
 import com.github.legman.Subscribe;
 
+import com.google.common.base.Objects;
 import com.google.inject.Inject;
+import com.google.inject.OutOfScopeException;
 import com.google.inject.Provider;
+import com.google.inject.ProvisionException;
 import com.google.inject.Singleton;
 
 import org.slf4j.Logger;
@@ -152,7 +155,7 @@ public class HgHookManager
 
     if (url == null)
     {
-      HttpServletRequest request = httpServletRequestProvider.get();
+      HttpServletRequest request = getHttpServletRequest();
 
       if (request != null)
       {
@@ -160,10 +163,10 @@ public class HgHookManager
       }
       else
       {
-        logger.warn(
-          "created hook url {} without request, in some cases this could cause problems",
-          hookUrl);
         url = createConfiguredUrl();
+        logger.warn(
+          "created url {} without request, in some cases this could cause problems",
+          url);
       }
     }
 
@@ -269,8 +272,14 @@ public class HgHookManager
    */
   private String createConfiguredUrl()
   {
+    //J-
     return HttpUtil.getUriWithoutEndSeperator(
-      configuration.getBaseUrl()).concat("/hook/hg/");
+      Objects.firstNonNull(
+        configuration.getBaseUrl(), 
+        "http://localhost:8080/scm"
+      )
+    ).concat("/hook/hg/");
+    //J+
   }
 
   /**
@@ -309,6 +318,32 @@ public class HgHookManager
 
   //~--- get methods ----------------------------------------------------------
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private HttpServletRequest getHttpServletRequest()
+  {
+    HttpServletRequest request = null;
+
+    try
+    {
+      request = httpServletRequestProvider.get();
+    }
+    catch (ProvisionException ex)
+    {
+      logger.debug("http servlet request is not available");
+    }
+    catch (OutOfScopeException ex)
+    {
+      logger.debug("http servlet request is not available");
+    }
+
+    return request;
+  }
+
   /**
    * Method description
    *

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgBasicAuthenticationFilter.java

@@ -0,0 +1,99 @@
+/**
+ * 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.web;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import sonia.scm.config.ScmConfiguration;
+import sonia.scm.web.filter.AutoLoginModule;
+import sonia.scm.web.filter.BasicAuthenticationFilter;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.IOException;
+
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Singleton
+public class HgBasicAuthenticationFilter extends BasicAuthenticationFilter
+{
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param configuration
+   * @param autoLoginModules
+   */
+  @Inject
+  public HgBasicAuthenticationFilter(ScmConfiguration configuration,
+    Set<AutoLoginModule> autoLoginModules)
+  {
+    super(configuration, autoLoginModules);
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param request
+   * @param response
+   *
+   * @throws IOException
+   */
+  @Override
+  protected void sendFailedAuthenticationError(HttpServletRequest request,
+    HttpServletResponse response)
+    throws IOException
+  {
+    if (HgUtil.isHgClient(request))
+    {
+      response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+    }
+    else
+    {
+      super.sendFailedAuthenticationError(request, response);
+    }
+  }
+}

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilter.java

@@ -57,9 +57,6 @@ public class HgPermissionFilter extends ProviderPermissionFilter
   /**
    * Constructs ...
    *
-   *
-   * @param securityContextProvider
-   *
    * @param configuration
    * @param repositoryProvider
    */

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java

@@ -75,7 +75,7 @@ public class HgServletModule extends ServletModule
     serve(MAPPING_HOOK).with(HgHookCallbackServlet.class);
 
     // register hg cgi servlet
-    filter(MAPPING_HG).through(BasicAuthenticationFilter.class);
+    filter(MAPPING_HG).through(HgBasicAuthenticationFilter.class);
     filter(MAPPING_HG).through(HgPermissionFilter.class);
     serve(MAPPING_HG).with(HgCGIServlet.class);
   }

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgUtil.java

@@ -50,6 +50,7 @@ import sonia.scm.repository.HgHookManager;
 import sonia.scm.repository.HgPythonScript;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.spi.javahg.HgFileviewExtension;
+import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -58,6 +59,8 @@ import java.io.File;
 
 import java.nio.charset.Charset;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -68,6 +71,9 @@ public final class HgUtil
   /** Field description */
   public static final String REVISION_TIP = "tip";
 
+  /** Field description */
+  private static final String USERAGENT_HG = "mercurial/";
+
   /**
    * the logger for HgUtil
    */
@@ -180,4 +186,17 @@ public final class HgUtil
       ? REVISION_TIP
       : revision;
   }
+
+  /**
+   * Returns true if the request comes from a mercurial client.
+   *
+   *
+   * @param request servlet request
+   *
+   * @return true if the client is mercurial
+   */
+  public static boolean isHgClient(HttpServletRequest request)
+  {
+    return HttpUtil.userAgentStartsWith(request, USERAGENT_HG);
+  }
 }