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

Merge branch '4.1.x'

Browse Source
This commit is contained in:
spencergibb
2024-09-05 14:50:06 -04:00
parent 3835adc9e2 4676b39c60
commit 2c016c9ff9
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/cache/ResponseCacheManager.java vendored
View File

@@ -81,7 +81,7 @@ public class ResponseCacheManager {
this.ignoreNoCacheUpdate = isSkipNoCacheUpdateActive(requestOptions);
this.afterCacheExchangeMutators = List.of(new SetResponseHeadersAfterCacheExchangeMutator(),
new SetStatusCodeAfterCacheExchangeMutator(),
new RemoveHeadersAfterCacheExchangeMutator(HttpHeaders.PRAGMA),
new RemoveHeadersAfterCacheExchangeMutator(HttpHeaders.PRAGMA, HttpHeaders.EXPIRES),
new SetMaxAgeHeaderAfterCacheExchangeMutator(configuredTimeToLive, Clock.systemDefaultZone(),
ignoreNoCacheUpdate),
new SetCacheDirectivesByMaxAgeAfterCacheExchangeMutator());

13
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/cache/LocalResponseCacheGatewayFilterFactoryTests.java vendored
View File

@@ -353,6 +353,15 @@ public class LocalResponseCacheGatewayFilterFactoryTests extends BaseWebClientTe
@Test
void shouldNotReturnPragmaHeaderInNonCachedAndCachedResponses() {
shouldNotReturnHeader(HttpHeaders.PRAGMA);
}
@Test
void shouldNotReturnExpiresHeaderInNonCachedAndCachedResponses() {
shouldNotReturnHeader(HttpHeaders.EXPIRES);
}
private void shouldNotReturnHeader(String header) {
String uri = "/" + UUID.randomUUID() + "/cache/headers";
testClient.get()
@@ -360,14 +369,14 @@ public class LocalResponseCacheGatewayFilterFactoryTests extends BaseWebClientTe
.header("Host", "www.localresponsecache.org")
.exchange()
.expectHeader()
.doesNotExist(HttpHeaders.PRAGMA);
.doesNotExist(header);
testClient.get()
.uri(uri)
.header("Host", "www.localresponsecache.org")
.exchange()
.expectHeader()
.doesNotExist(HttpHeaders.PRAGMA);
.doesNotExist(header);
}
void assertNonVaryHeaderInContent(String uri, String varyHeader, String varyHeaderValue, String nonVaryHeader,

13
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/cache/LocalResponseCacheGlobalFilterTests.java vendored
View File

@@ -126,6 +126,15 @@ public class LocalResponseCacheGlobalFilterTests {
@Test
void shouldNotReturnPragmaHeaderInNonCachedAndCachedResponses() {
shouldNotReturnHeader(HttpHeaders.PRAGMA);
}
@Test
void shouldNotReturnExpiresHeaderInNonCachedAndCachedResponses() {
shouldNotReturnHeader(HttpHeaders.EXPIRES);
}
private void shouldNotReturnHeader(String header) {
String uri = "/" + UUID.randomUUID() + "/global-cache/headers";
testClient.get()
@@ -133,14 +142,14 @@ public class LocalResponseCacheGlobalFilterTests {
.header("Host", "www.localresponsecache.org")
.exchange()
.expectHeader()
.doesNotExist(HttpHeaders.PRAGMA);
.doesNotExist(header);
testClient.get()
.uri(uri)
.header("Host", "www.localresponsecache.org")
.exchange()
.expectHeader()
.doesNotExist(HttpHeaders.PRAGMA);
.doesNotExist(header);
}
@EnableAutoConfiguration