浏览代码

Removed unecessary check in additionalAuthenticationChecks() for null credentials in authentication object. Previous line already throws an exception if null is found.

Luke Taylor 18 年之前
父节点
当前提交
09c588a138

+ 1 - 2
core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java

@@ -63,8 +63,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
                     includeDetailsObject ? userDetails : null);
         }
 
-        String presentedPassword = authentication.getCredentials() == null ? "" : authentication.getCredentials()
-                .toString();
+        String presentedPassword = authentication.getCredentials().toString();
 
         if (!passwordEncoder.isPasswordValid(userDetails.getPassword(), presentedPassword, salt)) {
             throw new BadCredentialsException(messages.getMessage(

+ 1 - 9
core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java

@@ -55,14 +55,6 @@ import java.util.Map;
 public class DaoAuthenticationProviderTests extends TestCase {
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(DaoAuthenticationProviderTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
     public void testAuthenticateFailsForIncorrectPasswordCase() {
         UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("marissa", "KOala");
 
@@ -86,7 +78,7 @@ public class DaoAuthenticationProviderTests extends TestCase {
 
     	UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken("marissa", null);
     	try {
-    		provider.authenticate(authenticationToken); // null pointer exception
+    		provider.authenticate(authenticationToken);
     		fail("Expected BadCredenialsException");
     	} catch (BadCredentialsException expected) {
     		assertTrue(true);