From 8e092f8d2cc8d33fef9905703cc87c3deef5d678 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 23 Jul 2020 13:23:10 -0700 Subject: [PATCH] Add noformat blocks around withDefaultPasswordEncoder Find `withDefaultPasswordEncoder` calls and protect them against formatting. Issue gh-8945 --- .../config/annotation/rsocket/HelloRSocketITests.java | 2 ++ .../rsocket/RSocketMessageHandlerConnectionITests.java | 3 ++- .../annotation/rsocket/RSocketMessageHandlerITests.java | 2 ++ .../config/annotation/rsocket/SimpleAuthenticationITests.java | 2 ++ .../web/configurers/ExceptionHandlingConfigurerTests.java | 2 ++ .../annotation/web/configurers/HttpBasicConfigurerTests.java | 2 ++ .../annotation/web/configurers/NamespaceHttpBasicTests.java | 2 ++ .../web/configurers/NamespaceHttpCustomFilterTests.java | 2 ++ .../web/configurers/NamespaceHttpFormLoginTests.java | 2 ++ .../web/configurers/NamespaceHttpOpenIDLoginTests.java | 2 ++ .../annotation/web/configurers/NamespaceRememberMeTests.java | 2 ++ .../web/configurers/NamespaceSessionManagementTests.java | 2 ++ .../annotation/web/configurers/RememberMeConfigurerTests.java | 2 ++ .../web/configurers/RequestCacheConfigurerTests.java | 2 ++ .../server/resource/OAuth2ResourceServerConfigurerTests.java | 4 ++++ .../servlet/response/SecurityMockMvcResultMatchersTests.java | 4 ++-- .../SecurityMockWithAuthoritiesMvcResultMatchersTests.java | 4 ++-- .../test/web/servlet/showcase/login/AuthenticationTests.java | 4 ++-- 18 files changed, 38 insertions(+), 7 deletions(-) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java index 876e22d2a5..624332b308 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java @@ -147,11 +147,13 @@ public class HelloRSocketITests { @Bean MapReactiveUserDetailsService uds() { + // @formatter:off UserDetails rob = User.withDefaultPasswordEncoder() .username("rob") .password("password") .roles("USER", "ADMIN") .build(); + // @formatter:on return new MapReactiveUserDetailsService(rob); } } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index 269bcbb951..66cafbebef 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -268,6 +268,7 @@ public class RSocketMessageHandlerConnectionITests { @Bean MapReactiveUserDetailsService uds() { + // @formatter:off UserDetails admin = User.withDefaultPasswordEncoder() .username("admin") .password("password") @@ -278,12 +279,12 @@ public class RSocketMessageHandlerConnectionITests { .password("password") .roles("USER", "SETUP") .build(); - UserDetails evil = User.withDefaultPasswordEncoder() .username("evil") .password("password") .roles("EVIL") .build(); + // @formatter:on return new MapReactiveUserDetailsService(admin, user, evil); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index 19f5e1010c..0256651580 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -237,6 +237,7 @@ public class RSocketMessageHandlerITests { @Bean MapReactiveUserDetailsService uds() { + // @formatter:off UserDetails rob = User.withDefaultPasswordEncoder() .username("rob") .password("password") @@ -247,6 +248,7 @@ public class RSocketMessageHandlerITests { .password("password") .roles("USER") .build(); + // @formatter:on return new MapReactiveUserDetailsService(rob, rossen); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java index 9c9f4607c3..1e01b26cd8 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java @@ -165,11 +165,13 @@ public class SimpleAuthenticationITests { @Bean MapReactiveUserDetailsService uds() { + // @formatter:off UserDetails rob = User.withDefaultPasswordEncoder() .username("rob") .password("password") .roles("USER", "ADMIN") .build(); + // @formatter:on return new MapReactiveUserDetailsService(rob); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java index bd452d0090..5b4ea82259 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java @@ -251,12 +251,14 @@ public class ExceptionHandlingConfigurerTests { @Bean public InMemoryUserDetailsManager userDetailsManager() { + // @formatter:off return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build() ); + // @formatter:off } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java index 4a33b440e5..455621bedb 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java @@ -259,11 +259,13 @@ public class HttpBasicConfigurerTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build() + // @formatter:on ); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java index 967b12d8ea..30239fcf54 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java @@ -83,11 +83,13 @@ public class NamespaceHttpBasicTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build() + // @formatter:on ); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java index 8e23245742..9c504e0c8f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java @@ -170,11 +170,13 @@ public class NamespaceHttpCustomFilterTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java index 553033215c..04fd811943 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java @@ -188,11 +188,13 @@ public class NamespaceHttpFormLoginTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java index 04bbe88d51..7687bab5d5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java @@ -300,11 +300,13 @@ public class NamespaceHttpOpenIDLoginTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build()); + // @formatter:on } } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java index 41673a98cb..b46aab6f9b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java @@ -499,11 +499,13 @@ public class NamespaceRememberMeTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java index e163d7946e..21ba2ef19d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java @@ -413,11 +413,13 @@ public class NamespaceSessionManagementTests { @Bean UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java index 1cba7745fe..2988162ff0 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java @@ -190,11 +190,13 @@ public class RememberMeConfigurerTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build() + // @formatter:on ); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java index 5b22f8662f..3647b0210a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java @@ -399,12 +399,14 @@ public class RequestCacheConfigurerTests { @Bean public InMemoryUserDetailsManager userDetailsManager() { + // @formatter:off return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() .username("user") .password("password") .roles("USER") .build() ); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java index 957c383d96..a830d226c1 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java @@ -1746,11 +1746,13 @@ public class OAuth2ResourceServerConfigurerTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off org.springframework.security.core.userdetails.User.withDefaultPasswordEncoder() .username("basic-user") .password("basic-password") .roles("USER") .build()); + // @formatter:on } } @@ -1819,11 +1821,13 @@ public class OAuth2ResourceServerConfigurerTests { @Bean public UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( + // @formatter:off org.springframework.security.core.userdetails.User.withDefaultPasswordEncoder() .username("basic-user") .password("basic-password") .roles("USER") .build()); + // @formatter:on } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java index 9a63cfe4fa..fdb23bcf24 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java @@ -100,13 +100,13 @@ public class SecurityMockMvcResultMatchersTests { @EnableWebMvc static class Config extends WebSecurityConfigurerAdapter { - // @formatter:off @Bean public UserDetailsService userDetailsService() { + // @formatter:off UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER", "SELLER").build(); + // @formatter:on return new InMemoryUserDetailsManager(user); } - // @formatter:on @RestController static class Controller { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java index 5f4b7af1f9..5753a20f98 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java @@ -80,13 +80,13 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests { @EnableWebMvc static class Config extends WebSecurityConfigurerAdapter { - // @formatter:off @Bean public UserDetailsService userDetailsService() { + // @formatter:off UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("ADMIN", "SELLER").build(); return new InMemoryUserDetailsManager(user); + // @formatter:on } - // @formatter:on @RestController static class Controller { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java index 660872ea58..bc445ea770 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java @@ -90,12 +90,12 @@ public class AuthenticationTests { @EnableWebSecurity @EnableWebMvc static class Config extends WebSecurityConfigurerAdapter { - // @formatter:off @Bean public UserDetailsService userDetailsService() { + // @formatter:off UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER").build(); return new InMemoryUserDetailsManager(user); + // @formatter:on } - // @formatter:on } }