Skip to content
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.

Sign up for GitHub

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

Refactor header appending logic for better readability. #3674

Closed
wants to merge 1 commit into from
Closed

Refactor header appending logic for better readability. #3674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 16 additions & 19 deletions ...-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,30 +403,27 @@ private void proxy() {

private void appendXForwarded(URI uri) {
// Append the legacy headers if they were already added upstream
String host = headers.getFirst("x-forwarded-host");
if (host == null) {
return;
}
host = host + "," + uri.getHost();
headers.set("x-forwarded-host", host);
String proto = headers.getFirst("x-forwarded-proto");
if (proto == null) {
return;
}
proto = proto + "," + uri.getScheme();
headers.set("x-forwarded-proto", proto);
appendXForwardedHeader("x-forwarded-host", () -> uri.getHost());
appendXForwardedHeader("x-forwarded-proto", () -> uri.getScheme());
}

private void appendXForwardedHeader(String headerName, Supplier<String> uriValue) {
String existingValue = headers.getFirst(headerName);
if (existingValue != null) {
StringBuilder builder = new StringBuilder(existingValue);
builder.append(",").append(uriValue.get());
headers.set(headerName, builder.toString());
}
}

private void appendForwarded(URI uri) {
String forwarded = headers.getFirst("forwarded");
if (forwarded != null) {
forwarded = forwarded + ",";
}
else {
forwarded = "";
StringBuilder sb = new StringBuilder();
if (StringUtils.hasText(forwarded)) {
sb.append(forwarded).append(",");
}
forwarded = forwarded + forwarded(uri, webRequest.getHeader("host"));
headers.set("forwarded", forwarded);
sb.append(forwarded(uri, webRequest.getHeader("host")));
headers.set("forwarded", sb.toString());
}

private String forwarded(URI uri, String hostHeader) {
Expand Down
Loading