From 2f730b62e589cd829c5fcb021a2a92d436073eac Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Sat, 16 Apr 2016 14:19:50 -0400 Subject: Added realm to methods for listing requests and keys 1. Added query parameters for the realm. If a realm is specified, then only the key requests and keys associated with the realm are returned. If no realm is specified, then only those requests and keys without a realm are returned. 2. Added parameters to keyClient and the CLI Part of Trac Ticket #2041 --- .../cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java') diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java index 931ade159..ccf84cafa 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java +++ b/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java @@ -27,6 +27,7 @@ import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.IAuthzSubsystem; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.request.CMSRequestInfo; import com.netscape.certsrv.request.CMSRequestInfos; @@ -44,6 +45,7 @@ import com.netscape.certsrv.request.RequestId; public abstract class CMSRequestDAO { protected IRequestQueue queue; protected IAuthority authority; + protected IAuthzSubsystem authz = (IAuthzSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_AUTHZ); private String[] vlvFilters = { "(requeststate=*)", "(requesttype=enrollment)", @@ -78,6 +80,7 @@ public abstract class CMSRequestDAO { * @param maxResults - max results to be returned in normal search * @param maxTime - max time for normal search * @param uriInfo - uri context of request + * @param authToken - auth token for the request * @return collection of key request info * @throws EBaseException */ @@ -130,6 +133,9 @@ public abstract class CMSRequestDAO { if (params.containsKey("requestType")) { builder.queryParam("requestType", params.getFirst("requestType")); } + if (params.containsKey("realm")) { + builder.queryParam("realm", params.getFirst("realm")); + } builder.queryParam("start", "{start}"); builder.queryParam("pageSize", "{pageSize}"); -- cgit