You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/09 00:32:52 UTC
svn commit: r441677 -
/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
Author: carlos
Date: Fri Sep 8 15:32:51 2006
New Revision: 441677
URL: http://svn.apache.org/viewvc?view=rev&rev=441677
Log:
Reformat
Modified:
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-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=441677&r1=441676&r2=441677
==============================================================================
--- 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 Fri Sep 8 15:32:51 2006
@@ -31,7 +31,6 @@
import org.apache.maven.user.model.UserHolder;
import org.apache.maven.user.model.UserManager;
import org.apache.maven.user.model.UserSecurityPolicy;
-import org.apache.maven.user.model.InstancePermissions;
import org.apache.maven.user.model.store.UserStore;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -70,7 +69,7 @@
public void initialize()
throws InitializationException
{
-
+
}
public boolean login( String username, String rawPassword )
@@ -80,7 +79,7 @@
{
return false;
}
-
+
if ( user.isLocked() )
{
return false;
@@ -88,9 +87,10 @@
// Ensure that user cannot set password during login.
user.setPassword( null );
-
- boolean validPassword = securityPolicy.getPasswordEncoder().isPasswordValid( user.getEncodedPassword(), rawPassword );
-
+
+ boolean validPassword = securityPolicy.getPasswordEncoder().isPasswordValid( user.getEncodedPassword(),
+ rawPassword );
+
if ( validPassword )
{
// successful login. reset any failed login attempts counter.
@@ -103,13 +103,13 @@
{
user.setLocked( true );
}
-
+
this.updateUser( user );
- }
-
+ }
+
return validPassword;
}
-
+
/**
* Sets the Security Policy to use.
*
@@ -146,26 +146,26 @@
private void processPasswordChange( User user )
throws PasswordRuleViolationException
{
- if(user.isGuest())
+ if ( user.isGuest() )
{
user.setEncodedPassword( null );
return;
}
-
+
validatePassword( user );
-
+
// set the current encoded password.
user.setEncodedPassword( securityPolicy.getPasswordEncoder().encodePassword( user.getPassword() ) );
user.setPassword( null );
-
+
// push new password onto list of previous password.
List previousPasswords = new ArrayList();
previousPasswords.add( user.getEncodedPassword() );
-
+
if ( !user.getPreviousEncodedPasswords().isEmpty() )
{
- int oldCount = Math.min( securityPolicy.getPreviousPasswordsCount() - 1,
- user.getPreviousEncodedPasswords().size() );
+ int oldCount = Math.min( securityPolicy.getPreviousPasswordsCount() - 1, user.getPreviousEncodedPasswords()
+ .size() );
//modified sublist start index as the previous value results to nothing being added to the list.
//TODO Please check and verify if it satisfies the objective.
List sublist = user.getPreviousEncodedPasswords().subList( 0, oldCount );
@@ -182,7 +182,7 @@
{
// Trim password.
user.setPassword( StringUtils.trim( user.getPassword() ) );
-
+
PasswordRuleViolations violations = new PasswordRuleViolations();
Iterator it = securityPolicy.getPasswordRules().iterator();