merge with branch 1.x

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

@@ -35,6 +35,7 @@ package sonia.scm.web;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.base.Stopwatch;
 import com.google.common.base.Strings;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -130,6 +131,7 @@ public class HgCGIServlet extends HttpServlet
     this.hookManager = hookManager;
     this.requestListenerUtil = requestListenerUtil;
     this.exceptionHandler = new HgCGIExceptionHandler();
+    this.command = HgPythonScript.HGWEB.getFile(SCMContext.getContext());
   }
 
   //~--- methods --------------------------------------------------------------
@@ -143,7 +145,7 @@ public class HgCGIServlet extends HttpServlet
   @Override
   public void init() throws ServletException
   {
-    command = HgPythonScript.HGWEB.getFile(SCMContext.getContext());
+
     super.init();
   }
 
@@ -184,7 +186,11 @@ public class HgCGIServlet extends HttpServlet
       {
         handleRequest(request, response, repository);
       }
-      catch (Exception ex)
+      catch (ServletException ex)
+      {
+        exceptionHandler.handleException(request, response, ex);
+      }
+      catch (IOException ex)
       {
         exceptionHandler.handleException(request, response, ex);
       }
@@ -241,7 +247,9 @@ public class HgCGIServlet extends HttpServlet
   {
     if (requestListenerUtil.callListeners(request, response, repository))
     {
+      Stopwatch sw = Stopwatch.createStarted();
       process(request, response, repository);
+      logger.debug("mercurial request finished in {}", sw.stop());
     }
     else if (logger.isDebugEnabled())
     {
@@ -358,26 +366,26 @@ public class HgCGIServlet extends HttpServlet
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private CGIExecutorFactory cgiExecutorFactory;
+  private final CGIExecutorFactory cgiExecutorFactory;
 
   /** Field description */
-  private File command;
+  private final File command;
 
   /** Field description */
-  private ScmConfiguration configuration;
+  private final ScmConfiguration configuration;
 
   /** Field description */
-  private HgCGIExceptionHandler exceptionHandler;
+  private final HgCGIExceptionHandler exceptionHandler;
 
   /** Field description */
-  private HgRepositoryHandler handler;
+  private final HgRepositoryHandler handler;
 
   /** Field description */
-  private HgHookManager hookManager;
+  private final HgHookManager hookManager;
 
   /** Field description */
-  private RepositoryProvider repositoryProvider;
+  private final RepositoryProvider repositoryProvider;
 
   /** Field description */
-  private RepositoryRequestListenerUtil requestListenerUtil;
+  private final RepositoryRequestListenerUtil requestListenerUtil;
 }

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

@@ -35,6 +35,7 @@ package sonia.scm.web;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 
 import sonia.scm.Priority;
@@ -46,22 +47,27 @@ import sonia.scm.web.filter.ProviderPermissionFilter;
 
 //~--- JDK imports ------------------------------------------------------------
 
+import java.util.Set;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**
- *
+ * Permission filter for mercurial repositories.
+ * 
  * @author Sebastian Sdorra
  */
 @Priority(Filters.PRIORITY_AUTHORIZATION)
 @WebElement(value = HgServletModule.MAPPING_HG)
 public class HgPermissionFilter extends ProviderPermissionFilter
 {
+  
+  private static final Set<String> READ_METHODS = ImmutableSet.of("GET", "HEAD", "OPTIONS", "TRACE");
 
   /**
-   * Constructs ...
+   * Constructs a new instance.
    *
-   * @param configuration
-   * @param repositoryProvider
+   * @param configuration scm configuration
+   * @param repositoryProvider repository provider
    */
   @Inject
   public HgPermissionFilter(ScmConfiguration configuration,
@@ -72,17 +78,9 @@ public class HgPermissionFilter extends ProviderPermissionFilter
 
   //~--- get methods ----------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   * @param request
-   *
-   * @return
-   */
   @Override
   protected boolean isWriteRequest(HttpServletRequest request)
   {
-    return !request.getMethod().equalsIgnoreCase("GET");
+    return !READ_METHODS.contains(request.getMethod());
   }
 }

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

@@ -0,0 +1,84 @@
+/**
+ * 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.common.annotations.VisibleForTesting;
+
+import sonia.scm.plugin.Extension;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.nio.charset.Charset;
+
+/**
+ *
+ * @author Sebastian Sdorra <s.sdorra@gmail.com>
+ * @since 1.45
+ */
+@Extension
+public class HgUserAgentProvider implements UserAgentProvider
+{
+
+  /** mercurial seems to use system encoding */
+  @VisibleForTesting
+  static UserAgent HG = UserAgent.builder("Mercurial").browser(
+                          false).basicAuthenticationCharset(
+                          Charset.defaultCharset()).build();
+
+  /** Field description */
+  private static final String PREFIX = "mercurial";
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param userAgentString
+   *
+   * @return
+   */
+  @Override
+  public UserAgent parseUserAgent(String userAgentString)
+  {
+    UserAgent ua = null;
+
+    if (userAgentString.startsWith(PREFIX))
+    {
+      ua = HG;
+    }
+
+    return ua;
+  }
+}