1
0
mirror of synced 2026-05-22 13:23:17 +00:00

Add noformat blocks around auth config

Find `auth` config using a regex search of `^\s*auths*$` and protect
them against formatting.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-23 12:58:41 -07:00
committed by Rob Winch
parent 103d822e46
commit 63b5998fad
46 changed files with 158 additions and 64 deletions
@@ -48,13 +48,13 @@ public class WithMockUserParentTests extends WithMockUserParent {
@EnableGlobalMethodSecurity(prePostEnabled = true)
@ComponentScan(basePackageClasses = HelloMessageService.class)
static class Config {
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -77,13 +77,13 @@ public class WithMockUserTests {
@EnableGlobalMethodSecurity(prePostEnabled = true)
@ComponentScan(basePackageClasses = HelloMessageService.class)
static class Config {
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -77,13 +77,13 @@ public class WithUserDetailsTests {
@EnableGlobalMethodSecurity(prePostEnabled = true)
@ComponentScan(basePackageClasses = HelloMessageService.class)
static class Config {
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.userDetailsService(myUserDetailsService());
// @formatter:on
}
// @formatter:on
@Bean
public UserDetailsService myUserDetailsService() {
@@ -82,13 +82,13 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests {
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication();
// @formatter:on
}
// @formatter:on
@RestController
static class Controller {
@@ -82,13 +82,13 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTes
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication();
// @formatter:on
}
// @formatter:on
@RestController
static class Controller {
@@ -75,13 +75,13 @@ public class CsrfShowcaseTests {
protected void configure(HttpSecurity http) {
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -83,14 +83,14 @@ public class CustomCsrfShowcaseTests {
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
@Bean
public CsrfTokenRepository repo() {
@@ -70,13 +70,13 @@ public class DefaultCsrfShowcaseTests {
protected void configure(HttpSecurity http) {
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -97,13 +97,13 @@ public class DefaultfSecurityRequestsTests {
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -115,14 +115,14 @@ public class SecurityRequestsTests {
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
@Override
@Bean
@@ -99,13 +99,13 @@ public class WithUserAuthenticationTests {
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -99,13 +99,13 @@ public class WithUserClassLevelAuthenticationTests {
// @formatter:on
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER");
// @formatter:on
}
// @formatter:on
}
}
@@ -97,14 +97,14 @@ public class WithUserDetailsAuthenticationTests {
return super.userDetailsServiceBean();
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER").and()
.withUser("admin").password("password").roles("USER", "ADMIN");
// @formatter:on
}
// @formatter:on
}
}
@@ -97,14 +97,14 @@ public class WithUserDetailsClassLevelAuthenticationTests {
return super.userDetailsServiceBean();
}
// @formatter:off
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth
.inMemoryAuthentication()
.withUser("user").password("password").roles("USER").and()
.withUser("admin").password("password").roles("USER", "ADMIN");
// @formatter:on
}
// @formatter:on
}
}