Changeset 1332 for trunk/src/org/rapla/plugin/jndi/JNDIAuthenticationStore.java

Timestamp:

08/19/08 00:55:11 (4 years ago)

Author:

kohlhaas

Message:

closes #57

Files:

• trunk/src/org/rapla/plugin/jndi/JNDIAuthenticationStore.java (modified) (15 diffs)

trunk/src/org/rapla/plugin/jndi/JNDIAuthenticationStore.java

@@ -65 +65 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.naming.AuthenticationException;
@@ -75 +77 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
@@ -82 +86 @@
 import org.apache.avalon.framework.activity.Startable;
 import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.logger.ConsoleLogger;
@@ -89 +92 @@
 import org.rapla.entities.Category;
 import org.rapla.framework.RaplaException;
+import org.rapla.plugin.jndi.internal.JNDIConf;
 import org.rapla.storage.AuthenticationStore;
+import org.rapla.storage.RaplaSecurityException;
 
 /**
@@ -125 +130 @@
  */
 
-public class JNDIAuthenticationStore extends AbstractLogEnabled implements AuthenticationStore,Startable {
+public class JNDIAuthenticationStore extends AbstractLogEnabled implements AuthenticationStore,Startable,JNDIConf {
     // ----------------------------------------------------- Instance Variables
 
+   
     /**
      * Digest algorithm used in storing passwords in a non-plaintext format.
@@ -199 +205 @@
      */
     protected String userSearch = null;
+    
 
 
@@ -213 +220 @@
     protected int connectionAttempt = 0;
 
-    public JNDIAuthenticationStore(Configuration config,Logger logger) throws ConfigurationException{
+    public JNDIAuthenticationStore(Configuration config,Logger logger) throws RaplaException {
         enableLogging( logger);
-        setDigest( config.getAttribute( "digest", null ) );
-        setConnectionName( config.getAttribute( "connectionName" ) );
-        setConnectionPassword( config.getAttribute( "connectionPassword", null) );
-        setConnectionURL( config.getAttribute( "connectionURL" ) );
-        setContextFactory( config.getAttribute( "contextFactory", contextFactory ) );
-        setUserPassword( config.getAttribute( "userPassword", null ) );
-        setUserMail( config.getAttribute( "userMail", null ) );
-        setUserCn( config.getAttribute( "userCn", null ) );
-        setUserSearch( config.getAttribute( "userSearch") );
-        setUserBase( config.getAttribute( "userBase") );
+        Map map = generateMap(config);
+        initWithMap(map);
+        /*
+        setDigest( config.getAttribute( DIGEST, null ) );
+        setConnectionName( config.getAttribute( CONNECTION_NAME ) );
+        setConnectionPassword( config.getAttribute( CONNECTION_PASSWORD, null) );
+        setConnectionURL( config.getAttribute( CONNECTION_URL ) );
+        setContextFactory( config.getAttribute( CONTEXT_FACTORY, contextFactory ) );
+        setUserPassword( config.getAttribute( USER_PASSWORD, null ) );
+        setUserMail( config.getAttribute( USER_MAIL, null ) );
+        setUserCn( config.getAttribute( USER_CN, null ) );
+        setUserSearch( config.getAttribute( USER_SEARCH) );
+        setUserBase( config.getAttribute( USER_BASE) );
+    */
+    }
+
+    static public Map generateMap(Configuration config) {
+        String[] attributes = config.getAttributeNames();
+        Map map = new TreeMap();
+        for (int i=0;i<attributes.length;i++)
+        {
+            map.put( attributes[i], config.getAttribute(attributes[i], null));
+        }
+        return map;
+    }
+    
+    public static JNDIAuthenticationStore createJNDIAuthenticationStore(
+            Map config, Logger logger) throws RaplaException {
+        return new JNDIAuthenticationStore(config, logger);
+    }
+
+    private JNDIAuthenticationStore(Map config, Logger logger) throws RaplaException
+    {
+        enableLogging(logger);
+        initWithMap(config);
+        
+    }
+
+    private void initWithMap(Map config) throws RaplaException {
+        setDigest( getAttribute( config,DIGEST, null ) );
+        setConnectionName( getAttribute(config, CONNECTION_NAME ) );
+        setConnectionPassword( getAttribute( config,CONNECTION_PASSWORD, null) );
+        setConnectionURL( getAttribute( config,CONNECTION_URL ) );
+        setContextFactory( getAttribute( config,CONTEXT_FACTORY, contextFactory ) );
+        setUserPassword( getAttribute( config,USER_PASSWORD, null ) );
+        setUserMail( getAttribute( config,USER_MAIL, null ) );
+        setUserCn( getAttribute( config,USER_CN, null ) );
+        setUserSearch( getAttribute( config,USER_SEARCH) );
+        setUserBase( getAttribute( config,USER_BASE) );
+    }
+
+    private String getAttribute(Map config, String key, String defaultValue) {
+        Object object = config.get(key);
+        if (object == null)
+        {
+            return defaultValue;
+        }
+        return (String)object;
+    }
+
+    private String getAttribute(Map config, String key) throws RaplaException{
+        String result = getAttribute(config, key, null);
+        if ( result == null)
+        {
+            throw new RaplaException("Can't find provided configuration entry for key " + key);
+        }
+        return result;
     }
 
@@ -262 +326 @@
         JNDIUser intUser = authenticateUser( username, password );
         if ( intUser == null )
-            throw new RaplaException("Can't authenticate user " + username);
+            throw new RaplaSecurityException("Can't authenticate user " + username);
         String oldUsername = user.getUsername();
         if ( oldUsername == null || !oldUsername.equals( username ) ) {
@@ -278 +342 @@
             modified = true;
         } 
+        /* Uncomment this if you want to add predefined groups for the new users
+        Category canReadEvents = userGroupCategory.getCategory( Permission.GROUP_CAN_READ_EVENTS_FROM_OTHERS);
+        user.addGroup( canReadEvents);
+        Category canModifiyPreferences = userGroupCategory.getCategory( Permission.GROUP_MODIFY_PREFERENCES_KEY);
+        user.addGroup( canModifiyPreferences);
+        */
+        
         return modified;
     }
@@ -545 +616 @@
             log("  base: " + userBase + "  filter: " + filter);
         }
-
+        //filter = "";
+        Attributes attributes = new BasicAttributes(true);
+        attributes.put(new BasicAttribute("uid","admin"));
         NamingEnumeration results =
-            context.search(userBase, filter, constraints);
-
-
-        // Fail if no entries found
+            //context.search(userBase,attributes);//
+            context.search(userBase,  filter,constraints);
+/*
+        while ( results.hasMore())
+        {
+            System.out.println( results.next());
+        }
+  */      // Fail if no entries found
         if (results == null || !results.hasMore()) {
             if (getLogger().isDebugEnabled()) {
@@ -861 +938 @@
             // Ensure that we have a directory context available
             context = new InitialDirContext(getDirectoryContextEnvironment());
-
+/*
         } catch (NamingException e) {
 
@@ -871 +948 @@
             // Try connecting to the alternate url.
             context = new InitialDirContext(getDirectoryContextEnvironment());
-
+*/
         } finally {
 
@@ -903 +980 @@
         if (connectionURL != null && connectionAttempt == 0)
             env.put(Context.PROVIDER_URL, connectionURL);
-
         return env;
-
     }
 
@@ -943 +1018 @@
         JNDIAuthenticationStore aut = new JNDIAuthenticationStore();
         aut.enableLogging(new ConsoleLogger());
-        aut.setConnectionName( "cn=Manager,dc=einfachanders" );
-        aut.setConnectionPassword( "rapla2003" );
-        aut.setConnectionURL( "ldap://localhost:389" );
+        aut.setConnectionName( "uid=admin,ou=system" );
+        aut.setConnectionPassword( "secret" );
+        aut.setConnectionURL( "ldap://localhost:10389" );
         //aut.setUserPassword ( "userPassword" );
-        aut.setUserBase ( "ou=people,dc=einfachanders" );
-        aut.setUserSearch (" (uid={0})" );
+        aut.setUserBase ( "dc=example,dc=com" );
+        aut.setUserSearch ("(uid={0})" );
         try {
             aut.start();
-            if ( aut.authenticate ( "admin", "test" ) ) {
+            if ( aut.authenticate ( "admin", "admin" ) ) {
                 System.out.println( "Authentication succeeded." );
             } else {
@@ -961 +1036 @@
     }
 
+   
     /**
      * A private class representing a User