Skip to content

Handle X-Forwarded-Prefix parsed by Reactor-Netty in ReactorServerHttpRequest #33638

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

Closed
wants to merge 5 commits into from
Closed

Handle X-Forwarded-Prefix parsed by Reactor-Netty in ReactorServerHttpRequest #33638

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c8a159
Handle X-Forwarded-Prefix parsed by Reactor-Netty in ReactorServerHtt…
chemicL Oct 1, 2024
6cbd5cb
Revert refactoring of appendRequestUri
chemicL Oct 1, 2024
432a6df
Removed mavenLocal from build.gradle
chemicL Oct 3, 2024
8978106
Formatting
chemicL Oct 3, 2024
f5a5a9c
Use reactor bom snapshot
chemicL Oct 3, 2024
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
1 change: 1 addition & 0 deletions framework-platform/framework-platform.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ dependencies {
api("io.micrometer:context-propagation:1.1.1")
api("io.mockk:mockk:1.13.4")
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
api("io.projectreactor.netty:reactor-netty-http:1.1.23-SNAPSHOT")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once #33636 is resolved, this can be removed before merging.

api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
Expand Down
3 changes: 2 additions & 1 deletion ...-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest {
public ReactorServerHttpRequest(HttpServerRequest request, NettyDataBufferFactory bufferFactory)
throws URISyntaxException {

super(HttpMethod.valueOf(request.method().name()), ReactorUriHelper.createUri(request), "",
super(HttpMethod.valueOf(request.method().name()),
ReactorUriHelper.createUri(request), request.forwardedPrefix(),
new Netty4HeadersAdapter(request.requestHeaders()));
Assert.notNull(bufferFactory, "DataBufferFactory must not be null");
this.request = request;
Expand Down
6 changes: 5 additions & 1 deletion spring-web/src/main/java/org/springframework/http/server/reactive/ReactorUriHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ public static URI createUri(HttpServerRequest request) throws URISyntaxException
builder.append(port);
}

appendRequestUri(request, builder);
String prefix = request.forwardedPrefix();
if (prefix != null && !prefix.isEmpty()) {
builder.append(prefix);
}

appendRequestUri(request, builder);
return new URI(builder.toString());
}

Expand Down
27 changes: 27 additions & 0 deletions spring-web/src/test/java/org/springframework/http/server/reactive/ReactorUriHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import java.net.URISyntaxException;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import reactor.netty.http.server.HttpServerRequest;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -49,4 +51,29 @@ void hostnameWithZoneId() throws URISyntaxException {

}

@ParameterizedTest(name = "{displayName}({arguments})")
@CsvSource(delimiter='|', value = {
"/prefix | /prefix/",
"/prefix1/prefix2 | /prefix1/prefix2/",
" | /",
"'' | /",
})
void forwardedPrefix(String prefixHeader, String expectedPath) throws URISyntaxException {
HttpServerRequest nettyRequest = mock();

given(nettyRequest.scheme()).willReturn("https");
given(nettyRequest.hostName()).willReturn("localhost");
given(nettyRequest.hostPort()).willReturn(443);
given(nettyRequest.uri()).willReturn("/");
given(nettyRequest.forwardedPrefix()).willReturn(prefixHeader);

URI uri = ReactorUriHelper.createUri(nettyRequest);
assertThat(uri).hasScheme("https")
.hasHost("localhost")
.hasPort(-1)
.hasPath(expectedPath)
.hasToString("https://localhost" + expectedPath);
}


}
Loading