Skip to content
Snippets Groups Projects
Commit 79dc8a3a authored by Adrian Damian's avatar Adrian Damian
Browse files

Fixed unit testing

parent 3e8c65a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+ 116
− 181
View file @ 79dc8a3a
...@@ -162,10 +162,14 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -162,10 +162,14 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
"Support for groups properties not available"); "Support for groups properties not available");
} }
Group inactiveGroup = getInactiveGroup(group); try
if (inactiveGroup != null) {
getInactiveGroup(group);
return reactivateGroup(group);
}
catch (GroupNotFoundException e)
{ {
return reactiveGroup(group, inactiveGroup); // ignore
} }
DN ownerDN = userPersist.getUserDN(group.getOwner()); DN ownerDN = userPersist.getUserDN(group.getOwner());
...@@ -197,7 +201,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -197,7 +201,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
{ {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
} }
...@@ -247,45 +251,55 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -247,45 +251,55 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
} }
private Group getInactiveGroup(final Group group) private Group getInactiveGroup(final Group group)
throws AccessControlException, UserNotFoundException, LDAPException throws AccessControlException, UserNotFoundException,
GroupNotFoundException
{ {
Group inactiveGroup = Group inactiveGroup;
getInactiveGroup(getGroupDN(group.getID()).toNormalizedString(), try
group.getID());
if (inactiveGroup == null)
{
return null;
}
if (!group.getOwner().equals(inactiveGroup.getOwner()))
{ {
throw new AccessControlException( inactiveGroup = getInactiveGroup(getGroupDN(group.getID())
"Inactive group not owned be requestor"); .toNormalizedString(), group.getID());
}
if (inactiveGroup == null)
Group inactiveAdminGroup = getInactiveGroup( {
getAdminGroupDN(group.getID()).toNormalizedString(), return null;
group.getID()); }
if (inactiveAdminGroup == null) if (!group.getOwner().equals(inactiveGroup.getOwner()))
{
throw new AccessControlException(
"Inactive group not owned be requestor");
}
Group inactiveAdminGroup = getInactiveGroup(
getAdminGroupDN(group.getID()).toNormalizedString(),
group.getID());
if (inactiveAdminGroup == null)
{
throw new RuntimeException(
"BUG: adminGroup not found for group " + group.getID());
}
if (!group.getOwner().equals(inactiveAdminGroup.getOwner()))
{
throw new RuntimeException(
"Bug: adminGroup owner doesn't match "
+ "group owner for group " + group.getID());
}
return inactiveGroup;
}
catch (LDAPException e)
{ {
throw new RuntimeException("BUG: adminGroup not found for group " + // TODO Auto-generated catch block
group.getID()); throw new RuntimeException("BUG: LDAP Exception: ", e);
} }
if (!group.getOwner().equals(inactiveAdminGroup.getOwner()))
{
throw new RuntimeException("Bug: adminGroup owner doesn't match " +
"group owner for group " +
group.getID());
}
return inactiveGroup;
} }
private Group getInactiveGroup(final String groupDN, final String groupID) private Group getInactiveGroup(final String groupDN, final String groupID)
throws UserNotFoundException, LDAPException throws UserNotFoundException, LDAPException, GroupNotFoundException
{ {
Filter filter = Filter.createANDFilter( Filter filter = Filter.createANDFilter(
Filter.createEqualityFilter("cn", groupID), Filter.createEqualityFilter("cn", groupID),
...@@ -306,7 +320,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -306,7 +320,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
{ {
String msg = "Inactive Group not found " + groupID; String msg = "Inactive Group not found " + groupID;
logger.debug(msg); logger.debug(msg);
return null; throw new GroupNotFoundException(msg);
} }
String groupCN = searchResult.getAttributeValue("cn"); String groupCN = searchResult.getAttributeValue("cn");
...@@ -317,35 +331,12 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -317,35 +331,12 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
return new Group(groupCN, owner); return new Group(groupCN, owner);
} }
private Group reactiveGroup(final Group newGroup, final Group inactiveGroup) private Group reactivateGroup(final Group group)
throws UserNotFoundException, LDAPException, TransientException throws UserNotFoundException, LDAPException, TransientException, AccessControlException, GroupNotFoundException
{ {
Group group = reactiveGroup(getGroupDN(newGroup.getID()), newGroup, return modifyGroup(group, true);
inactiveGroup);
Group adminGroup = reactiveGroup(getGroupDN(newGroup.getID()), newGroup,
inactiveGroup);
return group;
} }
private Group reactiveGroup(final DN groupDN, final Group newGroup,
final Group inactiveGroup)
throws UserNotFoundException, LDAPException, TransientException
{
List<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.DELETE, "nsaccountlock"));
Group modifiedGroup = modifyGroup(groupDN, newGroup, inactiveGroup,
mods);
Group activatedGroup = new ActivatedGroup(modifiedGroup.getID(),
modifiedGroup.getOwner());
activatedGroup.description = modifiedGroup.description;
activatedGroup.getProperties().addAll(modifiedGroup.getProperties());
activatedGroup.getGroupMembers().addAll(modifiedGroup.getGroupMembers());
activatedGroup.getUserMembers().addAll(modifiedGroup.getUserMembers());
activatedGroup.getGroupAdmins().addAll(modifiedGroup.getGroupAdmins());
activatedGroup.getUserAdmins().addAll(modifiedGroup.getUserAdmins());
return activatedGroup;
}
/** /**
* Get the group with the given Group ID. * Get the group with the given Group ID.
...@@ -504,7 +495,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -504,7 +495,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
/** /**
* Modify the given group. * Modify the given group.
* *
* @param group The group to update. * @param group The group to update. It must be an existing group
* *
* @return The newly updated group. * @return The newly updated group.
* *
...@@ -517,171 +508,108 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -517,171 +508,108 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
throws GroupNotFoundException, TransientException, throws GroupNotFoundException, TransientException,
AccessControlException, UserNotFoundException AccessControlException, UserNotFoundException
{ {
DN groupDN = getGroupDN(group.getID()); return modifyGroup(group, false);
Group oldGroup = getGroup(groupDN, group.getID(), true);
Group newGroup = modifyGroup(groupDN, group, oldGroup, null);
DN adminGroupDN = getAdminGroupDN(group.getID());
Group oldAdminGroup = getGroup(adminGroupDN, group.getID(), true);
Group newAdminGroup = modifyGroup(adminGroupDN, group, oldAdminGroup,
null);
newGroup.getGroupAdmins().addAll(newAdminGroup.getGroupAdmins());
newGroup.getUserAdmins().addAll(newAdminGroup.getUserAdmins());
return newGroup;
} }
private Group modifyGroup(final DN groupDN, final Group newGroup, private Group modifyGroup(final Group group,
final Group oldGroup, boolean withActivate)
final List<Modification> modifications)
throws UserNotFoundException, TransientException, throws UserNotFoundException, TransientException,
AccessControlException AccessControlException, GroupNotFoundException
{ {
if (!newGroup.getProperties().isEmpty()) if (!group.getProperties().isEmpty())
{ {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Support for groups properties not available"); "Support for groups properties not available");
} }
List<Modification> mods = new ArrayList<Modification>(); // check if group exists
if (modifications != null) if (withActivate)
{
mods.addAll(modifications);
}
if (newGroup.description == null && oldGroup.description != null)
{
mods.add(new Modification(ModificationType.DELETE, "description"));
}
else if (newGroup.description != null && oldGroup.description == null)
{ {
mods.add(new Modification(ModificationType.ADD, "description", getInactiveGroup(group);
newGroup.description));
} }
else if (newGroup.description != null && oldGroup.description != null) else
{ {
mods.add(new Modification(ModificationType.REPLACE, "description", getGroup(group.getID());
newGroup.description));
} }
List<String> newMembers = new ArrayList<String>(); List<Modification> mods = new ArrayList<Modification>();
for (User<?> member : newGroup.getUserMembers()) List<Modification> adminMods = new ArrayList<Modification>();
if (withActivate)
{ {
if (!oldGroup.getUserMembers().remove(member)) mods.add(new Modification(ModificationType.DELETE, "nsaccountlock"));
{ adminMods.add(new Modification(ModificationType.DELETE, "nsaccountlock"));
DN memberDN;
try
{
memberDN = userPersist.getUserDN(member);
}
catch (LDAPException e)
{
throw new UserNotFoundException(
"User not found " + member.getUserID());
}
newMembers.add(memberDN.toNormalizedString());
}
} }
for (Group gr : newGroup.getGroupMembers())
{
if (gr.equals(newGroup))
{
throw new IllegalArgumentException(
"cyclical reference from group member to group");
}
if (!oldGroup.getGroupMembers().remove(gr)) if (group.description == null)
{
DN grDN = getGroupDN(gr.getID());
newMembers.add(grDN.toNormalizedString());
}
}
for (User<?> member : newGroup.getUserAdmins())
{
if (!oldGroup.getUserAdmins().remove(member))
{
DN memberDN;
try
{
memberDN = userPersist.getUserDN(member);
}
catch (LDAPException e)
{
throw new UserNotFoundException(
"User not found " + member.getUserID());
}
newMembers.add(memberDN.toNormalizedString());
}
}
for (Group gr : newGroup.getGroupAdmins())
{ {
if (gr.equals(newGroup)) mods.add(new Modification(ModificationType.REPLACE, "description"));
{
throw new IllegalArgumentException(
"cyclical reference from group member to group");
}
if (!oldGroup.getGroupAdmins().remove(gr))
{
DN grDN = getGroupDN(gr.getID());
newMembers.add(grDN.toNormalizedString());
}
} }
else
if (!newMembers.isEmpty())
{ {
mods.add(new Modification(ModificationType.ADD, "uniquemember", mods.add(new Modification(ModificationType.REPLACE, "description", group.description));
(String[]) newMembers.toArray(new String[newMembers.size()])));
} }
List<String> delMembers = new ArrayList<String>(); List<String> newMembers = new ArrayList<String>();
for (User<?> member : oldGroup.getUserMembers()) for (User<?> member : group.getUserMembers())
{ {
DN memberDN; DN memberDN;
try try
{ {
memberDN = this.userPersist.getUserDN(member); memberDN = userPersist.getUserDN(member);
} }
catch (LDAPException e) catch (LDAPException e)
{ {
throw new UserNotFoundException( throw new UserNotFoundException("User not found "
"User not found " + member.getUserID()); + member.getUserID());
} }
delMembers.add(memberDN.toNormalizedString()); newMembers.add(memberDN.toNormalizedString());
} }
for (Group gr : oldGroup.getGroupMembers()) for (Group gr : group.getGroupMembers())
{ {
DN grDN = getGroupDN(gr.getID()); DN grDN = getGroupDN(gr.getID());
delMembers.add(grDN.toNormalizedString()); newMembers.add(grDN.toNormalizedString());
} }
for (User<?> member : oldGroup.getUserAdmins()) List<String> newAdmins = new ArrayList<String>();
for (User<?> member : group.getUserAdmins())
{ {
DN memberDN; DN memberDN;
try try
{ {
memberDN = this.userPersist.getUserDN(member); memberDN = userPersist.getUserDN(member);
} }
catch (LDAPException e) catch (LDAPException e)
{ {
throw new UserNotFoundException( throw new UserNotFoundException(
"User not found " + member.getUserID()); "User not found " + member.getUserID());
} }
delMembers.add(memberDN.toNormalizedString()); newAdmins.add(memberDN.toNormalizedString());
} }
for (Group gr : oldGroup.getGroupAdmins()) for (Group gr : group.getGroupAdmins())
{ {
DN grDN = getGroupDN(gr.getID()); DN grDN = getGroupDN(gr.getID());
delMembers.add(grDN.toNormalizedString()); newMembers.add(grDN.toNormalizedString());
} }
mods.add(new Modification(ModificationType.REPLACE, "uniquemember",
(String[]) newMembers.toArray(new String[newMembers.size()])));
adminMods.add(new Modification(ModificationType.REPLACE, "uniquemember",
(String[]) newAdmins.toArray(new String[newAdmins.size()])));
if (!delMembers.isEmpty()) // modify admin group first
ModifyRequest modifyRequest = new ModifyRequest(getAdminGroupDN(group.getID()), adminMods);
try
{ {
mods.add(new Modification(ModificationType.DELETE, "uniquemember", modifyRequest.addControl(
(String[]) delMembers.toArray(new String[delMembers.size()]))); new ProxiedAuthorizationV2RequestControl(
"dn:" + getSubjectDN().toNormalizedString()));
LDAPResult result = getConnection().modify(modifyRequest);
} }
catch (LDAPException e1)
ModifyRequest modifyRequest = new ModifyRequest(groupDN, mods); {
throw new RuntimeException("LDAP problem", e1);
}
// modify the group itself now
modifyRequest = new ModifyRequest(getGroupDN(group.getID()), mods);
try try
{ {
modifyRequest.addControl( modifyRequest.addControl(
...@@ -695,12 +623,19 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -695,12 +623,19 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
} }
try try
{ {
return getGroup(newGroup.getID()); if (withActivate)
{
return new ActivatedGroup(getGroup(group.getID()));
}
else
{
return getGroup(group.getID());
}
} }
catch (GroupNotFoundException e) catch (GroupNotFoundException e)
{ {
throw new RuntimeException( throw new RuntimeException(
"BUG: modified group not found (" + groupDN + ")"); "BUG: modified group not found (" + group.getID() + ")");
} }
} }
......
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
+ 0
− 9
View file @ 79dc8a3a
...@@ -457,15 +457,6 @@ public class LdapGroupDAOTest ...@@ -457,15 +457,6 @@ public class LdapGroupDAOTest
public Object run() throws Exception public Object run() throws Exception
{ {
getGroupDAO().addGroup(new Group(groupID, daoTestUser1)); getGroupDAO().addGroup(new Group(groupID, daoTestUser1));
// try
// {
// getGroupDAO().modifyGroup(new Group(groupID, unknownUser));
// fail("modifyGroup with unknown user should throw " +
// "UserNotFoundException");
// }
// catch (UserNotFoundException ignore) {}
try try
{ {
getGroupDAO().modifyGroup(new Group("foo", daoTestUser1)); getGroupDAO().modifyGroup(new Group("foo", daoTestUser1));
......
projects/cadcAccessControl/src/ca/nrc/cadc/ac/ActivatedGroup.java
+ 9
− 10
View file @ 79dc8a3a
...@@ -68,19 +68,18 @@ ...@@ -68,19 +68,18 @@
*/ */
package ca.nrc.cadc.ac; package ca.nrc.cadc.ac;
import java.security.Principal;
public class ActivatedGroup extends Group public class ActivatedGroup extends Group
{ {
public ActivatedGroup(Group group)
public ActivatedGroup(String groupID)
{
super(groupID);
}
public ActivatedGroup(String groupID, User<? extends Principal> owner)
{ {
super(groupID, owner); super(group.getID(), group.getOwner());
this.description = group.description;
this.properties = group.getProperties();
this.lastModified = group.lastModified;
this.getUserMembers().addAll(group.getUserMembers());
this.getGroupMembers().addAll(group.getGroupMembers());
this.getUserAdmins().addAll(group.getUserAdmins());
this.getGroupAdmins().addAll(group.getGroupAdmins());
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment