summaryrefslogtreecommitdiffstats
path: root/pki/base/kra/functional/src/com/netscape
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/kra/functional/src/com/netscape')
-rw-r--r--pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java13
-rw-r--r--pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java28
2 files changed, 22 insertions, 19 deletions
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
index eaf6b98dd..51cead47b 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
+++ b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
@@ -5,6 +5,9 @@ import java.util.Iterator;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.client.ProxyFactory;
+
+import com.netscape.certsrv.dbs.keydb.KeyId;
+import com.netscape.certsrv.request.RequestId;
import com.netscape.cms.servlet.admin.SystemCertificateResource;
import com.netscape.cms.servlet.cert.model.CertificateData;
import com.netscape.cms.servlet.key.KeyResource;
@@ -45,7 +48,9 @@ public class DRMRestClient {
}
public Collection<KeyRequestInfo> listRequests(String requestState, String requestType) {
- KeyRequestInfos infos = keyRequestsClient.listRequests(requestState, requestType, null, "0", 100, 100, 10);
+ KeyRequestInfos infos = keyRequestsClient.listRequests(
+ requestState, requestType, null, new RequestId(0), 100, 100, 10
+ );
Collection<KeyRequestInfo> list = infos.getRequests();
return list;
}
@@ -77,7 +82,7 @@ public class DRMRestClient {
return null;
}
- public KeyRequestInfo requestRecovery(String keyId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
+ public KeyRequestInfo requestRecovery(KeyId keyId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
// create recovery request
RecoveryRequestData data = new RecoveryRequestData();
data.setKeyId(keyId);
@@ -96,11 +101,11 @@ public class DRMRestClient {
return info;
}
- public void approveRecovery(String recoveryId) {
+ public void approveRecovery(RequestId recoveryId) {
keyRequestClient.approveRequest(recoveryId);
}
- public KeyData retrieveKey(String keyId, String requestId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
+ public KeyData retrieveKey(KeyId keyId, RequestId requestId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
// create recovery request
RecoveryRequestData data = new RecoveryRequestData();
data.setKeyId(keyId);
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
index 368cb7282..8020ec2ca 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
+++ b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
@@ -38,6 +38,8 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import com.netscape.certsrv.dbs.keydb.KeyId;
+import com.netscape.certsrv.request.RequestId;
import com.netscape.cms.servlet.base.CMSResourceService;
import com.netscape.cms.servlet.key.model.KeyData;
import com.netscape.cms.servlet.key.model.KeyDataInfo;
@@ -134,9 +136,9 @@ public class DRMTest {
String recoveredKey = null;
// various ids used in recovery/archival operations
- String keyId = null;
+ KeyId keyId = null;
String clientId = null;
- String recoveryRequestId = null;
+ RequestId recoveryRequestId = null;
// Variables for data structures from calls
KeyRequestInfo requestInfo = null;
@@ -218,7 +220,7 @@ public class DRMTest {
KeyRequestInfo info = client.archiveSecurityData(encoded, clientId, KeyRequestResource.SYMMETRIC_KEY_TYPE);
log("Archival Results:");
printRequestInfo(info);
- keyId = getId(info.getKeyURL());
+ keyId = info.getKeyId();
} catch (Exception e) {
log("Exception in archiving symmetric key:" + e.getMessage());
e.printStackTrace();
@@ -228,7 +230,7 @@ public class DRMTest {
log("Getting key ID for symmetric key");
keyInfo = client.getKeyData(clientId, "active");
- String keyId2 = getId(keyInfo.getKeyURL());
+ KeyId keyId2 = keyInfo.getKeyId();
if (keyId2 == null) {
log("No archived key found");
} else {
@@ -247,7 +249,7 @@ public class DRMTest {
recoveryKey = CryptoUtil.generateKey(token, KeyGenAlgorithm.DES3);
wrappedRecoveryKey = CryptoUtil.wrapSymmetricKey(manager, token, transportCert, recoveryKey);
KeyRequestInfo info = client.requestRecovery(keyId, null, wrappedRecoveryKey, ivps.getIV());
- recoveryRequestId = getId(info.getRequestURL());
+ recoveryRequestId = info.getRequestId();
} catch (Exception e) {
log("Exception in recovering symmetric key using session key: " + e.getMessage());
}
@@ -289,7 +291,7 @@ public class DRMTest {
wrappedRecoveryKey = CryptoUtil.wrapSymmetricKey(manager, token, transportCert, recoveryKey);
requestInfo = client.requestRecovery(keyId, wrappedRecoveryPassphrase, wrappedRecoveryKey, ivps.getIV());
- recoveryRequestId = getId(requestInfo.getRequestURL());
+ recoveryRequestId = requestInfo.getRequestId();
} catch (Exception e) {
log("Exception in recovering symmetric key using passphrase" + e.toString());
e.printStackTrace();
@@ -327,7 +329,7 @@ public class DRMTest {
requestInfo = client.archiveSecurityData(encoded, clientId, KeyRequestResource.PASS_PHRASE_TYPE);
log("Archival Results:");
printRequestInfo(requestInfo);
- keyId = getId(requestInfo.getKeyURL());
+ keyId = requestInfo.getKeyId();
} catch (Exception e) {
log("Exception in archiving symmetric key:" + e.toString());
e.printStackTrace();
@@ -336,7 +338,7 @@ public class DRMTest {
//Test 13: Get keyId for active passphrase with client ID
log("Getting key ID for passphrase");
keyInfo = client.getKeyData(clientId, "active");
- keyId2 = getId(keyInfo.getKeyURL());
+ keyId2 = keyInfo.getKeyId();
if (keyId2 == null) {
log("No archived key found");
} else {
@@ -360,7 +362,7 @@ public class DRMTest {
wrappedRecoveryPassphrase = CryptoUtil.wrapPassphrase(token, recoveryPassphrase, ivps, recoveryKey,
EncryptionAlgorithm.DES3_CBC_PAD);
requestInfo = client.requestRecovery(keyId, null, wrappedRecoveryKey, ivps.getIV());
- recoveryRequestId = getId(requestInfo.getRequestURL());
+ recoveryRequestId = requestInfo.getRequestId();
} catch (Exception e) {
log("Exception in recovering passphrase using session key: " + e.getMessage());
}
@@ -394,7 +396,7 @@ public class DRMTest {
// Test 17: Submit a recovery request for the passphrase using a passphrase
log("Submitting a recovery request for the passphrase using a passphrase");
requestInfo = client.requestRecovery(keyId, wrappedRecoveryPassphrase, wrappedRecoveryKey, ivps.getIV());
- recoveryRequestId = getId(requestInfo.getRequestURL());
+ recoveryRequestId = requestInfo.getRequestId();
//Test 18: Approve recovery
log("Approving recovery request: " + recoveryRequestId);
@@ -423,7 +425,7 @@ public class DRMTest {
log("Submitting a recovery request for the passphrase using a passphrase, wait till end to provide recovery data.");
requestInfo = client.requestRecovery(keyId, null, null, null);
- recoveryRequestId = getId(requestInfo.getRequestURL());
+ recoveryRequestId = requestInfo.getRequestId();
//Test 21: Approve recovery
log("Approving recovery request: " + recoveryRequestId);
@@ -453,10 +455,6 @@ public class DRMTest {
System.out.println(string);
}
- private static String getId(String link) {
- return link.substring(link.lastIndexOf("/") + 1);
- }
-
private static void printRequestInfo(KeyRequestInfo info) {
log("KeyRequestURL: " + info.getRequestURL());
log("Key URL: " + info.getKeyURL());
generated by cgit (git 2.34.1) at 2024-05-22 19:25:34 +0000