/ - Diff - Metacat - Ecoinformatics Redmine

     import java.util.Hashtable;
     import java.util.Stack;
     import java.util.Vector;
     import java.util.regex.PatternSyntaxException;
     import edu.ucsb.nceas.dbadapter.AbstractDatabase;
     import edu.ucsb.nceas.utilities.Options;
-...
         private static Options options = null;
         private static boolean debug = true;
         private static String[] administrators;
         private static String[] moderators;
         /**
          * Determine our db adapter class and create an instance of that class
          */
         static {
             // Determine our db adapter class and create an instance of that class
             try {
                 dbAdapter = (AbstractDatabase) createObject(getOption("dbAdapter"));
             } catch (Exception e) {
                 System.err.println("Error in MetaCatUtil static block:"
                         + e.getMessage());
+            }
             // read administrator and moderator lists from metacat.properties
             getAdminInfo();
+        }
         /**
-...
         }// replaceWhiteSpaceForUR
         /**
          * A method to read administrators and moderators list from the metacat.properties
          **/
         public static void getAdminInfo(){
         	String adminList = MetaCatUtil.getOption("administrators");
             try {
                 administrators = adminList.split(":");
             } catch (PatternSyntaxException pse) {
                 administrators = null;
                 MetaCatUtil.debugMessage("Error in MetacatServlet.init: "
                     + pse.getMessage(), 20);
+            }
         	String modList = MetaCatUtil.getOption("moderators");
             try {
                 moderators = modList.split(":");
             } catch (PatternSyntaxException pse) {
                 moderators = null;
                 MetaCatUtil.debugMessage("Error in MetacatServlet.init: "
                     + pse.getMessage(), 20);
+            }
+        }
         /**
          * A method to check if the specified user is part of the administrators list
          **/
         public static boolean isAdministrator(String username, String[] groups){
             // Check that the user is authenticated as an administrator account
         	for (int i = 0; i < administrators.length; i++) {
                 // check the given admin dn is a group dn...
             	if(administrators[i].startsWith("cn=")){
             		// is a group dn
             		for (int j = 0; j < groups.length; j++) {
             			if (groups[j].equals(administrators[i])) {
                     		return true;
+                    	}
+            		}
                 } else {
                 	// is a user dn
                 	if (username.equals(administrators[i])) {
                 		return true;
+                	}
+                }
+            }
             return false;
+        }
         /**
          * A method to check if the specified user is part of the moderators list
          **/
         public static boolean isModerator(String username, String[] groups){
             // Check that the user is authenticated as an administrator account
             for (int i = 0; i < moderators.length; i++) {
                 // check the given admin dn is a group dn...
             	if(moderators[i].startsWith("cn=")){
                 	// is a group dn
             		for (int j = 0; j < groups.length; j++) {
             			if (groups[j].equals(moderators[i])) {
                     		return true;
+                    	}
+            		}
                 } else {
                 	// is a user dn
                 	if (username.equals(moderators[i])) {
                 		return true;
+                	}
+                }
+            }
             return false;
+        }
+    }

         private String htmlpath = null;
         private String[] administrators = null;
         private PropertyResourceBundle options = null;
         private MetaCatUtil util = null;
-...
                 dataDirectory = new File(datafilepath);
                 servletpath = MetaCatUtil.getOption("servletpath");
                 htmlpath = MetaCatUtil.getOption("htmlpath");
                 String adminList = MetaCatUtil.getOption("administrators");
                 try {
                     administrators = adminList.split(":");
                 } catch (PatternSyntaxException pse) {
                     administrators = null;
                     MetaCatUtil.debugMessage("Error in MetacatServlet.init: "
                         + pse.getMessage(), 20);
+                }
                 // Index the paths specified in the metacat.properties
                 checkIndexPaths();
-...
                     out.println(Version.getVersionAsXml());
                     out.close();
                 } else if (action.equals("getlog")) {
                     handleGetLogAction(params, request, response, username);
                     handleGetLogAction(params, request, response, username, groupnames);
                 } else if (action.equals("buildindex")) {
                     handleBuildIndexAction(params, request, response, username);
                     handleBuildIndexAction(params, request, response, username, groupnames);
                 } else if (action.equals("login") || action.equals("logout")) {
                     /*
                 } else if (action.equals("protocoltest")) {
-...
          * @param response the http response object for writing output
          */
         private void handleGetLogAction(Hashtable params, HttpServletRequest request,
                 HttpServletResponse response, String username)
                 HttpServletResponse response, String username, String[] groups)
+        {
             try {
                 response.setContentType("text/xml");
                 PrintWriter out = response.getWriter();
                 // Check that the user is authenticated as an administrator account
                 boolean adminIsAuthenticated = false;
                 for (int i = 0; i < administrators.length; i++) {
                     if (username.equals(administrators[i])) {
                             adminIsAuthenticated = true;
+                    }
+                }
                 if (!adminIsAuthenticated) {
                 if (!MetaCatUtil.isAdministrator(username, groups)) {
                     out.print("<error>");
                     out.print("The user \"" + username +
                             "\" is not authorized for this action.");
-...
          */
         private void handleBuildIndexAction(Hashtable params,
                 HttpServletRequest request, HttpServletResponse response,
                 String username)
                 String username, String[] groups)
+        {
             // Get all of the parameters in the correct formats
             String[] docid = (String[])params.get("docid");
-...
                 PrintWriter out = response.getWriter();
                 // Check that the user is authenticated as an administrator account
                 boolean adminIsAuthenticated = false;
                 for (int i = 0; i < administrators.length; i++) {
                     if (username.equals(administrators[i])) {
                             adminIsAuthenticated = true;
+                    }
+                }
                 if (!adminIsAuthenticated) {
                 if (!MetaCatUtil.isAdministrator(username, groups)) {
                     out.print("<error>");
                     out.print("The user \"" + username +
                             "\" is not authorized for this action.");

                 MetaCatUtil.debugMessage("Start deleting doc " + docid + "...", 20);
                 // check for 'write' permission for 'user' to delete this document
                 if (!hasAllPermission(user, groups, accnum)) {
                     boolean adminIsAuthenticated = false;
                     String[] administrators = null;
                     String adminList = MetaCatUtil.getOption("administrators");
                     try {
                         administrators = adminList.split(":");
                     } catch (Exception pse) {
                         administrators = null;
                         MetaCatUtil.debugMessage("Error in DocumentImpl.delete: "
                                                  + pse.getMessage(), 20);
+                    }
                     for (int i = 0; i < administrators.length; i++) {
                         if (user.equals(administrators[i])) {
                             adminIsAuthenticated = true;
+                        }
+                    }
                     if(!adminIsAuthenticated){
                     if(!MetaCatUtil.isAdministrator(user, groups)){
                         throw new Exception(
                             "User " + user
                             + " does not have permission to delete XML Document #"

Project

General

Profile

Metacat

Revision 2558

Added by sgarg over 18 years ago