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

Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2

parents 2e05b2a1 4654cbbf

projects/cadcCDP-Server/src/ca/nrc/cadc/cred/server/ProxyServlet.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ public class ProxyServlet extends HttpServlet 
                if (st2.countTokens() == 1)

                if (st2.countTokens() == 1)

                {

                {

                    principal = principalStr.trim();

                    principal = principalStr.trim();

                    maxDaysValid = Float.MAX_VALUE; // no limit

                    maxDaysValid = 30.0f;

                }

                }

                else if (st2.countTokens() == 2)

                else if (st2.countTokens() == 2)

                {

                {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ public abstract class DelegationAction implements 
                    // Time to determine the allowed lifetime of certificate

                    // Time to determine the allowed lifetime of certificate

                    float maxDaysValid = trustedPrincipals.get(trustedPrinc);

                    float maxDaysValid = trustedPrincipals.get(trustedPrinc);

                    if (maxDaysValid < daysValid)

                    if (maxDaysValid < daysValid)

                        throw new ResourceNotFoundException("Requested lifetime limitted to " + maxDaysValid);

                        daysValid = maxDaysValid;





                    if (daysValid == 0)

                    if (daysValid == 0)

                        daysValid = maxDaysValid;

                        daysValid = maxDaysValid;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ public class ProxyServletTest 
        ProxyServlet testServlet = new ProxyServlet();

        ProxyServlet testServlet = new ProxyServlet();

        ServletConfig configMock = createMock(ServletConfig.class);

        ServletConfig configMock = createMock(ServletConfig.class);

        String expectedDN1 = "cn=test1,ou=hia.nrc.ca,o=grid,c=ca";

        String expectedDN1 = "cn=test1,ou=hia.nrc.ca,o=grid,c=ca";

        Float expectedDaysValid1 = new Float(Float.MAX_VALUE);

        Float expectedDaysValid1 = new Float(30.0f);

        String expectedDN2 = "cn=test2,ou=hia.nrc.ca,o=grid,c=ca";

        String expectedDN2 = "cn=test2,ou=hia.nrc.ca,o=grid,c=ca";

        Float expectedDaysValid2 = new Float(0.5);

        Float expectedDaysValid2 = new Float(0.5);

        expect(configMock.getInitParameter(ProxyServlet.TRUSTED_PRINCIPALS_PARAM))

        expect(configMock.getInitParameter(ProxyServlet.TRUSTED_PRINCIPALS_PARAM))