Update pki ca-cert-request-submit

The pki ca-cert-request-submit has been updated to get the
subject DN from the PKCS #10 request by default.

base/tools/src/main/java/com/netscape/cmstools/ca/CACertRequestSubmitCLI.java

@@ -16,7 +16,9 @@
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.dogtag.util.cert.CertUtil;
 import org.dogtagpki.cli.CommandCLI;
+import org.mozilla.jss.netscape.security.pkcs.PKCS10;
 import org.mozilla.jss.netscape.security.util.Cert;
 import org.mozilla.jss.netscape.security.util.Utils;
 import org.mozilla.jss.netscape.security.x509.X500Name;
@@ -193,13 +195,18 @@ public void execute(CommandLine cmd) throws Exception {
 
         String csrFilename = cmd.getOptionValue("csr-file");
         String csr = null;
+        PKCS10 pkcs10 = null;
 
         if (csrFilename != null) {
 
             csr = loadFile(csrFilename);
-
             logger.debug("CSR:\n" + csr);
 
+            byte[] bytes = CertUtil.parseCSR(csr);
+            if ("pkcs10".equals(requestType)) {
+                pkcs10 = new PKCS10(bytes);
+            }
+
             for (ProfileInput input : request.getInputs()) {
                 ProfileAttribute csrAttr = input.getAttribute("cert_request");
                 if (csrAttr != null) {
@@ -225,6 +232,14 @@ public void execute(CommandLine cmd) throws Exception {
         }
 
         String subjectDN = cmd.getOptionValue("subject");
+
+        if (subjectDN == null) {
+            // if no subject DN provided, get from CSR
+            if (pkcs10 != null) {
+                subjectDN = pkcs10.getSubjectName().toLdapDNString();
+            }
+        }
+
         if (subjectDN != null) {
             DN dn = new DN(subjectDN);
             Vector<?> rdns = dn.getRDNs();