You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2011/11/03 20:10:16 UTC
svn commit: r1197273 - in /directory/apacheds/branches/apacheds-osgi:
core-api/src/main/java/org/apache/directory/server/core/api/partition/
interceptors/authz/src/main/java/org/apache/directory/server/core/authz/
Author: kayyagari
Date: Thu Nov 3 19:10:15 2011
New Revision: 1197273
URL: http://svn.apache.org/viewvc?rev=1197273&view=rev
Log:
o removed HAS_ENTRY_BYPASS
Modified:
directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java?rev=1197273&r1=1197272&r2=1197273&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java Thu Nov 3 19:10:15 2011
@@ -43,11 +43,6 @@ public class ByPassConstants
public static final Collection<String> LOOKUP_COLLECTIVE_BYPASS;
/**
- * bypass instructions used by ExceptionInterceptor
- */
- public final static Collection<String> HAS_ENTRY_BYPASS;
-
- /**
* safe to use set of bypass instructions to getMatchedDn
*/
public static final Collection<String> GETMATCHEDDN_BYPASS;
@@ -74,19 +69,6 @@ public class ByPassConstants
c.add( "AuthenticationInterceptor" );
c.add( "AciAuthorizationInterceptor" );
c.add( "DefaultAuthorizationInterceptor" );
- c.add( "ExceptionInterceptor" );
- c.add( "OperationalAttributeInterceptor" );
- c.add( "SchemaInterceptor" );
- c.add( "SubentryInterceptor" );
- c.add( "EventInterceptor" );
- c.add( "JournalInterceptor" );
- HAS_ENTRY_BYPASS = Collections.unmodifiableCollection( c );
-
- c = new HashSet<String>();
- c.add( "NormalizationInterceptor" );
- c.add( "AuthenticationInterceptor" );
- c.add( "AciAuthorizationInterceptor" );
- c.add( "DefaultAuthorizationInterceptor" );
c.add( "CollectiveAttributeInterceptor" );
c.add( "OperationalAttributeInterceptor" );
c.add( "SchemaInterceptor" );
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1197273&r1=1197272&r2=1197273&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Nov 3 19:10:15 2011
@@ -844,7 +844,9 @@ public class AciAuthorizationInterceptor
return answer;
}
- Entry entry = hasEntryContext.lookup( dn, ByPassConstants.HAS_ENTRY_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+ CoreSession session = hasEntryContext.getSession();
+ LookupOperationContext lookupContext = new LookupOperationContext( session, dn, SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+ Entry entry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext );
Set<Dn> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
addPerscriptiveAciTuples( hasEntryContext, tuples, dn, entry );