Commit 814bfe88 authored by Brian Major's avatar Brian Major
Browse files

s1885 - Removed hardcoded references to AC service URIs

parent 7b9232ef

cadcAccessControl-Server/build.xml

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ 
    <mkdir dir="${user.home}/config" />

    <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"/>

  </target>



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

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

+0 −5
Original line number Diff line number Diff line
@@ -1273,11 +1273,6 @@ public class LdapUserDAO extends LdapDAO 
        return uuid.getLeastSignificantBits();

    }



    protected void setInternalIdUriPrefix(String internalIdUriPrefix)

    {

        this.internalIdUriPrefix = internalIdUriPrefix;

    }



    protected InternalID getInternalID(String numericID)

    {

        UUID uuid = new UUID(0L, Long.parseLong(numericID));

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

+8 −2
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ import javax.servlet.http.HttpServletResponse; 


import org.apache.log4j.Logger;



import ca.nrc.cadc.ac.AC;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.log.ServletLogInfo;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.reg.client.RegistryClient;



/**
@@ -164,9 +164,15 @@ public class WhoAmIServlet extends HttpServlet 
                  final String scheme) throws IOException

    {

        final RegistryClient registryClient = getRegistryClient();



        LocalAuthority localAuthority = new LocalAuthority();

        URI umsServiceURI = localAuthority.getServiceURI("ums");



        log.debug("ums service uri: " + umsServiceURI);



        final URL redirectURL =

                registryClient.getServiceURL(

                        URI.create(AC.UMS_SERVICE_URI + "#users"), scheme, USER_GET_PATH);

                        URI.create(umsServiceURI.toString() + "#users"), scheme, USER_GET_PATH);



        // Take the first one.

        final String redirectUrl =

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java

+5 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ import javax.servlet.http.HttpServletResponse; 


import org.junit.Test;



import ca.nrc.cadc.ac.AC;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.reg.client.RegistryClient;
@@ -132,7 +132,10 @@ public class WhoAmIServletTest 
        mockResponse.sendRedirect("/ac/users/CADCtest?idType=HTTP");

        expectLastCall().once();



        expect(mockRegistry.getServiceURL(URI.create(AC.UMS_SERVICE_URI + "#users"),

        LocalAuthority localAuthority = new LocalAuthority();

        URI umsServiceURI = localAuthority.getServiceURI("ums");



        expect(mockRegistry.getServiceURL(URI.create(umsServiceURI.toString() + "#users"),

                                          "http", "/%s?idType=HTTP")).

                andReturn(new URL("http://mysite.com/ac/users/CADCtest?idType=HTTP")).once();

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java

+10 −6
Original line number Diff line number Diff line
@@ -77,10 +77,6 @@ import java.util.UUID; 


import javax.security.auth.x500.X500Principal;



import ca.nrc.cadc.ac.AC;

import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.util.ObjectUtil;

import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.easymock.EasyMock;
@@ -88,13 +84,17 @@ import org.junit.BeforeClass; 
import org.junit.Test;



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.ac.MemberNotFoundException;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.server.GroupPersistence;

import ca.nrc.cadc.ac.server.UserPersistence;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.IdentityType;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.ObjectUtil;



/**

 *
@@ -117,7 +117,9 @@ public class RemoveUserMemberActionTest 
        try

        {

            User user = new User();

            InternalID internalID = new InternalID(new URI(AC.USER_URI + "?" + UUID.randomUUID()));

            LocalAuthority localAuthority = new LocalAuthority();

            URI umsServiceURI = localAuthority.getServiceURI("ums");

            InternalID internalID = new InternalID(new URI(umsServiceURI.toASCIIString() + "?" + UUID.randomUUID()));

            ObjectUtil.setField(user, internalID, "id");



            String userID = "cn=foo,c=ca";
@@ -169,7 +171,9 @@ public class RemoveUserMemberActionTest 
        try

        {

            User user = new User();

            InternalID internalID = new InternalID(new URI(AC.USER_URI + "?" + UUID.randomUUID()));

            LocalAuthority localAuthority = new LocalAuthority();

            URI umsServiceURI = localAuthority.getServiceURI("ums");

            InternalID internalID = new InternalID(new URI(umsServiceURI.toString() + "?" + UUID.randomUUID()));

            ObjectUtil.setField(user, internalID, "id");



            String userID = "cn=foo,c=ca";