Project

General

Profile

« Previous | Next » 

Revision 4589

Added by daigle over 15 years ago

Rename LDAPUtil to AuthUtil

View differences:

MetaCatServlet.java
83 83 
import edu.ucsb.nceas.metacat.service.XMLSchemaService;
84 84 
import edu.ucsb.nceas.metacat.spatial.SpatialHarvester;
85 85 
import edu.ucsb.nceas.metacat.spatial.SpatialQuery;
86 
import edu.ucsb.nceas.metacat.util.LDAPUtil;
86 
import edu.ucsb.nceas.metacat.util.AuthUtil;
87 87 
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
88 88 
import edu.ucsb.nceas.metacat.util.RequestUtil;
89 89 
import edu.ucsb.nceas.metacat.util.SystemUtil;
......
812 812 
						out.println(name);
813 813 
						out.println("\n</name>\n");
814 814 
					}
815 
					if (LDAPUtil.isAdministrator(userName, groupNames)) {
815 
					if (AuthUtil.isAdministrator(userName, groupNames)) {
816 816 
						out.println("<isAdministrator></isAdministrator>\n");
817 817 
					}
818 
					if (LDAPUtil.isModerator(userName, groupNames)) {
818 
					if (AuthUtil.isModerator(userName, groupNames)) {
819 819 
						out.println("<isModerator></isModerator>\n");
820 820 
					}
821 821 
					out.println("\n</user>\n");
......
2061 2061 
        }
2062 2062
2063 2063 
        try {
2064 
			if (!LDAPUtil.canInsertOrUpdate(user, groups)) {
2064 
			if (!AuthUtil.canInsertOrUpdate(user, groups)) {
2065 2065 
				out.println("<?xml version=\"1.0\"?>");
2066 2066 
				out.println("<error>");
2067 2067 
				out.println("User '" + user + "' not allowed to insert and update");
......
2664 2664 
            PrintWriter out = response.getWriter();
2665 2665
2666 2666 
            // Check that the user is authenticated as an administrator account
2667 
            if (!LDAPUtil.isAdministrator(username, groups)) {
2667 
            if (!AuthUtil.isAdministrator(username, groups)) {
2668 2668 
                out.print("<error>");
2669 2669 
                out.print("The user \"" + username +
2670 2670 
                        "\" is not authorized for this action.");
......
2742 2742 
            PrintWriter out = response.getWriter();
2743 2743
2744 2744 
            // Check that the user is authenticated as an administrator account
2745 
            if (!LDAPUtil.isAdministrator(username, groups)) {
2745 
            if (!AuthUtil.isAdministrator(username, groups)) {
2746 2746 
                out.print("<error>");
2747 2747 
                out.print("The user \"" + username +
2748 2748 
                        "\" is not authorized for this action.");

Also available in: Unified diff