[FIX JENKINS-18114] Exclude /cli URL from crumb requirement (#2315)

* [FIX JENKINS-18114] Exclude /cli URL from crumb requirement * [JENKINS-18114] Fix test: Don't send the crumb The CLI doesn't do this either.
jenkinsci · Sep 22, 2016 · de740c7 · de740c7
1 parent a371610
commit de740c7
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/cli/CliCrumbExclusion.java b/core/src/main/java/hudson/cli/CliCrumbExclusion.java
@@ -0,0 +1,52 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.cli;
+
+import hudson.Extension;
+import hudson.security.csrf.CrumbExclusion;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Makes CLI HTTP fallback work with CSRF protection enabled (JENKINS-18114).
+ */
+@Extension
+@Restricted(DoNotUse.class)
+public class CliCrumbExclusion extends CrumbExclusion {
+    @Override
+    public boolean process(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+        String pathInfo = request.getPathInfo();
+        if (pathInfo != null && "/cli".equals(pathInfo)) {
+            chain.doFilter(request, response);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/test/src/test/java/hudson/cli/CLIActionTest.java b/test/src/test/java/hudson/cli/CLIActionTest.java
@@ -89,7 +89,6 @@ public void serveCliActionToAnonymousUserWithoutPermissions() throws Exception {
         settings.setHttpMethod(HttpMethod.POST);
         settings.setAdditionalHeader("Session", UUID.randomUUID().toString());
         settings.setAdditionalHeader("Side", "download"); // We try to download something to init the duplex channel
-        settings = wc.addCrumb(settings);
 
         Page page = wc.getPage(settings);
         WebResponse webResponse = page.getWebResponse();