directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r190349 - in /directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server: AbstractAdminTestCase.java AbstractCoreTest.java AbstractNonAdminTestCase.java AbstractTestCase.java jndi/AbstractContextFactory.java jndi/ContextFactoryContext.java jndi/DefaultContextFactoryContext.java prefs/ServerSystemPreferences.java
Date Mon, 13 Jun 2005 04:58:20 GMT
Author: trustin
Date: Sun Jun 12 21:58:20 2005
New Revision: 190349

URL: http://svn.apache.org/viewcvs?rev=190349&view=rev
Log:
Fixed: DIREVE-162 Support multiple 'new InitialContext()' calls with different principle and
root DN

Added:
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
  (with props)
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
  (with props)
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
  (with props)
Removed:
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java
Modified:
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java

Added: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java?rev=190349&view=auto
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
(added)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
Sun Jun 12 21:58:20 2005
@@ -0,0 +1,32 @@
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.ldap.server;
+
+
+/**
+ * A simple testcase for testing JNDI provider functionality.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public abstract class AbstractAdminTestCase extends AbstractTestCase
+{
+    protected AbstractAdminTestCase()
+    {
+        super( "uid=admin,ou=system", "secret" );
+    }
+}

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractAdminTestCase.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Added: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java?rev=190349&view=auto
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
(added)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
Sun Jun 12 21:58:20 2005
@@ -0,0 +1,34 @@
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.ldap.server;
+
+
+
+
+/**
+ * Adds extra code to perform operations as another user besides the admin user.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public abstract class AbstractNonAdminTestCase extends AbstractTestCase
+{
+    protected AbstractNonAdminTestCase()
+    {
+        super( "uid=akarasulu,ou=users,ou=system", "test" );
+    }
+}

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractNonAdminTestCase.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Added: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java?rev=190349&view=auto
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
(added)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
Sun Jun 12 21:58:20 2005
@@ -0,0 +1,310 @@
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.ldap.server;
+
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.exception.NestableRuntimeException;
+import org.apache.ldap.common.ldif.LdifIterator;
+import org.apache.ldap.common.ldif.LdifParserImpl;
+import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.ldap.server.configuration.Configuration;
+import org.apache.ldap.server.configuration.MutableStartupConfiguration;
+import org.apache.ldap.server.configuration.ShutdownConfiguration;
+
+                                                                                        
                   
+/**
+ * A simple testcase for testing JNDI provider functionality.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public abstract class AbstractTestCase extends TestCase
+{
+    public static final String LDIF = "dn: uid=akarasulu,ou=users,ou=system\n" +
+            "cn: Alex Karasulu\n" +
+            "sn: Karasulu\n" +
+            "givenname: Alex\n" +
+            "objectclass: top\n" +
+            "objectclass: person\n" +
+            "objectclass: organizationalPerson\n" +
+            "objectclass: inetOrgPerson\n" +
+            "ou: Engineering\n" +
+            "ou: People\n" +
+            "l: Bogusville\n" +
+            "uid: akarasulu\n" +
+            "mail: akarasulu@apache.org\n" +
+            "telephonenumber: +1 408 555 4798\n" +
+            "facsimiletelephonenumber: +1 408 555 9751\n" +
+            "roomnumber: 4612\n" +
+            "userpassword: test\n";
+    
+    private final String username;
+    
+    private final String password;
+
+    /** the context root for the system partition */
+    protected LdapContext sysRoot;
+
+    /** flag whether to delete database files for each test or not */
+    protected boolean doDelete = true;
+    
+    protected MutableStartupConfiguration configuration = new MutableStartupConfiguration();
+
+    /** A testEntries of entries as Attributes to add to the DIT for testing */
+    protected Set testEntries = new HashSet();
+
+    /** An optional LDIF file path if set and present is read to add more test entries */
+    private String ldifPath;
+
+    /** Load resources relative to this class */
+    private Class loadClass;
+
+    protected AbstractTestCase( String username, String password )
+    {
+        if( username == null || password == null )
+        {
+            throw new NullPointerException();
+        }
+
+        this.username = username;
+        this.password = password;
+    }
+
+    /**
+     * Sets the LDIF path as a relative resource path to use with the
+     * loadClass parameter to load the resource.
+     *
+     * @param ldifPath the relative resource path to the LDIF file
+     * @param loadClass the class used to load the LDIF as a resource stream
+     */
+    protected void setLdifPath( String ldifPath, Class loadClass )
+    {
+        this.loadClass = loadClass;
+
+        this.ldifPath = ldifPath;
+    }
+
+
+    /**
+     * Sets the LDIF path to use.  If the path is relative to this class then it
+     * is first tested
+     *
+     * @param ldifPath the path to the LDIF file
+     */
+    protected void setLdifPath( String ldifPath )
+    {
+        this.ldifPath = ldifPath;
+    }
+
+
+    /**
+     * Get's the initial context factory for the provider's ou=system context
+     * root.
+     *
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        // -------------------------------------------------------------------
+        // Add a single test entry
+        // -------------------------------------------------------------------
+
+        Attributes attributes = new LockableAttributesImpl();
+
+        LdifParserImpl parser = new LdifParserImpl();
+
+        try
+        {
+            parser.parse( attributes, LDIF );
+        }
+        catch ( NamingException e )
+        {
+            e.printStackTrace();
+
+            throw new NestableRuntimeException( e );
+        }
+
+        testEntries.add( attributes );
+
+        // -------------------------------------------------------------------
+        // Add more from an optional LDIF file if they exist
+        // -------------------------------------------------------------------
+
+        InputStream in = null;
+
+        if ( loadClass == null && ldifPath != null )
+        {
+            File ldifFile = new File( ldifPath );
+
+            if ( ldifFile.exists() )
+            {
+                in = new FileInputStream( ldifPath );
+            }
+            else
+            {
+                in = getClass().getResourceAsStream( ldifPath );
+            }
+
+            throw new FileNotFoundException( ldifPath );
+        }
+        else if ( loadClass != null && ldifPath != null )
+        {
+            in = loadClass.getResourceAsStream( ldifPath );
+        }
+
+        if ( in != null )
+        {
+            LdifIterator list = new LdifIterator( in );
+
+            while ( list.hasNext() )
+            {
+                String ldif = ( String ) list.next();
+
+                attributes = new LockableAttributesImpl();
+
+                parser.parse( attributes, ldif );
+
+                testEntries.add( attributes );
+            }
+        }
+
+        // -------------------------------------------------------------------
+        // Add key for extra entries to the testEntries of extras
+        // -------------------------------------------------------------------
+
+        configuration.setTestEntries( testEntries );
+        doDelete( configuration.getWorkingDirectory() );
+        setSysRoot( username, password, configuration );
+    }
+
+
+    /**
+     * Deletes the Eve working directory.
+     */
+    protected void doDelete( File wkdir ) throws IOException
+    {
+        if ( doDelete )
+        {
+            if ( wkdir.exists() )
+            {
+                FileUtils.deleteDirectory( wkdir );
+            }
+            if ( wkdir.exists() )
+            {
+                throw new IOException( "Failed to delete: " + wkdir );
+            }
+        }
+    }
+
+
+    /**
+     * Sets and returns the system root.  Values of user and password used to
+     * set the respective JNDI properties.  These values can be overriden by the
+     * overrides properties.
+     *
+     * @param user the username for authenticating as this user
+     * @param passwd the password of the user
+     * @return the sysRoot context which is also set
+     * @throws NamingException if there is a failure of any kind
+     */
+    protected LdapContext setSysRoot( String user, String passwd, Configuration cfg ) throws
NamingException
+    {
+        Hashtable env = new Hashtable( cfg.toJndiEnvironment() );
+        env.put( Context.SECURITY_PRINCIPAL, user );
+        env.put( Context.SECURITY_CREDENTIALS, passwd );
+        return setSysRoot( env );
+    }
+
+
+    /**
+     * Sets the system root taking into account the extras and overrides
+     * properties.  In between these it sets the properties for the working
+     * directory, the provider URL and the JNDI InitialContexFactory to use.
+     *
+     * @param env an environment to use while setting up the system root.
+     * @return the sysRoot context which is also set
+     * @throws NamingException if there is a failure of any kind
+     */
+    protected LdapContext setSysRoot( Hashtable env ) throws NamingException
+    {
+        Hashtable envFinal = new Hashtable( env );
+        if ( ! envFinal.containsKey( Context.PROVIDER_URL ) )
+        {
+            envFinal.put( Context.PROVIDER_URL, "ou=system" );
+        }
+
+        envFinal.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory"
);
+        return sysRoot = new InitialLdapContext( envFinal, null );
+    }
+
+
+
+    /**
+     * Sets the system context root to null.
+     *
+     * @see junit.framework.TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+
+        Hashtable env = new Hashtable();
+
+        env.put( Context.PROVIDER_URL, "ou=system" );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory"
);
+        env.putAll( new ShutdownConfiguration().toJndiEnvironment() );
+        env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
+        env.put( Context.SECURITY_CREDENTIALS, "secret" );
+
+        try { new InitialContext( env ); } catch( Exception e ) {}
+
+        sysRoot = null;
+
+        Runtime.getRuntime().gc();
+
+        testEntries.clear();
+
+        ldifPath = null;
+
+        loadClass = null;
+        
+        configuration = new MutableStartupConfiguration();
+        
+        doDelete( configuration.getWorkingDirectory() );
+    }
+}

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java?rev=190349&r1=190348&r2=190349&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
(original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
Sun Jun 12 21:58:20 2005
@@ -66,6 +66,10 @@
     {
         Configuration cfg = Configuration.toConfiguration( env );
         
+        String username = null;
+        String password = null;
+        String providerUrl = null;
+
         if( cfg instanceof ShutdownConfiguration )
         {
             provider.shutdown();
@@ -77,6 +81,10 @@
         else if( cfg instanceof StartupConfiguration )
         {
             // fire up the backend subsystem if we need to
+            username = env.remove( Context.SECURITY_PRINCIPAL ).toString();
+            password = env.remove( Context.SECURITY_CREDENTIALS ).toString();
+
+            providerUrl = env.remove( Context.PROVIDER_URL ).toString();
             ( ( DefaultContextFactoryContext ) provider ).startup( this, env );
         }
         else
@@ -84,7 +92,7 @@
             throw new NamingException( "Unknown configuration: " + cfg );
         }
         
-        return provider.getJndiContext();
+        return provider.getJndiContext( username, password, providerUrl );
     }
     
     protected abstract void beforeStartup( ContextFactoryContext ctx ) throws NamingException;

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java?rev=190349&r1=190348&r2=190349&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
(original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
Sun Jun 12 21:58:20 2005
@@ -66,6 +66,8 @@
     boolean isStarted();
     
     Context getJndiContext() throws NamingException;
+    Context getJndiContext( String rootDN ) throws NamingException;
+    Context getJndiContext( String username, String password, String rootDN ) throws NamingException;
 
     /**
      * Invokes {@link Invocation} to this context.

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java?rev=190349&r1=190348&r2=190349&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
(original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
Sun Jun 12 21:58:20 2005
@@ -146,12 +146,42 @@
     // BackendSubsystem Interface Method Implemetations
     // ------------------------------------------------------------------------
 
-    public synchronized Context getJndiContext() throws NamingException
+    public Context getJndiContext() throws NamingException
+    {
+        return this.getJndiContext( "" );
+    }
+
+    public Context getJndiContext( String rootDN ) throws NamingException
+    {
+        return this.getJndiContext( "", "", rootDN );
+    }
+    
+    public synchronized Context getJndiContext( String username, String password, String
rootDN ) throws NamingException
     {
         if ( !started )
         {
             return new DeadContext();
         }
+        
+        if( username == null )
+        {
+            username = "";
+        }
+        
+        if( password == null )
+        {
+            password = "";
+        }
+        
+        if( rootDN == null )
+        {
+            rootDN = "";
+        }
+
+        Hashtable environment = getEnvironment();
+        environment.put( Context.SECURITY_PRINCIPAL, username );
+        environment.put( Context.SECURITY_CREDENTIALS, password );
+        environment.put( Context.PROVIDER_URL, rootDN );
 
         return new ServerLdapContext( proxy, environment );
     }
@@ -171,7 +201,9 @@
         {
             env.put( PRINCIPAL, "" );
         }
-
+        
+        env.put( Context.PROVIDER_URL, "" );
+        
         // we need to check this here instead of in AuthenticationService
         // because otherwise we are going to start up the system incorrectly
         if ( isAnonymous( env ) && !cfg.isAllowAnonymousAccess() )

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java?rev=190349&r1=190348&r2=190349&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java
(original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java
Sun Jun 12 21:58:20 2005
@@ -42,6 +42,7 @@
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.util.PreferencesDictionary;
 import org.apache.ldap.server.configuration.MutableStartupConfiguration;
+import org.apache.ldap.server.configuration.ShutdownConfiguration;
 import org.apache.ldap.server.jndi.CoreContextFactory;
 
 
@@ -93,7 +94,28 @@
         }
         catch ( Exception e )
         {
-            throw new ServerSystemPreferenceException( "Failed to initialize InitialLdapContext.",
e );
+            throw new ServerSystemPreferenceException( "Failed to open.", e );
+        }
+    }
+    
+    public synchronized void close()
+    {
+        if( this.parent() != null )
+        {
+            throw new ServerSystemPreferenceException( "Cannot close child preferences."
);
+        }
+
+        Hashtable env = new Hashtable( new ShutdownConfiguration().toJndiEnvironment() );
+        env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
+        env.put( Context.PROVIDER_URL, PreferencesUtils.SYSPREF_BASE );
+
+        try
+        {
+            ctx = new InitialLdapContext( env, null );
+        }
+        catch ( Exception e )
+        {
+            throw new ServerSystemPreferenceException( "Failed to close.", e );
         }
     }
 



Mime
View raw message