Skip to content

Support unresolved remote addresses in XForwardedHeadersFilter #4140

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

Open
tkatta-stack wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −1
Open

Support unresolved remote addresses in XForwardedHeadersFilter #4140

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion ...c/main/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {

if (isForEnabled()) {
String remoteAddr = null;
if (request.getRemoteAddress() != null && request.getRemoteAddress().getAddress() != null) {
if (request.getRemoteAddress() != null) {
// Support unresolved addresses (getAddress() may be null)
remoteAddr = request.getRemoteAddress().getHostString();
}
// match xforwarded for against trusted proxies
Expand Down
21 changes: 21 additions & 0 deletions ...t/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,27 @@ public void xForwardedHeadersDoNotExist() throws Exception {
assertThat(headers.getFirst(X_FORWARDED_PROTO_HEADER)).isEqualTo("http");
}

@Test
public void unresolvedRemoteAddressAddsXForwardedForHeader() {
// Create unresolved InetSocketAddress (this is the actual bug scenario)
InetSocketAddress unresolved = InetSocketAddress.createUnresolved("example.com", 80);

MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/get")
.remoteAddress(unresolved)
.header(HttpHeaders.HOST, "myhost")
.build();

XForwardedHeadersFilter filter = new XForwardedHeadersFilter(ALLOW_ALL_REGEX);

HttpHeaders headers = filter.filter(request.getHeaders(), MockServerWebExchange.from(request));

// Verify header is present (this currently fails before your fix)
assertThat(headers.headerNames()).contains(X_FORWARDED_FOR_HEADER);

// Verify it uses host string (not null)
assertThat(headers.getFirst(X_FORWARDED_FOR_HEADER)).isEqualTo("example.com");
}

@Test
public void defaultPort() throws Exception {
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost/get")
Expand Down
Loading