From 19d8b80bb2f33e4877c7170bcca8bfa318ebe77d Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Tue, 29 Jul 2014 10:51:44 +0100 Subject: [PATCH] You have just got to love people using non-standard headers... --- core/src/main/java/jenkins/model/Jenkins.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index c98600ad90..ad1903e8c6 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -1923,8 +1923,23 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve String scheme = getXForwardedHeader(req, "X-Forwarded-Proto", req.getScheme()); buf.append(scheme).append("://"); String host = getXForwardedHeader(req, "X-Forwarded-Host", req.getServerName()); - buf.append(host); + int index = host.indexOf(':'); int port = req.getServerPort(); + if (index == -1) { + // Almost everyone else except Nginx put the host and port in separate headers + buf.append(host); + } else { + // Nginx uses the same spec as for the Host header, i.e. hostanme:port + buf.append(host.substring(0, index)); + if (index + 1 < host.length()) { + try { + port = Integer.parseInt(host.substring(index + 1)); + } catch (NumberFormatException e) { + // ignore + } + } + // but if a user has configured Nginx with an X-Forwarded-Port, that will win out. + } String forwardedPort = getXForwardedHeader(req, "X-Forwarded-Port", null); if (forwardedPort != null) { try {