You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/03/21 23:03:12 UTC

isis git commit: ISIS-1060 An exception is logged when the provided credentials are invalid

Repository: isis
Updated Branches:
  refs/heads/master e4c77e209 -> 63d26a7b2


ISIS-1060 An exception is logged when the provided credentials are invalid


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/63d26a7b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/63d26a7b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/63d26a7b

Branch: refs/heads/master
Commit: 63d26a7b23672066f9595d6fe5ae3a6854feb951
Parents: e4c77e2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Mar 22 00:02:47 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Mar 22 00:02:47 2015 +0200

----------------------------------------------------------------------
 .../isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java      | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/63d26a7b/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 f893ed4..4293193 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
@@ -28,6 +28,7 @@ import org.apache.shiro.UnavailableSecurityManagerException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.CredentialsException;
 import org.apache.shiro.authc.ExcessiveAttemptsException;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.LockedAccountException;
@@ -145,6 +146,9 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
         } catch ( IncorrectCredentialsException ice ) {
             LOG.debug("Unable to authenticate", ice);
             return null;
+        } catch ( CredentialsException ice ) {
+            LOG.debug("Unable to authenticate", ice);
+            return null;
         } catch ( LockedAccountException lae ) {
             LOG.info("Unable to authenticate", lae);
             return null;