s1890: fixing UserDAO unit tests (ec5770af) · Commits · OATS-CADC / ac

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

deleted100644 → 0

+0 −84

Original line number	Diff line number	Diff line
		/*
		************************************************************************
		***************** CANADIAN ASTRONOMY DATA CENTRE *****************
		************ CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************
		*
		* (c) 2014. (c) 2014.
		* Government of Canada Gouvernement du Canada
		* National Research Council Conseil national de recherches
		* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
		* All rights reserved Tous droits réservés
		*
		* NRC disclaims any warranties, Le CNRC dénie toute garantie
		* expressed, implied, or énoncée, implicite ou légale,
		* statutory, of any kind with de quelque nature que ce
		* respect to the software, soit, concernant le logiciel,
		* including without limitation y compris sans restriction
		* any warranty of merchantability toute garantie de valeur
		* or fitness for a particular marchande ou de pertinence
		* purpose. NRC shall not be pour un usage particulier.
		* liable in any event for any Le CNRC ne pourra en aucun cas
		* damages, whether direct or être tenu responsable de tout
		* indirect, special or general, dommage, direct ou indirect,
		* consequential or incidental, particulier ou général,
		* arising from the use of the accessoire ou fortuit, résultant
		* software. Neither the name de l'utilisation du logiciel. Ni
		* of the National Research le nom du Conseil National de
		* Council of Canada nor the Recherches du Canada ni les noms
		* names of its contributors may de ses participants ne peuvent
		* be used to endorse or promote être utilisés pour approuver ou
		* products derived from this promouvoir les produits dérivés
		* software without specific prior de ce logiciel sans autorisation
		* written permission. préalable et particulière
		* par écrit.
		*
		* This file is part of the Ce fichier fait partie du projet
		* OpenCADC project. OpenCADC.
		*
		* OpenCADC is free software: OpenCADC est un logiciel libre ;
		* you can redistribute it and/or vous pouvez le redistribuer ou le
		* modify it under the terms of modifier suivant les termes de
		* the GNU Affero General Public la “GNU Affero General Public
		* License as published by the License” telle que publiée
		* Free Software Foundation, par la Free Software Foundation
		* either version 3 of the : soit la version 3 de cette
		* License, or (at your option) licence, soit (à votre gré)
		* any later version. toute version ultérieure.
		*
		* OpenCADC is distributed in the OpenCADC est distribué
		* hope that it will be useful, dans l’espoir qu’il vous
		* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE
		* without even the implied GARANTIE : sans même la garantie
		* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ
		* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF
		* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence
		* General Public License for Générale Publique GNU Affero
		* more details. pour plus de détails.
		*
		* You should have received Vous devriez avoir reçu une
		* a copy of the GNU Affero copie de la Licence Générale
		* General Public License along Publique GNU Affero avec
		* with OpenCADC. If not, see OpenCADC ; si ce n’est
		* <http://www.gnu.org/licenses/>. pas le cas, consultez :
		* <http://www.gnu.org/licenses/>.
		*
		* $Revision: 4 $
		*
		************************************************************************
		*/

		package ca.nrc.cadc.ac.server;

		import java.lang.reflect.Field;

		public class TestUtil
		{
		public static void setField(Object object, Object value, String name)
		throws Exception
		{
		Field field = object.getClass().getDeclaredField(name);
		field.setAccessible(true);
		field.set(object, value);
		}

		}

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java

+40 −21

Original line number	Diff line number	Diff line
		@@ -145,6 +145,10 @@ public class LdapUserDAO extends LdapDAO
		// Map of identity type to LDAP attribute
		private final Map<Class<?>, String> userLdapAttrib = new HashMap<Class<?>, String>();

		// User cn and sn values for users without a HttpPrincipal
		protected static final String EXTERNAL_USER_CN = "$EXTERNAL-CN";
		protected static final String EXTERNAL_USER_SN = "$EXTERNAL-SN";

		// LDAP User attributes
		protected static final String LDAP_OBJECT_CLASS = "objectClass";
		protected static final String LDAP_INET_USER = "inetuser";
		@@ -370,23 +374,30 @@ public class LdapUserDAO extends LdapDAO
		addAttribute(attributes, LDAP_OBJECT_CLASS, LDAP_INET_ORG_PERSON);
		addAttribute(attributes, LDAP_OBJECT_CLASS, LDAP_INET_USER);
		addAttribute(attributes, LDAP_OBJECT_CLASS, LDAP_CADC_ACCOUNT);
		if (user.getHttpPrincipal() != null)
		{
		addAttribute(attributes, LDAP_COMMON_NAME, userID.getName());
		}
		addAttribute(attributes, LADP_USER_PASSWORD, new String(userRequest.getPassword()));
		addAttribute(attributes, LDAP_UID, numericID);

		for (Principal princ : user.getIdentities())
		if (user.getHttpPrincipal() == null)
		{
		if (princ instanceof X500Principal)
		{
		addAttribute(attributes, LDAP_DISTINGUISHED_NAME, princ.getName());
		addAttribute(attributes, LDAP_COMMON_NAME, EXTERNAL_USER_CN);
		addAttribute(attributes, LDAP_LAST_NAME, EXTERNAL_USER_SN);
		addAttribute(attributes, LADP_USER_PASSWORD, UUID.randomUUID().toString());
		}
		else
		{
		if (user.personalDetails == null)
		{
		final String error = "User " + user.getHttpPrincipal().getName() +
		" missing required PersonalDetails";
		throw new IllegalArgumentException(error);
		}

		if (user.personalDetails != null)
		if (userID.getName().startsWith("$"))
		{
		final String error = "Username " + user.getHttpPrincipal().getName() +
		" cannot start with a $";
		throw new IllegalArgumentException(error);
		}
		addAttribute(attributes, LDAP_COMMON_NAME, userID.getName());
		addAttribute(attributes, LADP_USER_PASSWORD, new String(userRequest.getPassword()));
		addAttribute(attributes, LDAP_FIRST_NAME, user.personalDetails.getFirstName());
		addAttribute(attributes, LDAP_LAST_NAME, user.personalDetails.getLastName());
		addAttribute(attributes, LDAP_ADDRESS, user.personalDetails.address);
		@@ -396,6 +407,14 @@ public class LdapUserDAO extends LdapDAO
		addAttribute(attributes, LDAP_INSTITUTE, user.personalDetails.institute);
		}

		for (Principal princ : user.getIdentities())
		{
		if (princ instanceof X500Principal)
		{
		addAttribute(attributes, LDAP_DISTINGUISHED_NAME, princ.getName());
		}
		}

		if (user.posixDetails != null)
		{
		throw new UnsupportedOperationException("Support for users PosixDetails not available");
		@@ -403,9 +422,9 @@ public class LdapUserDAO extends LdapDAO

		DN userDN = getUserDN(numericID, usersDN);
		AddRequest addRequest = new AddRequest(userDN, attributes);
		logger.info("adding " + userID.getName() + " to " + usersDN);
		LDAPResult result = getReadWriteConnection().add(addRequest);
		LdapDAO.checkLdapResult(result.getResultCode());
		logger.info("added " + userID.getName() + " to " + usersDN);
		}
		catch (LDAPException e)
		{
		@@ -493,7 +512,7 @@ public class LdapUserDAO extends LdapDAO
		try
		{
		filter = Filter.createEqualityFilter(searchField, userID.getName());
		logger.debug("search filter: " + filter);
		logger.debug("getUser search filter: " + filter);

		SearchRequest searchRequest =
		new SearchRequest(usersDN, SearchScope.ONE, filter, userAttribs);
		@@ -1348,13 +1367,13 @@ public class LdapUserDAO extends LdapDAO
		}

		// Another supported Principal
		for (Principal principal : user.getIdentities())
		{
		if (userLdapAttrib.get(principal.getClass()) != null)
		{
		return principal;
		}
		}
		// for (Principal principal : user.getIdentities())
		// {
		// if (userLdapAttrib.get(principal.getClass()) != null)
		// {
		// return principal;
		// }
		// }
		return null;
		}

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java

+163 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,22 @@

		package ca.nrc.cadc.ac.server.ldap;

		import ca.nrc.cadc.ac.PersonalDetails;
		import ca.nrc.cadc.ac.User;
		import ca.nrc.cadc.ac.UserNotFoundException;
		import ca.nrc.cadc.ac.UserRequest;
		import ca.nrc.cadc.auth.DNPrincipal;
		import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.auth.NumericPrincipal;
		import ca.nrc.cadc.util.Log4jInit;
		import org.apache.log4j.Level;
		import org.junit.BeforeClass;

		import javax.security.auth.Subject;
		import javax.security.auth.x500.X500Principal;
		import java.lang.reflect.Field;
		import java.util.UUID;

		/**
		* Created by jburke on 2014-11-03.
		*/
		@@ -74,9 +90,156 @@ public class AbstractLdapDAOTest
		{
		static final String CONFIG = LdapConfig.class.getSimpleName() + ".test.properties";

		protected static final String SERVOPS_PEM = System.getProperty("user.home") + "/.pub/proxy.pem";
		static final String cadcDaoTest1_CN = "CadcDaoTest1";
		static final String cadcDaoTest2_CN = "CadcDaoTest2";
		static final String cadcDaoTest3_CN = "CadcDaoTest3";
		static final String cadcDaoTest1_X500DN = "cn=cadcdaotest1,ou=cadc,o=hia,c=ca";
		static final String cadcDaoTest2_X500DN = "cn=cadcdaotest2,ou=cadc,o=hia,c=ca";
		static final String cadcDaoTest3_X500DN = "cn=cadcdaotest3,ou=cadc,o=hia,c=ca";

		static User cadcDaoTest1_User;
		static User cadcDaoTest2_User;
		static User cadcDaoTest3_User;
		static User cadcDaoTest1_HttpUser;
		static User cadcDaoTest1_X500User;
		static User cadcDaoTest1_AugmentedUser;
		static User cadcDaoTest2_AugmentedUser;
		static User testMember;

		static String cadcDaoTest1_DN;
		static String cadcDaoTest2_DN;

		static HttpPrincipal cadcDaoTest1_HttpPrincipal;
		static HttpPrincipal cadcDaoTest2_HttpPrincipal;
		static HttpPrincipal cadcDaoTest3_HttpPrincipal;
		static X500Principal cadcDaoTest1_X500Principal;
		static X500Principal cadcDaoTest2_X500Principal;
		static X500Principal cadcDaoTest3_X500Principal;
		static DNPrincipal cadcDaoTest1_DNPrincipal;
		static DNPrincipal cadcDaoTest2_DNPrincipal;

		static Subject cadcDaoTest1_Subject;
		static Subject cadcDaoTest2_Subject;

		static LdapConfig config;

		@BeforeClass
		public static void setUpBeforeClass()
		throws Exception
		{
		Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);

		// get the configuration of the development server from and config files...
		config = getLdapConfig();

		cadcDaoTest1_HttpPrincipal = new HttpPrincipal(cadcDaoTest1_CN);
		cadcDaoTest2_HttpPrincipal = new HttpPrincipal(cadcDaoTest2_CN);
		cadcDaoTest3_HttpPrincipal = new HttpPrincipal(cadcDaoTest3_CN);

		cadcDaoTest1_X500Principal = new X500Principal(cadcDaoTest1_X500DN);
		cadcDaoTest2_X500Principal = new X500Principal(cadcDaoTest2_X500DN);
		cadcDaoTest3_X500Principal = new X500Principal(cadcDaoTest3_X500DN);

		try
		{
		cadcDaoTest1_User = getUserDAO().getUser(cadcDaoTest1_HttpPrincipal);
		}
		catch (UserNotFoundException e)
		{
		User user = new User();
		user.getIdentities().add(cadcDaoTest1_HttpPrincipal);
		user.getIdentities().add(cadcDaoTest1_X500Principal);
		user.personalDetails = new PersonalDetails("CADC", "DAOTest1");
		user.personalDetails.email = cadcDaoTest1_CN + "@canada.ca";
		UserRequest request = new UserRequest(user, "password1".toCharArray());
		getUserDAO().addUser(request);
		cadcDaoTest1_User = getUserDAO().getUser(cadcDaoTest1_HttpPrincipal);
		}

		try
		{
		cadcDaoTest2_User = getUserDAO().getUser(cadcDaoTest2_HttpPrincipal);
		}
		catch (UserNotFoundException e)
		{
		User user = new User();
		user.getIdentities().add(cadcDaoTest2_HttpPrincipal);
		user.getIdentities().add(cadcDaoTest2_X500Principal);
		user.personalDetails = new PersonalDetails("CADC", "DAOTest2");
		user.personalDetails.email = cadcDaoTest2_CN + "@canada.ca";
		UserRequest request = new UserRequest(user, "password2".toCharArray());
		getUserDAO().addUser(request);
		cadcDaoTest2_User = getUserDAO().getUser(cadcDaoTest2_HttpPrincipal);
		}

		try
		{
		cadcDaoTest3_User = getUserDAO().getUser(cadcDaoTest3_HttpPrincipal);
		}
		catch (UserNotFoundException e)
		{
		User user = new User();
		user.getIdentities().add(cadcDaoTest3_HttpPrincipal);
		user.getIdentities().add(cadcDaoTest3_X500Principal);
		user.personalDetails = new PersonalDetails("CADC", "DAOTest3");
		user.personalDetails.email = cadcDaoTest3_CN + "@canada.ca";
		UserRequest request = new UserRequest(user, "password3".toCharArray());
		getUserDAO().addUser(request);
		cadcDaoTest3_User = getUserDAO().getUser(cadcDaoTest3_HttpPrincipal);
		}

		// cadcDaoTest1 User and Subject with all Principals
		cadcDaoTest1_AugmentedUser = getUserDAO().getAugmentedUser(cadcDaoTest1_HttpPrincipal);
		cadcDaoTest1_Subject = new Subject();
		cadcDaoTest1_Subject.getPrincipals().addAll(cadcDaoTest1_AugmentedUser.getIdentities());

		// cadcDaoTest2 User and Subject with all Principals
		cadcDaoTest2_AugmentedUser = getUserDAO().getAugmentedUser(cadcDaoTest2_HttpPrincipal);
		cadcDaoTest2_Subject = new Subject();
		cadcDaoTest2_Subject.getPrincipals().addAll(cadcDaoTest2_AugmentedUser.getIdentities());

		// A cadcDaoTest1 user with only a HttpPrincipal
		// cadcDaoTest1_HttpUser = new User();
		// cadcDaoTest1_HttpUser.personalDetails = new PersonalDetails("CADC", "DAOTest1");
		// cadcDaoTest1_HttpUser.getIdentities().add(cadcDaoTest1_User.getHttpPrincipal());
		//
		// // A cadcDaoTest1 user with only a X500Principal
		// cadcDaoTest1_X500User = new User();
		// cadcDaoTest1_X500User.personalDetails = new PersonalDetails("CADC", "DAOTest1");
		// cadcDaoTest1_X500User.getIdentities().add(cadcDaoTest1_X500Principal);

		// member returned by getMember contains only the fields required by the GMS
		testMember = new User();
		testMember.personalDetails = new PersonalDetails("test", "member");
		testMember.getIdentities().add(cadcDaoTest1_X500Principal);
		testMember.getIdentities().add(cadcDaoTest1_HttpPrincipal);

		// entryDN
		cadcDaoTest1_DN = "uid=cadcdaotest1," + config.getUsersDN();
		cadcDaoTest2_DN = "uid=cadcdaotest2," + config.getUsersDN();

		cadcDaoTest1_DNPrincipal = new DNPrincipal(cadcDaoTest1_DN);
		cadcDaoTest2_DNPrincipal = new DNPrincipal(cadcDaoTest2_DN);
		}

		static LdapUserDAO getUserDAO() throws Exception
		{
		LdapConnections connections = new LdapConnections(config);
		return new LdapUserDAO(connections);
		}

		static protected LdapConfig getLdapConfig()
		{
		return LdapConfig.loadLdapConfig(CONFIG);
		}

		public static void setField(Object object, Object value, String name)
		throws Exception
		{
		Field field = object.getClass().getDeclaredField(name);
		field.setAccessible(true);
		field.set(object, value);
		}

		}

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -96,15 +96,6 @@ import static org.junit.Assert.assertTrue;

		public class LdapDAOTest extends AbstractLdapDAOTest
		{
		static LdapConfig config;

		@BeforeClass
		public static void setUpBeforeClass() throws Exception
		{
		Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);
		// get the configuration of the development server from and config files...
		config = getLdapConfig();
		}
		@Test
		public void testLdapBindConnection() throws Exception
		{

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

+33 −137

File changed.

Preview size limit exceeded, changes collapsed.