From cec1067f835fd24f1822d3bc0d1af5a6f94febc2 Mon Sep 17 00:00:00 2001
From: Adrian Damian <Adrian.Damian@nrc-cnrc.gc.ca>
Date: Thu, 30 Oct 2014 15:38:38 -0700
Subject: [PATCH] Temporary fix integration testing
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 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 9463a01c..2b23f616 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
@@ -473,7 +473,12 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
throw new GroupNotFoundException(groupID);
}
- String groupCN = searchEntry.getAttributeValue("cn");
+ if (searchEntry.getAttributeValueAsDN("owner") == null)
+ {
+ //TODO assume user not allowed to read group
+ throw new AccessControlException(groupID);
+ }
+
DN groupOwner = searchEntry.getAttributeValueAsDN("owner");
User<X500Principal> owner;
@@ -486,7 +491,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
throw new RuntimeException("BUG: group owner not found");
}
- Group ldapGroup = new Group(groupCN, owner);
+ Group ldapGroup = new Group(groupID, owner);
if (searchEntry.hasAttribute("description"))
{
ldapGroup.description =
--
GitLab