Commit 8fcea23c authored by Patrick Dowler's avatar Patrick Dowler Committed by GitHub
Browse files

Merge pull request #14 from pdowler/master 

strip quotes from DN in servlet init
parents 966ea7a5 50f7157f

cadc-cdp-server/build.gradle

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ sourceCompatibility = 1.7 




group = 'org.opencadc'

group = 'org.opencadc'





version = '1.1.1'

version = '1.1.2'





dependencies {

dependencies {

    compile 'log4j:log4j:1.+'

    compile 'log4j:log4j:1.+'

cadc-cdp-server/src/main/java/ca/nrc/cadc/cred/server/CadcDelegationServlet.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,8 @@ public class CadcDelegationServlet extends DelegationServlet 
            String[] dns = suDNStr.split("\n");

            String[] dns = suDNStr.split("\n");

            for (String dn : dns)

            for (String dn : dns)

            {

            {

                X500Principal su = new X500Principal(dn);

                String sp = dn.replaceAll("\"", "").trim();

                X500Principal su = new X500Principal(sp);

                suDNs.add(su);

                suDNs.add(su);

                LOGGER.info("SU: " + su.getName());

                LOGGER.info("SU: " + su.getName());

            }

            }

cadc-cdp-server/src/main/java/ca/nrc/cadc/cred/server/ProxyServlet.java

+8 −6
Original line number Original line Diff line number Diff line
@@ -154,8 +154,8 @@ public class ProxyServlet extends HttpServlet 
                String principalStr = st.nextToken();

                String principalStr = st.nextToken();

                StringTokenizer st2 = new StringTokenizer(principalStr, ":",

                StringTokenizer st2 = new StringTokenizer(principalStr, ":",

                                                          false);

                                                          false);

                final String principal; // the principal of the trusted client

                String principal; // the principal of the trusted client

                final Float maxDaysValid; // maximum lifetime of the returned proxy

                Float maxDaysValid; // maximum lifetime of the returned proxy





                if (st2.countTokens() == 1)

                if (st2.countTokens() == 1)

                {

                {
@@ -179,10 +179,12 @@ public class ProxyServlet extends HttpServlet 
                            "Cannot parse trusted principal from servlet " +

                            "Cannot parse trusted principal from servlet " +

                            "config: " + principalStr);

                            "config: " + principalStr);

                }

                }

                LOGGER.info("trusted: " + principal + " , max days valid: "

                if (principal != null)

                            + maxDaysValid);

                {

                trustedPrincipals.put(new X500Principal(principal),

                    principal = principal.replaceAll("\"", "");

                                      maxDaysValid);

                    LOGGER.info("trusted: " + principal + " , max days valid: " + maxDaysValid);

                    trustedPrincipals.put(new X500Principal(principal), maxDaysValid);

                }

            }

            }

        }

        }