/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1000

Added by berkley over 22 years ago

fixed groups error, I hope.

       public String[] getGroups(String user, String password, String foruser)
              throws ConnectException
+      {
         String[] groups = null;
         Vector uvec = new Vector();
         //Pass the username and password to run() method
         userName=user;
         userPassword=password;
-...
             } else {
                 filter = "(& " + gfilter + "(uniqueMember=" + foruser + "))";
+            }
             MetaCatUtil.debug("searching for groups: " + filter);
             NamingEnumeration enum = ctx.search(ldapBase, filter, ctls);
             // Print the groups
             Vector uvec = new Vector();
             MetaCatUtil.debug("getting group results.");
             while (enum.hasMore()) {
               SearchResult sr = (SearchResult)enum.next();
               SearchResult sr = (SearchResult)enum.next();
               uvec.add(sr.getName()+","+ldapBase);
               MetaCatUtil.debug("group " + sr.getName() + " added to Group vector");
+            }
             // 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 (ReferralException re) {
+        }
         catch (ReferralException re)
+        {
           refExc = re;
           Thread t = new Thread(new GetGroup());
           util.debugMessage("Starting thread...");
           t.start();
           util.debugMessage("sleeping for 5 seconds.");
           try
+          {
             refExc = re;
             Thread t = new Thread(new GetGroup());
             util.debugMessage("Starting thread...");
             t.start();
             util.debugMessage("sleeping for 5 seconds.");
             Thread.sleep(5000);
             //this is a manual override of ldap's hideously long time
             //out period.
             util.debugMessage("Awake after 5 seconds.");
             if (referralContext == null)
             Thread.sleep(5000);
+          }
           catch(InterruptedException ie)
+          {
             MetaCatUtil.debug("main thread interrupted: " + ie.getMessage());
+          }
           //this is a manual override of jndi's hideously long time
           //out period.
           util.debugMessage("Awake after 5 seconds.");
           if (referralContext == null)
+          {
             util.debug("thread timed out...returning groups: " + uvec.toString());
             String groups[] = new String[uvec.size()];
             for(int i=0; i<uvec.size(); i++)
+            {
               t.interrupt();
               return null;
               groups[i] = (String)uvec.elementAt(i);
+            }
             DirContext dc = (DirContext)referralContext;
             String[] attrIDs = {"cn"};
             // Specify the attributes to match.
             // Groups are objects with attribute objectclass=groupofuniquenames.
             // and have attribute uniquemember: uid=foruser,ldapbase.
             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 + "))";
+            }
             t.interrupt();
             return groups;
+          }
           DirContext dc = (DirContext)referralContext;
           String[] attrIDs = {"cn"};
           // Specify the attributes to match.
           // Groups are objects with attribute objectclass=groupofuniquenames.
           // and have attribute uniquemember: uid=foruser,ldapbase.
           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 + "))";
+          }
           try
+          {
             NamingEnumeration enum = dc.search(ldapBase, filter, ctls);
             // Print the groups
             Vector uvec = new Vector();
             while (enum.hasMore()) {
               SearchResult sr = (SearchResult)enum.next();
               uvec.add(sr.getName()+","+ldapBase);
+            }
             // initialize groups[] and fill it
             groups = new String[uvec.size()];
             for (int i=0; i < uvec.size(); i++) {
               groups[i] = (String)uvec.elementAt(i);
+            }
             referralContext.close();
             dc.close();
+          }
           catch (Exception e)
           catch(NamingException ne)
+          {
             return groups;
             MetaCatUtil.debug("Naming Exception in AuthLdap.getGroups");
+          }
         } catch (NamingException e) {
           e.printStackTrace(System.err);
           throw new ConnectException(
           "Problem getting groups for a user in AuthLdap.getGroups:" + e);
+        }
         MetaCatUtil.debug("The user is in the following groups: " + uvec.toString());
         String groups[] = new String[uvec.size()];
         for(int i=0; i<uvec.size(); i++)
+        {
           groups[i] = (String)uvec.elementAt(i);
+        }
         return groups;
+      }
-...
         public void run()
+        {
           referralContext = null;
           MetaCatUtil.debug("getting groups context");
           DirContext refDirContext=null;
           boolean moreReferrals=true;
           //set a while loop is because we don't know if a referral excption
-...
               //revise environment variable
               String refInfo = null;
               refInfo = (String)refExc.getReferralInfo();
               //refInfo = (String)refExc.getReferralContext().getEnvironment()
               //.get(Context.PROVIDER_URL);
               //System.out.println("refInfo: " + refInfo);
               if(refInfo != null)
+              {
                 //System.out.println("Referral in thread to: " +
                 //                  refInfo.toString());
                 MetaCatUtil.debug("Referral in thread to: " +
                                   refInfo.toString());
+              }
               else
+              {
                 MetaCatUtil.debug("getting refInfo Manually");
                 refInfo = (String)refExc.getReferralContext().getEnvironment().
                                                       get(Context.PROVIDER_URL);
+              }
               MetaCatUtil.debug("refInfo: " + refInfo);
               /*env.put(Context.PROVIDER_URL, refExc.getReferralInfo());
               env.put(Context.INITIAL_CONTEXT_FACTORY,
                     "com.sun.jndi.ldap.LdapCtxFactory");
               env.put(Context.SECURITY_PRINCIPAL, userName);
               env.put(Context.SECURITY_CREDENTIALS, userPassword);
               env.put(Context.REFERRAL, "throw");*/
               //get a context object for referral in the new envriment
               //rContext = refExc.getReferralContext();
               env.put(Context.INITIAL_CONTEXT_FACTORY,
                   "com.sun.jndi.ldap.LdapCtxFactory");
               env.put(Context.REFERRAL, "throw");
               env.put(Context.PROVIDER_URL, refInfo);
               MetaCatUtil.debug("creating referralContext");
               referralContext = new InitialDirContext(env);
               //casting the context to dircontext and it will create a
               //autherntication or naming exception if DN and password is incorrect
               //referralContext=rContext;
               //refDirContext=(DirContext)rContext;
               //refDirContext.close();
               MetaCatUtil.debug("referralContext created");
               //get context and jump out the while loop
               moreReferrals=false;
             }//try

       public static AbstractDatabase dbAdapter;
       private static PropertyResourceBundle options = null;
       private static String propertiesFile = "edu.ucsb.nceas.metacat.metacat";
       private static boolean debug = false;
       private static boolean debug = true;
       private Hashtable connectionPool = new Hashtable();
-...
+        }
+      }
       public static void debug(String msg)
+      {
         if(debug)
+        {
           System.err.println(msg);
+        }
+      }
       public static Vector getOptionList(String optiontext)
+      {
         Vector options = new Vector();

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1000

Added by berkley over 22 years ago