diff options
author | Endi S. Dewata <edewata@redhat.com> | 2014-05-01 18:37:05 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2014-05-08 22:59:05 -0400 |
commit | 45c80df9cfcc26d251be2eb50d787dcecd40f388 (patch) | |
tree | 4ae1a9ec22048a5b13a9b3b3057b2c8b394db283 /base/server/cms/src | |
parent | e03bff7807bf7043cf396bd0d383e13e46c211ed (diff) | |
download | pki-45c80df9cfcc26d251be2eb50d787dcecd40f388.tar.gz pki-45c80df9cfcc26d251be2eb50d787dcecd40f388.tar.xz pki-45c80df9cfcc26d251be2eb50d787dcecd40f388.zip |
Replace filter in UGSubsystem.listGroups().
The UGSubsystem.listGroups() has been modified to generate an
LDAP filter from a keyword. The filter itself cannot contain
wildcards. The wildcard will be added in listGroups(). In the
future the filter will be made configurable to allow searching
different attributes.
Ticket #920
Diffstat (limited to 'base/server/cms/src')
3 files changed, 6 insertions, 5 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java index ff56c2139..78f602acd 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java @@ -300,7 +300,7 @@ public class GroupMemberProcessor extends Processor { } try { - Enumeration<IGroup> groups = userGroupManager.listGroups("*"); + Enumeration<IGroup> groups = userGroupManager.listGroups(null); while (groups.hasMoreElements()) { IGroup group = groups.nextElement(); String name = group.getName(); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index c4eed9068..836369bc4 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -555,7 +555,7 @@ public class UsrGrpAdminServlet extends AdminServlet { Enumeration<IGroup> e = null; try { - e = mMgr.listGroups("*"); + e = mMgr.listGroups(null); } catch (Exception ex) { ex.printStackTrace(); sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_INTERNAL_ERROR"), null, resp); @@ -2068,6 +2068,9 @@ public class UsrGrpAdminServlet extends AdminServlet { return false; } + /** + * TODO: replace this with GroupMemberProcessor.isDuplicate() + */ private boolean isDuplicate(String groupName, String memberName) { Enumeration<IGroup> groups = null; @@ -2082,7 +2085,7 @@ public class UsrGrpAdminServlet extends AdminServlet { return false; } try { - groups = mMgr.listGroups("*"); + groups = mMgr.listGroups(null); while (groups.hasMoreElements()) { IGroup group = groups.nextElement(); String name = group.getName(); diff --git a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java index 365326315..fdfbbd966 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java @@ -51,7 +51,6 @@ import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.cms.servlet.admin.GroupMemberProcessor; import com.netscape.cms.servlet.base.PKIService; -import com.netscape.cmsutil.ldap.LDAPUtil; /** * @author Endi S. Dewata @@ -104,7 +103,6 @@ public class GroupService extends PKIService implements GroupResource { @Override public Response findGroups(String filter, Integer start, Integer size) { try { - filter = StringUtils.isEmpty(filter) ? "*" : "*"+LDAPUtil.escapeFilter(filter)+"*"; start = start == null ? 0 : start; size = size == null ? DEFAULT_SIZE : size; |