Commit b0df4c2c authored by Jeff Burke's avatar Jeff Burke
Browse files

ac2 rework

parent b4e49af8

projects/cadcAccessControl-Server/build.xml

+2 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
  <property name="testingJars"

            value="${lib.commons-logging}:${dev.junit}:${dev.jsonassert}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>



  <target name="test" depends="compile,compile-test">

  <target name="single-test" depends="compile,compile-test">

    <echo message="Running test suite..." />

    <junit printsummary="yes" haltonfailure="yes" fork="yes">

      <classpath>
@@ -148,8 +148,7 @@ 
        <pathelement path="${jars}:${testingJars}"/>

      </classpath>

      <sysproperty key="ca.nrc.cadc.util.PropertiesReader.dir" value="test"/>

      <test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />

      <test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />

      <test name="ca.nrc.cadc.ac.server.web.users.GetUserListActionTest" />

      <formatter type="plain" usefile="false" />

    </junit>

  </target>

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

+3 −3
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
        {

            final Filter filter = Filter.createPresenceFilter("cn");

            final String [] attributes = new String[] {"cn", "nsaccountlock"};

            final List<String> groupNames = new ArrayList<String>();

            final Collection<String> groupNames = new ArrayList<String>();

            final long begin = System.currentTimeMillis();



            final SearchResult searchResult =

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

+2 −2
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
                .getName());

            addAttribute(attributes, LDAP_DISTINGUISHED_NAME, userDN

                .toNormalizedString());

            addAttribute(attributes, LADP_USER_PASSWORD, userRequest

                    .getPassword());

            addAttribute(attributes, LADP_USER_PASSWORD,

                String.valueOf(userRequest.getPassword()));



            for (UserDetails details : user.details)

            {

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

+3 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ import ca.nrc.cadc.ac.UserNotFoundException; 
import ca.nrc.cadc.ac.server.GroupPersistence;

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

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

import ca.nrc.cadc.ac.xml.GroupsWriter;

import ca.nrc.cadc.ac.xml.GroupListWriter;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.net.TransientException;
@@ -236,7 +236,8 @@ public class ACSearchRunner implements JobRunner 
                groups = new ArrayList<Group>();

            }

            syncOut.setResponseCode(HttpServletResponse.SC_OK);

            GroupsWriter.write(groups, syncOut.getOutputStream());

            GroupListWriter groupListWriter = new GroupListWriter();

            groupListWriter.write(groups, syncOut.getOutputStream());

            

            // Mark the Job as completed.

//            jobUpdater.setPhase(job.getID(), ExecutionPhase.EXECUTING,

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupsAction.java→projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java

+3 −3
Original line number Diff line number Diff line
@@ -90,14 +90,14 @@ import ca.nrc.cadc.ac.server.PluginFactory; 
import ca.nrc.cadc.ac.server.UserPersistence;

import ca.nrc.cadc.net.TransientException;



public abstract class GroupsAction

public abstract class AbstractGroupAction

    implements PrivilegedExceptionAction<Object>

{

    private static final Logger log = Logger.getLogger(GroupsAction.class);

    private static final Logger log = Logger.getLogger(AbstractGroupAction.class);

    protected GroupLogInfo logInfo;

    protected HttpServletResponse response;



    GroupsAction(GroupLogInfo logInfo)

    AbstractGroupAction(GroupLogInfo logInfo)

    {

        this.logInfo = logInfo;

    }