Merge branch 's1689' of /usr/cadc/dev/git/wopencadc into nep110 (eb8c29bb) · Commits · OATS-CADC / ac

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -68,16 +68,16 @@
		*/
		package ca.nrc.cadc.ac.server;

		import ca.nrc.cadc.ac.IdentityType;
		import java.security.Principal;
		import java.util.List;

		import org.apache.log4j.Logger;

		import ca.nrc.cadc.ac.Role;
		import ca.nrc.cadc.auth.AuthenticationUtil;
		import ca.nrc.cadc.uws.Parameter;
		import ca.nrc.cadc.uws.ParameterUtil;

		import java.security.Principal;
		import java.util.List;
		import org.apache.log4j.Logger;

		/**
		* Request Validator. This class extracts and validates the ID, TYPE, ROLE
		* and GURI parameters.

+2 −25

Original line number	Diff line number	Diff line
		@@ -408,10 +408,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
		"Unsupported principal type " + user.getUserID().getClass());
		}

		String name = getUserName(searchField, user);

		searchField = "(" + searchField + "=" +
		name + ")";
		user.getUserID().getName() + ")";

		SearchResultEntry searchResult = null;
		try
		@@ -430,32 +428,11 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO

		if (searchResult == null)
		{
		String msg = "User not found " + name;
		String msg = "User not found " + user.getUserID().getName();
		logger.debug(msg);
		throw new UserNotFoundException(msg);
		}
		return searchResult.getAttributeValueAsDN("entrydn");
		}

		/**
		* If the principal is of type x500, canonize the name for the
		* search.
		*
		* @param searchField
		* @param user
		* @return
		*/
		private String getUserName(String searchField, User<? extends Principal> user)
		{
		if (searchField != null)
		{
		if (searchField.equals("distinguishedname"))
		{
		return AuthenticationUtil.canonizeDistinguishedName(user.getUserID().getName());
		}
		return user.getUserID().getName();
		}
		return null;
		}

		}