Skip to content

Commit 64d26a4

Browse files
jgrandjajgrandja
committed
Use securityMatcher() and authorizeHttpRequests()
Closes gh-922
1 parent 411bf63 commit 64d26a4

File tree

17 files changed

+70
-70
lines changed

17 files changed

+70
-70
lines changed

‎docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
8383
)
8484
);
8585
http
86-
.requestMatcher(endpointsMatcher)
87-
.authorizeRequests((authorize) -> authorize
86+
.securityMatcher(endpointsMatcher)
87+
.authorizeHttpRequests((authorize) -> authorize
8888
.anyRequest().authenticated()
8989
)
9090
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public static void applyDefaultSecurity(HttpSecurity http) throws Exception {
6363
.getEndpointsMatcher();
6464

6565
http
66-
.requestMatcher(endpointsMatcher)
67-
.authorizeRequests(authorizeRequests ->
68-
authorizeRequests.anyRequest().authenticated()
66+
.securityMatcher(endpointsMatcher)
67+
.authorizeHttpRequests(authorize ->
68+
authorize.anyRequest().authenticated()
6969
)
7070
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
7171
.apply(authorizationServerConfigurer);

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -843,9 +843,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
843843
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
844844

845845
http
846-
.requestMatcher(endpointsMatcher)
847-
.authorizeRequests(authorizeRequests ->
848-
authorizeRequests.anyRequest().authenticated()
846+
.securityMatcher(endpointsMatcher)
847+
.authorizeHttpRequests(authorize ->
848+
authorize.anyRequest().authenticated()
849849
)
850850
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
851851
.securityContext(securityContext ->
@@ -905,9 +905,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
905905
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
906906

907907
http
908-
.requestMatcher(endpointsMatcher)
909-
.authorizeRequests(authorizeRequests ->
910-
authorizeRequests.anyRequest().authenticated()
908+
.securityMatcher(endpointsMatcher)
909+
.authorizeHttpRequests(authorize ->
910+
authorize.anyRequest().authenticated()
911911
)
912912
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
913913
.apply(authorizationServerConfigurer);
@@ -938,9 +938,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
938938
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
939939

940940
http
941-
.requestMatcher(endpointsMatcher)
942-
.authorizeRequests(authorizeRequests ->
943-
authorizeRequests.anyRequest().authenticated()
941+
.securityMatcher(endpointsMatcher)
942+
.authorizeHttpRequests(authorize ->
943+
authorize.anyRequest().authenticated()
944944
)
945945
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
946946
.apply(authorizationServerConfigurer);
@@ -1029,9 +1029,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
10291029
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
10301030

10311031
http
1032-
.requestMatcher(endpointsMatcher)
1033-
.authorizeRequests(authorizeRequests ->
1034-
authorizeRequests.anyRequest().authenticated()
1032+
.securityMatcher(endpointsMatcher)
1033+
.authorizeHttpRequests(authorize ->
1034+
authorize.anyRequest().authenticated()
10351035
)
10361036
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
10371037
.apply(authorizationServerConfigurer);

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
178178
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
179179

180180
http
181-
.requestMatcher(endpointsMatcher)
182-
.authorizeRequests(authorizeRequests ->
183-
authorizeRequests.anyRequest().authenticated()
181+
.securityMatcher(endpointsMatcher)
182+
.authorizeHttpRequests(authorize ->
183+
authorize.anyRequest().authenticated()
184184
)
185185
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher));
186186

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
415415
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
416416

417417
http
418-
.requestMatcher(endpointsMatcher)
419-
.authorizeRequests(authorizeRequests ->
420-
authorizeRequests.anyRequest().authenticated()
418+
.securityMatcher(endpointsMatcher)
419+
.authorizeHttpRequests(authorize ->
420+
authorize.anyRequest().authenticated()
421421
)
422422
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
423423
.apply(authorizationServerConfigurer);
@@ -447,9 +447,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
447447
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
448448

449449
http
450-
.requestMatcher(endpointsMatcher)
451-
.authorizeRequests(authorizeRequests ->
452-
authorizeRequests.anyRequest().authenticated()
450+
.securityMatcher(endpointsMatcher)
451+
.authorizeHttpRequests(authorize ->
452+
authorize.anyRequest().authenticated()
453453
)
454454
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
455455
.apply(authorizationServerConfigurer);

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
519519
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
520520

521521
http
522-
.requestMatcher(endpointsMatcher)
523-
.authorizeRequests(authorizeRequests ->
524-
authorizeRequests.anyRequest().authenticated()
522+
.securityMatcher(endpointsMatcher)
523+
.authorizeHttpRequests(authorize ->
524+
authorize.anyRequest().authenticated()
525525
)
526526
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
527527
.apply(authorizationServerConfigurer);

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
339339
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
340340

341341
http
342-
.requestMatcher(endpointsMatcher)
343-
.authorizeRequests(authorizeRequests ->
344-
authorizeRequests.anyRequest().authenticated()
342+
.securityMatcher(endpointsMatcher)
343+
.authorizeHttpRequests(authorize ->
344+
authorize.anyRequest().authenticated()
345345
)
346346
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
347347
.apply(authorizationServerConfigurer);

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
366366
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
367367

368368
http
369-
.requestMatcher(endpointsMatcher)
370-
.authorizeRequests(authorizeRequests ->
371-
authorizeRequests.anyRequest().authenticated()
369+
.securityMatcher(endpointsMatcher)
370+
.authorizeHttpRequests(authorize ->
371+
authorize.anyRequest().authenticated()
372372
)
373373
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
374374
.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
235235
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
236236

237237
http
238-
.requestMatcher(endpointsMatcher)
239-
.authorizeRequests(authorizeRequests ->
240-
authorizeRequests.anyRequest().authenticated()
238+
.securityMatcher(endpointsMatcher)
239+
.authorizeHttpRequests(authorize ->
240+
authorize.anyRequest().authenticated()
241241
)
242242
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher));
243243

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
367367
RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
368368

369369
http
370-
.requestMatcher(endpointsMatcher)
371-
.authorizeRequests(authorizeRequests ->
372-
authorizeRequests.anyRequest().authenticated()
370+
.securityMatcher(endpointsMatcher)
371+
.authorizeHttpRequests(authorize ->
372+
authorize.anyRequest().authenticated()
373373
)
374374
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher));
375375

0 commit comments

Comments
 (0)