From aa5c3e6bfb9558ed8ec744e021a9832d2491d793 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <Dustin.Jenkins@nrc-cnrc.gc.ca>
Date: Fri, 26 Sep 2014 08:57:53 -0700
Subject: [PATCH] Story 1651: Added owner to getGroup().
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
index 6b0566c6..4dae5cf1 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
@@ -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;
}
--
GitLab