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

Story 1651: Added owner to getGroup().

parent 6a0360e0

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

+6 −3
Original line number Diff line number Diff line
@@ -809,14 +809,14 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
     * @throws ca.nrc.cadc.ac.GroupNotFoundException

     */

    protected Group getGroup(final DN groupDN)

        throws LDAPException, GroupNotFoundException

        throws LDAPException, GroupNotFoundException, UserNotFoundException

    {

        Filter filter = Filter.createEqualityFilter("entrydn", 

                                                    groupDN.toNormalizedString());

        

        SearchRequest searchRequest =  new SearchRequest(

                    config.getGroupsDN(), SearchScope.SUB, filter, 

                    new String[] {"cn", "description"});

                    "cn", "description", "owner");

            

        searchRequest.addControl(

                    new ProxiedAuthorizationV2RequestControl("dn:" +
@@ -832,7 +832,10 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
            throw new GroupNotFoundException(groupDN.toNormalizedString());

        }



        Group group = new Group(searchResult.getAttributeValue("cn"));

        Group group = new Group(searchResult.getAttributeValue("cn"),

                                userPersist.getMember(

                                        new DN(searchResult.getAttributeValue(

                                                "owner"))));

        group.description = searchResult.getAttributeValue("description");

        return group;

    }