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

Merge branch '3.1.x'

Browse Source
This commit is contained in:
spencergibb
2023-01-24 15:14:01 -05:00
parent 50cec9c312 22536f2702
commit a2e815b30b
4 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayFilterChain.java
View File

@@ -24,6 +24,7 @@ import org.springframework.web.server.ServerWebExchange;
* Contract to allow a {@link GatewayFilter} to delegate to the next in the chain.
*
* Copied from framework WebFilterChain
*
* @author Rossen Stoyanchev
* @since 5.0
*/

7
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GlobalFilter.java
View File

@@ -21,13 +21,14 @@ import reactor.core.publisher.Mono;
import org.springframework.web.server.ServerWebExchange;
/**
* Contract for interception-style, chained processing of gateway requests that may be used to
* implement cross-cutting, application-agnostic requirements such as security, timeouts,
* and others.
* Contract for interception-style, chained processing of gateway requests that may be
* used to implement cross-cutting, application-agnostic requirements such as security,
* timeouts, and others.
*
* Only applies to matched gateway routes.
*
* Copied from framework WebFilter
*
* @author Rossen Stoyanchev
* @since 5.0
*/

20
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java
View File

@@ -24,6 +24,8 @@ import reactor.core.publisher.Mono;
import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.util.Assert;
@@ -40,6 +42,8 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.C
public class CacheRequestBodyGatewayFilterFactory
extends AbstractGatewayFilterFactory<CacheRequestBodyGatewayFilterFactory.Config> {
static final String CACHED_ORIGINAL_REQUEST_BODY_BACKUP_ATTR = "cachedOriginalRequestBodyBackup";
private final List<HttpMessageReader<?>> messageReaders;
public CacheRequestBodyGatewayFilterFactory() {
@@ -70,13 +74,25 @@ public class CacheRequestBodyGatewayFilterFactory
final ServerRequest serverRequest = ServerRequest
.create(exchange.mutate().request(serverHttpRequest).build(), messageReaders);
return serverRequest.bodyToMono((config.getBodyClass())).doOnNext(objectValue -> {
exchange.getAttributes().put(ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR, objectValue);
Object previousCachedBody = exchange.getAttributes()
.put(ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR, objectValue);
if (previousCachedBody != null) {
// store previous cached body
exchange.getAttributes().put(CACHED_ORIGINAL_REQUEST_BODY_BACKUP_ATTR, previousCachedBody);
}
}).then(Mono.defer(() -> {
ServerHttpRequest cachedRequest = exchange
.getAttribute(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
Assert.notNull(cachedRequest, "cache request shouldn't be null");
exchange.getAttributes().remove(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
return chain.filter(exchange.mutate().request(cachedRequest).build());
return chain.filter(exchange.mutate().request(cachedRequest).build()).doFinally(s -> {
//
Object backupCachedBody = exchange.getAttributes()
.get(CACHED_ORIGINAL_REQUEST_BODY_BACKUP_ATTR);
if (backupCachedBody instanceof DataBuffer) {
DataBufferUtils.release((DataBuffer) backupCachedBody);
}
});
}));
});
}

28
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactoryTests.java
View File

@@ -33,11 +33,14 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
import org.springframework.cloud.gateway.test.BaseWebClientTests;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.buffer.PooledDataBuffer;
import org.springframework.http.HttpStatus;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.util.StringUtils;
import org.springframework.web.server.ServerWebExchange;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@SpringBootTest(webEnvironment = RANDOM_PORT)
@@ -101,7 +104,8 @@ public class CacheRequestBodyGatewayFilterFactoryTests extends BaseWebClientTest
.route("cache_request_body_java_test",
r -> r.path("/post").and().host("**.cacherequestbody.org")
.filters(f -> f.prefixPath("/httpbin").cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_VALUE)))
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_VALUE))
.filter(new CheckCachedRequestBodyReleasedGatewayFilter()))
.uri(uri))
.route("cache_request_body_empty_java_test",
r -> r.path("/post").and().host("**.cacherequestbodyempty.org")
@@ -161,4 +165,26 @@ public class CacheRequestBodyGatewayFilterFactoryTests extends BaseWebClientTest
}
private static class CheckCachedRequestBodyReleasedGatewayFilter implements GatewayFilter {
CheckCachedRequestBodyReleasedGatewayFilter() {
}
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
return chain.filter(exchange).doAfterTerminate(() -> {
Object o = exchange.getAttributes()
.get(CacheRequestBodyGatewayFilterFactory.CACHED_ORIGINAL_REQUEST_BODY_BACKUP_ATTR);
if (o instanceof PooledDataBuffer) {
PooledDataBuffer dataBuffer = (PooledDataBuffer) o;
if (dataBuffer.isAllocated()) {
exchange.getResponse().setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
fail("DataBuffer is not released");
}
}
});
}
}
}