Author: olamy
Date: Wed Dec 5 17:21:51 2012
New Revision: 1417537
URL: http://svn.apache.org/viewvc?rev=1417537&view=rev
Log:
moving configuration keys to a constant class
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-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.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=1417537&r1=1417536&r2=1417537&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
Wed Dec 5 17:21:51 2012
@@ -23,6 +23,7 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.common.ldap.UserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
@@ -83,9 +84,9 @@ public class LdapBindAuthenticator
{
PasswordBasedAuthenticationDataSource source =
(PasswordBasedAuthenticationDataSource) s;
- if ( !config.getBoolean( "ldap.bind.authenticator.enabled" ) || (
- !config.getBoolean( "ldap.bind.authenticator.allowEmptyPasswords",
false ) && StringUtils.isEmpty(
- source.getPassword() ) ) )
+ if ( !config.getBoolean(
UserConfigurationKeys.LDAP_BIND_AUTHENTICATOR_ENABLED ) || (
+ !config.getBoolean(
UserConfigurationKeys.LDAP_BIND_AUTHENTICATOR_ALLOW_EMPTY_PASSWORDS, false )
+ && StringUtils.isEmpty( source.getPassword() ) ) )
{
return new AuthenticationResult( false, source.getPrincipal(),
null );
}
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
Wed Dec 5 17:21:51 2012
@@ -35,7 +35,7 @@ import java.util.Date;
/**
* @author <a href="[email protected]"> jesse
*/
-@Service( "userMapper#ldap" )
+@Service("userMapper#ldap")
public class LdapUserMapper
implements UserMapper
{
@@ -80,7 +80,7 @@ public class LdapUserMapper
int maxResultCount = 0;
@Inject
- @Named( value = "userConfiguration" )
+ @Named(value = "userConfiguration")
private UserConfiguration userConf;
@PostConstruct
@@ -97,7 +97,7 @@ public class LdapUserMapper
userObjectClass =
userConf.getString(
UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS, userObjectClass
);
userFilter = userConf.getString(
UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter );
- maxResultCount = userConf.getInt( "ldap.config.max.result.count",
maxResultCount );
+ maxResultCount = userConf.getInt(
UserConfigurationKeys.LDAP_MAX_RESULT_COUNT, maxResultCount );
}
public Attributes getCreationAttributes( User user, boolean
encodePasswordIfChanged )
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
Wed Dec 5 17:21:51 2012
@@ -76,12 +76,12 @@ public class ConfigurableLdapConnectionF
{
configuration = new LdapConnectionConfiguration();
configuration.setHostname( userConf.getString(
UserConfigurationKeys.LDAP_HOSTNAME, hostname ) );
- configuration.setPort( userConf.getInt( "ldap.config.port", port )
);
- configuration.setSsl( userConf.getBoolean( "ldap.config.ssl", ssl
) );
- configuration.setBaseDn( userConf.getConcatenatedList(
"ldap.config.base.dn", baseDn ) );
+ configuration.setPort( userConf.getInt(
UserConfigurationKeys.LDAP_PORT, port ) );
+ configuration.setSsl( userConf.getBoolean(
UserConfigurationKeys.LDAP_SSL, ssl ) );
+ configuration.setBaseDn( userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_BASEDN, baseDn ) );
configuration.setContextFactory(
userConf.getString( UserConfigurationKeys.LDAP_CONTEX_FACTORY,
contextFactory ) );
- configuration.setBindDn( userConf.getConcatenatedList(
"ldap.config.bind.dn", bindDn ) );
+ configuration.setBindDn( userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_BINDDN, bindDn ) );
configuration.setPassword( userConf.getString(
UserConfigurationKeys.LDAP_PASSWORD, password ) );
configuration.setAuthenticationMethod(
userConf.getString(
UserConfigurationKeys.LDAP_AUTHENTICATION_METHOD, authenticationMethod ) );
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
Wed Dec 5 17:21:51 2012
@@ -176,7 +176,6 @@ public class DefaultUserConfiguration
public String getConcatenatedList( String key, String defaultValue )
{
- String concatenatedList;
List<String> list = getList( key );
if ( !list.isEmpty() )
{
@@ -189,14 +188,11 @@ public class DefaultUserConfiguration
}
s.append( value );
}
- concatenatedList = s.toString();
+ log.debug( "getList for key {} return {}", key, s.toString() );
+ return s.toString();
}
- else
- {
- concatenatedList = defaultValue;
- }
-
- return concatenatedList;
+ log.debug( "getList for key {} return {}", key, defaultValue );
+ return defaultValue;
}
/**
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
Wed Dec 5 17:21:51 2012
@@ -45,18 +45,30 @@ public interface UserConfigurationKeys
String REMEMBER_ME_DOMAIN = "security.rememberme.domain";
+ String REMEMBER_ME_ENABLED = "security.rememberme.enabled";
+
String SIGNON_DOMAIN = "security.signon.domain";
String SIGNON_PATH = "security.signon.path";
+ String SIGNON_TIMEOUT = "security.signon.timeout";
+
String LDAP_HOSTNAME = "ldap.config.hostname";
+ String LDAP_PORT = "ldap.config.port";
+
+ String LDAP_SSL = "ldap.config.ssl";
+
String LDAP_CONTEX_FACTORY = "ldap.config.context.factory";
String LDAP_PASSWORD = "ldap.config.password";
String LDAP_AUTHENTICATION_METHOD = "ldap.config.authentication.method";
+ String LDAP_BASEDN = "ldap.config.base.dn";
+
+ String LDAP_BINDDN = "ldap.config.bind.dn";
+
String APPLICATION_URL = "application.url";
String EMAIL_URL_PATH = "email.url.path";
@@ -69,7 +81,60 @@ public interface UserConfigurationKeys
String LDAP_MAPPER_USER_ATTRIBUTE_ID =
"ldap.config.mapper.attribute.user.id";
- String LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS =
"ldap.config.mapper.attribute.user.object.class";
+ String LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS =
"ldap.config.mapper.attribute.user.object.class";
String LDAP_MAPPER_USER_ATTRIBUTE_FILTER =
"ldap.config.mapper.attribute.user.filter";
+
+ String LDAP_MAX_RESULT_COUNT = "ldap.config.max.result.count";
+
+ String LDAP_BIND_AUTHENTICATOR_ENABLED = "ldap.bind.authenticator.enabled";
+
+ String LDAP_BIND_AUTHENTICATOR_ALLOW_EMPTY_PASSWORDS =
"ldap.bind.authenticator.allowEmptyPasswords";
+
+ String PASSWORD_RETENTION_COUNT =
"security.policy.password.previous.count";
+
+ String LOGIN_ATTEMPT_COUNT = "security.policy.allowed.login.attempt";
+
+ String PASSWORD_EXPIRATION_ENABLED =
"security.policy.password.expiration.enabled";
+
+ String PASSWORD_EXPIRATION = "security.policy.password.expiration.days";
+
+ String UNLOCKABLE_ACCOUNTS = "security.policy.unlockable.accounts";
+
+ String EMAIL_VALIDATION_TIMEOUT = "email.validation.timeout";
+
+ String EMAIL_VALIDATION_REQUIRED = "email.validation.required";
+
+ String REMEMBERME_TIMEOUT = "security.rememberme.timeout";
+
+ String ALPHA_COUNT_MIN =
"security.policy.password.rule.alphacount.minimum";
+
+ String ALPHA_COUNT_VIOLATION = "user.password.violation.alpha";
+
+ String CHARACTER_LENGTH_MIN =
"security.policy.password.rule.characterlength.minimum";
+
+ String CHARACTER_LENGTH_MAX =
"security.policy.password.rule.characterlength.maximum";
+
+ String CHARACTER_LENGTH_MISCONFIGURED_VIOLATION =
"user.password.violation.length.misconfigured";
+
+ String CHARACTER_LENGTH_VIOLATION = "user.password.violation.length";
+
+ String MINIMUM = "security.policy.password.rule.numericalcount.minimum";
+
+ String NUMERICAL_COUNT_VIOLATION = "user.password.violation.numeric";
+
+ String POLICY_PASSWORD_RULE_ALPHANUMERIC_ENABLED =
"security.policy.password.rule.alphanumeric.enabled";
+
+ String POLICY_PASSWORD_RULE_ALPHACOUNT_ENABLED =
"security.policy.password.rule.alphacount.enabled";
+
+ String POLICY_PASSWORD_RULE_CHARACTERLENGTH_ENABLED =
"security.policy.password.rule.characterlength.enabled";
+
+ String POLICY_PASSWORD_RULE_MUSTHAVE_ENABLED =
"security.policy.password.rule.musthave.enabled";
+
+ String POLICY_PASSWORD_RULE_NUMERICALCOUNT_ENABLED =
"security.policy.password.rule.numericalcount.enabled";
+
+ String POLICY_PASSWORD_RULE_REUSE_ENABLED =
"security.policy.password.rule.reuse.enabled";
+
+ String POLICY_PASSWORD_RULE_NOWHITTESPACE_ENABLED =
"security.policy.password.rule.nowhitespace.enabled";
+
}
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
Wed Dec 5 17:21:51 2012
@@ -33,7 +33,6 @@ import javax.inject.Named;
* DefaultUserConfigurationTest
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
@@ -41,7 +40,8 @@ public class DefaultUserConfigurationTes
extends TestCase
{
- @Inject @Named(value = "test")
+ @Inject
+ @Named( value = "test" )
UserConfiguration config;
private void assertEmpty( String str )
@@ -100,8 +100,9 @@ public class DefaultUserConfigurationTes
@Test
public void testConcatenatedList()
{
- assertEquals( "uid=brett,dc=codehaus,dc=org",
config.getConcatenatedList( "ldap.bind.dn", null ) );
- assertEquals( "dc=codehaus,dc=org", config.getConcatenatedList(
"ldap.base.dn", null ) );
+ assertEquals( "uid=brett,dc=codehaus,dc=org",
+ config.getConcatenatedList(
UserConfigurationKeys.LDAP_BINDDN, null ) );
+ assertEquals( "dc=codehaus,dc=org", config.getConcatenatedList(
UserConfigurationKeys.LDAP_BASEDN, null ) );
assertEquals( "foo", config.getConcatenatedList( "short.list", null )
);
assertEquals( "bar,baz", config.getConcatenatedList( "no.list",
"bar,baz" ) );
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
Wed Dec 5 17:21:51 2012
@@ -41,45 +41,34 @@ import java.util.List;
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*/
-@Service( "userSecurityPolicy" )
+@Service("userSecurityPolicy")
public class DefaultUserSecurityPolicy
implements UserSecurityPolicy
{
private static final String ENABLEMENT_KEY = "UserSecurityPolicy" +
":ENABLED";
- public static final String PASSWORD_RETENTION_COUNT =
"security.policy.password.previous.count";
-
- public static final String LOGIN_ATTEMPT_COUNT =
"security.policy.allowed.login.attempt";
-
- public static final String PASSWORD_EXPIRATION_ENABLED =
"security.policy.password.expiration.enabled";
-
- public static final String PASSWORD_EXPIRATION =
"security.policy.password.expiration.days";
-
-
- public static final String UNLOCKABLE_ACCOUNTS =
"security.policy.unlockable.accounts";
-
- private static final Logger log = LoggerFactory.getLogger(
DefaultUserSecurityPolicy.class );
+ private Logger log = LoggerFactory.getLogger( getClass() );
private PasswordRule defaultPasswordRule = new MustHavePasswordRule();
@Inject
- @Named( value = "userConfiguration" )
+ @Named(value = "userConfiguration")
private UserConfiguration config;
@Inject
- @Named( value = "passwordEncoder#sha256" )
+ @Named(value = "passwordEncoder#sha256")
private PasswordEncoder passwordEncoder;
@Inject
- @Named( value = "userValidationSettings" )
+ @Named(value = "userValidationSettings")
private UserValidationSettings userValidationSettings;
@Inject
- @Named( value = "cookieSettings#rememberMe" )
+ @Named(value = "cookieSettings#rememberMe")
private CookieSettings rememberMeCookieSettings;
@Inject
- @Named( value = "cookieSettings#signon" )
+ @Named(value = "cookieSettings#signon")
private CookieSettings signonCookieSettings;
// TODO use something more generic to be able to do change about container
@@ -107,7 +96,7 @@ public class DefaultUserSecurityPolicy
// Component lifecycle
// ---------------------------------------
// TODO move this to constructor
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@PostConstruct
public void initialize()
{
@@ -141,11 +130,11 @@ public class DefaultUserSecurityPolicy
private void configurePolicy()
{
- this.previousPasswordsCount = config.getInt( PASSWORD_RETENTION_COUNT
);
- this.loginAttemptCount = config.getInt( LOGIN_ATTEMPT_COUNT );
- this.passwordExpirationEnabled = config.getBoolean(
PASSWORD_EXPIRATION_ENABLED );
- this.passwordExpirationDays = config.getInt( PASSWORD_EXPIRATION );
- this.unlockableAccounts = config.getList( UNLOCKABLE_ACCOUNTS );
+ this.previousPasswordsCount = config.getInt(
UserConfigurationKeys.PASSWORD_RETENTION_COUNT );
+ this.loginAttemptCount = config.getInt(
UserConfigurationKeys.LOGIN_ATTEMPT_COUNT );
+ this.passwordExpirationEnabled = config.getBoolean(
UserConfigurationKeys.PASSWORD_EXPIRATION_ENABLED );
+ this.passwordExpirationDays = config.getInt(
UserConfigurationKeys.PASSWORD_EXPIRATION );
+ this.unlockableAccounts = config.getList(
UserConfigurationKeys.UNLOCKABLE_ACCOUNTS );
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
Wed Dec 5 17:21:51 2012
@@ -62,8 +62,8 @@ public class DefaultUserValidationSettin
@PostConstruct
public void initialize()
{
- this.emailValidationRequired = config.getBoolean(
"email.validation.required" );
- this.emailValidationTimeout = config.getInt(
"email.validation.timeout" );
+ this.emailValidationRequired = config.getBoolean(
UserConfigurationKeys.EMAIL_VALIDATION_REQUIRED );
+ this.emailValidationTimeout = config.getInt(
UserConfigurationKeys.EMAIL_VALIDATION_TIMEOUT );
this.emailSubject = config.getString(
UserConfigurationKeys.EMAIL_VALIDATION_SUBJECT );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
Wed Dec 5 17:21:51 2012
@@ -44,9 +44,9 @@ public class RememberMeCookieSettings
@PostConstruct
public void initialize()
{
- this.cookieTimeout = config.getInt( "security.rememberme.timeout" );
+ this.cookieTimeout = config.getInt(
UserConfigurationKeys.REMEMBERME_TIMEOUT );
this.domain = config.getString(
UserConfigurationKeys.REMEMBER_ME_DOMAIN );
this.path = config.getString( UserConfigurationKeys.REMEMBER_ME_PATH );
- this.enabled = config.getBoolean( "security.rememberme.enabled" );
+ this.enabled = config.getBoolean(
UserConfigurationKeys.REMEMBER_ME_ENABLED );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
Wed Dec 5 17:21:51 2012
@@ -38,7 +38,7 @@ public class SignonCookieSettings
public void initialize()
{
// cookie timeouts in the configuration settings is labeled to be in
minutes, so adjust to minutes
- cookieTimeout = config.getInt( "security.signon.timeout" ) * 60;
+ cookieTimeout = config.getInt( UserConfigurationKeys.SIGNON_TIMEOUT )
* 60;
domain = config.getString( UserConfigurationKeys.SIGNON_DOMAIN );
path = config.getString( UserConfigurationKeys.SIGNON_PATH );
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
@@ -25,7 +26,6 @@ import javax.annotation.PostConstruct;
/**
* Basic Password Rule. Checks that password only contains alpha-numeric
characters.
- *
*/
@Service("passwordRule#alpha-numeric")
public class AlphaNumericPasswordRule
@@ -56,6 +56,6 @@ public class AlphaNumericPasswordRule
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.alphanumeric.enabled" );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_ALPHANUMERIC_ENABLED );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
@@ -29,15 +30,11 @@ import javax.annotation.PostConstruct;
* alpha characters contained within.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
-@Service("passwordRule#alpha-count")
+@Service( "passwordRule#alpha-count" )
public class AlphaPasswordRule
extends AbstractPasswordRule
{
- public static final String ALPHA_COUNT_MIN =
"security.policy.password.rule.alphacount.minimum";
-
- public static final String ALPHA_COUNT_VIOLATION =
"user.password.violation.alpha";
private int minimumCount;
@@ -95,15 +92,15 @@ public class AlphaPasswordRule
{
if ( countAlphaCharacters( user.getPassword() ) < this.minimumCount )
{
- violations.addViolation( ALPHA_COUNT_VIOLATION,
- new String[]{String.valueOf( minimumCount
)} ); //$NON-NLS-1$
+ violations.addViolation(
UserConfigurationKeys.ALPHA_COUNT_VIOLATION,
+ new String[]{ String.valueOf(
minimumCount ) } ); //$NON-NLS-1$
}
}
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.alphacount.enabled" );
- this.minimumCount = config.getInt( ALPHA_COUNT_MIN );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_ALPHACOUNT_ENABLED );
+ this.minimumCount = config.getInt(
UserConfigurationKeys.ALPHA_COUNT_MIN );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
@@ -29,20 +30,11 @@ import javax.annotation.PostConstruct;
* {@link #setMaximumCharacters(int)} characters in length.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
-@Service("passwordRule#character-length")
+@Service( "passwordRule#character-length" )
public class CharacterLengthPasswordRule
extends AbstractPasswordRule
{
- public static final String CHARACTER_LENGTH_MIN =
"security.policy.password.rule.characterlength.minimum";
-
- public static final String CHARACTER_LENGTH_MAX =
"security.policy.password.rule.characterlength.maximum";
-
- public static final String CHARACTER_LENGTH_MISCONFIGURED_VIOLATION =
- "user.password.violation.length.misconfigured";
-
- public static final String CHARACTER_LENGTH_VIOLATION =
"user.password.violation.length";
public static final int DEFAULT_CHARACTER_LENGTH_MAX = 8;
@@ -81,8 +73,9 @@ public class CharacterLengthPasswordRule
{
/* this should caught up front during the configuration of the
component */
// TODO: Throw runtime exception instead?
- violations.addViolation( CHARACTER_LENGTH_MISCONFIGURED_VIOLATION,
new String[]{
- String.valueOf( minimumCharacters ), String.valueOf(
maximumCharacters )} ); //$NON-NLS-1$
+ violations.addViolation(
UserConfigurationKeys.CHARACTER_LENGTH_MISCONFIGURED_VIOLATION,
+ new String[]{ String.valueOf(
minimumCharacters ),
+ String.valueOf( maximumCharacters ) }
); //$NON-NLS-1$
}
String password = user.getPassword();
@@ -90,16 +83,17 @@ public class CharacterLengthPasswordRule
if ( StringUtils.isEmpty( password ) || password.length() <
minimumCharacters ||
password.length() > maximumCharacters )
{
- violations.addViolation( CHARACTER_LENGTH_VIOLATION, new
String[]{String.valueOf( minimumCharacters ),
- String.valueOf( maximumCharacters )} ); //$NON-NLS-1$
+ violations.addViolation(
UserConfigurationKeys.CHARACTER_LENGTH_VIOLATION,
+ new String[]{ String.valueOf(
minimumCharacters ),
+ String.valueOf( maximumCharacters ) }
); //$NON-NLS-1$
}
}
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.characterlength.enabled" );
- this.minimumCharacters = config.getInt( CHARACTER_LENGTH_MIN );
- this.maximumCharacters = config.getInt( CHARACTER_LENGTH_MAX );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_CHARACTERLENGTH_ENABLED );
+ this.minimumCharacters = config.getInt(
UserConfigurationKeys.CHARACTER_LENGTH_MIN );
+ this.maximumCharacters = config.getInt(
UserConfigurationKeys.CHARACTER_LENGTH_MAX );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
@@ -28,7 +29,6 @@ import javax.annotation.PostConstruct;
* Basic Password Rule, Checks for non-empty Passwords in non guest users.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
@Service("passwordRule#must-have")
public class MustHavePasswordRule
@@ -52,6 +52,6 @@ public class MustHavePasswordRule
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.musthave.enabled" );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_MUSTHAVE_ENABLED );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
@@ -29,15 +30,11 @@ import javax.annotation.PostConstruct;
* numerical characters contained within.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
-@Service("passwordRule#numerical-count")
+@Service( "passwordRule#numerical-count" )
public class NumericalPasswordRule
extends AbstractPasswordRule
{
- public static final String MINIMUM =
"security.policy.password.rule.numericalcount.minimum";
-
- public static final String NUMERICAL_COUNT_VIOLATION =
"user.password.violation.numeric";
private int minimumCount;
@@ -95,15 +92,15 @@ public class NumericalPasswordRule
{
if ( countDigitCharacters( user.getPassword() ) < this.minimumCount )
{
- violations.addViolation( NUMERICAL_COUNT_VIOLATION,
- new String[]{String.valueOf( minimumCount
)} ); //$NON-NLS-1$
+ violations.addViolation(
UserConfigurationKeys.NUMERICAL_COUNT_VIOLATION,
+ new String[]{ String.valueOf(
minimumCount ) } ); //$NON-NLS-1$
}
}
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.numericalcount.enabled" );
- this.minimumCount = config.getInt( MINIMUM );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_NUMERICALCOUNT_ENABLED );
+ this.minimumCount = config.getInt( UserConfigurationKeys.MINIMUM );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
@@ -30,7 +31,6 @@ import java.util.Iterator;
* the {@link User#getPreviousEncodedPasswords()} to ensure that a password is
not reused.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
@Service("passwordRule#reuse")
public class ReusePasswordRule
@@ -108,13 +108,13 @@ public class ReusePasswordRule
if ( hasReusedPassword( user, password ) )
{
violations.addViolation( REUSE_VIOLATION,
- new String[]{String.valueOf(
getPreviousPasswordCount() )} ); //$NON-NLS-1$
+ new String[]{ String.valueOf(
getPreviousPasswordCount() ) } ); //$NON-NLS-1$
}
}
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.reuse.enabled" );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_REUSE_ENABLED );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java?rev=1417537&r1=1417536&r2=1417537&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java
Wed Dec 5 17:21:51 2012
@@ -16,6 +16,7 @@ package org.apache.archiva.redback.polic
* limitations under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
@@ -25,8 +26,6 @@ import javax.annotation.PostConstruct;
/**
* Basic Password Rule. Checks that password does not have whitespaces in it.
- *
- *
*/
@Service("passwordRule#no-whitespaces")
public class WhitespacePasswordRule
@@ -44,7 +43,7 @@ public class WhitespacePasswordRule
if ( user.getPassword() != null )
{
char[] password = user.getPassword().toCharArray();
-
+
for ( int i = 0; i < password.length; i++ )
{
if ( Character.isWhitespace( password[i] ) )
@@ -59,6 +58,6 @@ public class WhitespacePasswordRule
@PostConstruct
public void initialize()
{
- enabled = config.getBoolean(
"security.policy.password.rule.nowhitespace.enabled" );
+ enabled = config.getBoolean(
UserConfigurationKeys.POLICY_PASSWORD_RULE_NOWHITTESPACE_ENABLED );
}
}
