mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 06:22:29 +00:00
Strengthening the reverse proxy admin monitor to detect nontransparent slash encoding (/ vs. %2F).
Apache in its default configuration botches this: http://stackoverflow.com/a/9933890/12916
This commit is contained in:
1 parent
c528b95c51
commit
724f9e0dfc
2 files changed
+46
-6
No files matched your search
@@ -25,12 +25,10 @@ package hudson.diagnosis;
|
||||
|
||||
import hudson.Extension;
|
||||
import hudson.model.AdministrativeMonitor;
|
||||
import hudson.util.FormValidation;
|
||||
import org.kohsuke.stapler.HttpRedirect;
|
||||
import org.kohsuke.stapler.HttpResponse;
|
||||
import org.kohsuke.stapler.HttpResponses;
|
||||
import org.kohsuke.stapler.QueryParameter;
|
||||
import org.kohsuke.stapler.WebMethod;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@@ -54,12 +52,15 @@ public class ReverseProxySetupMonitor extends AdministrativeMonitor {
|
||||
}
|
||||
|
||||
public HttpResponse doTest() {
|
||||
return new HttpRedirect("test-for-reverse-proxy-setup");
|
||||
return new HttpRedirect("testForReverseProxySetup/a%2Fb/");
|
||||
}
|
||||
|
||||
@WebMethod(name="test-for-reverse-proxy-setup")
|
||||
public FormValidation doFoo() {
|
||||
return FormValidation.ok();
|
||||
public void getTestForReverseProxySetup(String rest) {
|
||||
if (rest.equals("a/b")) {
|
||||
throw HttpResponses.ok();
|
||||
} else {
|
||||
throw HttpResponses.errorWithoutStack(404, "expected a/b but got " + rest);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright 2014 Jesse Glick.
|
||||
*
|
||||
* 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.diagnosis;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.Rule;
|
||||
import org.jvnet.hudson.test.JenkinsRule;
|
||||
|
||||
public class ReverseProxySetupMonitorTest {
|
||||
|
||||
@Rule public JenkinsRule r = new JenkinsRule();
|
||||
|
||||
@Test public void normal() throws Exception {
|
||||
r.createWebClient().goTo(r.jenkins.getAdministrativeMonitor(ReverseProxySetupMonitor.class.getName()).getUrl() + "/test", null);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user