Skip to content

Forward incoming headers in WebFlux ProxyExchange body requests #4159

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
PreAgile wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −5
Open

Forward incoming headers in WebFlux ProxyExchange body requests #4159

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
9 changes: 4 additions & 5 deletions ...change-webflux/src/main/java/org/springframework/cloud/gateway/webflux/ProxyExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@ private Mono<ResponseEntity<T>> exchange(RequestEntity<?> requestEntity) {
Objects.requireNonNull(requestEntity.getMethod(), "Method must not be null");
RequestBodySpec builder = rest.method(requestEntity.getMethod())
.uri(requestEntity.getUrl())
.headers(headers -> addHeaders(headers, requestEntity.getHeaders()));
.headers(headers -> addHeaders(headers, requestEntity.getHeaders()))
.headers(headers -> addHeaders(headers, exchange.getRequest().getHeaders()));
WebClient.ResponseSpec result;
if (requestEntity.getBody() instanceof Publisher) {
@SuppressWarnings("unchecked")
Expand All @@ -384,12 +385,10 @@ else if (requestEntity.getBody() != null) {
}
else {
if (hasBody) {
result = builder.headers(headers -> addHeaders(headers, exchange.getRequest().getHeaders()))
.body(exchange.getRequest().getBody(), DataBuffer.class)
.retrieve();
result = builder.body(exchange.getRequest().getBody(), DataBuffer.class).retrieve();
}
else {
result = builder.headers(headers -> addHeaders(headers, exchange.getRequest().getHeaders())).retrieve();
result = builder.retrieve();
}
}
return result.onStatus(HttpStatusCode::isError, t -> Mono.empty())
Expand Down
10 changes: 10 additions & 0 deletions ...src/test/java/org/springframework/cloud/gateway/webflux/ProductionConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,16 @@ public void post() throws Exception {
.isEqualTo("host=localhost:" + port + ";foo");
}

@Test
public void postWithBodyForwardsIncomingHeaders() throws Exception {
ResponseEntity<Bar> response = rest
.exchange(RequestEntity.post(rest.getRestTemplate().getUriTemplateHandler().expand("/proxy/0"))
.header("X-Custom", "incoming-header-value")
.contentType(MediaType.APPLICATION_JSON)
.body(Collections.singletonMap("name", "foo")), Bar.class);
assertThat(response.getBody().getName()).contains("incoming-header-value");
}

@Test
public void postJsonWithWhitespace() {
var json = """
Expand Down