From 48d6dd158fda2b54d617e43d83f789a23c8bb21e Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <Dustin.Jenkins@nrc-cnrc.gc.ca>
Date: Fri, 13 Feb 2015 13:57:26 -0800
Subject: [PATCH] Story 1736: Fix for tests and create/get groups.
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 4 +++-
projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java | 9 ++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index f9293855..33eebfbc 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -83,6 +83,7 @@ import org.apache.log4j.Logger;
import ca.nrc.cadc.ac.PersonalDetails;
import ca.nrc.cadc.ac.User;
import ca.nrc.cadc.ac.UserNotFoundException;
+import ca.nrc.cadc.auth.AuthenticationUtil;
import ca.nrc.cadc.auth.HttpPrincipal;
import ca.nrc.cadc.net.TransientException;
@@ -407,7 +408,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
}
searchField = "(" + searchField + "=" +
- user.getUserID().getName() + ")";
+ AuthenticationUtil.canonizeDistinguishedName(
+ user.getUserID().getName()) + ")";
SearchResultEntry searchResult = null;
try
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
index 22f609ad..308552ef 100644
--- a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
+++ b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
@@ -72,6 +72,9 @@ import java.security.Principal;
import java.util.HashSet;
import java.util.Set;
+import ca.nrc.cadc.auth.AuthenticationUtil;
+
+
public class User<T extends Principal>
{
private T userID;
@@ -130,11 +133,7 @@ public class User<T extends Principal>
return false;
}
User other = (User) obj;
- if (!userID.equals(other.userID))
- {
- return false;
- }
- return true;
+ return AuthenticationUtil.equals(userID, other.userID);
}
@Override
--
GitLab