diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java index d525d5a77..080d4871b 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java @@ -16,13 +16,13 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; - + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.base.CMSResourceService; @@ -32,20 +32,20 @@ import com.netscape.cmsutil.ldap.LDAPUtil; /** * @author alee - * + * */ public class KeysResourceService extends CMSResourceService implements KeysResource { /** * Used to generate list of key infos based on the search parameters */ - public KeyDataInfos listKeys(String clientID, String status, int maxResults, int maxTime) { + public KeyDataInfos listKeys(String clientID, String status, int maxResults, int maxTime) { // auth and authz - + // get ldap filter String filter = createSearchFilter(status, clientID); CMS.debug("listKeys: filter is " + filter); - + KeyDAO dao = new KeyDAO(); KeyDataInfos infos; try { @@ -56,30 +56,30 @@ public class KeysResourceService extends CMSResourceService implements KeysResou } return infos; } - + private String createSearchFilter(String status, String clientID) { String filter = ""; int matches = 0; - + if ((status == null) && (clientID == null)) { filter = "(serialno=*)"; return filter; } - + if (status != null) { filter += "(status=" + LDAPUtil.escape(status) + ")"; matches ++; } - + if (clientID != null) { filter += "(clientID=" + LDAPUtil.escape(clientID) + ")"; matches ++; } - + if (matches > 1) { filter = "(&" + filter + ")"; } - + return filter; } |