Commit 1992c904 authored by Patrick Dowler's avatar Patrick Dowler
Browse files

changed User to add the userID in the identities list in constructor; changed... 

changed User to add the userID in the identities list in constructor; changed xml output to skip redundant userID when writing the identities list
parent c6e9c13a

projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public class User<T extends Principal> 
            throw new IllegalArgumentException("null userID");

        }

        this.userID = userID;

        identities.add(userID);

    }



    public Set<Principal> getIdentities()

projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java

+5 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import ca.nrc.cadc.ac.User; 
import ca.nrc.cadc.ac.UserDetails;

import ca.nrc.cadc.ac.UserRequest;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.DNPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.IdentityType;
@@ -656,6 +657,9 @@ public abstract class AbstractReaderWriter 
            Element identitiesElement = new Element("identities");

            for (Principal identity : identities)

            {

                // userID is in this list, so only include alternate identities

                // in the output

                if (!AuthenticationUtil.equals(identity, user.getUserID()))

                    identitiesElement.addContent(getElement(identity));

            }

            userElement.addContent(identitiesElement);