SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug for ModifyResponseBodyGatewayFilter not setting up response content-type, if newContentType is present in config. Fixes gh-2647 (#2649)

Browse Source
This commit is contained in:
Muchnik Andrey
2024-03-09 00:22:53 +03:00
committed by GitHub
parent 8c6cd4690a
commit 258dc09b49
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactory.java
View File

@@ -40,6 +40,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
import org.springframework.util.StringUtils;
import org.springframework.web.reactive.function.BodyInserter;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.reactive.function.client.ClientResponse;
@@ -233,6 +234,11 @@ public class ModifyResponseBodyGatewayFilterFactory
|| headers.containsKey(HttpHeaders.CONTENT_LENGTH)) {
messageBody = messageBody.doOnNext(data -> headers.setContentLength(data.readableByteCount()));
}
if (StringUtils.hasText(config.newContentType)) {
headers.set(HttpHeaders.CONTENT_TYPE, config.newContentType);
}
// TODO: fail if isStreamingMediaType?
return getDelegate().writeWith(messageBody);
}));

20
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactoryTests.java
View File

@@ -39,6 +39,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.util.UriComponentsBuilder;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@SpringBootTest(webEnvironment = RANDOM_PORT, properties = "spring.codec.max-in-memory-size=40")
@@ -63,6 +65,16 @@ public class ModifyResponseBodyGatewayFilterFactoryTests extends BaseWebClientTe
.exchange().expectBody().json("{\"value\": \"httpbin compatible home\", \"length\": 23}");
}
@Test
public void testModificationOfContentType() {
URI uri = UriComponentsBuilder.fromUriString(this.baseUri + "/").build(true).toUri();
testClient.get().uri(uri).header("Host", "www.modifyresponsebodyjavacontenttype.org").accept(MediaType.ALL)
.exchange().expectHeader().valueEquals(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE)
.expectBody().consumeWith(result -> assertThat(new String(result.getResponseBody(), UTF_8))
.isEqualTo("Modified response"));
}
@Test
public void modifyResponeBodyToLarge() {
testClient.post().uri("/post").header("Host", "www.modifyresponsebodyjavatoolarge.org")
@@ -97,6 +109,14 @@ public class ModifyResponseBodyGatewayFilterFactoryTests extends BaseWebClientTe
return Mono.just(toLarge);
}))
.uri(uri))
.route("modify_response_java_test_content_type",
r -> r.path("/").and().host("www.modifyresponsebodyjavacontenttype.org")
.filters(
f -> f.prefixPath("/httpbin").modifyResponseBody(String.class, String.class,
MediaType.TEXT_PLAIN_VALUE, (webExchange, originalResponse) -> {
return Mono.just("Modified response");
}))
.uri(uri))
.build();
}