summaryrefslogtreecommitdiffstats
path: root/base/java-tools/src/com/netscape/cmstools
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-01-30 17:57:17 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2013-02-04 12:05:30 -0500
commit9c6f3df2193de627f83c1f22fe47cd61e6e3578a (patch)
tree3fecd2cc32e6ce4eccd1c0b28e31d3c9822e3fac /base/java-tools/src/com/netscape/cmstools
parent95e41dc9043a3fbbeea2abd58cca84d1442c0102 (diff)
downloadpki-9c6f3df2193de627f83c1f22fe47cd61e6e3578a.tar.gz
pki-9c6f3df2193de627f83c1f22fe47cd61e6e3578a.tar.xz
pki-9c6f3df2193de627f83c1f22fe47cd61e6e3578a.zip
Merged cert-request-review/approve commands.
The cert-request-approve has been merged into cert-request-review to ensure that these operations are executed in the same session. Ticket #474
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools')
-rw-r--r--base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java11
-rw-r--r--base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java58
-rw-r--r--base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java138
3 files changed, 111 insertions, 96 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
index d3bf51e32..b9122531c 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
@@ -27,6 +27,7 @@ import com.netscape.certsrv.cert.CertClient;
import com.netscape.certsrv.cert.CertData;
import com.netscape.certsrv.cert.CertDataInfo;
import com.netscape.certsrv.cert.CertRequestInfo;
+import com.netscape.certsrv.cert.CertReviewResponse;
import com.netscape.cmstools.cli.CLI;
import com.netscape.cmstools.cli.MainCLI;
@@ -51,7 +52,6 @@ public class CertCLI extends CLI {
addModule(new CertRequestFindCLI(this));
addModule(new CertRequestSubmitCLI(this));
addModule(new CertRequestReviewCLI(this));
- addModule(new CertRequestApproveCLI(this));
}
public void printHelp() {
@@ -146,7 +146,14 @@ public class CertCLI extends CLI {
public static void printCertRequestInfo(CertRequestInfo info) {
System.out.println(" Request ID: " + info.getRequestId());
- System.out.println(" Status: " + info.getRequestStatus());
System.out.println(" Type: " + info.getRequestType());
+ System.out.println(" Status: " + info.getRequestStatus());
+ }
+
+ public static void printCertReviewResponse(CertReviewResponse response) {
+ System.out.println(" Request ID: " + response.getRequestId());
+ System.out.println(" Profile: " + response.getProfileName());
+ System.out.println(" Type: " + response.getRequestType());
+ System.out.println(" Status: " + response.getRequestStatus());
}
}
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java
deleted file mode 100644
index 0c6db8a90..000000000
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.netscape.cmstools.cert;
-
-import java.io.FileInputStream;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.ParseException;
-
-import com.netscape.certsrv.cert.CertReviewResponse;
-import com.netscape.cmstools.cli.CLI;
-import com.netscape.cmstools.cli.MainCLI;
-
-public class CertRequestApproveCLI extends CLI {
- CertCLI parent;
-
- public CertRequestApproveCLI(CertCLI parent) {
- super("request-approve", "Approve certificate request");
- this.parent = parent;
- }
-
- @Override
- public void execute(String[] args) throws Exception {
- CommandLine cmd = null;
-
- try {
- cmd = parser.parse(options, args);
- } catch (ParseException e) {
- System.err.println("Error: " + e.getMessage());
- printHelp();
- System.exit(-1);
- }
-
- String[] cLineArgs = cmd.getArgs();
-
- if (cLineArgs.length < 1) {
- System.err.println("Error: No file name specified.");
- printHelp();
- System.exit(-1);
- }
-
- FileInputStream fis = new FileInputStream(cLineArgs[0].trim());
-
- JAXBContext context = JAXBContext.newInstance(CertReviewResponse.class);
- Unmarshaller unmarshaller = context.createUnmarshaller();
- CertReviewResponse reviewInfo = (CertReviewResponse) unmarshaller.unmarshal(fis);
-
- parent.client.approveRequest(reviewInfo.getRequestId(), reviewInfo);
-
- MainCLI.printMessage("Approved certificate request " + reviewInfo.getRequestId().toString());
- }
-
- @Override
- public void printHelp() {
- formatter.printHelp(parent.name + "-" + name + " <file name>", options);
- }
-}
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java
index 682314b25..3891508bd 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java
@@ -1,15 +1,20 @@
package com.netscape.cmstools.cert;
-import java.io.FileNotFoundException;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.List;
import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang.StringUtils;
import com.netscape.certsrv.base.PKIException;
import com.netscape.certsrv.cert.CertReviewResponse;
@@ -20,6 +25,9 @@ import com.netscape.cmstools.cli.MainCLI;
public class CertRequestReviewCLI extends CLI {
CertCLI parent;
+ List<String> actions = Arrays.asList(
+ "approve", "reject", "cancel", "update", "validate", "assign", "unassign"
+ );
public CertRequestReviewCLI(CertCLI parent) {
super("request-review", "Review certificate request");
@@ -27,11 +35,21 @@ public class CertRequestReviewCLI extends CLI {
}
@Override
- public void execute(String[] args) {
+ public void printHelp() {
+ formatter.printHelp(parent.name + "-" + name + " <Request ID> [OPTIONS...]", options);
+ }
+
+ @Override
+ public void execute(String[] args) throws Exception {
CommandLine cmd = null;
- Option output = new Option(null, "output", true, "Output Filename");
- options.addOption(output);
+ Option option = new Option(null, "action", true, "Action: " + StringUtils.join(actions, ", "));
+ option.setArgName("action");
+ options.addOption(option);
+
+ option = new Option(null, "output", true, "Output filename");
+ option.setArgName("filename");
+ options.addOption(option);
try {
cmd = parser.parse(options, args);
@@ -42,62 +60,110 @@ public class CertRequestReviewCLI extends CLI {
}
String[] cLineArgs = cmd.getArgs();
-
if (cLineArgs.length < 1) {
- System.err.println("Error: No request id specified.");
- printHelp();
- System.exit(-1);
- }
- String filename = null;
- if (cmd.hasOption("output")) {
- filename = cmd.getOptionValue("output");
- } else {
- System.err.println("No output option specified.");
- printHelp();
- System.exit(-1);
- }
-
- if (filename == null || filename.trim().length() == 0) {
- System.err.println("Specify the filename to write the request information");
+ System.err.println("Error: Missing certificate request ID.");
printHelp();
System.exit(-1);
}
- RequestId reqId = null;
+ RequestId requestId = null;
try {
- reqId = new RequestId(cLineArgs[0]);
+ requestId = new RequestId(cLineArgs[0]);
} catch (NumberFormatException e) {
- System.err.println("Error: Invalid RequestID: " + cLineArgs[0]);
+ System.err.println("Error: Invalid certificate request ID " + cLineArgs[0] + ".");
System.exit(-1);
}
+ String action = cmd.getOptionValue("action");
+ String filename = null;
+
+ if (action == null) {
+ if (cmd.hasOption("output")) {
+ filename = cmd.getOptionValue("output");
+ } else {
+ System.err.println("Error: Missing output file name.");
+ printHelp();
+ System.exit(-1);
+ }
+
+ if (filename == null || filename.trim().length() == 0) {
+ System.err.println("Error: Missing output file name.");
+ printHelp();
+ System.exit(-1);
+ }
+ }
+
+ // Retrieve certificate request.
CertReviewResponse reviewInfo = null;
try {
- reviewInfo = parent.client.reviewRequest(reqId);
+ reviewInfo = parent.client.reviewRequest(requestId);
} catch (PKIException e) {
System.err.println(e.getMessage());
System.exit(-1);
}
- try {
+ if (action == null) {
+ // Store certificate request in a file.
JAXBContext context = JAXBContext.newInstance(CertReviewResponse.class);
Marshaller marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
FileOutputStream stream = new FileOutputStream(filename);
-
marshaller.marshal(reviewInfo, stream);
- MainCLI.printMessage("Downloaded certificate request " + cLineArgs[0]);
- } catch (JAXBException e) {
- System.err.println("Cannot write to the file. " + e);
- } catch (FileNotFoundException e) {
- System.err.println("File not found at " + filename);
+
+ MainCLI.printMessage("Retrieved certificate request " + requestId);
+ CertCLI.printCertReviewResponse(reviewInfo);
+ System.out.println(" Filename: " + filename);
+ if (verbose) System.out.println(" Nonce: " + reviewInfo.getNonce());
+ System.out.println();
+
+ while (true) {
+ // Prompt for action.
+ System.out.print("Action (" + StringUtils.join(actions, "/") + "): ");
+ System.out.flush();
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+ action = reader.readLine().trim().toLowerCase();
+
+ if (actions.contains(action)) break;
+ }
+
+ // Read certificate request file.
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ FileInputStream fis = new FileInputStream(filename);
+ reviewInfo = (CertReviewResponse) unmarshaller.unmarshal(fis);
}
- }
+ if (action.equalsIgnoreCase("approve")) {
+ parent.client.approveRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Approved certificate request " + requestId);
- @Override
- public void printHelp() {
- formatter.printHelp(parent.name + "-" + name + " <request id>", options);
+ } else if (action.equalsIgnoreCase("reject")) {
+ parent.client.rejectRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Rejected certificate request " + requestId);
+
+ } else if (action.equalsIgnoreCase("cancel")) {
+ parent.client.cancelRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Canceled certificate request " + requestId);
+
+ } else if (action.equalsIgnoreCase("update")) {
+ parent.client.updateRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Updated certificate request " + requestId);
+
+ } else if (action.equalsIgnoreCase("validate")) {
+ parent.client.validateRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Validated certificate request " + requestId);
+
+ } else if (action.equalsIgnoreCase("assign")) {
+ parent.client.assignRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Assigned certificate request " + requestId);
+
+ } else if (action.equalsIgnoreCase("unassign")) {
+ parent.client.unassignRequest(reviewInfo.getRequestId(), reviewInfo);
+ MainCLI.printMessage("Unassigned certificate request " + requestId);
+
+ } else {
+ throw new Error("Invalid action: " + action);
+ }
}
}