Bladeren bron

SEC-2369: PreAuthenticatedGrantedAuthoritiesUserDetailsService fix case to createUserDetails method

Rob Winch 12 jaren geleden
bovenliggende
commit
04b091c385

+ 13 - 0
web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java

@@ -42,15 +42,28 @@ public class PreAuthenticatedGrantedAuthoritiesUserDetailsService
         Assert.notNull(token.getDetails());
         Assert.isInstanceOf(GrantedAuthoritiesContainer.class, token.getDetails());
         Collection<? extends GrantedAuthority> authorities = ((GrantedAuthoritiesContainer) token.getDetails()).getGrantedAuthorities();
+        return createUserDetails(token, authorities);
+    }
+
+    /**
+     * Creates the final <tt>UserDetails</tt> object. Can be overridden to customize the contents.
+     *
+     * @param token the authentication request token
+     * @param authorities the pre-authenticated authorities.
+     */
+    protected UserDetails createUserDetails(Authentication token, Collection<? extends GrantedAuthority> authorities) {
         return createuserDetails(token, authorities);
     }
 
     /**
      * Creates the final <tt>UserDetails</tt> object. Can be overridden to customize the contents.
      *
+     * @deprecated Use {@link #createUserDetails(Authentication, Collection)}
+     *
      * @param token the authentication request token
      * @param authorities the pre-authenticated authorities.
      */
+    @Deprecated
     protected UserDetails createuserDetails(Authentication token, Collection<? extends GrantedAuthority> authorities) {
         return new User(token.getName(), "N/A", true, true, true, true, authorities);
     }