From ec9d809ddd2ed6930d1bf970999b152c5debdaa4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 9 Aug 2013 19:57:56 -0400 Subject: [PATCH] [FIXED JENKINS-16918] Use HTTP 405 when POST is required. --- changelog.html | 3 +++ core/src/main/java/hudson/model/BuildAuthorizationToken.java | 3 +++ test/src/test/java/jenkins/model/JenkinsTest.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index d74de3cd15..c8a0e7adb3 100644 --- a/changelog.html +++ b/changelog.html @@ -60,6 +60,9 @@ Upcoming changes
  • Form validation methods weren't getting triggered when one of its dependency controls change. (issue 19124) +
  • + When POST is required for some HTTP operation but GET was used, the response should have status code 405. + (issue 16918) diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java index ddb9283925..8d4483ba08 100644 --- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java +++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java @@ -31,6 +31,7 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import java.io.IOException; +import javax.servlet.http.HttpServletResponse; import jenkins.security.ApiTokenProperty; import org.acegisecurity.AccessDeniedException; import org.kohsuke.stapler.HttpResponses; @@ -84,6 +85,8 @@ public final class BuildAuthorizationToken { return; } + rsp.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + rsp.addHeader("Allow", "POST"); throw HttpResponses.forwardToView(project, "requirePOST.jelly"); } diff --git a/test/src/test/java/jenkins/model/JenkinsTest.java b/test/src/test/java/jenkins/model/JenkinsTest.java index 9b93b9ce14..ab0e2d87a2 100644 --- a/test/src/test/java/jenkins/model/JenkinsTest.java +++ b/test/src/test/java/jenkins/model/JenkinsTest.java @@ -290,7 +290,7 @@ public class JenkinsTest extends HudsonTestCase { jenkins.setCrumbIssuer(null); WebClient wc = createWebClient(); wc.login("alice"); - wc.assertFails("eval", HttpURLConnection.HTTP_INTERNAL_ERROR); + wc.assertFails("eval", HttpURLConnection.HTTP_BAD_METHOD); assertEquals("3", eval(wc)); wc.login("bob"); try {