Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 07:55:47 +01:00
Code Issues Packages Projects Releases Activity

BasicSecurityContext should not throw AuthenticationException, to not break existing behavior

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-29 09:27:55 +02:00
parent 0197eb6f07
commit 2ddfe06a54
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.web.security;
import com.google.inject.Inject;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
@@ -110,12 +111,28 @@ public class BasicSecurityContext implements WebSecurityContext
public User authenticate(HttpServletRequest request,
HttpServletResponse response, String username, String password)
{
Subject subject = SecurityUtils.getSubject();
User user = null;
subject.login(new ScmAuthenticationToken(request, response, username,
password));
try
{
return subject.getPrincipals().oneByType(User.class);
Subject subject = SecurityUtils.getSubject();
subject.login(new ScmAuthenticationToken(request, response, username,
password));
user = subject.getPrincipals().oneByType(User.class);
}
catch (AuthenticationException ex)
{
if (logger.isWarnEnabled())
{
logger.warn("authentication failed", ex);
}
}
return user;
}
/**