Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1792: Fixed NullPointerException in RunAsUserToken#toString()

This commit is contained in:
Rob Winch 2011-07-29 09:24:02 -05:00
parent dfd467f26e
commit 7399c9a7a5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
View File

@ -71,7 +71,8 @@ public class RunAsUserToken extends AbstractAuthenticationToken {
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(super.toString()); StringBuilder sb = new StringBuilder(super.toString());
sb.append("; Original Class: ").append(this.originalAuthentication.getName()); String className = this.originalAuthentication == null ? null : this.originalAuthentication.getName();
sb.append("; Original Class: ").append(className);
return sb.toString(); return sb.toString();
} }

9
core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
View File

@ -58,6 +58,13 @@ public class RunAsUserTokenTests extends TestCase {
public void testToString() { public void testToString() {
RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password", RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class); AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class);
assertTrue(token.toString().lastIndexOf("Original Class:") != -1); assertTrue(token.toString().lastIndexOf("Original Class: "+UsernamePasswordAuthenticationToken.class.getName().toString()) != -1);
}
// SEC-1792
public void testToStringNullOriginalAuthentication() {
RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), null);
assertTrue(token.toString().lastIndexOf("Original Class: null") != -1);
} }
} }