From 4727410953dd536268cdc0c527d79c31196a0381 Mon Sep 17 00:00:00 2001
From: Adrian Damian <Adrian.Damian@nrc-cnrc.gc.ca>
Date: Fri, 31 Oct 2014 13:57:11 -0700
Subject: [PATCH] Small fix for integration testing
---
.../nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 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 2b23f616..64fe6d8c 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
@@ -205,7 +205,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
final DN ownerDN, final String description,
final Set<User<? extends Principal>> users,
final Set<Group> groups)
- throws UserNotFoundException, LDAPException, TransientException
+ throws UserNotFoundException, LDAPException, TransientException, AccessControlException
{
// add new group
List<Attribute> attributes = new ArrayList<Attribute>();
@@ -604,8 +604,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
}
for (Group gr : group.getGroupMembers())
{
- DN grDN = getGroupDN(gr.getID());
- newMembers.add(grDN.toNormalizedString());
+ DN grDN = getGroupDN(gr.getID());
+ newMembers.add(grDN.toNormalizedString());
}
List<String> newAdmins = new ArrayList<String>();
for (User<?> member : group.getUserAdmins())
@@ -751,7 +751,16 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
GroupNotFoundException, UserNotFoundException
{
User<T> user = new User<T>(userID);
- DN userDN = userPersist.getUserDN(user);
+ DN userDN = null;
+ try
+ {
+ userDN = userPersist.getUserDN(user);
+ }
+ catch (UserNotFoundException e)
+ {
+ // no anonymous searches
+ throw new AccessControlException("Not authorized to search");
+ }
Collection<DN> groupDNs = new HashSet<DN>();
if (role == Role.OWNER)
--
GitLab