Commit 9d349167 authored by Patrick Dowler's avatar Patrick Dowler
Browse files

s1795 rework

parent 8f5de096

projects/cadcCDP-Server/test/src/ca/nrc/cadc/cred/server/actions/DelegationActionTest.java

+9 −10
Original line number Original line Diff line number Diff line
@@ -20,26 +20,25 @@ import org.apache.log4j.Level; 




public class DelegationActionTest

public class DelegationActionTest

{

{

    static File cadcRegtest1CertFile;

    static File certFile;





    static

    static

    {

    {

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

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

        

        

        cadcRegtest1CertFile = new File("build/test/class/proxy.pem");

        certFile = new File("build/test/class/proxy.pem");

    }

    }





    @Test

    @Test

    public void testTrustedPrincipals() throws Exception

    public void testTrustedPrincipals() throws Exception

    {

    {

        X500Principal target = new X500Principal("cn=foo,ou=cadc.o=hia,c=ca");

        X500Principal target = new X500Principal("cn=foo,ou=cadc,o=nrc,c=ca");

        Subject subject = SSLUtil.createSubject(certFile);

       

       

        X500Principal principal = new X500Principal("cn=cadcregtest1_b5d,ou=cadc,o=hia,c=ca");

        X500Principal principal =  subject.getPrincipals(X500Principal.class).iterator().next();

        Map<X500Principal, Float> trustedPrincipals = new HashMap<X500Principal, Float>();

        Map<X500Principal, Float> trustedPrincipals = new HashMap<X500Principal, Float>();

        trustedPrincipals.put(principal, Float.MAX_VALUE);

        trustedPrincipals.put(principal, Float.MAX_VALUE);





        Subject subject = SSLUtil.createSubject(cadcRegtest1CertFile);



        DelegationAction delegationAction = new DelegationStub(target, 0.1f, trustedPrincipals);

        DelegationAction delegationAction = new DelegationStub(target, 0.1f, trustedPrincipals);

        Subject.doAs(subject, delegationAction);

        Subject.doAs(subject, delegationAction);

    }

    }
@@ -47,13 +46,13 @@ public class DelegationActionTest 
    @Test

    @Test

    public void testUntrustedPrincipals() throws Exception

    public void testUntrustedPrincipals() throws Exception

    {

    {

        X500Principal target = new X500Principal("cn=foo,ou=cadc.o=hia,c=ca");

        X500Principal target = new X500Principal("cn=foo,ou=cadc,o=nrc,c=ca");

        

        

        X500Principal principal = new X500Principal("cn=cadcauthtest1,ou=hia.nrc.ca,o=grid,c=ca");

        X500Principal principal = new X500Principal("cn=somebody else,ou=cadc,o=nrc,c=ca");

        Map<X500Principal, Float> trustedPrincipals = new HashMap<X500Principal, Float>();

        Map<X500Principal, Float> trustedPrincipals = new HashMap<X500Principal, Float>();

        trustedPrincipals.put(principal, new Float(0.0));

        trustedPrincipals.put(principal, new Float(0.0));

        

        

        Subject subject = SSLUtil.createSubject(cadcRegtest1CertFile);

        Subject subject = SSLUtil.createSubject(certFile);





        DelegationAction delegationAction = new DelegationStub(target, 0.1f, trustedPrincipals);

        DelegationAction delegationAction = new DelegationStub(target, 0.1f, trustedPrincipals);

        try

        try

projects/cadcCDP/src/ca/nrc/cadc/cred/CertUtil.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
*******************  CANADIAN ASTRONOMY DATA CENTRE  *******************

*******************  CANADIAN ASTRONOMY DATA CENTRE  *******************

**************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************

**************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************

*

*

*  (c) 2011.                            (c) 2011.

*  (c) 2015.                            (c) 2015.

*  Government of Canada                 Gouvernement du Canada

*  Government of Canada                 Gouvernement du Canada

*  National Research Council            Conseil national de recherches

*  National Research Council            Conseil national de recherches

*  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6

*  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6

projects/cadcCDP/src/ca/nrc/cadc/cred/client/Main.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
*******************  CANADIAN ASTRONOMY DATA CENTRE  *******************

*******************  CANADIAN ASTRONOMY DATA CENTRE  *******************

**************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************

**************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************

*

*

*  (c) 2011.                            (c) 2011.

*  (c) 2015.                            (c) 2015.

*  Government of Canada                 Gouvernement du Canada

*  Government of Canada                 Gouvernement du Canada

*  National Research Council            Conseil national de recherches

*  National Research Council            Conseil national de recherches

*  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6

*  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -362,8 +362,6 @@ public class Main implements PrivilegedAction<Boolean> 
            usage();

            usage();

            System.exit(INIT_STATUS);

            System.exit(INIT_STATUS);

        }

        }



        return;

    }

    }





    /**

    /**