From a42ea4725493e151b048441a5105979b2796313a Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Tue, 11 Aug 2015 10:51:38 -0700
Subject: [PATCH] Story ac2 rework. We now expose isMember() in
GroupPersistence instead of in UserPersistence.
---
.../ca/nrc/cadc/ac/server/GroupPersistence.java | 16 ++++++++++++++++
.../ca/nrc/cadc/ac/server/UserPersistence.java | 16 ----------------
.../ac/server/ldap/LdapGroupPersistence.java | 8 ++++++++
.../cadc/ac/server/ldap/LdapUserPersistence.java | 2 +-
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
index df3b6579..901413c5 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
@@ -195,4 +195,20 @@ public abstract interface GroupPersistence<T extends Principal>
throws UserNotFoundException, GroupNotFoundException,
TransientException, AccessControlException;
+ /**
+ * Check whether the user is a member of the group.
+ *
+ * @param userID The userID.
+ * @param groupID The groupID.
+ *
+ * @return true or false
+ *
+ * @throws UserNotFoundException If the user is not found.
+ * @throws TransientException If an temporary, unexpected problem occurred.
+ * @throws AccessControlException If the operation is not permitted.
+ */
+ public boolean isMember(T userID, String groupID)
+ throws UserNotFoundException, TransientException,
+ AccessControlException;
+
}
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
index 94498c47..f88faffe 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
@@ -175,20 +175,4 @@ public interface UserPersistence<T extends Principal>
void deleteUser(T userID)
throws UserNotFoundException, TransientException,
AccessControlException;
-
- /**
- * Check whether the user is a member of the group.
- *
- * @param userID The userID.
- * @param groupID The groupID.
- *
- * @return true or false
- *
- * @throws UserNotFoundException If the user is not found.
- * @throws TransientException If an temporary, unexpected problem occurred.
- * @throws AccessControlException If the operation is not permitted.
- */
- boolean isMember(T userID, String groupID)
- throws UserNotFoundException, TransientException,
- AccessControlException;
}
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
index 4ba6cc65..b45f6015 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
@@ -259,4 +259,12 @@ public class LdapGroupPersistence<T extends Principal>
}
}
+ public boolean isMember(T userID, String groupID)
+ throws UserNotFoundException, TransientException,
+ AccessControlException
+ {
+ return (new LdapUserPersistence<T>()).isMember(userID, groupID);
+ }
+
+
}
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
index 1e365d54..5c85dcfc 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
@@ -362,7 +362,7 @@ public class LdapUserPersistence<T extends Principal>
* @throws TransientException If an temporary, unexpected problem occurred.
* @throws AccessControlException If the operation is not permitted.
*/
- public boolean isMember(T userID, String groupID)
+ protected boolean isMember(T userID, String groupID)
throws UserNotFoundException, TransientException,
AccessControlException
{
--
GitLab