You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/11/30 12:28:07 UTC
[3/3] isis git commit: ISIS-1546: reduces logging for the more common
exceptions.
ISIS-1546: reduces logging for the more common exceptions.
UnknownAccountException:
- was debug plus stack trace
- now info message (showing user name)
IncorrectCredentialsException
- was debug plus stack trace
- now info message (showing user name)
CredentialsException
- was debug plus stack trace
- now error plus stack trace
LockedAccountException
- was info plus stack trace
- now info message (showing user name)
ExcessiveAttemptsException
- was info plus stack trace
- now info message (showing user name)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/40780330
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/40780330
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/40780330
Branch: refs/heads/maint-1.13.2
Commit: 4078033097de2b75f1582e938c73f48958522b7a
Parents: 56bd624
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Nov 30 12:26:33 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Nov 30 12:26:33 2016 +0000
----------------------------------------------------------------------
.../shiro/ShiroAuthenticatorOrAuthorizor.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/40780330/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
index c0c05e2..5fa49a8 100644
--- a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
@@ -134,10 +134,10 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
if(currentSubject.isAuthenticated()) {
if(autoLogout) {
- // (this is preserving behaviour pre 1.13.0. However, there is a suspicion that this might
+ // this is preserving behaviour pre 1.13.0. However, there is a suspicion that this might
// produce a race condition. In 1.13.0 the default is to simply reuse the session.
//
- // (See this thread for further info: http://markmail.org/message/hsjljwgkhhrzxbrm
+ // See this thread for further info: http://markmail.org/message/hsjljwgkhhrzxbrm
currentSubject.logout();
} else {
@@ -150,19 +150,19 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
try {
currentSubject.login(token);
} catch ( UnknownAccountException uae ) {
- LOG.debug("Unable to authenticate", uae);
+ LOG.info("Unknown account: {}", request.getName());
return null;
} catch ( IncorrectCredentialsException ice ) {
- LOG.debug("Unable to authenticate", ice);
+ LOG.info("Incorrect credentials for user: {}", request.getName());
return null;
} catch ( CredentialsException ice ) {
- LOG.debug("Unable to authenticate", ice);
+ LOG.error("Unable to authenticate", ice);
return null;
} catch ( LockedAccountException lae ) {
- LOG.info("Unable to authenticate", lae);
+ LOG.info("Locked account for user: {}", request.getName());
return null;
} catch ( ExcessiveAttemptsException eae ) {
- LOG.info("Unable to authenticate", eae);
+ LOG.info("Excessive attempts for user: {}", request.getName());
return null;
} catch ( AuthenticationException ae ) {
LOG.error("Unable to authenticate", ae);