Commit d64d22ff authored by Adrian Damian's avatar Adrian Damian
Browse files

Removed test user password from unit test files.

parent 18d3ac66

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

+18 −1
Original line number Diff line number Diff line
@@ -80,13 +80,30 @@ import ca.nrc.cadc.auth.NumericPrincipal; 
import com.unboundid.ldap.sdk.LDAPConnection;



import org.junit.Test;

import org.junit.BeforeClass;

import static org.junit.Assert.*;





public class LdapDAOTest

{

    final LdapConfig config = new TestLDAPConfig();

    static String usersDN = "ou=Users,ou=ds,dc=canfartest,dc=net";

    static String groupsDN = "ou=Groups,ou=ds,dc=canfartest,dc=net";

    static String adminGroupsDN = "ou=adminGroups,ou=ds,dc=canfartest,dc=net";

    

    static LdapConfig config;

    

    @BeforeClass

    public static void setUpBeforeClass() throws Exception

    {

        // get the configuration of the development server from and config files...

        LdapConfig devServerConfig = LdapConfig.getLdapConfig();

        

        // ... but use the test tree

        config = new LdapConfig(devServerConfig.getServer(),

                devServerConfig.getPort(), devServerConfig.getProxyUserDN(),

                devServerConfig.getProxyPasswd(), usersDN, groupsDN,

                adminGroupsDN);

    }

    @Test

    public void testLdapBindConnection() throws Exception

    {

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

+16 −9
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ public class LdapGroupDAOTest 
{

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



    static String adminDN = "uid=webproxy,ou=SpecialUsers,dc=canfar,dc=net";

//    static String usersDN = "ou=Users,ou=ds,dc=canfar,dc=net";

//    static String groupsDN = "ou=Groups,ou=ds,dc=canfar,dc=net";

    static String usersDN = "ou=Users,ou=ds,dc=canfar,dc=net";

    static String groupsDN = "ou=Groups,ou=ds,dc=canfar,dc=net";

    static String adminGroupsDN = "ou=adminGroups,ou=ds,dc=canfartest,dc=net";

    

    static String daoTestDN1 = "cn=cadcdaotest1,ou=cadc,o=hia,c=ca";

    static String daoTestDN2 = "cn=cadcdaotest2,ou=cadc,o=hia,c=ca";
@@ -78,19 +78,19 @@ public class LdapGroupDAOTest 
    static X500Principal daoTestPrincipal2;

    static X500Principal daoTestPrincipal3;

    static X500Principal unknownPrincipal;

    static X500Principal adminPrincipal;



    

    static User<X500Principal> daoTestUser1;

    static User<X500Principal> daoTestUser2;

    static User<X500Principal> daoTestUser3;

    static User<X500Principal> unknownUser;

    static User<X500Principal> adminUser;



    

    static Subject daoTestUser1Subject;

    static Subject daoTestUser2Subject;

    static Subject anonSubject;



    final LdapConfig config = new TestLDAPConfig();

    static LdapConfig config;

    

    @BeforeClass

    public static void setUpBeforeClass()
@@ -98,17 +98,24 @@ public class LdapGroupDAOTest 
    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);

        

        // get the configuration of the development server from and config files...

        LdapConfig devServerConfig = LdapConfig.getLdapConfig();

            

        // ... but use the test tree

        config = new LdapConfig(devServerConfig.getServer(),

                 devServerConfig.getPort(), devServerConfig.getProxyUserDN(),

                 devServerConfig.getProxyPasswd(), usersDN, groupsDN,

                 adminGroupsDN);

        

        daoTestPrincipal1 = new X500Principal(daoTestDN1);

        daoTestPrincipal2 = new X500Principal(daoTestDN2);

        daoTestPrincipal3 = new X500Principal(daoTestDN3);

        unknownPrincipal = new X500Principal(unknownDN);

        adminPrincipal = new X500Principal(adminDN);



        daoTestUser1 = new User<X500Principal>(daoTestPrincipal1);

        daoTestUser2 = new User<X500Principal>(daoTestPrincipal2);

        daoTestUser3 = new User<X500Principal>(daoTestPrincipal3);

        unknownUser = new User<X500Principal>(unknownPrincipal);

        adminUser = new User<X500Principal>(adminPrincipal);

        

        daoTestUser1Subject = new Subject();

        daoTestUser1Subject.getPrincipals().add(daoTestUser1.getUserID());

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

+10 −7
Original line number Diff line number Diff line
@@ -85,12 +85,10 @@ import org.apache.log4j.Logger; 
import org.junit.BeforeClass;

import org.junit.Test;



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserDetails;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.util.Log4jInit;



import com.unboundid.ldap.sdk.DN;
@@ -103,10 +101,6 @@ public class LdapUserDAOTest 
{

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

    

    static String server = "mach275.cadc.dao.nrc.ca";

    static int port = 389;

    static String adminDN = "uid=webproxy,ou=Webproxy,ou=topologymanagement,o=netscaperoot";

    static String adminPW = "go4it";

    static String usersDN = "ou=Users,ou=ds,dc=canfartest,dc=net";

    static String groupsDN = "ou=Groups,ou=ds,dc=canfartest,dc=net";

    static String adminGroupsDN = "ou=adminGroups,ou=ds,dc=canfartest,dc=net";
@@ -128,7 +122,16 @@ public class LdapUserDAOTest 
        

        testUser = new User<X500Principal>(new X500Principal(testUserX509DN));

    

        config = new LdapConfig(server, port, adminDN, adminPW, usersDN, groupsDN, adminGroupsDN);



        // get the configuration of the development server from and config files...

        LdapConfig devServerConfig = LdapConfig.getLdapConfig();

            

        // ... but use the test tree

        config = new LdapConfig(devServerConfig.getServer(),

                 devServerConfig.getPort(), devServerConfig.getProxyUserDN(),

                 devServerConfig.getProxyPasswd(), usersDN, groupsDN,

                 adminGroupsDN);



        

        testUser.details.add(new PersonalDetails("CADC", "DAOTest1"));

        testUser.getIdentities().add(new HttpPrincipal("CadcDaoTest1"));