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

improve logging

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-10-03 12:49:12 +02:00
parent bff2b74c4e
commit ac683ad8a9
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scm-webapp/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
View File

@@ -89,9 +89,9 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
*/ */
@Inject @Inject
public ChainAuthenticatonManager( public ChainAuthenticatonManager(
Set<AuthenticationHandler> authenticationHandlerSet, Set<AuthenticationHandler> authenticationHandlerSet,
EncryptionHandler encryptionHandler, CacheManager cacheManager, EncryptionHandler encryptionHandler, CacheManager cacheManager,
Provider<Set<AuthenticationListener>> authenticationListenerProvider) Provider<Set<AuthenticationListener>> authenticationListenerProvider)
{ {
AssertUtil.assertIsNotEmpty(authenticationHandlerSet); AssertUtil.assertIsNotEmpty(authenticationHandlerSet);
AssertUtil.assertIsNotNull(cacheManager); AssertUtil.assertIsNotNull(cacheManager);
@@ -99,8 +99,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
this.encryptionHandler = encryptionHandler; this.encryptionHandler = encryptionHandler;
this.authenticationListenerProvider = authenticationListenerProvider; this.authenticationListenerProvider = authenticationListenerProvider;
this.cache = cacheManager.getCache(String.class, this.cache = cacheManager.getCache(String.class,
AuthenticationCacheValue.class, AuthenticationCacheValue.class, CACHE_NAME);
CACHE_NAME);
// addListeners(authenticationListeners); // addListeners(authenticationListeners);
} }
@@ -120,7 +119,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
*/ */
@Override @Override
public AuthenticationResult authenticate(HttpServletRequest request, public AuthenticationResult authenticate(HttpServletRequest request,
HttpServletResponse response, String username, String password) HttpServletResponse response, String username, String password)
{ {
AssertUtil.assertIsNotEmpty(username); AssertUtil.assertIsNotEmpty(username);
AssertUtil.assertIsNotEmpty(password); AssertUtil.assertIsNotEmpty(password);
@@ -133,7 +132,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
if (logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("no authentication result for user {} found in cache", logger.trace("no authentication result for user {} found in cache",
username); username);
} }
ar = doAuthentication(request, response, username, password); ar = doAuthentication(request, response, username, password);
@@ -141,7 +140,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
if ((ar != null) && ar.isCacheable()) if ((ar != null) && ar.isCacheable())
{ {
cache.put(username, cache.put(username,
new AuthenticationCacheValue(ar, encryptedPassword)); new AuthenticationCacheValue(ar, encryptedPassword));
} }
} }
else if (logger.isDebugEnabled()) else if (logger.isDebugEnabled())
@@ -212,7 +211,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
* @return * @return
*/ */
private AuthenticationResult doAuthentication(HttpServletRequest request, private AuthenticationResult doAuthentication(HttpServletRequest request,
HttpServletResponse response, String username, String password) HttpServletResponse response, String username, String password)
{ {
AuthenticationResult ar = null; AuthenticationResult ar = null;
@@ -226,7 +225,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
if (logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("check authenticator {} for user {}", logger.trace("check authenticator {} for user {}",
authenticator.getClass(), username); authenticator.getClass(), username);
} }
try try
@@ -237,12 +236,12 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("authenticator {} ends with result, {}", logger.debug("authenticator {} ends with result, {}",
authenticator.getClass().getName(), result); authenticator.getClass().getName(), result);
} }
if ((result != null) && (result.getState() != null) if ((result != null) && (result.getState() != null)
&& (result.getState().isSuccessfully() && (result.getState().isSuccessfully()
|| (result.getState() == AuthenticationState.FAILED))) || (result.getState() == AuthenticationState.FAILED)))
{ {
if (result.getState().isSuccessfully() && (result.getUser() != null)) if (result.getState().isSuccessfully() && (result.getUser() != null))
{ {
@@ -260,7 +259,9 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.error(ex.getMessage(), ex); logger.error(
"error durring authentication process of ".concat(
authenticator.getClass().getName()), ex);
} }
} }
@@ -279,7 +280,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
* @return * @return
*/ */
private AuthenticationResult getCached(String username, private AuthenticationResult getCached(String username,
String encryptedPassword) String encryptedPassword)
{ {
AuthenticationResult result = null; AuthenticationResult result = null;
AuthenticationCacheValue value = cache.get(username); AuthenticationCacheValue value = cache.get(username);
@@ -326,7 +327,7 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
{ {
this.authenticationResult = this.authenticationResult =
new AuthenticationResult(ar.getUser().clone(), ar.getGroups(), new AuthenticationResult(ar.getUser().clone(), ar.getGroups(),
ar.getState()); ar.getState());
this.password = password; this.password = password;
} }