reame client_id to client_key_id

3 files changed, 35 insertions, 35 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
index b19f92b64..308d3daf8 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
@@ -136,13 +136,13 @@ public class KeyRequestDAO extends CMSRequestDAO {
      * @throws EBaseException
      */
     public KeyRequestResponse submitRequest(KeyArchivalRequest data, UriInfo uriInfo) throws EBaseException {
-        String clientId = data.getClientId();
+        String clientKeyId = data.getClientKeyId();
         String wrappedSecurityData = data.getWrappedPrivateData();
         String dataType = data.getDataType();
         String keyAlgorithm = data.getKeyAlgorithm();
         int keyStrength = data.getKeySize();
 
-        boolean keyExists = doesKeyExist(clientId, "active", uriInfo);
+        boolean keyExists = doesKeyExist(clientKeyId, "active", uriInfo);
 
         if (keyExists == true) {
             throw new EBaseException("Can not archive already active existing key!");
@@ -151,7 +151,7 @@ public class KeyRequestDAO extends CMSRequestDAO {
         IRequest request = queue.newRequest(IRequest.SECURITY_DATA_ENROLLMENT_REQUEST);
 
         request.setExtData(REQUEST_ARCHIVE_OPTIONS, wrappedSecurityData);
-        request.setExtData(IRequest.SECURITY_DATA_CLIENT_ID, clientId);
+        request.setExtData(IRequest.SECURITY_DATA_CLIENT_KEY_ID, clientKeyId);
         request.setExtData(IRequest.SECURITY_DATA_TYPE, dataType);
         request.setExtData(IRequest.SECURITY_DATA_STRENGTH,
                 (keyStrength > 0) ? Integer.toString(keyStrength) : Integer.toString(0));
@@ -215,16 +215,16 @@ public class KeyRequestDAO extends CMSRequestDAO {
     }
 
     public KeyRequestResponse submitRequest(SymKeyGenerationRequest data, UriInfo uriInfo) throws EBaseException {
-        String clientId = data.getClientId();
+        String clientKeyId = data.getClientKeyId();
         String algName = data.getKeyAlgorithm();
         Integer keySize = data.getKeySize();
         List<String> usages = data.getUsages();
 
-        if (StringUtils.isBlank(clientId)) {
+        if (StringUtils.isBlank(clientKeyId)) {
             throw new BadRequestException("Invalid key generation request. Missing client ID");
         }
 
-        boolean keyExists = doesKeyExist(clientId, "active", uriInfo);
+        boolean keyExists = doesKeyExist(clientKeyId, "active", uriInfo);
         if (keyExists == true) {
             throw new BadRequestException("Can not archive already active existing key!");
         }
@@ -259,7 +259,7 @@ public class KeyRequestDAO extends CMSRequestDAO {
         request.setExtData(IRequest.SECURITY_DATA_ALGORITHM, algName);
 
         request.setExtData(IRequest.SYMKEY_GEN_USAGES, StringUtils.join(usages, ","));
-        request.setExtData(IRequest.SECURITY_DATA_CLIENT_ID, clientId);
+        request.setExtData(IRequest.SECURITY_DATA_CLIENT_KEY_ID, clientKeyId);
 
         queue.processRequest(request);
         queue.markAsServiced(request);
@@ -331,9 +331,9 @@ public class KeyRequestDAO extends CMSRequestDAO {
     }
 
     //We only care if the key exists or not
-    private boolean doesKeyExist(String clientId, String keyStatus, UriInfo uriInfo) {
+    private boolean doesKeyExist(String clientKeyId, String keyStatus, UriInfo uriInfo) {
         String state = "active";
-        String filter = "(&(" + IRequest.SECURITY_DATA_CLIENT_ID + "=" + clientId + ")"
+        String filter = "(&(" + IRequest.SECURITY_DATA_CLIENT_KEY_ID + "=" + clientKeyId + ")"
                 + "(" + IRequest.SECURITY_DATA_STATUS + "=" + state + "))";
         try {
             Enumeration<IKeyRecord> existingKeys = null;
diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
index 31dd2c0aa..520ae4c5a 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
@@ -332,19 +332,19 @@ public class KeyService extends PKIService implements KeyResource {
      * Used to generate list of key infos based on the search parameters
      */
     @Override
-    public Response listKeys(String clientID, String status, Integer maxResults, Integer maxTime,
+    public Response listKeys(String clientKeyID, String status, Integer maxResults, Integer maxTime,
             Integer start, Integer size) {
-        return createOKResponse(listKeyInfos(clientID, status, maxResults, maxTime, start, size));
+        return createOKResponse(listKeyInfos(clientKeyID, status, maxResults, maxTime, start, size));
     }
 
-    public KeyInfoCollection listKeyInfos(String clientID, String status, Integer maxResults, Integer maxTime,
+    public KeyInfoCollection listKeyInfos(String clientKeyID, String status, Integer maxResults, Integer maxTime,
             Integer start, Integer size) {
 
         start = start == null ? 0 : start;
         size = size == null ? DEFAULT_SIZE : size;
 
         // get ldap filter
-        String filter = createSearchFilter(status, clientID);
+        String filter = createSearchFilter(status, clientKeyID);
         CMS.debug("listKeys: filter is " + filter);
 
         maxResults = maxResults == null ? DEFAULT_MAXRESULTS : maxResults;
@@ -392,10 +392,10 @@ public class KeyService extends PKIService implements KeyResource {
     }
 
     @Override
-    public Response getActiveKeyInfo(String clientID) {
+    public Response getActiveKeyInfo(String clientKeyID) {
 
         KeyInfoCollection infos = listKeyInfos(
-                clientID,
+                clientKeyID,
                 "active",
                 null,
                 null,
@@ -419,7 +419,7 @@ public class KeyService extends PKIService implements KeyResource {
 
     public KeyInfo createKeyDataInfo(IKeyRecord rec) throws EBaseException {
         KeyInfo ret = new KeyInfo();
-        ret.setClientID(rec.getClientId());
+        ret.setClientKeyID(rec.getClientId());
         ret.setStatus(rec.getKeyStatus());
         ret.setAlgorithm(rec.getAlgorithm());
         ret.setSize(rec.getKeySize());
@@ -435,11 +435,11 @@ public class KeyService extends PKIService implements KeyResource {
         return ret;
     }
 
-    private String createSearchFilter(String status, String clientID) {
+    private String createSearchFilter(String status, String clientKeyID) {
         String filter = "";
         int matches = 0;
 
-        if ((status == null) && (clientID == null)) {
+        if ((status == null) && (clientKeyID == null)) {
             filter = "(serialno=*)";
             return filter;
         }
@@ -449,8 +449,8 @@ public class KeyService extends PKIService implements KeyResource {
             matches ++;
         }
 
-        if (clientID != null) {
-            filter += "(clientID=" + LDAPUtil.escapeFilter(clientID) + ")";
+        if (clientKeyID != null) {
+            filter += "(clientID=" + LDAPUtil.escapeFilter(clientKeyID) + ")";
             matches ++;
         }
 
diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
index b85978a34..dd27c2ac7 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
@@ -162,7 +162,7 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
         // auth and authz
         // Catch this before internal server processing has to deal with it
 
-        if (data == null || data.getClientId() == null
+        if (data == null || data.getClientKeyId() == null
                 || data.getWrappedPrivateData() == null
                 || data.getDataType() == null) {
             throw new BadRequestException("Invalid key archival request.");
@@ -179,13 +179,13 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
         KeyRequestResponse response;
         try {
             response = dao.submitRequest(data, uriInfo);
-            auditArchivalRequestMade(response.getRequestInfo().getRequestId(), ILogger.SUCCESS, data.getClientId());
+            auditArchivalRequestMade(response.getRequestInfo().getRequestId(), ILogger.SUCCESS, data.getClientKeyId());
 
             return createCreatedResponse(response, new URI(response.getRequestInfo().getRequestURL()));
 
         } catch (EBaseException | URISyntaxException e) {
             e.printStackTrace();
-            auditArchivalRequestMade(null, ILogger.FAILURE, data.getClientId());
+            auditArchivalRequestMade(null, ILogger.FAILURE, data.getClientKeyId());
             throw new PKIException(e.toString());
         }
     }
@@ -318,12 +318,12 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
      * Used to generate list of key requests based on the search parameters
      */
     @Override
-    public Response listRequests(String requestState, String requestType, String clientID,
+    public Response listRequests(String requestState, String requestType, String clientKeyID,
             RequestId start, Integer pageSize, Integer maxResults, Integer maxTime) {
         // auth and authz
 
         // get ldap filter
-        String filter = createSearchFilter(requestState, requestType, clientID);
+        String filter = createSearchFilter(requestState, requestType, clientKeyID);
         CMS.debug("listRequests: filter is " + filter);
 
         start = start == null ? new RequestId(KeyRequestService.DEFAULT_START) : start;
@@ -343,11 +343,11 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
         return createOKResponse(requests);
     }
 
-    private String createSearchFilter(String requestState, String requestType, String clientID) {
+    private String createSearchFilter(String requestState, String requestType, String clientKeyID) {
         String filter = "";
         int matches = 0;
 
-        if ((requestState == null) && (requestType == null) && (clientID == null)) {
+        if ((requestState == null) && (requestType == null) && (clientKeyID == null)) {
             filter = "(requeststate=*)";
             return filter;
         }
@@ -362,8 +362,8 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
             matches ++;
         }
 
-        if (clientID != null) {
-            filter += "(clientID=" + LDAPUtil.escapeFilter(clientID) + ")";
+        if (clientKeyID != null) {
+            filter += "(clientID=" + LDAPUtil.escapeFilter(clientKeyID) + ")";
             matches ++;
         }
 
@@ -394,23 +394,23 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
         auditor.log(msg);
     }
 
-    public void auditArchivalRequestMade(RequestId requestId, String status, String clientId) {
+    public void auditArchivalRequestMade(RequestId requestId, String status, String clientKeyID) {
         String msg = CMS.getLogMessage(
                 LOGGING_SIGNED_AUDIT_SECURITY_DATA_ARCHIVAL_REQUEST,
                 servletRequest.getUserPrincipal().getName(),
                 status,
                 requestId != null? requestId.toString(): "null",
-                clientId);
+                clientKeyID);
         auditor.log(msg);
     }
 
-    public void auditSymKeyGenRequestMade(RequestId requestId, String status, String clientId) {
+    public void auditSymKeyGenRequestMade(RequestId requestId, String status, String clientKeyID) {
         String msg = CMS.getLogMessage(
                 LOGGING_SIGNED_AUDIT_SYMKEY_GENERATION_REQUEST,
                 servletRequest.getUserPrincipal().getName(),
                 status,
                 requestId != null ? requestId.toString() : "null",
-                clientId);
+                clientKeyID);
         auditor.log(msg);
     }
 
@@ -452,13 +452,13 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
         try {
             response = dao.submitRequest(data, uriInfo);
             auditSymKeyGenRequestMade(response.getRequestInfo().getRequestId(), ILogger.SUCCESS,
-                    data.getClientId());
+                    data.getClientKeyId());
 
             return createCreatedResponse(response, new URI(response.getRequestInfo().getRequestURL()));
 
         } catch (EBaseException | URISyntaxException e) {
             e.printStackTrace();
-            auditArchivalRequestMade(null, ILogger.FAILURE, data.getClientId());
+            auditArchivalRequestMade(null, ILogger.FAILURE, data.getClientKeyId());
             throw new PKIException(e.toString());
         }
     }