[Yanel-commits] rev 29654 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl

michi at wyona.com michi at wyona.com
Fri Dec 7 18:20:19 CET 2007


Author: michi
Date: 2007-12-07 18:20:18 +0100 (Fri, 07 Dec 2007)
New Revision: 29654

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
Log:
check on expiration date

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java	2007-12-07 17:19:48 UTC (rev 29653)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java	2007-12-07 17:20:18 UTC (rev 29654)
@@ -6,6 +6,8 @@
 import org.wyona.yanel.servlet.YanelServlet;
 import org.wyona.yanel.core.api.security.WebAuthenticator;
 
+import org.wyona.security.core.api.AccessManagementException;
+import org.wyona.security.core.ExpiredIdentityException;
 import org.wyona.security.core.api.Identity;
 import org.wyona.security.core.api.User;
 
@@ -74,8 +76,12 @@
                         getXHTMLAuthenticationForm(request, response, realm, "Login failed!", reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
                         return response;
                     }
-                } catch (Exception e) {
-                    log.warn("Login failed: " + loginUsername + " " + e);
+                } catch (ExpiredIdentityException e) {
+                    log.warn("Login failed: [" + loginUsername + "] " + e);
+                    getXHTMLAuthenticationForm(request, response, realm, "The account has expired!", reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
+                    return response;
+                } catch (AccessManagementException e) {
+                    log.warn("Login failed: [" + loginUsername + "] " + e);
                     getXHTMLAuthenticationForm(request, response, realm, "Login failed!", reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
                     return response;
                 }



More information about the Yanel-commits mailing list