Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'validauth' into jpa

This commit is contained in:
Martin Stockhammer 2016-10-04 20:46:28 +02:00
parent e217190250 7e83bebcec
commit e2581cd127
6 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AbstractAuthenticator.java
View File

@ -24,9 +24,15 @@ package org.apache.archiva.redback.authentication;
public abstract class AbstractAuthenticator
implements Authenticator
{
protected boolean valid = false;
public void initialize()
throws AuthenticationException
{
// no op
valid = true;
}
public boolean isValid() {
return valid;
}
}

2
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
View File

@ -38,4 +38,6 @@ public interface Authenticator
throws AccountLockedException, AuthenticationException, MustChangePasswordException;
void initialize() throws AuthenticationException;
boolean isValid();
}

2
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
View File

@ -92,7 +92,7 @@ public class DefaultAuthenticationManager
List<AuthenticationFailureCause> authnResultErrors = new ArrayList<AuthenticationFailureCause>();
for ( Authenticator authenticator : authenticators )
{
if ( authenticator.supportsDataSource( source ) )
if ( authenticator.isValid() && authenticator.supportsDataSource( source ) )
{
AuthenticationResult authResult = authenticator.authenticate( source );
List<AuthenticationFailureCause> authenticationFailureCauses =

5
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
View File

@ -208,4 +208,9 @@ public class LdapBindAuthenticator
log.warn( "skip exception closing naming search result {}", e.getMessage() );
}
}
@Override
public boolean isValid() {
return connectionFactory.isValid();
}
}

13
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
View File

@ -21,6 +21,8 @@ package org.apache.archiva.redback.common.ldap.connection;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@ -41,6 +43,8 @@ public class ConfigurableLdapConnectionFactory
implements LdapConnectionFactory
{
private final Logger log = LoggerFactory.getLogger(ConfigurableLdapConnectionFactory.class);
private String hostname;
private int port;
@ -61,6 +65,8 @@ public class ConfigurableLdapConnectionFactory
private LdapConnectionConfiguration ldapConnectionConfiguration;
private boolean valid = false;
@Inject
@Named(value = "userConfiguration#default")
@ -90,10 +96,11 @@ public class ConfigurableLdapConnectionFactory
ldapConnectionConfiguration.setAuthenticationMethod(
userConf.getString( UserConfigurationKeys.LDAP_AUTHENTICATION_METHOD, authenticationMethod ) );
ldapConnectionConfiguration.setExtraProperties( extraProperties );
valid = true;
}
catch ( InvalidNameException e )
{
throw new RuntimeException( "Error while initializing connection factory.", e );
log.error("Error during initialization of LdapConnectionFactory "+e.getMessage(),e);
}
}
@ -266,4 +273,8 @@ public class ConfigurableLdapConnectionFactory
{
this.userConf = userConf;
}
public boolean isValid() {
return valid;
}
}

2
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
View File

@ -51,4 +51,6 @@ public interface LdapConnectionFactory
void initialize();
public boolean isValid();
}