Skip to content

Commit 1435e0f

Browse files
jzheauxjzheaux
committed
Use HttpSecurity Lambda DSL in Config Tests
Issue gh-13067
1 parent 13e738e commit 1435e0f

File tree

72 files changed

+1185
-1392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1185
-1392
lines changed

‎config/src/test/java/org/springframework/security/config/annotation/issue50/SecurityConfig.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ public class SecurityConfig {
5151
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
5252
// @formatter:off
5353
http
54-
.authorizeRequests()
55-
.requestMatchers(new AntPathRequestMatcher("/*")).permitAll()
56-
.and()
54+
.authorizeRequests((requests) -> requests
55+
.requestMatchers(new AntPathRequestMatcher("/*")).permitAll())
5756
.authenticationProvider(authenticationProvider());
5857
// @formatter:on
5958
return http.build();

‎config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ static class SecurityConfig {
8787
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8888
// @formatter:off
8989
http
90-
.authorizeRequests()
91-
.anyRequest().access("hasAnyRole('CUSTOM')");
90+
.authorizeRequests((requests) -> requests
91+
.anyRequest().access("hasAnyRole('CUSTOM')"));
9292
return http.build();
9393
// @formatter:on
9494
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ static class AntMatchersAfterAnyRequestConfig {
8686
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8787
// @formatter:off
8888
http
89-
.authorizeRequests()
90-
.anyRequest().authenticated()
91-
.requestMatchers(new AntPathRequestMatcher("/demo/**")).permitAll();
89+
.authorizeRequests((requests) -> requests
90+
.anyRequest().authenticated()
91+
.requestMatchers(new AntPathRequestMatcher("/demo/**")).permitAll());
9292
return http.build();
9393
// @formatter:on
9494
}
@@ -103,9 +103,9 @@ static class MvcMatchersAfterAnyRequestConfig {
103103
SecurityFilterChain filterChain(HttpSecurity http, HandlerMappingIntrospector introspector) throws Exception {
104104
// @formatter:off
105105
http
106-
.authorizeRequests()
107-
.anyRequest().authenticated()
108-
.requestMatchers(new MvcRequestMatcher(introspector, "/demo/**")).permitAll();
106+
.authorizeRequests((requests) -> requests
107+
.anyRequest().authenticated()
108+
.requestMatchers(new MvcRequestMatcher(introspector, "/demo/**")).permitAll());
109109
return http.build();
110110
// @formatter:on
111111
}
@@ -120,9 +120,9 @@ static class RegexMatchersAfterAnyRequestConfig {
120120
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
121121
// @formatter:off
122122
http
123-
.authorizeRequests()
124-
.anyRequest().authenticated()
125-
.requestMatchers(new RegexRequestMatcher(".*", null)).permitAll();
123+
.authorizeRequests((requests) -> requests
124+
.anyRequest().authenticated()
125+
.requestMatchers(new RegexRequestMatcher(".*", null)).permitAll());
126126
return http.build();
127127
// @formatter:on
128128
}
@@ -137,9 +137,9 @@ static class AnyRequestAfterItselfConfig {
137137
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
138138
// @formatter:off
139139
http
140-
.authorizeRequests()
141-
.anyRequest().authenticated()
142-
.anyRequest().permitAll();
140+
.authorizeRequests((requests) -> requests
141+
.anyRequest().authenticated()
142+
.anyRequest().permitAll());
143143
return http.build();
144144
// @formatter:on
145145
}
@@ -154,9 +154,9 @@ static class RequestMatchersAfterAnyRequestConfig {
154154
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
155155
// @formatter:off
156156
http
157-
.authorizeRequests()
158-
.anyRequest().authenticated()
159-
.requestMatchers(new AntPathRequestMatcher("/**")).permitAll();
157+
.authorizeRequests((requests) -> requests
158+
.anyRequest().authenticated()
159+
.requestMatchers(new AntPathRequestMatcher("/**")).permitAll());
160160
return http.build();
161161
// @formatter:on
162162
}

‎config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static org.mockito.ArgumentMatchers.any;
4949
import static org.mockito.Mockito.spy;
5050
import static org.mockito.Mockito.verify;
51+
import static org.springframework.security.config.Customizer.withDefaults;
5152
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
5253
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
5354

@@ -148,14 +149,12 @@ static class RequestMatcherRegistryConfigs {
148149
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
149150
// @formatter:off
150151
http
151-
.securityMatchers()
152+
.securityMatchers((security) -> security
152153
.requestMatchers(new AntPathRequestMatcher("/api/**"))
153-
.requestMatchers(new AntPathRequestMatcher("/oauth/**"))
154-
.and()
155-
.authorizeRequests()
156-
.anyRequest().hasRole("USER")
157-
.and()
158-
.httpBasic();
154+
.requestMatchers(new AntPathRequestMatcher("/oauth/**")))
155+
.authorizeRequests((requests) -> requests
156+
.anyRequest().hasRole("USER"))
157+
.httpBasic(withDefaults());
159158
return http.build();
160159
// @formatter:on
161160
}

‎config/src/test/java/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.java‎

Lines changed: 49 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import static org.mockito.Mockito.mock;
7272
import static org.mockito.Mockito.times;
7373
import static org.mockito.Mockito.verify;
74+
import static org.springframework.security.config.Customizer.withDefaults;
7475
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
7576
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
7677
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
@@ -293,9 +294,9 @@ static class AccessDecisionManagerRefConfig {
293294
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
294295
// @formatter:off
295296
http
296-
.authorizeRequests()
297+
.authorizeRequests((requests) -> requests
297298
.anyRequest().permitAll()
298-
.accessDecisionManager(ACCESS_DECISION_MANAGER);
299+
.accessDecisionManager(ACCESS_DECISION_MANAGER));
299300
return http.build();
300301
// @formatter:on
301302
}
@@ -311,12 +312,11 @@ static class AccessDeniedPageConfig {
311312
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
312313
// @formatter:off
313314
http
314-
.authorizeRequests()
315+
.authorizeRequests((requests) -> requests
315316
.requestMatchers("/admin").hasRole("ADMIN")
316-
.anyRequest().authenticated()
317-
.and()
318-
.exceptionHandling()
319-
.accessDeniedPage("/AccessDeniedPage");
317+
.anyRequest().authenticated())
318+
.exceptionHandling((handling) -> handling
319+
.accessDeniedPage("/AccessDeniedPage"));
320320
return http.build();
321321
// @formatter:on
322322
}
@@ -338,10 +338,9 @@ AuthenticationManager authenticationManager() {
338338
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
339339
// @formatter:off
340340
http
341-
.authorizeRequests()
342-
.anyRequest().authenticated()
343-
.and()
344-
.formLogin();
341+
.authorizeRequests((requests) -> requests
342+
.anyRequest().authenticated())
343+
.formLogin(withDefaults());
345344
return http.build();
346345
// @formatter:on
347346
}
@@ -356,11 +355,10 @@ static class CreateSessionAlwaysConfig {
356355
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
357356
// @formatter:off
358357
http
359-
.authorizeRequests()
360-
.anyRequest().permitAll()
361-
.and()
362-
.sessionManagement()
363-
.sessionCreationPolicy(SessionCreationPolicy.ALWAYS);
358+
.authorizeRequests((requests) -> requests
359+
.anyRequest().permitAll())
360+
.sessionManagement((management) -> management
361+
.sessionCreationPolicy(SessionCreationPolicy.ALWAYS));
364362
return http.build();
365363
// @formatter:on
366364
}
@@ -375,11 +373,10 @@ static class CreateSessionStatelessConfig {
375373
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
376374
// @formatter:off
377375
http
378-
.authorizeRequests()
379-
.anyRequest().permitAll()
380-
.and()
381-
.sessionManagement()
382-
.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
376+
.authorizeRequests((requests) -> requests
377+
.anyRequest().permitAll())
378+
.sessionManagement((management) -> management
379+
.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
383380
return http.build();
384381
// @formatter:on
385382
}
@@ -395,14 +392,12 @@ static class IfRequiredConfig {
395392
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
396393
// @formatter:off
397394
http
398-
.authorizeRequests()
395+
.authorizeRequests((requests) -> requests
399396
.requestMatchers("/unsecure").permitAll()
400-
.anyRequest().authenticated()
401-
.and()
402-
.sessionManagement()
403-
.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
404-
.and()
405-
.formLogin();
397+
.anyRequest().authenticated())
398+
.sessionManagement((management) -> management
399+
.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED))
400+
.formLogin(withDefaults());
406401
return http.build();
407402
// @formatter:on
408403
}
@@ -417,11 +412,10 @@ static class CreateSessionNeverConfig {
417412
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
418413
// @formatter:off
419414
http
420-
.authorizeRequests()
421-
.anyRequest().anonymous()
422-
.and()
423-
.sessionManagement()
424-
.sessionCreationPolicy(SessionCreationPolicy.NEVER);
415+
.authorizeRequests((requests) -> requests
416+
.anyRequest().anonymous())
417+
.sessionManagement((management) -> management
418+
.sessionCreationPolicy(SessionCreationPolicy.NEVER));
425419
return http.build();
426420
// @formatter:on
427421
}
@@ -436,13 +430,11 @@ static class EntryPointRefConfig {
436430
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
437431
// @formatter:off
438432
http
439-
.authorizeRequests()
440-
.anyRequest().authenticated()
441-
.and()
442-
.exceptionHandling()
443-
.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/entry-point"))
444-
.and()
445-
.formLogin();
433+
.authorizeRequests((requests) -> requests
434+
.anyRequest().authenticated())
435+
.exceptionHandling((handling) -> handling
436+
.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/entry-point")))
437+
.formLogin(withDefaults());
446438
return http.build();
447439
// @formatter:on
448440
}
@@ -472,11 +464,10 @@ static class RealmConfig {
472464
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
473465
// @formatter:off
474466
http
475-
.authorizeRequests()
476-
.anyRequest().authenticated()
477-
.and()
478-
.httpBasic()
479-
.realmName("RealmConfig");
467+
.authorizeRequests((requests) -> requests
468+
.anyRequest().authenticated())
469+
.httpBasic((basic) -> basic
470+
.realmName("RealmConfig"));
480471
return http.build();
481472
// @formatter:on
482473
}
@@ -562,13 +553,11 @@ static class SecurityContextRepoConfig {
562553
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
563554
// @formatter:off
564555
http
565-
.authorizeRequests()
566-
.anyRequest().authenticated()
567-
.and()
568-
.securityContext()
569-
.securityContextRepository(new NullSecurityContextRepository())
570-
.and()
571-
.formLogin();
556+
.authorizeRequests((requests) -> requests
557+
.anyRequest().authenticated())
558+
.securityContext((context) -> context
559+
.securityContextRepository(new NullSecurityContextRepository()))
560+
.formLogin(withDefaults());
572561
// @formatter:on
573562
return http.build();
574563
}
@@ -588,11 +577,10 @@ static class ServletApiProvisionConfig {
588577
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
589578
// @formatter:off
590579
http
591-
.authorizeRequests()
592-
.anyRequest().permitAll()
593-
.and()
594-
.servletApi()
595-
.disable();
580+
.authorizeRequests((requests) -> requests
581+
.anyRequest().permitAll())
582+
.servletApi((api) -> api
583+
.disable());
596584
return http.build();
597585
// @formatter:on
598586
}
@@ -607,8 +595,8 @@ static class ServletApiProvisionDefaultsConfig {
607595
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
608596
// @formatter:off
609597
http
610-
.authorizeRequests()
611-
.anyRequest().permitAll();
598+
.authorizeRequests((requests) -> requests
599+
.anyRequest().permitAll());
612600
return http.build();
613601
// @formatter:on
614602
}
@@ -641,10 +629,10 @@ static class UseExpressionsConfig {
641629
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
642630
// @formatter:off
643631
http
644-
.authorizeRequests()
632+
.authorizeRequests((requests) -> requests
645633
.requestMatchers("/users**", "/sessions/**").hasRole("USER")
646634
.requestMatchers("/signup").permitAll()
647-
.anyRequest().hasRole("USER");
635+
.anyRequest().hasRole("USER"));
648636
this.httpSecurity = http;
649637
return http.build();
650638
// @formatter:on

‎config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
5151

5252
import static org.assertj.core.api.Assertions.assertThat;
53+
import static org.springframework.security.config.Customizer.withDefaults;
5354

5455
/**
5556
* @author Rob Winch
@@ -137,9 +138,9 @@ WebSecurityCustomizer webSecurityCustomizer(HandlerMappingIntrospector introspec
137138
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
138139
// @formatter:off
139140
http
140-
.httpBasic().and()
141-
.authorizeRequests()
142-
.anyRequest().denyAll();
141+
.httpBasic(withDefaults())
142+
.authorizeRequests((requests) -> requests
143+
.anyRequest().denyAll());
143144
// @formatter:on
144145
return http.build();
145146
}
@@ -176,9 +177,9 @@ WebSecurityCustomizer webSecurityCustomizer(HandlerMappingIntrospector introspec
176177
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
177178
// @formatter:off
178179
http
179-
.httpBasic().and()
180-
.authorizeRequests()
181-
.anyRequest().denyAll();
180+
.httpBasic(withDefaults())
181+
.authorizeRequests((requests) -> requests
182+
.anyRequest().denyAll());
182183
// @formatter:on
183184
return http.build();
184185
}

0 commit comments

Comments
 (0)