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

cadcAccessControl-Admin/build.xml

+9 −3

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@
		<!-- JAR files to be included in classpath and war file -->
		<property name="cadcAC" value="${lib}/cadcAccessControl.jar"/>
		<property name="cadcAC-Server" value="${lib}/cadcAccessControl-Server.jar"/>
		<property name="cadcReg" value="${lib}/cadcRegistry.jar"/>
		<property name="cadcLog" value="${lib}/cadcLog.jar"/>
		<property name="cadcUtil" value="${lib}/cadcUtil.jar"/>
		<property name="log4j" value="${ext.lib}/log4j.jar"/>
		@@ -102,16 +103,21 @@
		<property name="mail" value="${ext.lib}/mail.jar"/>

		<property name="cadc" value="${cadcAC}:${cadcAC-Server}:${cadcUtil}"/>
		<property name="client.cadc.jars" value="${cadcAC}:${cadcAC-Server}:${cadcLog}:${cadcUtil}"/>
		<property name="client.cadc.jars" value="${cadcAC}:${cadcAC-Server}:${cadcLog}:${cadcUtil}:${cadcReg}"/>
		<property name="client.external.jars" value="${unboundid}:${log4j}:${servlet-api}:${mail}"/>

		<property name="jars" value="${cadc}:${client.cadc.jars}:${client.external.jars}"/>

		<target name="build" depends="compile,manifest">
		<target name="copyResources" depends="compile">
		<copy overwrite="true"
		file="${env.A}/etc/LocalAuthority.properties"
		tofile="${build}/class/LocalAuthority.properties"/>
		</target>

		<target name="build" depends="compile,copyResources,manifest">
		<jar jarfile="${build}/lib/${project}.jar"
		basedir="${build}/class" update="no"
		manifest="${build}/tmp/${project}.mf">
		<include name="ca/nrc/cadc/**"/>
		</jar>
		</target>

cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java

+8 −15

Original line number	Diff line number	Diff line
		package ca.nrc.cadc.auth;

		import java.io.File;
		import java.net.MalformedURLException;
		import java.net.URI;
		import java.net.URL;
		import java.security.Principal;
		@@ -20,6 +19,7 @@ import org.apache.log4j.Logger;
		import ca.nrc.cadc.ac.User;
		import ca.nrc.cadc.ac.client.UserClient;
		import ca.nrc.cadc.profiler.Profiler;
		import ca.nrc.cadc.reg.Standards;
		import ca.nrc.cadc.reg.client.LocalAuthority;
		import ca.nrc.cadc.reg.client.RegistryClient;
		import ca.nrc.cadc.vosi.avail.CheckResource;
		@@ -109,7 +109,7 @@ public class ACIdentityManager implements IdentityManager
		public NumericPrincipal run() throws Exception
		{
		LocalAuthority localAuth = new LocalAuthority();
		URI serviceURI = localAuth.getServiceURI("ums");
		URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());

		UserClient userClient = new UserClient(serviceURI);
		User newUser = userClient.createUser(x500Principal);
		@@ -205,7 +205,7 @@ public class ACIdentityManager implements IdentityManager
		public Object run() throws Exception
		{
		LocalAuthority localAuth = new LocalAuthority();
		URI serviceURI = localAuth.getServiceURI("ums");
		URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());

		UserClient userClient = new UserClient(serviceURI);
		userClient.augmentSubject(subject);
		@@ -230,18 +230,11 @@ public class ACIdentityManager implements IdentityManager
		* @return
		*/
		public static CheckResource getAvailabilityCheck()
		{
		try
		{
		RegistryClient regClient = new RegistryClient();
		LocalAuthority localAuth = new LocalAuthority();
		URI serviceURI = localAuth.getServiceURI("gms");
		URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");
		URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());
		URL availURL = regClient.getServiceURL(serviceURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
		return new CheckWebService(availURL.toExternalForm());
		}
		catch (MalformedURLException e)
		{
		throw new RuntimeException(e);
		}
		}
		}

cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java

+6 −13

Original line number	Diff line number	Diff line
		package ca.nrc.cadc.auth;

		import java.net.MalformedURLException;
		import java.net.URI;
		import java.net.URL;

		@@ -10,6 +9,7 @@ import javax.security.auth.x500.X500Principal;
		import org.apache.log4j.Logger;

		import ca.nrc.cadc.profiler.Profiler;
		import ca.nrc.cadc.reg.Standards;
		import ca.nrc.cadc.reg.client.LocalAuthority;
		import ca.nrc.cadc.reg.client.RegistryClient;
		import ca.nrc.cadc.vosi.avail.CheckResource;
		@@ -68,18 +68,11 @@ public class AuthenticatorImpl implements Authenticator
		}

		public static CheckResource getAvailabilityCheck()
		{
		try
		{
		RegistryClient regClient = new RegistryClient();
		LocalAuthority localAuth = new LocalAuthority();
		URI serviceURI = localAuth.getServiceURI("gms");
		URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");
		URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());
		URL availURL = regClient.getServiceURL(serviceURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
		return new CheckWebService(availURL.toExternalForm());
		}
		catch (MalformedURLException e)
		{
		throw new RuntimeException(e);
		}
		}
		}

cadcAccessControl-Server/build.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,8 @@
		<copy overwrite="true" file="test/LdapConfig.test.properties"
		todir="${user.home}/config/"/>
		<copy overwrite="true"
		file="${env.CADC_PREFIX}/etc/LocalAuthority.properties"
		tofile="${build}/class/LocalAuthority.properties"/>
		file="${env.A}/etc/LocalAuthority.properties"
		todir="${build}/test/class/"/>
		</target>

		<!-- JAR files needed to run the test suite -->

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.auth.NumericPrincipal;
		import ca.nrc.cadc.net.TransientException;
		import ca.nrc.cadc.profiler.Profiler;
		import ca.nrc.cadc.reg.Standards;
		import ca.nrc.cadc.reg.client.LocalAuthority;
		import ca.nrc.cadc.util.ObjectUtil;
		import ca.nrc.cadc.util.StringUtil;
		@@ -739,7 +740,7 @@ public class LdapUserDAO extends LdapDAO

		// cache memberOf values in the user
		LocalAuthority localAuthority = new LocalAuthority();
		URI gmsServiceURI = localAuthority.getServiceURI("gms");
		URI gmsServiceURI = localAuthority.getServiceURI(Standards.GMS_GROUPS_01.toString());

		GroupMemberships gms = new GroupMemberships(gmsServiceURI.toString(), userID);
		user.appData = gms; // add even if empty
		@@ -1277,7 +1278,7 @@ public class LdapUserDAO extends LdapDAO
		{
		UUID uuid = new UUID(0L, Long.parseLong(numericID));
		LocalAuthority localAuthority = new LocalAuthority();
		URI umsServiceURI = localAuthority.getServiceURI("ums");
		URI umsServiceURI = localAuthority.getServiceURI(Standards.UMS_REQS_01.toString());
		String uriString = umsServiceURI.toString() + "?" + uuid.toString();
		URI uri;
		try