svn commit: r443184 - in /maven/shared/trunk/maven-user: maven-user-acegi/src/main/java/org/apache/maven/user/acegi/ maven-user-model/src/main/java/org/apache/maven/user/model/ maven-user-model/src/main/java/org/apache/maven/user/model/impl/

[ca...@apache.org]

Author: carlos
Date: Wed Sep 13 18:35:37 2006
New Revision: 443184

URL: http://svn.apache.org/viewvc?view=rev&rev=443184
Log:
[CONTINUUM-794] Password expiration. Add change password method.

Modified:
    maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/AcegiUserManager.java
    maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
    maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java

Modified: maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/AcegiUserManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/AcegiUserManager.java?view=diff&rev=443184&r1=443183&r2=443184
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/AcegiUserManager.java (original)
+++ maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/AcegiUserManager.java Wed Sep 13 18:35:37 2006
@@ -94,6 +94,11 @@
         return getUserManager().addUser( user );
     }
 
+    public boolean changePassword( String userName, String oldPassword, String newPassword )
+    {
+        return getUserManager().changePassword( userName, oldPassword, newPassword );
+    }
+
     public UserGroup addUserGroup( UserGroup userGroup )
     {
         return getUserManager().addUserGroup( userGroup );

Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java?view=diff&rev=443184&r1=443183&r2=443184
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java Wed Sep 13 18:35:37 2006
@@ -45,6 +45,17 @@
         throws PasswordRuleViolationException;
 
     /**
+     * Change user password.
+     * 
+     * @param userName
+     * @param oldPassword current password of the user
+     * @param newPassword new password of the user
+     * @return <code>true</code> if the old password matches the oldPassword parameter,
+     * <code>false</code> otherwise.
+     */
+    boolean changePassword( String userName, String oldPassword, String newPassword );
+
+    /**
      * Update user data. User password may be encoded before storing it.
      * 
      * @param user

Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java?view=diff&rev=443184&r1=443183&r2=443184
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java Wed Sep 13 18:35:37 2006
@@ -161,6 +161,19 @@
         return userStore.addUser( user );
     }
 
+    public boolean changePassword( String userName, String oldPassword, String newPassword )
+    {
+        User user = getUser( userName );
+        String encodedOldPassword = securityPolicy.getPasswordEncoder().encodePassword( oldPassword );
+        if ( !encodedOldPassword.equals( user.getEncodedPassword() ) )
+        {
+            return false;
+        }
+        user.setPassword( newPassword );
+        processPasswordChange( user );
+        return true;
+    }
+
     private void processPasswordChange( User user )
         throws PasswordRuleViolationException
     {