From commits-return-32746-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Nov 3 19:10:40 2011 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 560987033 for ; Thu, 3 Nov 2011 19:10:40 +0000 (UTC) Received: (qmail 90309 invoked by uid 500); 3 Nov 2011 19:10:40 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 90265 invoked by uid 500); 3 Nov 2011 19:10:40 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 90257 invoked by uid 99); 3 Nov 2011 19:10:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 19:10:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 19:10:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 697CD238897A for ; Thu, 3 Nov 2011 19:10:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 03 Nov 2011 19:10:16 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111103191016.697CD238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 LOOKUP_COLLECTIVE_BYPASS; /** - * bypass instructions used by ExceptionInterceptor - */ - public final static Collection HAS_ENTRY_BYPASS; - - /** * safe to use set of bypass instructions to getMatchedDn */ public static final Collection 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(); - 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 userGroups = groupCache.getGroups( principalDn.getNormName() ); Collection tuples = new HashSet(); addPerscriptiveAciTuples( hasEntryContext, tuples, dn, entry );