Add noformat blocks around withDefaultPasswordEncoder

Find `withDefaultPasswordEncoder` calls and protect them against
formatting.

Issue gh-8945
This commit is contained in:
Phillip Webb 2020-07-23 13:23:10 -07:00 committed by Rob Winch
parent 6979125ccf
commit 8e092f8d2c
18 changed files with 38 additions and 7 deletions

View File

@ -147,11 +147,13 @@ public class HelloRSocketITests {
@Bean @Bean
MapReactiveUserDetailsService uds() { MapReactiveUserDetailsService uds() {
// @formatter:off
UserDetails rob = User.withDefaultPasswordEncoder() UserDetails rob = User.withDefaultPasswordEncoder()
.username("rob") .username("rob")
.password("password") .password("password")
.roles("USER", "ADMIN") .roles("USER", "ADMIN")
.build(); .build();
// @formatter:on
return new MapReactiveUserDetailsService(rob); return new MapReactiveUserDetailsService(rob);
} }
} }

View File

@ -268,6 +268,7 @@ public class RSocketMessageHandlerConnectionITests {
@Bean @Bean
MapReactiveUserDetailsService uds() { MapReactiveUserDetailsService uds() {
// @formatter:off
UserDetails admin = User.withDefaultPasswordEncoder() UserDetails admin = User.withDefaultPasswordEncoder()
.username("admin") .username("admin")
.password("password") .password("password")
@ -278,12 +279,12 @@ public class RSocketMessageHandlerConnectionITests {
.password("password") .password("password")
.roles("USER", "SETUP") .roles("USER", "SETUP")
.build(); .build();
UserDetails evil = User.withDefaultPasswordEncoder() UserDetails evil = User.withDefaultPasswordEncoder()
.username("evil") .username("evil")
.password("password") .password("password")
.roles("EVIL") .roles("EVIL")
.build(); .build();
// @formatter:on
return new MapReactiveUserDetailsService(admin, user, evil); return new MapReactiveUserDetailsService(admin, user, evil);
} }

View File

@ -237,6 +237,7 @@ public class RSocketMessageHandlerITests {
@Bean @Bean
MapReactiveUserDetailsService uds() { MapReactiveUserDetailsService uds() {
// @formatter:off
UserDetails rob = User.withDefaultPasswordEncoder() UserDetails rob = User.withDefaultPasswordEncoder()
.username("rob") .username("rob")
.password("password") .password("password")
@ -247,6 +248,7 @@ public class RSocketMessageHandlerITests {
.password("password") .password("password")
.roles("USER") .roles("USER")
.build(); .build();
// @formatter:on
return new MapReactiveUserDetailsService(rob, rossen); return new MapReactiveUserDetailsService(rob, rossen);
} }

View File

@ -165,11 +165,13 @@ public class SimpleAuthenticationITests {
@Bean @Bean
MapReactiveUserDetailsService uds() { MapReactiveUserDetailsService uds() {
// @formatter:off
UserDetails rob = User.withDefaultPasswordEncoder() UserDetails rob = User.withDefaultPasswordEncoder()
.username("rob") .username("rob")
.password("password") .password("password")
.roles("USER", "ADMIN") .roles("USER", "ADMIN")
.build(); .build();
// @formatter:on
return new MapReactiveUserDetailsService(rob); return new MapReactiveUserDetailsService(rob);
} }
} }

View File

@ -251,12 +251,14 @@ public class ExceptionHandlingConfigurerTests {
@Bean @Bean
public InMemoryUserDetailsManager userDetailsManager() { public InMemoryUserDetailsManager userDetailsManager() {
// @formatter:off
return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build() .build()
); );
// @formatter:off
} }
} }

View File

@ -259,11 +259,13 @@ public class HttpBasicConfigurerTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build() .build()
// @formatter:on
); );
} }
} }

View File

@ -83,11 +83,13 @@ public class NamespaceHttpBasicTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build() .build()
// @formatter:on
); );
} }
} }

View File

@ -170,11 +170,13 @@ public class NamespaceHttpCustomFilterTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }

View File

@ -188,11 +188,13 @@ public class NamespaceHttpFormLoginTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }

View File

@ -300,11 +300,13 @@ public class NamespaceHttpOpenIDLoginTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }
} }

View File

@ -499,11 +499,13 @@ public class NamespaceRememberMeTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }

View File

@ -413,11 +413,13 @@ public class NamespaceSessionManagementTests {
@Bean @Bean
UserDetailsService userDetailsService() { UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }

View File

@ -190,11 +190,13 @@ public class RememberMeConfigurerTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
User.withDefaultPasswordEncoder() User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build() .build()
// @formatter:on
); );
} }
} }

View File

@ -399,12 +399,14 @@ public class RequestCacheConfigurerTests {
@Bean @Bean
public InMemoryUserDetailsManager userDetailsManager() { public InMemoryUserDetailsManager userDetailsManager() {
// @formatter:off
return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder()
.username("user") .username("user")
.password("password") .password("password")
.roles("USER") .roles("USER")
.build() .build()
); );
// @formatter:on
} }
} }

View File

@ -1746,11 +1746,13 @@ public class OAuth2ResourceServerConfigurerTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
org.springframework.security.core.userdetails.User.withDefaultPasswordEncoder() org.springframework.security.core.userdetails.User.withDefaultPasswordEncoder()
.username("basic-user") .username("basic-user")
.password("basic-password") .password("basic-password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }
@ -1819,11 +1821,13 @@ public class OAuth2ResourceServerConfigurerTests {
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager( return new InMemoryUserDetailsManager(
// @formatter:off
org.springframework.security.core.userdetails.User.withDefaultPasswordEncoder() org.springframework.security.core.userdetails.User.withDefaultPasswordEncoder()
.username("basic-user") .username("basic-user")
.password("basic-password") .password("basic-password")
.roles("USER") .roles("USER")
.build()); .build());
// @formatter:on
} }
} }

View File

@ -100,13 +100,13 @@ public class SecurityMockMvcResultMatchersTests {
@EnableWebMvc @EnableWebMvc
static class Config extends WebSecurityConfigurerAdapter { static class Config extends WebSecurityConfigurerAdapter {
// @formatter:off
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
// @formatter:off
UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER", "SELLER").build(); UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER", "SELLER").build();
// @formatter:on
return new InMemoryUserDetailsManager(user); return new InMemoryUserDetailsManager(user);
} }
// @formatter:on
@RestController @RestController
static class Controller { static class Controller {

View File

@ -80,13 +80,13 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests {
@EnableWebMvc @EnableWebMvc
static class Config extends WebSecurityConfigurerAdapter { static class Config extends WebSecurityConfigurerAdapter {
// @formatter:off
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
// @formatter:off
UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("ADMIN", "SELLER").build(); UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("ADMIN", "SELLER").build();
return new InMemoryUserDetailsManager(user); return new InMemoryUserDetailsManager(user);
// @formatter:on
} }
// @formatter:on
@RestController @RestController
static class Controller { static class Controller {

View File

@ -90,12 +90,12 @@ public class AuthenticationTests {
@EnableWebSecurity @EnableWebSecurity
@EnableWebMvc @EnableWebMvc
static class Config extends WebSecurityConfigurerAdapter { static class Config extends WebSecurityConfigurerAdapter {
// @formatter:off
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
// @formatter:off
UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER").build(); UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER").build();
return new InMemoryUserDetailsManager(user); return new InMemoryUserDetailsManager(user);
// @formatter:on
} }
// @formatter:on
} }
} }