Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-04 01:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-688: java.lang.NullPointerException in AbstractAuthenticationToken.equals()

Browse Source 
http://jira.springframework.org/browse/SEC-688
This commit is contained in:
Luke Taylor 2008-02-28 11:44:15 +00:00
parent e6e1f2586f
commit 709f78e481
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/springframework/security/providers/AbstractAuthenticationToken.java
View File

@ -110,9 +110,16 @@ public abstract class AbstractAuthenticationToken implements Authentication {
if ((this.getCredentials() != null) && !this.getCredentials().equals(test.getCredentials())) {
return false;
}
if (this.getPrincipal() == null && test.getPrincipal() != null) {
return false;
}
return (this.getPrincipal().equals(test.getPrincipal())
&& (this.isAuthenticated() == test.isAuthenticated()));
if (this.getPrincipal() != null && !this.getPrincipal().equals(test.getPrincipal())) {
return false;
}
return this.isAuthenticated() == test.isAuthenticated();
}
return false;

4
core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationTokenTests.java
View File

@ -45,4 +45,8 @@ public class X509AuthenticationTokenTests extends TestCase {
token.setAuthenticated(true);
assertTrue(token.isAuthenticated());
}
public void testEquals() throws Exception {
assertEquals(X509TestUtils.createToken(), X509TestUtils.createToken());
}
}

3
core/src/test/java/org/springframework/security/providers/x509/X509TestUtils.java
View File

@ -100,8 +100,7 @@ public class X509TestUtils {
return (X509Certificate) cf.generateCertificate(in);
}
public static X509AuthenticationToken createToken()
throws Exception {
public static X509AuthenticationToken createToken() throws Exception {
return new X509AuthenticationToken(buildTestCertificate());
}
}