Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 (8f7d8939) · Commits · OATS-CADC / ac

projects/cadcAccessControl-Admin/build.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -144,8 +144,7 @@
		<pathelement path="${build}/test/class"/>
		<pathelement path="${jars}:${testingJars}"/>
		</classpath>
		<sysproperty key="ca.nrc.cadc.util.PropertiesReader.dir" value="test"/>
		<test name="ca.nrc.cadc.ac.admin.integration.AdminIntTest" />
		<test name="ca.nrc.cadc.ac.admin.UserAdminTest" />
		<formatter type="plain" usefile="false" />
		</junit>
		</target>

projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,9 @@ public abstract class AbstractCommand implements PrivilegedAction<Object>

		protected <T extends Principal> UserPersistence<T> getUserPersistence()
		{
		System.setProperty("java.naming.factory.initial", ContextFactoryImpl.class.getName());

		PluginFactory pluginFactory = new PluginFactory();
		return pluginFactory.getUserPersistence();
		return pluginFactory.createUserPersistence();
		}
		}

projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		package ca.nrc.cadc.ac.admin;

		import javax.naming.Context;
		import javax.naming.NamingException;
		import javax.naming.spi.InitialContextFactory;
		import java.util.Hashtable;

		/**
		* A Simple ContextFactory.
		*/
		public class ContextFactoryImpl implements InitialContextFactory
		{

		public ContextFactoryImpl()
		{
		}

		@Override
		public Context getInitialContext(Hashtable environment)
		throws NamingException
		{
		return new ContextImpl();
		}

		}

projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextImpl.java

0 → 100644

+266 −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.admin;

		import javax.naming.Binding;
		import javax.naming.Context;
		import javax.naming.InitialContext;
		import javax.naming.Name;
		import javax.naming.NameClassPair;
		import javax.naming.NameParser;
		import javax.naming.NamingEnumeration;
		import javax.naming.NamingException;
		import java.util.HashMap;
		import java.util.Hashtable;
		import java.util.Map;

		/**
		* A Simple JNDI context.
		*/
		public class ContextImpl implements Context
		{
		Map<String,Object> map = new HashMap<String,Object>(1);

		@Override
		public Object lookup(String name) throws NamingException
		{
		return map.get(name);
		}

		@Override
		public void bind(String name, Object value) throws NamingException
		{
		map.put(name, value);
		}

		@Override
		public Object addToEnvironment(String arg0, Object arg1)
		throws NamingException
		{
		return null;
		}

		@Override
		public void bind(Name arg0, Object arg1) throws NamingException
		{
		}

		@Override
		public void close() throws NamingException
		{
		}

		@Override
		public Name composeName(Name arg0, Name arg1) throws NamingException
		{
		return null;
		}

		@Override
		public String composeName(String arg0, String arg1)
		throws NamingException
		{
		return null;
		}

		@Override
		public Context createSubcontext(Name arg0) throws NamingException
		{
		// TODO Auto-generated method stub
		return null;
		}

		@Override
		public Context createSubcontext(String arg0) throws NamingException
		{
		return null;
		}

		@Override
		public void destroySubcontext(Name arg0) throws NamingException
		{
		}

		@Override
		public void destroySubcontext(String arg0) throws NamingException
		{
		// TODO Auto-generated method stub

		}

		@Override
		public Hashtable<?, ?> getEnvironment() throws NamingException
		{
		return null;
		}

		@Override
		public String getNameInNamespace() throws NamingException
		{
		return null;
		}

		@Override
		public NameParser getNameParser(Name arg0) throws NamingException
		{
		return null;
		}

		@Override
		public NameParser getNameParser(String arg0) throws NamingException
		{
		return null;
		}

		@Override
		public NamingEnumeration<NameClassPair> list(Name arg0)
		throws NamingException
		{
		return null;
		}

		@Override
		public NamingEnumeration<NameClassPair> list(String arg0)
		throws NamingException
		{
		// TODO Auto-generated method stub
		return null;
		}

		@Override
		public NamingEnumeration<Binding> listBindings(Name arg0)
		throws NamingException
		{
		return null;
		}

		@Override
		public NamingEnumeration<Binding> listBindings(String arg0)
		throws NamingException
		{
		return null;
		}

		@Override
		public Object lookup(Name arg0) throws NamingException
		{
		// TODO Auto-generated method stub
		return null;
		}

		@Override
		public Object lookupLink(Name arg0) throws NamingException
		{
		return null;
		}

		@Override
		public Object lookupLink(String arg0) throws NamingException
		{
		return null;
		}

		@Override
		public void rebind(Name arg0, Object arg1) throws NamingException
		{
		}

		@Override
		public void rebind(String arg0, Object arg1) throws NamingException
		{
		}

		@Override
		public Object removeFromEnvironment(String arg0) throws NamingException
		{
		return null;
		}

		@Override
		public void rename(Name arg0, Name arg1) throws NamingException
		{
		}

		@Override
		public void rename(String arg0, String arg1) throws NamingException
		{
		}

		@Override
		public void unbind(Name arg0) throws NamingException
		{
		}

		@Override
		public void unbind(String arg0) throws NamingException
		{
		}

		}
		No newline at end of file

projects/cadcAccessControl-Admin/test/LdapConfig.properties

+46 −6

Original line number	Diff line number	Diff line
		# This are the configuration fields required by the unit tests
		server = proc5-03.cadc.dao.nrc.ca
		###############################################################
		#
		# LDAP Connection and Pool Configuration
		#
		#
		###############################################################

		# Read-only connection pool
		readOnly.servers = proc5-03.cadc.dao.nrc.ca
		readOnly.poolInitSize = 1
		readOnly.poolMaxSize = 2
		readOnly.poolPolicy = roundRobin
		readOnly.maxWait = 30000
		readOnly.createIfNeeded = false

		# Read-write connection pool
		readWrite.servers = proc5-03.cadc.dao.nrc.ca
		readWrite.poolInitSize = 1
		readWrite.poolMaxSize = 2
		readWrite.poolPolicy = roundRobin
		readWrite.maxWait = 30000
		readWrite.createIfNeeded = false

		# Unbound-Read-only connection pool
		unboundReadOnly.servers = proc5-03.cadc.dao.nrc.ca
		unboundReadOnly.poolInitSize = 1
		unboundReadOnly.poolMaxSize = 2
		unboundReadOnly.poolPolicy = roundRobin
		unboundReadOnly.maxWait = 30000
		unboundReadOnly.createIfNeeded = false

		# server configuration -- applies to all servers
		#dbrcHost = devLdap
		#port = 636
		#proxyUser = uid=webproxy,ou=SpecialUsers,dc=canfar,dc=net
		#usersDN = ou=Users,ou=ds,dc=canfar,dc=net
		#userRequestsDN = ou=userRequests,ou=ds,dc=canfar,dc=net
		#groupsDN = ou=Groups,ou=ds,dc=canfar,dc=net
		#adminGroupsDN = ou=adminGroups,ou=ds,dc=canfar,dc=net

		# tree without aci's
		dbrcHost = devLdap
		port = 389
		proxyUser = testproxy
		usersDn = ou=Users,ou=ds,dc=testcanfar
		proxyUser = uid=testproxy,ou=SpecialUsers,dc=testcanfar
		usersDN = ou=Users,ou=ds,dc=testcanfar
		userRequestsDN = ou=UserRequests,ou=ds,dc=testcanfar
		groupsDn = ou=Groups,ou=ds,dc=testcanfar
		adminGroupsDn = ou=adminGroups,ou=ds,dc=testcanfar
		No newline at end of file
		groupsDN = ou=Groups,ou=ds,dc=testcanfar
		adminGroupsDN = ou=adminGroups,ou=ds,dc=testcanfar
		No newline at end of file