Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc (ad4f1003) · Commits · OATS-CADC / ac

projects/cadcAccessControl-Server/build.xml

+13 −13

Original line number	Diff line number	Diff line
		@@ -132,17 +132,17 @@
		</copy>
		</target>

		<!--<target name="test" depends="compile,compile-test,resources">-->
		<!--<echo message="Running test suite..." />-->
		<!--<junit printsummary="yes" haltonfailure="yes" fork="yes">-->
		<!--<classpath>-->
		<!--<pathelement path="${build}/class"/>-->
		<!--<pathelement path="${build}/test/class"/>-->
		<!--<pathelement path="${testingJars}"/>-->
		<!--</classpath>-->
		<!--<test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />-->
		<!--<formatter type="plain" usefile="false" />-->
		<!--</junit>-->
		<!--</target>-->

		<!--
		<target name="group-dao-test" depends="compile,compile-test,resources">
		<junit printsummary="yes" haltonfailure="yes" fork="yes">
		<classpath>
		<pathelement path="${build}/class"/>
		<pathelement path="${build}/test/class"/>
		<pathelement path="${testingJars}"/>
		</classpath>
		<test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />
		<formatter type="plain" usefile="false" />
		</junit>
		</target>
		-->
		</project>

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

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		/*
		************************************************************************
		***************** CANADIAN ASTRONOMY DATA CENTRE *****************
		************ CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************
		*
		* (c) 2011. (c) 2011.
		* 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: 5 $
		*
		************************************************************************
		*/

		package ca.nrc.cadc.ac.server;

		import ca.nrc.cadc.ac.Group;
		import ca.nrc.cadc.ac.Role;

		/**
		*
		* @author pdowler
		*/
		public interface GroupDetailSelector
		{
		/**
		* Check if group details should be filled in for the group when
		* querying for role.
		* @param g
		* @param r
		* @return true if group details should be filled
		*/
		boolean isDetailedSearch(Group g, Role r);
		}

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -227,6 +227,11 @@ public abstract class LdapDAO
		throws TransientException
		{
		logger.debug("Ldap result: " + code);
		if (code == ResultCode.SUCCESS
		\|\| code == ResultCode.NO_SUCH_OBJECT)
		{
		return;
		}

		if (code == ResultCode.INSUFFICIENT_ACCESS_RIGHTS)
		{
		@@ -236,20 +241,20 @@ public abstract class LdapDAO
		{
		throw new AccessControlException("Invalid credentials ");
		}
		else if ((code == ResultCode.SUCCESS) \|\| (code
		== ResultCode.NO_SUCH_OBJECT))
		{
		// all good. nothing to do
		}
		else if (code == ResultCode.PARAM_ERROR)
		{
		throw new IllegalArgumentException("Error in Ldap parameters ");
		}
		else if (code == ResultCode.BUSY \|\|
		code == ResultCode.CONNECT_ERROR)
		else if (code == ResultCode.BUSY
		\|\| code == ResultCode.CONNECT_ERROR)
		{
		throw new TransientException("Connection problems ");
		}
		else if (code == ResultCode.TIMEOUT
		\|\| code == ResultCode.TIME_LIMIT_EXCEEDED)
		{
		throw new TransientException("ldap timeout");
		}
		else
		{
		throw new RuntimeException("Ldap error (" + code.getName() + ")");

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

+264 −382

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import ca.nrc.cadc.ac.GroupAlreadyExistsException;
		import ca.nrc.cadc.ac.GroupNotFoundException;
		import ca.nrc.cadc.ac.Role;
		import ca.nrc.cadc.ac.UserNotFoundException;
		import ca.nrc.cadc.ac.server.GroupDetailSelector;
		import ca.nrc.cadc.ac.server.GroupPersistence;
		import ca.nrc.cadc.net.TransientException;

		@@ -89,11 +90,18 @@ public class LdapGroupPersistence<T extends Principal>
		Logger.getLogger(LdapGroupPersistence.class);
		private final LdapConfig config;

		private GroupDetailSelector detailSelector;

		public LdapGroupPersistence()
		{
		config = LdapConfig.getLdapConfig();
		}

		protected void setDetailSelector(GroupDetailSelector gds)
		{
		this.detailSelector = gds;
		}

		public Collection<String> getGroupNames()
		throws TransientException, AccessControlException
		{
		@@ -233,6 +241,7 @@ public class LdapGroupPersistence<T extends Principal>
		{
		userDAO = new LdapUserDAO<T>(config);
		groupDAO = new LdapGroupDAO<T>(config, userDAO);
		groupDAO.searchDetailSelector = detailSelector;
		Collection<Group> ret = groupDAO.getGroups(userID, role, groupID);
		return ret;
		}