Skip to content
Permalink
Browse files
[FIXED JENKINS-10675] use X-Forwarded-Proto if present
(cherry picked from commit ddfa65f)
  • Loading branch information
Ian Hopkins authored and olivergondza committed Oct 31, 2013
1 parent ca35f24 commit 2235fcd90526f1e22de114973da4d08fd1df777f
Showing with 35 additions and 1 deletion.
  1. +6 −1 core/src/main/java/jenkins/model/Jenkins.java
  2. +29 −0 core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
@@ -1909,7 +1909,12 @@ public boolean isRootUrlSecure() {
public String getRootUrlFromRequest() {
StaplerRequest req = Stapler.getCurrentRequest();
StringBuilder buf = new StringBuilder();
buf.append(req.getScheme()+"://");
String scheme = req.getScheme();
String forwardedScheme = req.getHeader("X-Forwarded-Proto");
if (forwardedScheme != null) {
scheme = forwardedScheme;
}
buf.append(scheme+"://");
buf.append(req.getServerName());
if(req.getServerPort()!=80)
buf.append(':').append(req.getServerPort());
@@ -102,6 +102,30 @@ public void doNotInheritProtocolWhenDispatchingRequest2() {
accessing("http://localhost:8080/");
rootUrlIs("https://ci/jenkins/");
}

@Bug(10675)
@Test
public void useForwardedProtoWhenPresent() {
configured("https://ci/jenkins/");

// Without a forwarded protocol, it should use the request protocol
accessing("http://ci/jenkins/");
rootUrlFromRequestIs("http://ci/jenkins/");

// With a forwarded protocol, it should use the forwarded protocol
accessing("http://ci/jenkins/");
withHeader("X-Forwarded-Proto", "https");
rootUrlFromRequestIs("https://ci/jenkins/");

accessing("https://ci/jenkins/");
withHeader("X-Forwarded-Proto", "http");
rootUrlFromRequestIs("http://ci/jenkins/");
}

private void rootUrlFromRequestIs(final String expectedRootUrl) {

assertThat(jenkins.getRootUrlFromRequest(), equalTo(expectedRootUrl));
}

private void rootUrlIs(final String expectedRootUrl) {

@@ -112,6 +136,11 @@ private void configured(final String configuredHost) {

when(config.getUrl()).thenReturn(configuredHost);
}

private void withHeader(String name, String value) {
final StaplerRequest req = Stapler.getCurrentRequest();
when(req.getHeader(name)).thenReturn(value);
}

private void accessing(final String realUrl) {

0 comments on commit 2235fcd

Please sign in to comment.