directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r577659 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/
Date Thu, 20 Sep 2007 09:45:55 GMT
Author: elecharny
Date: Thu Sep 20 02:45:54 2007
New Revision: 577659

URL: http://svn.apache.org/viewvc?rev=577659&view=rev
Log:
Change from LdapDN to Name in generic Set

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
Thu Sep 20 02:45:54 2007
@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -117,7 +118,7 @@
      * @param aciTuples {@link org.apache.directory.shared.ldap.aci.ACITuple}s translated
from {@link org.apache.directory.shared.ldap.aci.ACIItem}s in the subtree entries
      * @throws NamingException if failed to evaluate ACI items
      */
-    public void checkPermission( PartitionNexusProxy proxy, Collection<LdapDN> userGroupNames,
LdapDN username,
+    public void checkPermission( PartitionNexusProxy proxy, Collection<Name> userGroupNames,
LdapDN username,
                                  AuthenticationLevel authenticationLevel, LdapDN entryName,
String attrId, Object attrValue,
                                  Collection<MicroOperation> microOperations, Collection<ACITuple>
aciTuples, Attributes entry ) throws NamingException
     {
@@ -161,7 +162,7 @@
      * @param microOperations the {@link org.apache.directory.shared.ldap.aci.MicroOperation}s
to perform
      * @param aciTuples {@link org.apache.directory.shared.ldap.aci.ACITuple}s translated
from {@link org.apache.directory.shared.ldap.aci.ACIItem}s in the subtree entries
      */
-    public boolean hasPermission( PartitionNexusProxy proxy, Collection<LdapDN> userGroupNames,
LdapDN userName,
+    public boolean hasPermission( PartitionNexusProxy proxy, Collection<Name> userGroupNames,
LdapDN userName,
                                   AuthenticationLevel authenticationLevel, LdapDN entryName,
String attrId, Object attrValue,
                                   Collection<MicroOperation> microOperations, Collection<ACITuple>
aciTuples, Attributes entry ) throws NamingException
     {
@@ -174,6 +175,7 @@
 
         // Determine the scope of the requested operation.
         OperationScope scope;
+        
         if ( attrId == null )
         {
             scope = OperationScope.ENTRY;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
Thu Sep 20 02:45:54 2007
@@ -67,7 +67,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry,
             AuthenticationLevel authenticationLevel, 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -46,7 +47,7 @@
     		Collection<ACITuple> tuples, 
     		OperationScope scope, 
     		PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
Thu Sep 20 02:45:54 2007
@@ -26,6 +26,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
@@ -70,7 +71,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -49,7 +50,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.Collection;  
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -47,7 +48,7 @@
                 Collection<ACITuple> tuples, 
                 OperationScope scope, 
                 PartitionNexusProxy proxy,
-                Collection<LdapDN> userGroupNames, 
+                Collection<Name> userGroupNames, 
                 LdapDN userName, 
                 Attributes userEntry, 
                 AuthenticationLevel authenticationLevel,

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -55,7 +56,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -53,7 +54,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -73,7 +74,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry,
             AuthenticationLevel authenticationLevel, 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -60,7 +61,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,
@@ -79,6 +80,7 @@
         for ( Iterator<ACITuple> ii = tuples.iterator(); ii.hasNext(); )
         {
             ACITuple tuple = ii.next();
+            
             if ( tuple.isGrant() )
             {
                 if ( !isRelated( userGroupNames, userName, userEntry, entryName, tuple.getUserClasses()
)
@@ -102,7 +104,7 @@
     }
 
 
-    private boolean isRelated( Collection<LdapDN> userGroupNames, LdapDN userName,
Attributes userEntry, 
+    private boolean isRelated( Collection<Name> userGroupNames, LdapDN userName, Attributes
userEntry, 
         LdapDN entryName, Collection<UserClass> userClasses ) throws NamingException
     {
         for ( UserClass userClass : userClasses )
@@ -129,7 +131,8 @@
             else if ( userClass instanceof UserClass.UserGroup )
             {
                 UserClass.UserGroup userGroupUserClass = ( UserClass.UserGroup ) userClass;
-                for ( LdapDN userGroupName : userGroupNames )
+                
+                for ( Name userGroupName : userGroupNames )
                 {
                     if ( userGroupName != null && userGroupUserClass.getNames().contains(
userGroupName ) )
                     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=577659&r1=577658&r2=577659&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
Thu Sep 20 02:45:54 2007
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -49,7 +50,7 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             PartitionNexusProxy proxy,
-            Collection<LdapDN> userGroupNames, 
+            Collection<Name> userGroupNames, 
             LdapDN userName, 
             Attributes userEntry, 
             AuthenticationLevel authenticationLevel,



Mime
View raw message