Improve login feedback.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / widgets / auth / CmsLogin.java

diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java
index 298b3965b9fdc0bfc2b79ecaa6ec6f700de4e810..1051bd7239e0564f408711809c2b40f0ab4603c1 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java
+++ b/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java
@@ -17,6 +17,7 @@ import javax.security.auth.callback.LanguageCallback;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
@@ -263,8 +264,10 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
                        new LoginContext(LOGIN_CONTEXT_ANONYMOUS, subject).logout();
                        loginContext = new LoginContext(LOGIN_CONTEXT_USER, subject, this);
                        loginContext.login();
+               } catch (FailedLoginException e) {
+                       log.warn(e.getMessage());
+                       return false;
                } catch (LoginException e) {
-                       // throw new CmsException("Cannot authenticate", e1);
                        log.error("Cannot login", e);
                        return false;
                }