You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/08/08 19:15:42 UTC
svn commit: r429739 - in /directory/trunks/apacheds:
protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
server-unit/src/test/java/org/apache/directory/server/SearchTest.java
Author: akarasulu
Date: Tue Aug 8 10:15:41 2006
New Revision: 429739
URL: http://svn.apache.org/viewvc?rev=429739&view=rev
Log:
Fix for DIRSERVER-699: SubentriesControl causes null pointer exception
Modified:
directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
Modified: directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java?rev=429739&r1=429738&r2=429739&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java (original)
+++ directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java Tue Aug 8 10:15:41 2006
@@ -26,6 +26,7 @@
import javax.naming.NamingException;
import javax.naming.ReferralException;
import javax.naming.directory.SearchControls;
+import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
import org.apache.directory.server.core.configuration.StartupConfiguration;
@@ -198,6 +199,8 @@
{
ctx = ( ServerLdapContext ) unknown;
}
+ Control[] controls = ( Control[] ) req.getControls().values().toArray( new Control[0] );
+ ctx.setRequestControls( controls );
}
ctx.addToEnvironment( DEREFALIASES_KEY, req.getDerefAliases().getName() );
if ( req.getControls().containsKey( ManageDsaITControl.CONTROL_OID ) )
Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java?rev=429739&r1=429738&r2=429739&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java Tue Aug 8 10:15:41 2006
@@ -27,12 +27,16 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import javax.naming.ldap.Control;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
+import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.unit.AbstractServerTest;
+import org.apache.directory.shared.ldap.message.SubentriesControl;
/**
@@ -389,5 +393,71 @@
assertFalse( results.hasMore() );
assertNotNull( result.getAttributes().get( "objectClasses" ) );
assertEquals( 1, result.getAttributes().size() );
+ }
+
+
+ /**
+ * Creates an access control subentry under ou=system whose subtree covers
+ * the entire naming context.
+ *
+ * @param cn the common name and rdn for the subentry
+ * @param subtree the subtreeSpecification for the subentry
+ * @param aciItem the prescriptive ACI attribute value
+ * @throws NamingException if there is a problem creating the subentry
+ */
+ public void createAccessControlSubentry( String cn, String subtree, String aciItem ) throws NamingException
+ {
+ DirContext adminCtx = ctx;
+
+ // modify ou=system to be an AP for an A/C AA if it is not already
+ Attributes ap = adminCtx.getAttributes( "", new String[] { "administrativeRole" } );
+ Attribute administrativeRole = ap.get( "administrativeRole" );
+ if ( administrativeRole == null || !administrativeRole.contains( SubentryService.AC_AREA ) )
+ {
+ Attributes changes = new BasicAttributes( "administrativeRole", SubentryService.AC_AREA, true );
+ adminCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
+ }
+
+ // now add the A/C subentry below ou=system
+ Attributes subentry = new BasicAttributes( "cn", cn, true );
+ Attribute objectClass = new BasicAttribute( "objectClass" );
+ subentry.put( objectClass );
+ objectClass.add( "top" );
+ objectClass.add( "subentry" );
+ objectClass.add( "accessControlSubentry" );
+ subentry.put( "subtreeSpecification", subtree );
+ subentry.put( "prescriptiveACI", aciItem );
+ adminCtx.createSubcontext( "cn=" + cn, subentry );
+ }
+
+
+ public void testSubentryControl() throws Exception
+ {
+ // create a real access control subentry
+ createAccessControlSubentry( "anyBodyAdd", "{}",
+ "{ " + "identificationTag \"addAci\", " + "precedence 14, "
+ + "authenticationLevel none, " + "itemOrUserFirst userFirst: { " + "userClasses { allUsers }, "
+ + "userPermissions { { " + "protectedItems {entry, allUserAttributeTypesAndValues}, "
+ + "grantsAndDenials { grantAdd, grantBrowse } } } } }"
+ );
+
+ // prepare the subentry control to make the subentry visible
+ SubentriesControl control = new SubentriesControl();
+ control.setVisibility( true );
+ Control[] reqControls = new Control[] { control };
+ SearchControls searchControls = new SearchControls();
+ searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+
+ ctx.setRequestControls( reqControls );
+ NamingEnumeration enm = ctx.search( "", "(objectClass=*)", searchControls );
+ Set results = new HashSet();
+ while ( enm.hasMore() )
+ {
+ SearchResult result = ( SearchResult ) enm.next();
+ results.add( result.getName() );
+ }
+
+ assertEquals( "expected results size of", 1, results.size() );
+ assertTrue( results.contains( "cn=anyBodyAdd" ) );
}
}