Skip to content

Fix transformLocation for X-Forwarded-Host containing host:port #1422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ protected String transformLocation(String location, HttpServletRequest request)
int serverPort = StringUtils.hasText(xForwardedPort) ? Integer.parseInt(xForwardedPort) : request.getServerPort();

StringBuilder url = new StringBuilder(scheme);
url.append("://").append(serverName).append(':').append(serverPort);
url.append("://").append(serverName);
boolean serverHasColonAfterAt = serverName.indexOf("@") < serverName.indexOf(":");
if(!serverHasColonAfterAt) {
url.append(':').append(serverPort);
}
if (location.startsWith("/")) {
// a relative path, prepend the context path
url.append(request.getContextPath()).append(location);
Expand Down