Added cert-request-show command.

A new cert-request-show command has been added to allow EE users to
check certificate request status.

Ticket #511

2 files changed, 63 insertions, 1 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 f43ef9702..9f47b20c6 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
@@ -48,11 +48,12 @@ public class CertCLI extends CLI {
 
         addModule(new CertFindCLI(this));
         addModule(new CertShowCLI(this));
-
         addModule(new CertRevokeCLI(this));
         addModule(new CertHoldCLI(this));
         addModule(new CertReleaseHoldCLI(this));
+
         addModule(new CertRequestFindCLI(this));
+        addModule(new CertRequestShowCLI(this));
         addModule(new CertRequestSubmitCLI(this));
         addModule(new CertRequestReviewCLI(this));
     }
@@ -184,6 +185,10 @@ public class CertCLI extends CLI {
         System.out.println("  Request ID: " + info.getRequestId());
         System.out.println("  Type: " + info.getRequestType());
         System.out.println("  Status: " + info.getRequestStatus());
+
+        if (info.getCertId() != null) {
+            System.out.println("  Certificate ID: " + info.getCertId().toHexString());
+        }
     }
 
     public static void printCertReviewResponse(CertReviewResponse response) {
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestShowCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestShowCLI.java
new file mode 100644
index 000000000..bee9f841a
--- /dev/null
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestShowCLI.java
@@ -0,0 +1,57 @@
+package com.netscape.cmstools.cert;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+
+import com.netscape.certsrv.cert.CertRequestInfo;
+import com.netscape.certsrv.request.RequestId;
+import com.netscape.cmstools.cli.CLI;
+import com.netscape.cmstools.cli.MainCLI;
+
+public class CertRequestShowCLI extends CLI {
+
+    CertCLI parent;
+
+    public CertRequestShowCLI(CertCLI parent) {
+        super("request-show", "Show certificate request");
+        this.parent = parent;
+    }
+
+    @Override
+    public void printHelp() {
+        formatter.printHelp(parent.name + "-" + name + " <Request ID> [OPTIONS...]", options);
+    }
+
+    @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: Missing certificate request ID.");
+            printHelp();
+            System.exit(-1);
+        }
+
+        RequestId requestId = null;
+        try {
+            requestId = new RequestId(cLineArgs[0]);
+        } catch (NumberFormatException e) {
+            System.err.println("Error: Invalid certificate request ID " + cLineArgs[0] + ".");
+            System.exit(-1);
+        }
+
+        CertRequestInfo certRequest = parent.client.getRequest(requestId);
+
+        MainCLI.printMessage("Certificate request \"" + requestId + "\"");
+        CertCLI.printCertRequestInfo(certRequest);
+    }
+}