[java-identity-provider COMMIT] /trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePas...

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Dec  5 22:51:07 2013
New Revision: 4995

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4995&view=rev
Log:
Separate authentication failures from other types of exceptions.

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java?rev=4995&r1=4994&r2=4995&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java Thu Dec  5 22:51:07 2013
@@ -189,9 +189,13 @@
                 buildAuthenticationResult(profileRequestContext, authenticationContext);
                 ActionSupport.buildProceedEvent(profileRequestContext);
                 return;
-            } catch (Exception e) {
+            } catch (LoginException e){ 
                 log.debug(getLogPrefix() + " login by '" + upContext.getUsername() + "' failed", e);
                 handleError(profileRequestContext, authenticationContext, e, AuthnEventIds.INVALID_CREDENTIALS);
+            } catch (Exception e) {
+                log.warn(getLogPrefix() + " login by '" + upContext.getUsername() + "' produced exception", e);
+                handleError(profileRequestContext, authenticationContext, e, AuthnEventIds.AUTHENTCATION_EXCEPTION);
+                throw new AuthenticationException(e);
             }
         }
     }
@@ -262,4 +266,4 @@
             }
         }
     }
-}
+}