Author: olamy
Date: Thu Nov 22 21:52:50 2012
New Revision: 1412680
URL: http://svn.apache.org/viewvc?rev=1412680&view=rev
Log:
do not use harcoded userManager impl
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java?rev=1412680&r1=1412679&r2=1412680&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
Thu Nov 22 21:52:50 2012
@@ -98,7 +98,7 @@ public class LdapBindAuthenticator
+ ( mapper.getUserFilter() != null ? mapper.getUserFilter() : "" )
+ "(" + mapper.getUserIdAttribute() + "="
+ source.getPrincipal() + "))";
- log.info( "Searching for users with filter: \'{}\'" + " from base dn:
{}", filter, mapper.getUserBaseDn() );
+ log.info( "Searching for users with filter: '{}'" + " from base dn:
{}", filter, mapper.getUserBaseDn() );
LdapConnection ldapConnection = getLdapConnection();
LdapConnection authLdapConnection = null;
@@ -135,7 +135,7 @@ public class LdapBindAuthenticator
}
}
- log.info( "Attempting Authenication: + {}", userDn );
+ log.info( "Attempting Authenication: {}", userDn );
authLdapConnection = connectionFactory.getConnection( userDn,
source.getPassword() );
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java?rev=1412680&r1=1412679&r2=1412680&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
Thu Nov 22 21:52:50 2012
@@ -71,7 +71,7 @@ public class LockedAdminEnvironmentCheck
*/
public void validateEnvironment( List<String> violations )
{
- if ( !checked && !userManager.isReadOnly() )
+ if ( !checked ) //&& !userManager.isReadOnly() )
{
List<String> roles = new ArrayList<String>();
roles.add( RedbackRoleConstants.SYSTEM_ADMINISTRATOR_ROLE );
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java?rev=1412680&r1=1412679&r2=1412680&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
Thu Nov 22 21:52:50 2012
@@ -19,20 +19,20 @@ package org.apache.archiva.redback.authe
* under the License.
*/
-import org.apache.archiva.redback.authentication.Authenticator;
-import org.apache.archiva.redback.policy.AccountLockedException;
-import org.apache.archiva.redback.policy.PasswordEncoder;
-import org.apache.archiva.redback.policy.UserSecurityPolicy;
-import org.apache.archiva.redback.users.UserManager;
-import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
+import org.apache.archiva.redback.authentication.Authenticator;
import
org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
+import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
+import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.PolicyViolationException;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
+import org.apache.archiva.redback.users.UserManager;
+import org.apache.archiva.redback.users.UserNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -46,16 +46,15 @@ import java.util.Map;
* {@link Authenticator} implementation that uses a wrapped {@link
UserManager} to authenticate.
*
* @author <a href='mailto:[email protected]'>Rahul Thakur</a>
- *
*/
-@Service( "authenticator#user-manager" )
+@Service ("authenticator#user-manager")
public class UserManagerAuthenticator
implements Authenticator
{
- private Logger log = LoggerFactory.getLogger(
UserManagerAuthenticator.class );
+ private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- @Named( value = "userManager#jdo" )
+ @Named (value = "userManager#configurable")
private UserManager userManager;
@Inject
@@ -148,7 +147,7 @@ public class UserManagerAuthenticator
}
catch ( UserNotFoundException e )
{
- log.warn( "Login for user " + source.getPrincipal() + " failed.
user not found." );
+ log.warn( "Login for user {} failed. user not found.",
source.getPrincipal() );
resultException = e;
authnResultExceptionsMap.put(
AuthenticationConstants.AUTHN_NO_SUCH_USER,
"Login for user \" +
source.getPrincipal() + \" failed. user not found." );
