/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 725

Added by bojilova over 23 years ago

Included back getting the list of users and groups stored in auth scheme
through new action="getprincipals". No extra parameters are needed.
Any logged in users are able to get this information

               NamingEnumeration enum1 = attrs.getAll(); // only "uid" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 System.out.print(attr.getID() + "=");
                 System.out.println((String)attr.get());
                 //System.out.print(attr.getID() + "=");
                 //System.out.println((String)attr.get());
                 uvec.add(attr.get());
+              }
+            }
-...
               NamingEnumeration enum1 = attrs.getAll(); // only "uid" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 System.out.print(attr.getID() + "=");
                 System.out.println((String)attr.get());
                 //System.out.print(attr.getID() + "=");
                 //System.out.println((String)attr.get());
                 uvec.add(attr.get());
+              }
+            }
-...
               NamingEnumeration enum1 = attrs.getAll(); // only "gid" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 System.out.print(attr.getID() + "=");
                 System.out.println((String)attr.get());
                 //System.out.print(attr.getID() + "=");
                 //System.out.println((String)attr.get());
                 uvec.add(attr.get());
+              }
+            }
-...
               NamingEnumeration enum1 = attrs.getAll(); // only "gid" attr
               while (enum1.hasMore()) {
                 Attribute attr = (Attribute)enum1.next();
                 System.out.print(attr.getID() + "=");
                 System.out.println((String)attr.get());
                 //System.out.print(attr.getID() + "=");
                 //System.out.println((String)attr.get());
                 uvec.add(attr.get());
+              }
+            }
-...
+      }
       /**
        * Get list of all groups and users from authentication scheme.
        * The output is formatted in XML.
        */
       private String getPrincipals(String user, String password)
                     throws ConnectException
+      {
         StringBuffer out = new StringBuffer();
         String[] groups = getGroups(user, password);
         out.append("<?xml version=\"1.0\"?>\n");
         out.append("<principals>\n");
         // for the groups and users that belong to them
         if ( groups.length > 0 ) {
           for (int i=0; i < groups.length; i++ ) {
             out.append("  <group>\n");
             out.append("    <groupname>" + groups[i] + "<groupname>\n");
             String[] usersForGroup = getUsers(user,password,groups[i]);
             for (int j=0; j <= usersForGroup.length; j++ ) {
               out.append("    <user>\n");
               out.append("      <username>" + usersForGroup[j] + "<username>\n");
               out.append("    </user>\n");
+            }
             out.append("</group>\n");
+          }
         // for the users only when there are no any groups defined
         } else {
           String[] users = getUsers(user, password);
           for (int j=0; j < users.length; j++ ) {
             out.append("  <user>\n");
             out.append("    <username>" + users[j] + "<username>\n");
             out.append("  </user>\n");
+          }
+        }
         out.append("</principals>");
         return out.toString();
+      }
       /**
        * Test method for the class
        */
       public static void main(String[] args) {
-...
           } else {
             System.out.println("Authentication failed for: " + user);
+          }
     /*
           if (isValid) {
             HashMap userInfo = authservice.getAttributes(user, password, user);
-...
+            }
+          }
     */
     /*
           // get the whole list of users
           if (isValid) {
             String[] users = authservice.getUsers(user, password);
-...
               System.out.println(users[i]);
+            }
+          }
     */
     /*
           // get the whole list of users for a group
           if (isValid) {
-...
+            }
+          }
     */
     /*      // get the whole list groups and users in XML format
           if (isValid) {
             String out = authservice.getPrincipals(user, password);
             java.io.File f = new java.io.File("principals.txt");
             java.io.FileWriter fw = new java.io.FileWriter(f);
             java.io.BufferedWriter buff = new java.io.BufferedWriter(fw);
             buff.write(out);
             buff.flush();
             buff.close();
             fw.close();
+          }
     */
         } catch (ConnectException ce) {
           System.err.println("Error connecting to LDAP server in authldap.main");
         } catch (java.io.IOException ioe) {
           System.err.println("I/O Error writing to file principals.txt");
+        }
+      }
+    }

        * @param password the password entered when login
        */
       public boolean authenticate(HttpServletRequest request,
                             String username, String password)  {
                                   String username, String password)  {
         String message = null;
         try {
           if ( authService.authenticate(username, password) ) {
             this.session = getSession(request, username, password);
             String[] groups = authService.getGroups(username,password,username);
             this.session = getSession(request, username, password, groups);
             message = "Authentication successful for user: " + username;
             this.statusMessage = formatOutput("login", message);
             return true;
-...
       /** Get new HttpSession and store username & password in it */
       private HttpSession getSession(HttpServletRequest request,
                                 String username, String password)
                                     throws IllegalStateException {
                                      String username, String password,
                                      String[] groups)
                           throws IllegalStateException {
         // get the current session object, create one if necessary
         HttpSession session = request.getSession(true);
-...
           session.invalidate();
           session = request.getSession(true);
+        }
         // store username & password in the session for later use, especially by
         // the authenticate() method
         // store the username, password, and groupname (the first only)
         // in the session obj for use on subsequent calls to Metacat servlet
         session.setMaxInactiveInterval(-1);
         session.setAttribute("username", username);
         session.setAttribute("password", password);
         if ( groups.length > 0 ) {
           session.setAttribute("groupname", groups[0]);
+        }
         return session;
+      }
-...
         return this.statusMessage;
+      }
     /* NOT NEEDED
       /**
        * Determine if the session has been successfully authenticated
        * @returns boolean true if authentication was successful, false otherwise
        * Get list of all groups and users from authentication scheme.
        * The output is formatted in XML.
        */
     /*
       public boolean isAuthenticated()
       public String getPrincipals(String user, String password)
                     throws ConnectException
+      {
         return this.isAuthenticated;
         StringBuffer out = new StringBuffer();
         String[] groups = authService.getGroups(user, password);
         out.append("<?xml version=\"1.0\"?>\n");
         out.append("<principals>\n");
         // for the groups and users that belong to them
         if ( groups.length > 0 ) {
           for (int i=0; i < groups.length; i++ ) {
             out.append("  <group>\n");
             out.append("    <groupname>" + groups[i] + "<groupname>\n");
             String[] usersForGroup = authService.getUsers(user,password,groups[i]);
             for (int j=0; j <= usersForGroup.length; j++ ) {
               out.append("    <user>\n");
               out.append("      <username>" + usersForGroup[j] + "<username>\n");
               out.append("    </user>\n");
+            }
             out.append("</group>\n");
+          }
         // for the users only when there are no any groups defined
         } else {
           String[] users = authService.getUsers(user, password);
           for (int j=0; j < users.length; j++ ) {
             out.append("  <user>\n");
             out.append("    <username>" + users[j] + "<username>\n");
             out.append("  </user>\n");
+          }
+        }
         out.append("</principals>");
         return out.toString();
+      }
     */
     /* NOT NEEDED
       /**
        * Invalidate this HTTPSession object.
        * All objects stored in the session are unbound.
        */
     /*
       private void invalidate(String message)
+      {
         this.isAuthenticated = false;
         this.session.setAttribute("isAuthenticated", new Boolean(isAuthenticated));
         this.statusMessage = formatOutput("error", message);
         this.session.setAttribute("statusMessage", this.statusMessage);
         this.session.invalidate();
+      }
     */
       /*
        * format the output in xml for processing from client applications
+       *

      * action=getdoctypes -- retrieve all doctypes (publicID)<br>
      * action=getdtdschema -- retrieve a DTD or Schema file<br>
      * action=getdataguide -- retrieve a Data Guide<br>
      * action=getprincipals -- retrieve a list of principals in XML<br>
      * datadoc -- data document name (id)<br>
      * <p>
      * The particular combination of parameters that are valid for each
-...
         // by looking up the current session information for all actions
         // other than "login" and "logout"
         String username = null;
         String password = null;
         String groupname = null;
         String sess_id = null;
-...
             sess.setAttribute("username", username);
           } else {
             username = (String)sess.getAttribute("username");
             password = (String)sess.getAttribute("password");
             groupname = (String)sess.getAttribute("groupname");
             try
+            {
-...
         } else if (action.equals("getdataguide")) {
           PrintWriter out = response.getWriter();
           handleGetDataGuideAction(out, params, response);
         } else if (action.equals("getprincipals")) {
           PrintWriter out = response.getWriter();
           handleGetPrincipalsAction(out, username, password);
         } else if (action.equals("login") || action.equals("logout")) {
         } else if (action.equals("protocoltest")) {
           String testURL = "metacat://dev.nceas.ucsb.edu/NCEAS.897766.9";
-...
+      }
       /**
        * Handle the "getprincipals" action.
        * Read all principals from authentication scheme in XML format
        */
       private void handleGetPrincipalsAction(PrintWriter out, String user,
                                              String password) {
         Connection conn = null;
         try {
             // get connection from the pool
             AuthSession auth = new AuthSession();
             String principals = auth.getPrincipals(user, password);
             out.println(principals);
         } catch (Exception e) {
           out.println("<?xml version=\"1.0\"?>");
           out.println("<error>");
           out.println(e.getMessage());
           out.println("</error>");
         } finally {
           util.returnConnection(conn);
+        }
+      }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 725

Added by bojilova over 23 years ago