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

Story 1848: Fix for tests and updated JSON Output.

parent 2e05b2a1

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

+19 −9
Original line number Original line Diff line number Diff line
@@ -69,16 +69,13 @@ 




package ca.nrc.cadc.cred.server.actions;

package ca.nrc.cadc.cred.server.actions;





import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.*;

import ca.nrc.cadc.auth.DelegationToken;



import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.PrincipalExtractor;

import java.util.Map;

import java.util.Map;





import javax.security.auth.x500.X500Principal;

import javax.security.auth.x500.X500Principal;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletRequest;





import ca.nrc.cadc.auth.X509CertificateChain;

import ca.nrc.cadc.cred.server.CertificateDAO;

import ca.nrc.cadc.cred.server.CertificateDAO;

import ca.nrc.cadc.net.ResourceNotFoundException;

import ca.nrc.cadc.net.ResourceNotFoundException;

import ca.nrc.cadc.profiler.Profiler;

import ca.nrc.cadc.profiler.Profiler;
@@ -225,18 +222,31 @@ public class DelegationActionFactory 
            {

            {

                return null;

                return null;

            }

            }



            /**

             * Create and return a SSOCookieCredential from the request

             *

             * @return

             */

            @Override

            public SSOCookieCredential getSSOCookieCredential()

            {

                return null;

            }

        });

        });

        log.debug("augmented: " + s);

        log.debug("augmented: " + s);

        profiler.checkpoint("getUser");

        profiler.checkpoint("getUser");

        

        

        Set<X500Principal> xp = s.getPrincipals(X500Principal.class);

        Set<X500Principal> xp = s.getPrincipals(X500Principal.class);

        if (xp != null && !xp.isEmpty())

        if (xp.isEmpty())

        {

        {

            X500Principal p = xp.iterator().next();

            return p;

        }

            throw new ResourceNotFoundException("user not found: " + userid);

            throw new ResourceNotFoundException("user not found: " + userid);

        }

        }

        else

        {

            return xp.iterator().next();

        }

    }





    /**

    /**

     * Action indicating that a resource could not be found.

     * Action indicating that a resource could not be found.