Skip to content

GH-4025: Fix Gzip decompression logic for byte[] in ModifyResponseBodyGatewayFilterFactory #4040

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

GH-4025: Fix Gzip decompression logic for byte[] in ModifyResponseBodyGatewayFilterFactory #4040

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
10 changes: 0 additions & 10 deletions ...ramework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,6 @@ private ClientResponse prepareClientResponse(Publisher<? extends DataBuffer> bod
}

private <T> Mono<T> extractBody(ServerWebExchange exchange, ClientResponse clientResponse, Class<T> inClass) {
// if inClass is byte[] then just return body, otherwise check if
// decoding required
if (byte[].class.isAssignableFrom(inClass)) {
return clientResponse.bodyToMono(inClass);
}

List<String> encodingHeaders = exchange.getResponse().getHeaders().getOrEmpty(HttpHeaders.CONTENT_ENCODING);
for (String encoding : encodingHeaders) {
MessageBodyDecoder decoder = messageBodyDecoders.get(encoding);
Expand All @@ -289,10 +283,6 @@ private <T> Mono<T> extractBody(ServerWebExchange exchange, ClientResponse clien
private Mono<DataBuffer> writeBody(ServerHttpResponse httpResponse, CachedBodyOutputMessage message,
Class<?> outClass) {
Mono<DataBuffer> response = DataBufferUtils.join(message.getBody());
if (byte[].class.isAssignableFrom(outClass)) {
return response;
}

List<String> encodingHeaders = httpResponse.getHeaders().getOrEmpty(HttpHeaders.CONTENT_ENCODING);
for (String encoding : encodingHeaders) {
MessageBodyEncoder encoder = messageBodyEncoders.get(encoding);
Expand Down
24 changes: 24 additions & 0 deletions ...cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactoryGzipTests.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.cloud.gateway.filter.factory.rewrite;

import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -55,6 +56,20 @@ void testModificationOfResponseBody() {
.json("{\"length\":25,\"value\":\"\\\"httpbin compatible home\\\"\"}");
}

@Test
void testModificationOfResponseBodyBytes() {
URI uri = UriComponentsBuilder.fromUriString(this.baseUri + "/gzip-byte").build(true).toUri();

testClient.get()
.uri(uri)
.header("Host", "www.modifyresponsebodyjava.org")
.accept(MediaType.APPLICATION_JSON)
.exchange()
.expectBody()
// Expected: the original data ("httpbin compatible home") should be correctly included as a JSON value
.json("{\"is_byte\":true,\"original\":\"httpbin compatible home\"}");
}

@EnableAutoConfiguration
@SpringBootConfiguration
@Import(DefaultTestConfig.class)
Expand All @@ -76,6 +91,15 @@ RouteLocator testRouteLocator(RouteLocatorBuilder builder) {
return Mono.just(modifiedResponse);
}))
.uri(uri))
.route("modify_response_java_test_gzip_byte", r -> r.path("/gzip-byte")
.and()
.host("www.modifyresponsebodyjava.org")
.filters(f -> f.setPath("/gzip").modifyResponseBody(byte[].class, byte[].class, (webExchange, originalResponse) -> {
String s = new String(originalResponse, StandardCharsets.UTF_8);
String modified = "{\"is_byte\":true,\"original\":" + s + "}";
return Mono.just(modified.getBytes(StandardCharsets.UTF_8));
}))
.uri(uri))
.build();
}

Expand Down
Loading