Skip to content

UriModifyingContentModifier.modifyContent decodes with the request charset but re-encodes with the platform default #1043

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

Merged
wilkinsona merged 1 commit into from
May 7, 2026
+32 −9
Merged

UriModifyingContentModifier.modifyContent decodes with the request charset but re-encodes with the platform default #1043

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
13 changes: 4 additions & 9 deletions .../org/springframework/restdocs/operation/preprocess/UriModifyingOperationPreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.restdocs.operation.preprocess;

import java.net.URI;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -191,15 +192,9 @@ private void setPort(String port) {

@Override
public byte[] modifyContent(byte[] content, MediaType contentType) {
String input;
if (contentType != null && contentType.getCharset() != null) {
input = new String(content, contentType.getCharset());
}
else {
input = new String(content);
}

return modify(input).getBytes();
Charset charset = (contentType != null && contentType.getCharset() != null) ? contentType.getCharset()
: Charset.defaultCharset();
return modify(new String(content, charset)).getBytes(charset);
}

private String modify(String input) {
Expand Down
28 changes: 28 additions & 0 deletions ...springframework/restdocs/operation/preprocess/UriModifyingOperationPreprocessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.restdocs.operation.preprocess;

import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand All @@ -26,6 +27,7 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.restdocs.operation.OperationRequest;
import org.springframework.restdocs.operation.OperationRequestFactory;
import org.springframework.restdocs.operation.OperationRequestPart;
Expand Down Expand Up @@ -299,6 +301,32 @@ public void modifiedUriDoesNotGetDoubleEncoded() {

}

@Test
public void requestContentWithNonAsciiCharactersIsPreservedWhenCharsetIsIso88591() {
this.preprocessor.scheme("https");
String original = "café http://localhost:12345 done";
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType("text/plain;charset=ISO-8859-1"));
OperationRequest request = this.requestFactory.create(URI.create("http://localhost"), HttpMethod.GET,
original.getBytes(StandardCharsets.ISO_8859_1), headers, Collections.<OperationRequestPart>emptyList());
OperationRequest processed = this.preprocessor.preprocess(request);
String result = new String(processed.getContent(), StandardCharsets.ISO_8859_1);
assertThat(result).isEqualTo("café https://localhost:12345 done");
}

@Test
public void responseContentWithNonAsciiCharactersIsPreservedWhenCharsetIsIso88591() {
this.preprocessor.scheme("https");
String original = "café http://localhost:12345 done";
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType("text/plain;charset=ISO-8859-1"));
OperationResponse response = this.responseFactory.create(HttpStatus.OK, headers,
original.getBytes(StandardCharsets.ISO_8859_1));
OperationResponse processed = this.preprocessor.preprocess(response);
String result = new String(processed.getContent(), StandardCharsets.ISO_8859_1);
assertThat(result).isEqualTo("café https://localhost:12345 done");
}

@Test
public void resultingRequestHasCookiesFromOriginalRequst() {
List<RequestCookie> cookies = Arrays.asList(new RequestCookie("a", "alpha"));
Expand Down
Loading