Cert CLI - cert-request-review and cert-request-approve implementations

4 files changed, 184 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/cms/client/cert/CertCLI.java b/base/common/src/com/netscape/cms/client/cert/CertCLI.java
index ff2383cd1..9340752b9 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertCLI.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertCLI.java
@@ -48,6 +48,8 @@ public class CertCLI extends CLI {
         addModule(new CertHoldCLI(this));
         addModule(new CertReleaseHoldCLI(this));
         addModule(new CertRequestSubmitCLI(this));
+        addModule(new CertRequestReviewCLI(this));
+        addModule(new CertRequestApproveCLI(this));
     }
 
     public void printHelp() {
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java
new file mode 100644
index 000000000..3d729424f
--- /dev/null
+++ b/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java
@@ -0,0 +1,69 @@
+package com.netscape.cms.client.cert;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+
+import com.netscape.cms.client.cli.CLI;
+import com.netscape.cms.client.cli.MainCLI;
+import com.netscape.cms.servlet.base.CMSException;
+import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData;
+
+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) {
+        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);
+        }
+        AgentEnrollmentRequestData reviewInfo = null;
+        try {
+            JAXBContext context = JAXBContext.newInstance(AgentEnrollmentRequestData.class);
+            Unmarshaller unmarshaller = context.createUnmarshaller();
+            FileInputStream fis = new FileInputStream(cLineArgs[0].trim());
+            reviewInfo = (AgentEnrollmentRequestData) unmarshaller.unmarshal(fis);
+            parent.client.approveRequest(reviewInfo.getRequestId(), reviewInfo);
+        } catch (CMSException e) {
+            System.err.println(e.getMessage());
+            System.exit(-1);
+        } catch (JAXBException e) {
+            System.err.println("Error: " + e.getMessage());
+            System.exit(-1);
+        } catch (FileNotFoundException e) {
+            System.err.println("Error: " + e.getMessage());
+            System.exit(-1);
+        }
+        MainCLI.printMessage("Approved certificate request " + reviewInfo.getRequestId().toString());
+    }
+
+    @Override
+    public void printHelp() {
+        formatter.printHelp(parent.name + "-" + name + " <file name>", options);
+    }
+}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java
new file mode 100644
index 000000000..10c0e40fc
--- /dev/null
+++ b/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java
@@ -0,0 +1,103 @@
+package com.netscape.cms.client.cert;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+
+import com.netscape.certsrv.request.RequestId;
+import com.netscape.cms.client.cli.CLI;
+import com.netscape.cms.client.cli.MainCLI;
+import com.netscape.cms.servlet.base.CMSException;
+import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData;
+
+public class CertRequestReviewCLI extends CLI {
+
+    CertCLI parent;
+
+    public CertRequestReviewCLI(CertCLI parent) {
+        super("request-review", "Review certificate request");
+        this.parent = parent;
+    }
+
+    @Override
+    public void execute(String[] args) {
+        CommandLine cmd = null;
+
+        Option output = new Option(null, "output", true, "Output Filename");
+        options.addOption(output);
+
+        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 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");
+            printHelp();
+            System.exit(-1);
+        }
+
+        RequestId reqId = null;
+        try {
+            reqId = new RequestId(cLineArgs[0]);
+        } catch (NumberFormatException e) {
+            System.err.println("Error: Invalid RequestID: " + cLineArgs[0]);
+            System.exit(-1);
+        }
+
+        AgentEnrollmentRequestData reviewInfo = null;
+        try {
+            reviewInfo = parent.client.reviewRequest(reqId);
+        } catch (CMSException e) {
+            System.err.println(e.getMessage());
+            System.exit(-1);
+        }
+
+        try {
+            JAXBContext context = JAXBContext.newInstance(AgentEnrollmentRequestData.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);
+        }
+
+    }
+
+    @Override
+    public void printHelp() {
+        formatter.printHelp(parent.name + "-" + name + " <request id>", options);
+    }
+}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRestClient.java b/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
index ba4c2fb04..b83912fae 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
@@ -20,6 +20,7 @@ package com.netscape.cms.client.cert;
 import java.net.URISyntaxException;
 
 import com.netscape.certsrv.dbs.certdb.CertId;
+import com.netscape.certsrv.request.RequestId;
 import com.netscape.cms.servlet.cert.CertResource;
 import com.netscape.cms.servlet.cert.model.CertDataInfos;
 import com.netscape.cms.servlet.cert.model.CertRevokeRequest;
@@ -28,6 +29,7 @@ import com.netscape.cms.servlet.cert.model.CertUnrevokeRequest;
 import com.netscape.cms.servlet.cert.model.CertificateData;
 import com.netscape.cms.servlet.csadmin.CMSRestClient;
 import com.netscape.cms.servlet.request.CertRequestResource;
+import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData;
 import com.netscape.cms.servlet.request.model.CertRequestInfo;
 import com.netscape.cms.servlet.request.model.CertRequestInfos;
 import com.netscape.cms.servlet.request.model.EnrollmentRequestData;
@@ -77,4 +79,12 @@ public class CertRestClient extends CMSRestClient {
     public CertRequestInfos enrollRequest(EnrollmentRequestData data){
         return certRequestResource.enrollCert(data);
     }
+
+    public AgentEnrollmentRequestData reviewRequest(RequestId id){
+        return certRequestResource.reviewRequest(id);
+    }
+
+    public void approveRequest(RequestId id, AgentEnrollmentRequestData data) {
+        certRequestResource.approveRequest(id, data);
+    }
 }