/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 871

Added by Matt Jones over 22 years ago

Modified AuthLdap to fix the may problems associated with group and user
queries. Now the getGroups() and getUsers() methods work as advertised,
and there is a test of each of the methods in "main" for testing purposes.
Simplified the class substantially. Fixed the getAttributes method as
well. The getSubtree and getPrincipals methods have yet to be tested and
I suspect that they do not work (but we'll see). Also need to check
if "getIdentifyingName() works properly.

The problems were all associated with not setting the ldapBase correctly in
the context. The getAttributes method also incorrectly overwrote the ldapBase
and was messing up session management. I think all of the ldapBase issues
are now resolved (except in the methods that I did not check, listed above.

Now we should be able to check if group-based authentication works for
Metacat.

         this.ldapsUrl = MetaCatUtil.getOption("ldapsurl");
         this.ldapBase = MetaCatUtil.getOption("ldapbase");
         this.referral = MetaCatUtil.getOption("referral");
         this.referral = "ignore";
         System.out.println("LDAPBASE is: " + ldapBase);
+      }
       /**
-...
       /**
        * Get all users from the authentication service
+       *
        * @param user the user for authenticating against the service
        * @param password the password for authenticating against the service
        * @returns string array of all of the user names
        */
       public String[] getUsers(String user, String password)
              throws ConnectException
-...
         env.put(Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         env.put(Context.PROVIDER_URL, ldapUrl + ldapBase);
         env.put(Context.PROVIDER_URL, ldapUrl);
         try {
             // Create the initial directory context
             DirContext ctx = new InitialDirContext(env);
             // Specify the ids of the attributes to return
             String[] attrIDs = {"uid"};
             // Specify the attributes to match.
             // Users are objects that have the attribute objectclass=InetOrgPerson.
             Attributes matchAttrs = new BasicAttributes(true); // ignore case
             matchAttrs.put(new BasicAttribute("objectclass", "inetOrgPerson"));
             // Search for objects in the current context
             NamingEnumeration enum = ctx.search("", matchAttrs, attrIDs);
             SearchControls ctls = new SearchControls();
             String[] attrIDs = {"dn"};
             ctls.setReturningAttributes(attrIDs);
             ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
             String filter = "(objectClass=inetOrgPerson)";
             NamingEnumeration enum = ctx.search(ldapBase, filter, ctls);
             // Print the users
             Vector uvec = new Vector();
             while (enum.hasMore()) {
               SearchResult sr = (SearchResult)enum.next();
               Attributes attrs = sr.getAttributes();
               NamingEnumeration enum1 = attrs.getAll(); // only "uid" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 uvec.add(attr.get());
+              }
               uvec.add(sr.getName()+","+ldapBase);
+            }
             // initialize users[]; fill users[]
-...
         } catch (NamingException e) {
           System.err.println("Problem getting users in AuthLdap.getUsers:" + e);
           e.printStackTrace(System.err);
           throw new ConnectException(
           "Problem getting users in AuthLdap.getUsers:" + e);
+        }
-...
       /**
        * Get the users for a particular group from the authentication service
+       *
        * @param user the user for authenticating against the service
        * @param password the password for authenticating against the service
        * @param group the group whose user list should be returned
        * @returns string array of the user names belonging to the group
        */
       public String[] getUsers(String user, String password, String group)
              throws ConnectException
-...
         env.put(Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         env.put(Context.PROVIDER_URL, ldapUrl + ldapBase);
         env.put(Context.PROVIDER_URL, ldapUrl);
         try {
-...
             DirContext ctx = new InitialDirContext(env);
             // Specify the ids of the attributes to return
             String[] attrIDs = {"uniquemember"};
             String[] attrIDs = {"uniqueMember"};
             // Specify the attributes to match.
             // Groups are objects with attribute objectclass=groupofuniquenames.
             Attributes matchAttrs = new BasicAttributes(true); // ignore case
             matchAttrs.put(new BasicAttribute("objectclass", "groupofuniquenames"));
             matchAttrs.put(new BasicAttribute("cn", group));
             Attributes answer = ctx.getAttributes(group, attrIDs);
             // Search for objects in the current context
             NamingEnumeration enum = ctx.search("", matchAttrs, attrIDs);
             // Print the users
             Vector uvec = new Vector();
             while (enum.hasMore()) {
               SearchResult sr = (SearchResult)enum.next();
               Attributes attrs = sr.getAttributes();
               // return all attributes (only "uniquemember" attr)
               NamingEnumeration enum1 = attrs.getAll();
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 // return all values of that attribute
                 NamingEnumeration enum2 = attr.getAll();
                 while (enum2.hasMore()) {
                   // get DN of a member
                   String memberDN = (String)enum2.next();
                   try {
                     // we actually need RDN of the member
                     // try to get RDN (UID) of the member in case of a user
                     String memberID = getUserID(memberDN);
                     if ( memberID != null ) {
                       uvec.add(memberID);
                     // CURRENTLY WE DON'T SUPPORT SUBGROUPING, THUS
                     // IGNORE SUBGROUPS AS MEMBERS OF THE GROUP
                     // // this is a group, not user
                     // // try to get RDN (CN) of the group
                     // } else {
                     //   memberID = getGroupID(memberDN);
                     //   uvec.add(memberID);
+                    }
                   } catch (NamingException ne) {}
+                }
+              }
             for (NamingEnumeration ae = answer.getAll(); ae.hasMore();) {
                 Attribute attr = (Attribute)ae.next();
                 for (NamingEnumeration e = attr.getAll(); e.hasMore();
                      uvec.add(e.next())
                      );
+            }
             // initialize users[]; fill users[]
-...
             ctx.close();
         } catch (NamingException e) {
           System.err.println("Problem getting users for a group in AuthLdap.getUsers:" + e);
           System.err.println("Problem getting users for a group in " +
                   "AuthLdap.getUsers:" + e);
           throw new ConnectException(
           "Problem getting users for a group in AuthLdap.getUsers:" + e);
+        }
-...
+      }
       /**
        * Get UID by DN of a member
        */
       private String getUserID(String dn)
              throws NamingException
+      {
         String[] users = null;
         // Identify service provider to use
         Hashtable env = new Hashtable(11);
         env.put(Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         env.put(Context.PROVIDER_URL, ldapUrl); // + ldapBase);
         try {
             // Create the initial directory context
             DirContext ctx = new InitialDirContext(env);
             // Specify the ids of the attributes to return
             String[] attrIDs = {"uid"};
             // Ask for "uid" attributes of the user
             Attributes attrs = ctx.getAttributes(dn, attrIDs);
             // Print all of the attributes (only "uid" attr)
             Vector uvec = new Vector();
             NamingEnumeration en = attrs.getAll();
             while (en.hasMore()) {
               Attribute att = (Attribute)en.next();
               Vector values = new Vector();
               String attName = att.getID();
               NamingEnumeration attvalues = att.getAll();
               while (attvalues.hasMore()) {
                 String value = (String)attvalues.next();
                 values.add(value);
+              }
               uvec.add(values.elementAt(0));
+            }
             // initialize users[]; fill users[]
             users = new String[uvec.size()];
             for (int i=0; i < uvec.size(); i++) {
               users[i] = (String)uvec.elementAt(i);
+            }
             // Close the context when we're done
             ctx.close();
         } catch (NamingException ne) {
           System.err.println("Problem getting userID by \"dn\" in AuthLdap.getUserID:" + ne);
           throw ne;
+        }
         if ( users.length > 0 ) {
           return users[0];
+        }
         return null;
+      }
       /**
        * Get CN by DN of a member
        */
       private String getGroupID(String dn)
              throws NamingException
+      {
         String[] groups = null;
         // Identify service provider to use
         Hashtable env = new Hashtable(11);
         env.put(Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         env.put(Context.PROVIDER_URL, ldapUrl); // + ldapBase);
         try {
             // Create the initial directory context
             DirContext ctx = new InitialDirContext(env);
             // Specify the ids of the attributes to return
             String[] attrIDs = {"cn"};
             // Ask for "uid" attributes of the user
             Attributes attrs = ctx.getAttributes(dn, attrIDs);
             // Print all of the attributes (only "cn" attr)
             Vector uvec = new Vector();
             NamingEnumeration en = attrs.getAll();
             while (en.hasMore()) {
               Attribute att = (Attribute)en.next();
               Vector values = new Vector();
               String attName = att.getID();
               NamingEnumeration attvalues = att.getAll();
               while (attvalues.hasMore()) {
                 String value = (String)attvalues.next();
                 values.add(value);
+              }
               uvec.add(values.elementAt(0));
+            }
             // initialize users[]; fill users[]
             groups = new String[uvec.size()];
             for (int i=0; i < uvec.size(); i++) {
               groups[i] = (String)uvec.elementAt(i);
+            }
             // Close the context when we're done
             ctx.close();
         } catch (NamingException ne) {
           System.err.println("Problem getting groupID by \"dn\" in AuthLdap.getGroupID:" + ne);
           throw ne;
+        }
         if ( groups.length > 0 ) {
           return groups[0];
+        }
         return null;
+      }
       /**
        * Get all groups from the authentication service
+       *
        * @param user the user for authenticating against the service
        * @param password the password for authenticating against the service
        * @returns string array of the group names
        */
       public String[] getGroups(String user, String password)
              throws ConnectException
+      {
         String[] groups = null;
         // Identify service provider to use
         Hashtable env = new Hashtable(11);
         env.put(Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         env.put(Context.PROVIDER_URL, ldapUrl + ldapBase);
         try {
             // Create the initial directory context
             DirContext ctx = new InitialDirContext(env);
             // Specify the ids of the attributes to return
             String[] attrIDs = {"cn"};
             // Specify the attributes to match.
             // Groups are objects with attribute objectclass=groupofuniquenames.
             Attributes matchAttrs = new BasicAttributes(true); // ignore case
             matchAttrs.put(new BasicAttribute("objectclass", "groupofuniquenames"));
             // Search for objects in the current context
             NamingEnumeration enum = ctx.search("", matchAttrs, attrIDs);
             // Print the users
             Vector uvec = new Vector();
             while (enum.hasMore()) {
               SearchResult sr = (SearchResult)enum.next();
               Attributes attrs = sr.getAttributes();
               NamingEnumeration enum1 = attrs.getAll(); // only "cn" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 uvec.add(attr.get());
+              }
+            }
             // initialize groups[] and fill it
             groups = new String[uvec.size()];
             for (int i=0; i < uvec.size(); i++) {
               groups[i] = (String)uvec.elementAt(i);
+            }
             // Close the context when we're done
             ctx.close();
         } catch (NamingException e) {
           System.err.println("Problem getting groups in AuthLdap.getGroups 1:" + e);
           throw new ConnectException(
           "Problem getting groups in AuthLdap.getGroups:" + e);
+        }
         return groups;
           return getGroups(user, password, null);
+      }
       /**
        * Get the groups for a particular user from the authentication service
+       *
        * @param user the user for authenticating against the service
        * @param password the password for authenticating against the service
        * @param foruser the user whose group list should be returned
        * @returns string array of the group names
        */
       public String[] getGroups(String user, String password, String foruser)
              throws ConnectException
-...
         env.put(Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         //System.out.println("GG server: " + ldapUrl + ldapBase);
         env.put(Context.PROVIDER_URL, ldapUrl + ldapBase);
         env.put(Context.PROVIDER_URL, ldapUrl);
         try {
             // Create the initial directory context
-...
             // Specify the attributes to match.
             // Groups are objects with attribute objectclass=groupofuniquenames.
             // and have attribute uniquemember: uid=foruser,ldapbase.
             Attributes matchAttrs = new BasicAttributes(); // ignore case
             matchAttrs.put(new BasicAttribute("objectClass", "groupOfUniqueNames"));
             //System.out.println("GG user: " + user);
             //System.out.println("GG foruser: " + foruser);
             String dn = user;/*getIdentifyingName(foruser, ldapUrl, ldapBase);*/
             //System.out.println("GG dn: " + dn);
             matchAttrs.put(new BasicAttribute("uniqueMember", dn));
             // Search for objects in the current context
             //System.out.println("GG matchAttrs: " + matchAttrs.toString());
             NamingEnumeration enum = ctx.search("", matchAttrs, attrIDs);
             // Print the users
             SearchControls ctls = new SearchControls();
             ctls.setReturningAttributes(attrIDs);
             ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
             String filter = null;
             String gfilter = "(objectClass=groupOfUniqueNames)";
             if (null == foruser) {
                 filter = gfilter;
             } else {
                 filter = "(& " + gfilter + "(uniqueMember=" + foruser + "))";
+            }
             NamingEnumeration enum = ctx.search(ldapBase, filter, ctls);
             // Print the groups
             Vector uvec = new Vector();
             while (enum.hasMore()) {
               //System.out.println("GG search result found");
               SearchResult sr = (SearchResult)enum.next();
               Attributes attrs = sr.getAttributes();
               NamingEnumeration enum1 = attrs.getAll(); // only "cn" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 uvec.add(attr.get());
+              }
               uvec.add(sr.getName()+","+ldapBase);
+            }
             // initialize groups[] and fill it
             //System.out.println("GG getting groups: " + uvec.size());
             groups = new String[uvec.size()];
             for (int i=0; i < uvec.size(); i++) {
               //System.out.println("GG group: " + groups[i]);
               groups[i] = (String)uvec.elementAt(i);
+            }
-...
       /**
        * Get attributes describing a user or group
+       *
        * @param user the user for which the attribute list is requested
        * @param foruser the user for which the attribute list is requested
        * @returns HashMap a map of attribute name to a Vector of values
        */
       public HashMap getAttributes(String foruser)
-...
       /**
        * Get attributes describing a user or group
+       *
        * @param user the user for which the attribute list is requested
        * @param authuser the user for authenticating against the service
        * @param user the user for authenticating against the service
        * @param password the password for authenticating against the service
        * @param foruser the user whose attributes should be returned
        * @returns HashMap a map of attribute name to a Vector of values
        */
       public HashMap getAttributes(String user, String password, String foruser)
-...
         String ldapUrl = this.ldapUrl;
         String ldapBase = this.ldapBase;
         String userident = foruser;
         /*
         try {
           this.ldapBase = userident.substring(userident.indexOf(",")+1);
           userident = userident.substring(0,userident.indexOf(","));
         } catch (StringIndexOutOfBoundsException e) {}
     */
         // Identify service provider to use
         Hashtable env = new Hashtable(11);
         env.put(Context.INITIAL_CONTEXT_FACTORY,
             "com.sun.jndi.ldap.LdapCtxFactory");
         env.put(Context.REFERRAL, referral);
         env.put(Context.PROVIDER_URL, ldapUrl + ldapBase);
         env.put(Context.PROVIDER_URL, ldapUrl);
         try {
-...
           DirContext ctx = new InitialDirContext(env);
           // Find out the identifying attribute for the user
           userident = getIdentifyingName(userident,ldapUrl,ldapBase);
           //userident = getIdentifyingName(userident,ldapUrl,ldapBase);
           // Ask for all attributes of the user
           Attributes attrs = ctx.getAttributes(userident);
           //Attributes attrs = ctx.getAttributes(userident);
           Attributes attrs = ctx.getAttributes(foruser);
           // Print all of the attributes
           NamingEnumeration en = attrs.getAll();
-...
           // Close the context when we're done
           ctx.close();
         } catch (NamingException e) {
           System.err.println("Problem getting attributes in AuthLdap.getAttributes:"
                               + e);
           System.err.println("Problem getting attributes in " +
                   "AuthLdap.getAttributes:" + e);
           throw new ConnectException(
           "Problem getting attributes in AuthLdap.getAttributes:" + e);
+        }
-...
           isValid = authservice.authenticate(user, password);
           if (isValid) {
             System.out.println("Authentication successful for: " + user );
             System.out.println(" ");
           } else {
             System.out.println("Authentication failed for: " + user);
+          }
           // Get attributes for the user
           if (isValid) {
             //String group = args[2];
             HashMap userInfo = authservice.getAttributes(user, password, "knb");
             System.out.println("\nGetting attributes for user....");
             HashMap userInfo = authservice.getAttributes(user, password, user);
             // Print all of the attributes
             Iterator attList = (Iterator)(((Set)userInfo.keySet()).iterator());
             while (attList.hasNext()) {
-...
                 System.out.println(att + ": " + value);
+              }
+            }
+          }
           // get the groups
           if (isValid) {
             System.out.println("\nGetting all groups....");
             String[] groups = authservice.getGroups(user, password);
             System.out.println("Groups found: " + groups.length);
             for (int i=0; i < groups.length; i++) {
                 System.out.println("Group " + i + ": " + groups[i]);
+            }
+          }
           // get the groups for the user
           String savedGroup = null;
           if (isValid) {
             System.out.println("\nGetting groups for user....");
             String[] groups = authservice.getGroups(user, password, user);
             System.out.println("Groups found: " + groups.length);
             for (int i=0; i < groups.length; i++) {
                 System.out.println("Group " + i + ": " + groups[i]);
                 savedGroup = groups[i];
+            }
+          }
           // get the users for a group
           if (isValid) {
             System.out.println("\nGetting users for group....");
             System.out.println("Group: " + savedGroup);
             String[] users = authservice.getUsers(user, password, savedGroup);
             System.out.println("Users found: " + users.length);
             for (int i=0; i < users.length; i++) {
                 System.out.println("User " + i + ": " + users[i]);
+            }
+          }
           // get all users
           if (isValid) {
             System.out.println("\nGetting all users ....");
             String[] users = authservice.getUsers(user, password);
             System.out.println("Users found: " + users.length);
             for (int i=0; i < users.length; i++) {
                 System.out.println("User " + i + ": " + users[i]);
+            }
+          }
     /*
           // get the whole list groups and users in XML format
           if (isValid) {
             System.out.println("\nTrying principals....");
             authservice = new AuthLdap();
             String out = authservice.getPrincipals(user, password);
             java.io.File f = new java.io.File("principals.xml");
-...
             buff.close();
             fw.close();
+          }
     */
         } catch (ConnectException ce) {
           System.err.println(ce.getMessage());
         } catch (java.io.IOException ioe) {

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 871

Added by Matt Jones over 22 years ago