fix lfs authentication via ssh command and enabled xsrf protection

scm-webapp/src/main/java/sonia/scm/security/XsrfAccessTokenEnricher.java

@@ -1,19 +1,19 @@
 /**
  * Copyright (c) 2014, Sebastian Sdorra
  * All rights reserved.
- *
+ * <p>
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- *
+ * <p>
  * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * 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.
+ * 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.
- *
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * <p>
  * 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
@@ -24,17 +24,19 @@
  * 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.
- *
+ * <p>
  * http://bitbucket.org/sdorra/scm-manager
- *
  */
 package sonia.scm.security;
 
 import com.google.common.annotations.VisibleForTesting;
+
 import java.util.UUID;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.servlet.http.HttpServletRequest;
+
+import com.google.inject.OutOfScopeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.config.ScmConfiguration;
@@ -46,9 +48,9 @@ import sonia.scm.util.HttpUtil;
  * add the xsrf field, if the authentication request is issued from the web interface and xsrf protection is
  * enabled. The xsrf field will be validated on every request by the {@link XsrfAccessTokenValidator}. Xsrf protection
  * can be disabled with {@link ScmConfiguration#setEnabledXsrfProtection(boolean)}.
- * 
- * @see <a href="https://goo.gl/s67xO3">Issue 793</a>
+ *
  * @author Sebastian Sdorra
+ * @see <a href="https://goo.gl/s67xO3">Issue 793</a>
  * @since 2.0.0
  */
 @Extension
@@ -58,14 +60,14 @@ public class XsrfAccessTokenEnricher implements AccessTokenEnricher {
    * the logger for XsrfAccessTokenEnricher
    */
   private static final Logger LOG = LoggerFactory.getLogger(XsrfAccessTokenEnricher.class);
-  
+
   private final ScmConfiguration configuration;
   private final Provider<HttpServletRequest> requestProvider;
 
   /**
    * Constructs a new instance.
-   * 
-   * @param configuration scm main configuration
+   *
+   * @param configuration   scm main configuration
    * @param requestProvider http request provider
    */
   @Inject
@@ -73,12 +75,11 @@ public class XsrfAccessTokenEnricher implements AccessTokenEnricher {
     this.configuration = configuration;
     this.requestProvider = requestProvider;
   }
-  
+
   @Override
   public void enrich(AccessTokenBuilder builder) {
     if (configuration.isEnabledXsrfProtection()) {
-      if (HttpUtil.isWUIRequest(requestProvider.get())) {
-        LOG.debug("received wui token claim, enrich jwt with xsrf key");
+      if (isEnrichable()) {
         builder.custom(Xsrf.TOKEN_KEY, createToken());
       } else {
         LOG.trace("skip xsrf enrichment, because jwt session is started from a non wui client");
@@ -87,11 +88,26 @@ public class XsrfAccessTokenEnricher implements AccessTokenEnricher {
       LOG.trace("xsrf is disabled, skip xsrf enrichment");
     }
   }
-  
+
+  private boolean isEnrichable() {
+    try {
+      HttpServletRequest request = requestProvider.get();
+      if (HttpUtil.isWUIRequest(request)) {
+        LOG.debug("received wui token claim, enrich jwt with xsrf key");
+        return true;
+      } else {
+        LOG.trace("skip xsrf enrichment, because jwt session is started from a non wui client");
+      }
+    } catch (OutOfScopeException ex) {
+      LOG.trace("skip xsrf enrichment, because no request scope is available");
+    }
+    return false;
+  }
+
   @VisibleForTesting
   String createToken() {
     // TODO create interface and use a better method
     return UUID.randomUUID().toString();
   }
-  
+
 }