Commit efcaed3d authored by Dustin Jenkins's avatar Dustin Jenkins
Browse files

Story 1848: Fix for WhoAmIServlet.

parent e6a1415e

projects/cadcAccessControl-Server/build.xml

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
  <property name="cadcRegistry" value="${lib}/cadcRegistryClient.jar"/>

  <property name="cadcUtil" value="${lib}/cadcUtil.jar"/>

  <property name="cadcUWS" value="${lib}/cadcUWS.jar"/>



  <property name="json" value="${ext.lib}/json.jar" />

  <property name="javacsv" value="${ext.lib}/javacsv.jar"/>

  <property name="jdom2" value="${ext.lib}/jdom2.jar"/>

  <property name="log4j" value="${ext.lib}/log4j.jar"/>
@@ -101,7 +101,7 @@ 
  <property name="xerces" value="${ext.lib}/xerces.jar"/>



  <property name="jars"

            value="${javacsv}:${jdom2}:${log4j}:${servlet}:${unboundid}:${xerces}:${cadcAccessControl}:${cadcLog}:${cadcRegistry}:${cadcUtil}:${cadcUWS}"/>

            value="${javacsv}:${jdom2}:${json}:${log4j}:${servlet}:${unboundid}:${xerces}:${cadcAccessControl}:${cadcLog}:${cadcRegistry}:${cadcUtil}:${cadcUWS}"/>



  <target name="build" depends="compile">

    <jar jarfile="${build}/lib/${project}.jar"

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

+6 −2
Original line number Diff line number Diff line
@@ -169,8 +169,12 @@ public class WhoAmIServlet extends HttpServlet 
        // Take the first one.

        final String redirectUrl =

            String.format(redirectURL.toString(), webPrincipal.getName());

        log.debug("redirecting to " + redirectUrl);

        response.sendRedirect(redirectUrl);

        final URI redirectURI = URI.create(redirectUrl);



        log.debug("redirecting to " + redirectURI.toASCIIString());



        response.sendRedirect(redirectURI.getPath() + "?"

                              + redirectURI.getQuery());

    }



    /**

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

+3 −2
Original line number Diff line number Diff line
@@ -792,7 +792,8 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest 
                //getGroupDAO().addGroup(new Group(groupID, daoTestUser1));

                try

                {

                    getGroupDAO().modifyGroup(new Group("foo", daoTestUser1));

                    getGroupDAO().modifyGroup(new Group("fooBOGUSASFgomsi",

                                                        daoTestUser1));

                    fail("modifyGroup with unknown user should throw " +

                         "GroupNotFoundException");

                }
@@ -821,7 +822,7 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest 
        {

            public Object run() throws Exception

            {

                getGroupDAO().deleteGroup(groupID);

                getGroupDAO().deleteGroup(groupID);setUpBeforeClass();

                return null;

            }

        });

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class WhoAmIServletTest 
        expect(mockRequest.getRemoteAddr()).andReturn("mysite.com").once();

        expect(mockRequest.getScheme()).andReturn("http");



        mockResponse.sendRedirect("http://mysite.com/ac/users/CADCtest?idType=HTTP");

        mockResponse.sendRedirect("/ac/users/CADCtest?idType=HTTP");

        expectLastCall().once();



        expect(mockRegistry.getServiceURL(URI.create(AC.GMS_SERVICE_URI),