Fixed missing cert request hostname and address.

The CA services have been modified to inject request hostname and
address into the certificate request object such that they will be
stored in the database. This fixes the problem with requests
submitted either via the UI or the CLI.

An unused method in CertRequestResource has been removed. Some
debug messages have been cleaned as well.

https://fedorahosted.org/pki/ticket/1535

2 files changed, 8 insertions, 10 deletions

diff --git a/base/common/src/com/netscape/certsrv/cert/CertEnrollmentRequest.java b/base/common/src/com/netscape/certsrv/cert/CertEnrollmentRequest.java
index 72aad330f..d55b5b4e1 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertEnrollmentRequest.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertEnrollmentRequest.java
@@ -275,6 +275,14 @@ public class CertEnrollmentRequest {
         return sw.toString();
     }
 
+    public String toString() {
+        try {
+            return toXML();
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
index b9ae1f1fe..7f08b4af3 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
@@ -17,14 +17,11 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.cert;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 
 import org.jboss.resteasy.annotations.ClientResponseType;
@@ -37,13 +34,6 @@ import com.netscape.certsrv.request.RequestId;
 @Path("")
 public interface CertRequestResource {
 
-    // Enrollment - used to test integration with a browser
-    @POST
-    @Path("certrequests")
-    @ClientResponseType(entityType=CertRequestInfos.class)
-    @Consumes({ MediaType.APPLICATION_FORM_URLENCODED })
-    public Response enrollCert(MultivaluedMap<String, String> form);
-
     @POST
     @Path("certrequests")
     @ClientResponseType(entityType=CertRequestInfos.class)