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

Improve null handling.

This commit is contained in:
Ben Alex 2004-12-01 02:55:01 +00:00
parent 3a0e43337c
commit 22f8cd0c44
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
View File

@ -203,7 +203,11 @@ public class DaoAuthenticationProvider implements AuthenticationProvider,
public Authentication authenticate(Authentication authentication) public Authentication authenticate(Authentication authentication)
throws AuthenticationException { throws AuthenticationException {
// Determine username // Determine username
String username = authentication.getPrincipal().toString(); String username = "NONE_PROVIDED";
if (authentication.getPrincipal() != null) {
username = authentication.getPrincipal().toString();
}
if (authentication.getPrincipal() instanceof UserDetails) { if (authentication.getPrincipal() instanceof UserDetails) {
username = ((UserDetails) authentication.getPrincipal()) username = ((UserDetails) authentication.getPrincipal())
@ -220,10 +224,6 @@ public class DaoAuthenticationProvider implements AuthenticationProvider,
user = getUserFromBackend(username); user = getUserFromBackend(username);
} catch (BadCredentialsException ex) { } catch (BadCredentialsException ex) {
if (this.context != null) { if (this.context != null) {
if ((username == null) || "".equals(username)) {
username = "NONE_PROVIDED";
}
context.publishEvent(new AuthenticationFailureUsernameNotFoundEvent( context.publishEvent(new AuthenticationFailureUsernameNotFoundEvent(
authentication, authentication,
new User(username, "*****", false, new User(username, "*****", false,