Skip to content

Fix handling of headers in reactive HTTP requests to ensure case-insensivity #33671

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

Closed
Show file tree
Hide file tree
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 @@ -30,7 +30,6 @@
import org.springframework.http.HttpMethod;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;

Expand Down Expand Up @@ -72,7 +71,9 @@ public DefaultServerHttpRequestBuilder(ServerHttpRequest original) {

this.uri = original.getURI();
// original headers can be immutable, so create a copy
this.headers = new HttpHeaders(new LinkedMultiValueMap<>(original.getHeaders()));
this.headers = new HttpHeaders();
this.headers.putAll(original.getHeaders());

this.httpMethod = original.getMethod();
this.contextPath = original.getPath().contextPath().value();
this.remoteAddress = original.getRemoteAddress();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,13 @@ public void mutateDoesNotPreventAccessToNativeRequest() throws Exception {
assertThat(nativeRequest).isInstanceOf(HttpServletRequest.class);
}

@Test // gh-33666
public void mutateKeepsHeadersCaseInsensitive() throws Exception {
ServerHttpRequest request = createRequest("/path");
request = request.mutate().header("key", "value").build();
assertThat(request.getHeaders().get("KEY")).isEqualTo(Collections.singletonList("value"));
}

private ServerHttpRequest createRequest(String uriString) throws Exception {
return createRequest(uriString, "");
}
Expand Down
Loading