isGroupMember shouldn't care about case of full dn (#171)

broadinstitute · Jun 15, 2018 · d46d3ef · d46d3ef
1 parent 99af22d
commit d46d3ef
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/directory/LdapDirectoryDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/directory/LdapDirectoryDAO.scala
@@ -105,7 +105,8 @@ class LdapDirectoryDAO(protected val ldapConnectionPool: LDAPConnectionPool, pro
       entry <- Option(ldapConnectionPool.getEntry(subjectDn(member), Attr.memberOf))
       memberOf <- Option(entry.getAttribute(Attr.memberOf))
     } yield {
-      memberOf.getValues.contains(groupDn(groupId))
+      val memberships = memberOf.getValues.toSet.map(dnToGroupIdentity)
+      memberships.contains(groupId)
     }
     isMember.getOrElse(false)
   }