summaryrefslogtreecommitdiffstats
path: root/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java
diff options
context:
space:
mode:
Diffstat (limited to 'base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java')
-rw-r--r--base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java20
1 files changed, 14 insertions, 6 deletions
diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java
index a67ce08a5..81ebe3e88 100644
--- a/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java
+++ b/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java
@@ -34,8 +34,6 @@ import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import netscape.security.x509.X509CertImpl;
-
import org.mozilla.jss.crypto.SymmetricKey;
import com.netscape.certsrv.apps.CMS;
@@ -65,6 +63,8 @@ import com.netscape.cms.servlet.key.KeyRequestDAO;
import com.netscape.cmsutil.ldap.LDAPUtil;
import com.netscape.cmsutil.util.Utils;
+import netscape.security.x509.X509CertImpl;
+
/**
* @author alee
*
@@ -321,11 +321,11 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
*/
@Override
public Response listRequests(String requestState, String requestType, String clientKeyID,
- RequestId start, Integer pageSize, Integer maxResults, Integer maxTime) {
+ RequestId start, Integer pageSize, Integer maxResults, Integer maxTime, String realm) {
// auth and authz
// get ldap filter
- String filter = createSearchFilter(requestState, requestType, clientKeyID);
+ String filter = createSearchFilter(requestState, requestType, clientKeyID, realm);
CMS.debug("listRequests: filter is " + filter);
start = start == null ? new RequestId(KeyRequestService.DEFAULT_START) : start;
@@ -345,13 +345,13 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
return createOKResponse(requests);
}
- private String createSearchFilter(String requestState, String requestType, String clientKeyID) {
+ private String createSearchFilter(String requestState, String requestType, String clientKeyID, String realm) {
String filter = "";
int matches = 0;
if ((requestState == null) && (requestType == null) && (clientKeyID == null)) {
filter = "(requeststate=*)";
- return filter;
+ matches ++;
}
if (requestState != null) {
@@ -369,6 +369,14 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
matches ++;
}
+ if (realm != null) {
+ filter += "(realm=" + LDAPUtil.escapeFilter(realm) + ")";
+ matches++;
+ } else {
+ filter += "(!(realm=*))";
+ matches++;
+ }
+
if (matches > 1) {
filter = "(&" + filter + ")";
}