portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r278876 - in /portals/jetspeed-2/trunk: applications/security/src/java/org/apache/jetspeed/portlets/security/resources/ components/portal/src/java/org/apache/jetspeed/security/impl/ jetspeed-api/src/java/org/apache/jetspeed/login/
Date Mon, 05 Sep 2005 22:40:08 GMT
Author: ate
Date: Mon Sep  5 15:39:51 2005
New Revision: 278876

URL: http://svn.apache.org/viewcvs?rev=278876&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/JS2-358: 
  Login validation gives wrong error (Invalid password) when a password is expired

Modified:
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_en.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_nl.properties
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java

Modified: portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties?rev=278876&r1=278875&r2=278876&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties
(original)
+++ portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties
Mon Sep  5 15:39:51 2005
@@ -37,3 +37,5 @@
 login.label.ErrorCode.4=Invalid password.<br/>Warning: only one login attempt remains
for this account
 # LoginConstants.ERROR_CREDENTIAL_DISABLED
 login.label.ErrorCode.5=This user account its password is disabled.<br/>Please contact
administration.
+# LoginConstants.ERROR_CREDENTIAL_EXPIRED
+login.label.ErrorCode.6=This user account its password is expired.<br/>Please contact
administration.

Modified: portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_en.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_en.properties?rev=278876&r1=278875&r2=278876&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_en.properties
(original)
+++ portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_en.properties
Mon Sep  5 15:39:51 2005
@@ -39,3 +39,5 @@
 login.label.ErrorCode.4=Invalid password.<br/>Warning: only one login attempt remains
for this account
 # LoginConstants.ERROR_CREDENTIAL_DISABLED
 login.label.ErrorCode.5=This user account its password is disabled.<br/>Please contact
administration.
+# LoginConstants.ERROR_CREDENTIAL_EXPIRED
+login.label.ErrorCode.6=This user account its password is expired.<br/>Please contact
administration.

Modified: portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_nl.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_nl.properties?rev=278876&r1=278875&r2=278876&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_nl.properties
(original)
+++ portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_nl.properties
Mon Sep  5 15:39:51 2005
@@ -39,3 +39,5 @@
 login.label.ErrorCode.4=Incorrect wachtwoord.<br/>Waarschuwing: slechts 1 login poging
is nog toegestaan voor dit account.
 # LoginConstants.ERROR_CREDENTIAL_DISABLED
 login.label.ErrorCode.5=Het wachtwoord voor dit account is geblokkeerd.<br/>Neem contact
op met beheer.
+# LoginConstants.ERROR_CREDENTIAL_EXPIRED
+login.label.ErrorCode.6=Het wachtwoord voor dit account is verlopen.<br/>Neem contact
op met beheer.

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java?rev=278876&r1=278875&r2=278876&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
Mon Sep  5 15:39:51 2005
@@ -84,6 +84,10 @@
                                     {
                                         request.setSessionAttribute(LoginConstants.ERRORCODE,
LoginConstants.ERROR_CREDENTIAL_DISABLED);
                                     }
+                                    else if ( pwdCredential.isExpired() )
+                                    {
+                                        request.setSessionAttribute(LoginConstants.ERRORCODE,
LoginConstants.ERROR_CREDENTIAL_EXPIRED);
+                                    }
                                     else if ( maxNumberOfAuthenticationFailures > 1 &&
pwdCredential.getAuthenticationFailures() == maxNumberOfAuthenticationFailures -1  )
                                     {
                                         request.setSessionAttribute(LoginConstants.ERRORCODE,
LoginConstants.ERROR_FINAL_LOGIN_ATTEMPT);

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java?rev=278876&r1=278875&r2=278876&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java
Mon Sep  5 15:39:51 2005
@@ -35,4 +35,5 @@
     public final static Integer ERROR_USER_DISABLED = new Integer(3);
     public final static Integer ERROR_FINAL_LOGIN_ATTEMPT = new Integer(4);
     public final static Integer ERROR_CREDENTIAL_DISABLED = new Integer(5);
+    public final static Integer ERROR_CREDENTIAL_EXPIRED = new Integer(6);
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message