summaryrefslogtreecommitdiffstats
path: root/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/silent/src/com/netscape/pkisilent/common/Request.java')
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/Request.java151
1 files changed, 75 insertions, 76 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
index 9ddc99702..0cb085776 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
@@ -1,4 +1,5 @@
package com.netscape.pkisilent.common;
+
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -17,21 +18,17 @@ package com.netscape.pkisilent.common;
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-
import java.net.URLEncoder;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Vector;
-
-
/**
* CMS Test framework .
* Submits List,Approve,Reject,cancel requests to agent port
*/
-
public class Request extends TestClient {
private String validityperiod;
@@ -63,18 +60,19 @@ public class Request extends TestClient {
/**
* Constructor . Takes the parameter for Properties file name
- * @param propfileName name of the parameter file.
+ *
+ * @param propfileName name of the parameter file.
*/
-
public Request(String pfile) {
propfileName = pfile;
}
/**
- * Constructor . Takes the parameter host , port and "angent type - ca/ra"
+ * Constructor . Takes the parameter host , port and "angent type - ca/ra"
+ *
* @param hostname.
- * @param port
+ * @param port
* @param agenttype Whether ca or ra agent
*/
@@ -85,9 +83,10 @@ public class Request extends TestClient {
}
/**
- * Constructor . Takes the following parmaters
- * @param hostName .
- * @param port
+ * Constructor . Takes the following parmaters
+ *
+ * @param hostName .
+ * @param port
* @param adminuid
* @param adminpwd
* @param agentcertnickname
@@ -97,13 +96,12 @@ public class Request extends TestClient {
* @param ApproveSequenceNumberFrom
* @param ApproveSequnceNumberTo
* @param type
- * @param reqtype enrollment/revoked
- * @param requestState complete/pending
- * @param agentType ra/ca
- * @param trustedManager true/false
+ * @param reqtype enrollment/revoked
+ * @param requestState complete/pending
+ * @param agentType ra/ca
+ * @param trustedManager true/false
*/
-
public Request(String h, String p, String aid, String apwd, String cname, String cd, String ctpwd, String snum, String sfrom, String sto, String ty, String rty, String rstate, String aty, String tm) {
host = h;
ports = p;
@@ -142,7 +140,7 @@ public class Request extends TestClient {
}
/**
- * Set Agent Cert nick name
+ * Set Agent Cert nick name
*/
public void setAgentCertName(String s) {
certnickname = s;
@@ -150,7 +148,8 @@ public class Request extends TestClient {
/**
* List all pending enrollment request. Takes parameters fromRequestNumber,toRequestNumber
- * @param fromrequest number
+ *
+ * @param fromrequest number
* @param endrequestnumber.
*/
@@ -165,11 +164,11 @@ public class Request extends TestClient {
/**
* List all pending request. Takes parameters fromRequestNumber,toRequestNumber
- * @param fromrequest number
+ *
+ * @param fromrequest number
* @param endrequestnumber.
*/
-
public Vector<String> ListAllRequests(String fromRequestNumber, String toRequestNumber) {
reqState = "showAll";
reqType = "enrollment";
@@ -181,10 +180,10 @@ public class Request extends TestClient {
/**
* Approve pending enrollment request. Takes parameters RequestNumber
- * @param request number
+ *
+ * @param request number
*/
-
public int ApproveRequests(String requestNumber) {
reqState = "showWaiting";
reqType = "enrollment";
@@ -202,7 +201,8 @@ public class Request extends TestClient {
/**
* Approve profile based pending enrollment request. Takes parameters RequestNumber
- * @param request number
+ *
+ * @param request number
*/
public int ApproveProfileRequests(String RequestNumber) {
@@ -222,7 +222,7 @@ public class Request extends TestClient {
}
public boolean Approve_cadualcert_Profile_Request(String RequestNumber, String name) {
-
+
approveseqnum = RequestNumber;
approveseqnumFrom = RequestNumber;
approveseqnumTo = RequestNumber;
@@ -237,7 +237,7 @@ public class Request extends TestClient {
buildquery();
- if (!Send()) {
+ if (!Send()) {
System.out.println("Error: Approving request " + approveseqnum);
return false;
}
@@ -248,10 +248,10 @@ public class Request extends TestClient {
/**
* Reject profile based pending enrollment request. Takes parameters RequestNumber
- * @param request number
+ *
+ * @param request number
*/
-
public int RejectProfileRequests(String RequestNumber) {
approveseqnum = RequestNumber;
@@ -270,7 +270,8 @@ public class Request extends TestClient {
/**
* Cancel profile based pending enrollment request. Takes parameters RequestNumber
- * @param request number
+ *
+ * @param request number
*/
public int CancelProfileRequests(String RequestNumber) {
@@ -354,14 +355,14 @@ public class Request extends TestClient {
AUTH_ID = res.substring(ret + AUTHID.length() + 1,
res.indexOf(";", ret) - 1);
while (ret > 0) {
- if ((ret = res.indexOf(seqnum, ret)) > -1) {
- int bi = ret + seqnum.length() + 2;
+ if ((ret = res.indexOf(seqnum, ret)) > -1) {
+ int bi = ret + seqnum.length() + 2;
int be = res.indexOf(";", ret) - 1;
seqNum.addElement(res.substring(bi, be));
ret++;
- }
-
+ }
+
}
}
@@ -481,7 +482,6 @@ public class Request extends TestClient {
}
// System.out.println("Debug : Retrieving cert details ");
-
ret = res.indexOf("header.ext_ssl_client =");
if (ret > 0) {
clientcert = res.substring(
@@ -587,17 +587,17 @@ public class Request extends TestClient {
"requestStatus")) {
i = t;
break;
- }
+ }
}
-
+
String req = "header.SERVER_ATTRS[" + i + "].value=";
ret = res.indexOf(req);
reqStatus = res.substring(ret + req.length() + 1,
res.indexOf(";", ret) - 1);
- if (reqStatus != null) {
+ if (reqStatus != null) {
reqStatus.toLowerCase();
if (reqStatus.equals("complete")) {
return true;
@@ -627,7 +627,7 @@ public class Request extends TestClient {
con.setQueryString(query);
con.setActionURL(ACTION_STRING);
con.Send();
- StringBuffer s = new StringBuffer();
+ StringBuffer s = new StringBuffer();
s = con.getPage();
String line;
@@ -645,7 +645,7 @@ public class Request extends TestClient {
break;
case 3:
- st = approveRequestStatus(s);
+ st = approveRequestStatus(s);
break;
case 4:
@@ -665,7 +665,7 @@ public class Request extends TestClient {
break;
default:
- System.out.println("reqtype not recognized");
+ System.out.println("reqtype not recognized");
}
} catch (Exception e) {
System.err.println("exception: in Send routine" + e);
@@ -685,7 +685,7 @@ public class Request extends TestClient {
query += "&reqState=" + reqState;
}
-
+
if (reqtype == 2) { // get cert details
ACTION_PROCESS_CERT_REQUEST = "/" + AUTH_ID + "/processCertReq";
ACTION_STRING = ACTION_PROCESS_CERT_REQUEST;
@@ -699,7 +699,7 @@ public class Request extends TestClient {
Integer x = new Integer(validityperiod);
validperiod = x.intValue();
- } else {
+ } else {
validperiod = 180;
}
@@ -719,7 +719,7 @@ public class Request extends TestClient {
if (csrRequestorPhone != null) {
query += "&csrRequestorPhone=" + csrRequestorPhone;
}
-
+
if (csrRequestorEmail != null) {
query += "&csrRequestorEmail=" + csrRequestorEmail;
}
@@ -746,7 +746,7 @@ public class Request extends TestClient {
query += "&certTypeSSLServer=" + servercert;
}
- if (emailcert.equals("true")) {
+ if (emailcert.equals("true")) {
query += "&certTypeEmail=" + emailcert;
}
@@ -764,7 +764,7 @@ public class Request extends TestClient {
Integer x = new Integer(validityperiod);
validperiod = x.intValue();
- } else {
+ } else {
validperiod = 180;
}
@@ -872,18 +872,18 @@ public class Request extends TestClient {
+ "&keyUsageKeyCertSign=false" + "&keyUsageCrlSign=false"
+ "&keyUsageEncipherOnly=false"
+ "&keyUsageDecipherOnly=false" + /* -- For Older CMS 6.x servers use these
- "&nsCertCritical=false" +
- "&nsCertSSLClient=true" +
- "&nsCertSSLServer=false" +
- "&nsCertEmail=true" +
- "&nsCertObjectSigning=false" +
- "&nsCertSSLCA=false" +
- "&nsCertEmailCA=false" +
- "&nsCertObjectSigningCA=false" +
- "&subjAltNameExtCritical=false" +
- "&subjAltNames=RFC822Name: null" +
- "&signingAlg=MD5withRSA" +
- */ // For newer CS 7.x servers use these
+ "&nsCertCritical=false" +
+ "&nsCertSSLClient=true" +
+ "&nsCertSSLServer=false" +
+ "&nsCertEmail=true" +
+ "&nsCertObjectSigning=false" +
+ "&nsCertSSLCA=false" +
+ "&nsCertEmailCA=false" +
+ "&nsCertObjectSigningCA=false" +
+ "&subjAltNameExtCritical=false" +
+ "&subjAltNames=RFC822Name: null" +
+ "&signingAlg=MD5withRSA" +
+ */// For newer CS 7.x servers use these
"&exKeyUsageCritical=false"
+ "&exKeyUsageOIDs=1.3.6.1.5.5.7.3.2,1.3.6.1.5.5.7.3.4"
+ "&subjAltNameExtCritical=false"
@@ -892,7 +892,7 @@ public class Request extends TestClient {
+ "&op=approve" + "&submit=submit";
}
-
+
}
private void readProperties() {
@@ -968,14 +968,14 @@ public class Request extends TestClient {
maxCount = 50;
} else {
maxCount = y.intValue() - x.intValue();
- }
+ }
if (maxCount == 0) {
maxCount = 1;
- }
+ }
reqtype = 1;
buildquery();
- return(Send());
+ return (Send());
}
private boolean approveRequest() {
@@ -989,7 +989,7 @@ public class Request extends TestClient {
return false;
}
- if (approveseqnum.length() > 0) {
+ if (approveseqnum.length() > 0) {
if (seqNum.contains(approveseqnum)) {
seqNum.removeAllElements();
seqNum.addElement(approveseqnum);
@@ -1002,7 +1002,7 @@ public class Request extends TestClient {
System.out.println(
" Seq num not specified . Approving all pending request From : "
+ approveseqnumFrom + " To : " + approveseqnumTo);
- }
+ }
boolean flag = true;
@@ -1023,44 +1023,43 @@ public class Request extends TestClient {
i++;
continue;
}
-
+
if (debug) {
System.out.println(
csrRequestorName + " " + csrRequestorPhone + " "
- + csrRequestorEmail + " " + requestID + " "
- + subject);
+ + csrRequestorEmail + " " + requestID + " "
+ + subject);
}
// Now for pending status - approve the request
reqtype = 3;
buildquery();
if (!Send()) {
System.out.println(
- "Error: Approving request " + approveseqnum);
+ "Error: Approving request " + approveseqnum);
i++;
continue;
}
System.out.println("Request " + approveseqnum + " is approved ");
totalNumApproved++;
- i++;
+ i++;
}
Integer x = new Integer(approveseqnum);
- if (x.intValue() >= torequest) {
+ if (x.intValue() >= torequest) {
flag = false;
- } else {
+ } else {
listRequest(approveseqnum, approveseqnumTo);
}
-
+
}
return st;
}
/**
- * Use this method when you need to use properties file.
+ * Use this method when you need to use properties file.
*/
-
- public int processRequest() {
+ public int processRequest() {
if (propfileName != null) {
readProperties();
}
@@ -1090,7 +1089,7 @@ public class Request extends TestClient {
} else {
return 0;
}
- } else {
+ } else {
return -1;
}
@@ -1103,11 +1102,11 @@ public class Request extends TestClient {
// Exit Status - (0) for error
// - any number > 0 Pass
int st = 0;
-
+
if (args.length < 1) {
System.out.println("Usage : propertiesfile");
System.exit(0);
- }
+ }
Request t = new Request(args[0]);