Changeset 1332

Timestamp:

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

Author:

kohlhaas

Message:

closes #57

Location:

trunk/src/org/rapla/plugin/jndi

Files:

• JNDIAuthenticationStore.java (modified) (15 diffs)
• JNDIPlugin.java (modified) (1 diff)
• internal (added)
• internal/JNDIConf.java (added)
• internal/JNDIOption.java (moved) (moved from trunk/src/org/rapla/plugin/jndi/JNDIOption.java) (5 diffs, 1 prop)
• internal/JNDITest.java (added)
• internal/PasswordEnterUI.java (added)
• internal/RaplaJNDITestOnLocalhost.java (added)
• internal/RaplaJNDITestOnServer.java (added)
• internal/RaplaJNDITestRemoteServiceFactory.java (added)

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

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

@@ -17 +17 @@
 import org.rapla.framework.PluginDescriptor;
 import org.rapla.plugin.RaplaExtensionPoints;
+import org.rapla.plugin.jndi.internal.JNDIOption;
+import org.rapla.plugin.jndi.internal.JNDITest;
+import org.rapla.plugin.jndi.internal.RaplaJNDITestOnLocalhost;
+import org.rapla.plugin.jndi.internal.RaplaJNDITestOnServer;
+import org.rapla.plugin.jndi.internal.RaplaJNDITestRemoteServiceFactory;
+import org.rapla.server.RaplaRemoteServiceFactory;
+import org.rapla.server.ServerService;
 import org.rapla.storage.AuthenticationStore;
 
 public class JNDIPlugin implements PluginDescriptor {
     public static final String PLUGIN_CLASS = JNDIPlugin.class.getName();
-    static final String PLUGIN_NAME = "Ldap or other JNDI Authentication";
+    public static final String PLUGIN_NAME = "Ldap or other JNDI Authentication";
 
-    
+    public static final String JNDI_ON_SERVER = JNDIPlugin.class.getPackage().getName() + ".JNDIOnServer";
+    public static final String JNDI_ON_LOCALHOST = JNDIPlugin.class.getPackage().getName() + ".JNDIOnLocalhost";
+   
     public String toString() {
         return PLUGIN_NAME;
     }
     
-    public void provideServices(Container container, Configuration config) {
+    public void provideServices(Container container, Configuration config) 
+    {
+        if ( container.getContext().has( ServerService.ROLE) ){
+            container.addContainerProvidedComponent( RaplaRemoteServiceFactory.ROLE, RaplaJNDITestRemoteServiceFactory.class.getName());
+            // only add mail service on localhost
+            container.addContainerProvidedComponent( JNDITest.ROLE, RaplaJNDITestOnLocalhost.class.getName(), JNDI_ON_LOCALHOST , config);
+        } else {
+            // the following order is important for resolving,
+            // first add the service on the server
+            // then on localhost
+    //        container.addContainerProvidedComponent( JNDITest.ROLE, RaplaJNDITestOnLocalhost.class.getName(), JNDI_ON_LOCALHOST , config);
+            container.addContainerProvidedComponent( JNDITest.ROLE, RaplaJNDITestOnServer.class.getName(), JNDI_ON_SERVER , config);
+        }
         container.addContainerProvidedComponent( RaplaExtensionPoints.PLUGIN_OPTION_PANEL_EXTENSION,JNDIOption.class.getName(),JNDIPlugin.class.getName(), config);
-        
+           
         if ( !config.getAttributeAsBoolean("enabled", false) )
                 return;

trunk/src/org/rapla/plugin/jndi/internal/JNDIOption.java

@@ -11 +11 @@
  | Definition as published by the Open Source Initiative (OSI).             |
  *--------------------------------------------------------------------------*/
-package org.rapla.plugin.jndi;
+package org.rapla.plugin.jndi.internal;
 
 import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Locale;
 
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -28 +31 @@
 import org.rapla.gui.DefaultPluginOption;
 import org.rapla.gui.OptionPanel;
-
-public class JNDIOption extends DefaultPluginOption implements OptionPanel {
+import org.rapla.gui.toolkit.DialogUI;
+import org.rapla.plugin.jndi.JNDIPlugin;
+
+public class JNDIOption extends DefaultPluginOption implements OptionPanel,JNDIConf {
         TableLayout tableLayout;
         JPanel content;
@@ -44 +49 @@
         JTextField userBase;
         
+        
 
     public JNDIOption(RaplaContext sm) throws RaplaException {
@@ -71 +77 @@
         tableLayout.insertRow( 0, TableLayout.PREFERRED);
         content.add( new JLabel("WARNING! Only enable plugin, if you have a LDAP Server running!"), "0,0,2,0");
-        addRow("connectionName", connectionName);
-        addRow("connectionPassword", connectionPassword );
-        addRow("connectionURL", connectionURL );
-        addRow("contextFactory", contextFactory);
-        addRow( "digest", digest);
-        addRow("userPassword", userPassword );
-        addRow("userMail", userMail );
-        addRow("userCn", userCn );
-        addRow("userSearch", userSearch );
-        addRow("userBase", userBase );
+        addRow(CONNECTION_NAME, connectionName);
+        addRow(CONNECTION_PASSWORD, connectionPassword );
+        addRow(CONNECTION_URL, connectionURL );
+        addRow(CONTEXT_FACTORY, contextFactory);
+        addRow(DIGEST, digest);
+        addRow(USER_PASSWORD, userPassword );
+        addRow(USER_MAIL, userMail );
+        addRow(USER_CN, userCn );
+        addRow(USER_SEARCH, userSearch );
+        addRow(USER_BASE, userBase );
+        JButton testButton = new JButton("Test access");
+        addRow("TestAccess", testButton );
+        testButton.addActionListener( new ActionListener() 
+        {
+
+            public void actionPerformed(ActionEvent e) {
+                try
+                {
+                    JNDITest test = (JNDITest)getContext().lookup(JNDITest.ROLE);
+                    DefaultConfiguration conf = new DefaultConfiguration("test");
+                    StringBuffer buf = new StringBuffer();
+                    addChildren(conf);
+                    String[] attributes = conf.getAttributeNames();
+                    for (int i=0;i<attributes.length;i++)
+                    {
+                        String attribute = attributes[i];
+                        String value = conf.getAttribute( attribute, null);
+                        buf.append( attribute);
+                        buf.append("=");
+                        buf.append( value );
+                        buf.append("RAPLANEXT");
+                    }
+                    String list = buf.toString();
+                    String username = "admin";
+                    String password ="";
+                    {
+                        PasswordEnterUI testUser = new PasswordEnterUI(getContext());
+                        DialogUI dialog =DialogUI.create( getContext(), getComponent(), true,testUser.getComponent(),new String[] {"test","abort"});
+                        dialog.setTitle("Please enter valid user!");
+                        dialog.start();
+                        username = testUser.getUsername();
+                        password = new String(testUser.getNewPassword());
+                        int index=dialog.getSelectedIndex();
+                        if ( index > 0)
+                        {
+                            return;
+                        }
+                    }
+                    test.test(list,username,password);
+                    {
+                        DialogUI dialog =DialogUI.create( getContext(), getComponent(), true, "JNDI","JNDI Authentification successfull");
+                        dialog.start();
+                    }
+                } catch (Exception ex)
+                {
+                    showException(ex, getComponent());
+                }
+                
+            }
+            
+        });
         panel.add( content, BorderLayout.CENTER);
         return panel;
@@ -94 +151 @@
         
     protected void addChildren( DefaultConfiguration newConfig) {
-        setAttribute(newConfig,"digest", digest);
-        setAttribute(newConfig,"connectionName", connectionName);
-        setAttribute(newConfig,"connectionPassword", connectionPassword );
-        setAttribute(newConfig,"connectionURL", connectionURL );
-        setAttribute(newConfig,"contextFactory", contextFactory);
-        setAttribute(newConfig,"userPassword", userPassword );
-        setAttribute(newConfig,"userMail", userMail );
-        setAttribute(newConfig,"userCn", userCn );
-        setAttribute(newConfig,"userSearch", userSearch );
-        setAttribute(newConfig,"userBase", userBase );
+        setAttribute(newConfig,CONNECTION_NAME, connectionName);
+        setAttribute(newConfig,CONNECTION_PASSWORD, connectionPassword );
+        setAttribute(newConfig,CONNECTION_URL, connectionURL );
+        setAttribute(newConfig,CONTEXT_FACTORY, contextFactory);
+        setAttribute(newConfig,DIGEST, digest);
+        setAttribute(newConfig,USER_BASE, userBase );
+        setAttribute(newConfig,USER_CN, userCn );
+        setAttribute(newConfig,USER_MAIL, userMail );
+        setAttribute(newConfig,USER_PASSWORD, userPassword );
+        setAttribute(newConfig,USER_SEARCH, userSearch );
     }