You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/04/21 11:39:17 UTC
svn commit: r1792187 -
/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Author: elecharny
Date: Fri Apr 21 11:39:17 2017
New Revision: 1792187
URL: http://svn.apache.org/viewvc?rev=1792187&view=rev
Log:
Check that the ads_pwdValidator is not null, and if so, use the DefaultPasswordValidator class
Modified:
directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1792187&r1=1792186&r2=1792187&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Fri Apr 21 11:39:17 2017
@@ -78,8 +78,10 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.InterceptorEnum;
import org.apache.directory.server.core.api.LdapPrincipal;
import org.apache.directory.server.core.api.authn.ppolicy.CheckQualityEnum;
+import org.apache.directory.server.core.api.authn.ppolicy.DefaultPasswordValidator;
import org.apache.directory.server.core.api.authn.ppolicy.PasswordPolicyConfiguration;
import org.apache.directory.server.core.api.authn.ppolicy.PasswordPolicyException;
+import org.apache.directory.server.core.api.authn.ppolicy.PasswordValidator;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -1433,7 +1435,15 @@ public class AuthenticationInterceptor e
// perform the length validation
validatePasswordLength( strPassword, policyConfig );
- policyConfig.getPwdValidator().validate( strPassword, entry );
+ PasswordValidator passwordValidator = policyConfig.getPwdValidator();
+
+ if ( passwordValidator == null )
+ {
+ // Use the default one
+ passwordValidator = new DefaultPasswordValidator();
+ }
+
+ passwordValidator.validate( strPassword, entry );
}