Skip to content

Commit 1e81fd0

Browse files
committed
Avoid repeatedly configuring request matchers in CSP config tests
Signed-off-by: Ziqin Wang <[email protected]>
1 parent b3da43b commit 1e81fd0

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,8 +1315,7 @@ SecurityFilterChain filterChain(HttpSecurity http) {
13151315
.headers((headers) -> headers
13161316
.defaultsDisabled()
13171317
.contentSecurityPolicy((csp) -> csp
1318-
.policyDirectives("script-src 'self'")
1319-
.requestMatchers("/foo/**"))
1318+
.policyDirectives("script-src 'self'"))
13201319
.contentSecurityPolicy((csp) -> csp
13211320
.policyDirectives("default-src 'self'")
13221321
.requestMatchers("/bar/**")));

‎config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,9 @@ public void headersWhenContentSecurityPolicyConfiguredTwiceThenSecondCallReplace
533533
// @formatter:off
534534
this.http.headers((headers) -> headers
535535
.contentSecurityPolicy((csp) -> csp
536-
.exchangeMatchers("/foo/**")
537536
.policyDirectives("script-src 'self'"))
538537
.contentSecurityPolicy((csp) -> csp
538+
.exchangeMatchers("/bar/**")
539539
.policyDirectives(policyDirectives)));
540540
// @formatter:on
541541
WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.http.build()).build();
@@ -544,6 +544,10 @@ public void headersWhenContentSecurityPolicyConfiguredTwiceThenSecondCallReplace
544544
.uri("https://example.com/bar")
545545
.exchange()
546546
.expectHeader().valueEquals(headerName, policyDirectives);
547+
client.get()
548+
.uri("https://example.com/foo")
549+
.exchange()
550+
.expectHeader().doesNotExist(headerName);
547551
// @formatter:on
548552
}
549553

0 commit comments

Comments
 (0)