Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BufferingClientHttpRequestWrapper should not write empty body

Browse Source 
Prior to this commit, `BufferingClientHttpRequestWrapper` would always
write to the actual client request body, even if the buffered content
was empty (empty byte array).
This would cause issues with specific client request factories,
especially the OkHttp variant, that would consider empty byte arrays as
non-empty body and would reject such cases for GET requests with an
"IllegalArgumentException: method GET must not have a request body".

This commit only writes to the request if the buffered content is not
empty.

Fixes gh-32612
This commit is contained in:
Brian Clozel
2024-04-10 16:41:16 +02:00
parent a0136a276a
commit 019ce4418c
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
View File

@@ -55,21 +55,23 @@ final class BufferingClientHttpRequestWrapper extends AbstractBufferingClientHtt
protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
this.request.getHeaders().putAll(headers);
if (this.request instanceof StreamingHttpOutputMessage streamingHttpOutputMessage) {
streamingHttpOutputMessage.setBody(new StreamingHttpOutputMessage.Body() {
@Override
public void writeTo(OutputStream outputStream) throws IOException {
StreamUtils.copy(bufferedOutput, outputStream);
}
if (bufferedOutput.length > 0) {
if (this.request instanceof StreamingHttpOutputMessage streamingHttpOutputMessage) {
streamingHttpOutputMessage.setBody(new StreamingHttpOutputMessage.Body() {
@Override
public void writeTo(OutputStream outputStream) throws IOException {
StreamUtils.copy(bufferedOutput, outputStream);
}
@Override
public boolean repeatable() {
return true;
}
});
}
else {
StreamUtils.copy(bufferedOutput, this.request.getBody());
@Override
public boolean repeatable() {
return true;
}
});
}
else {
StreamUtils.copy(bufferedOutput, this.request.getBody());
}
}
ClientHttpResponse response = this.request.execute();