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 2011/11/03 15:39:15 UTC
svn commit: r1197156 -
/directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
Author: elecharny
Date: Thu Nov 3 14:39:15 2011
New Revision: 1197156
URL: http://svn.apache.org/viewvc?rev=1197156&view=rev
Log:
Removed the Lookup bypass, replaced it with a direct call to nexus.lookup()
Modified:
directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=1197156&r1=1197155&r2=1197156&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Thu Nov 3 14:39:15 2011
@@ -91,31 +91,6 @@ public class SimpleAuthenticator extends
private static final int DEFAULT_CACHE_SIZE = 100;
/**
- * Define the interceptors we should *not* go through when we will have to request the backend
- * about a userPassword.
- */
- private static final Collection<String> USERLOOKUP_BYPASS;
-
- static
- {
- Set<String> c = new HashSet<String>();
- c.add( "NormalizationInterceptor" );
- c.add( "AuthenticationInterceptor" );
- c.add( "AciAuthorizationInterceptor" );
- c.add( "DefaultAuthorizationInterceptor" );
- c.add( "AdministrativePointInterceptor" );
- c.add( "ExceptionInterceptor" );
- c.add( "OperationalAttributeInterceptor" );
- c.add( "SchemaInterceptor" );
- c.add( "CollectiveAttributeInterceptor" );
- c.add( "SubentryInterceptor" );
- c.add( "EventInterceptor" );
- c.add( "TriggerInterceptor" );
- USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );
- }
-
-
- /**
* Creates a new instance.
* @see AbstractAuthenticator
*/
@@ -265,12 +240,11 @@ public class SimpleAuthenticator extends
*/
LookupOperationContext lookupContext = new LookupOperationContext( getDirectoryService().getAdminSession(),
bindContext.getDn() );
- lookupContext.setByPassed( USERLOOKUP_BYPASS );
lookupContext.addAttrsId( SchemaConstants.ALL_USER_ATTRIBUTES );
// OP attributes required for ppolicy
lookupContext.addAttrsId( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES );
- userEntry = getDirectoryService().getOperationManager().lookup( lookupContext );
+ userEntry = getDirectoryService().getPartitionNexus().lookup( lookupContext );
if ( userEntry == null )
{