Removed requestID parameter usage in [un]revoke request.

There seems to be no use of the requestID parameter in both revoke
and unrevoke request. Removed requestID attribute in CertRevokeRequest
remove the class CertUnrevokeRequest.

Also made changes in RevocationProcesor to use the requestID of the
request created in it.

The setRequestID() is being called in the DoRevoke and DoUnRevoke servlets.
Removed the call and a function auditRequesterId in both the classes.

The auditRequestorId method tries to get a "requestID" stored as a INPUT field
in the reasonToRequest page. The ReasonToRevoke class which generates
this page does not set the value.

2 files changed, 2 insertions, 11 deletions

diff --git a/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template b/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
index 7edfe7e29..2a608438b 100644
--- a/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
+++ b/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
@@ -457,10 +457,6 @@ function revokeCert(serialNumber)
         document.writeln("<INPUT TYPE=hidden name=verifiedRecordCount value=\"" +
                          result.header.verifiedRecordCount +"\">");
         document.writeln("<INPUT TYPE=hidden name=invalidityDate value=\"0\">");
-        if (result.header.request != null) {
-            document.writeln("<INPUT TYPE=hidden name=requestId value=\"" +
-                             result.header.request +"\">");
-        }
         if (result.header.b64eCertificate != null) {
             document.writeln("<INPUT TYPE=hidden name=b64eCertificate value=\"" +
                              result.header.b64eCertificate +"\">");
diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
index 487b2b522..6b5ea2ca4 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
@@ -67,7 +67,6 @@ import com.netscape.certsrv.cert.CertResource;
 import com.netscape.certsrv.cert.CertRetrievalRequest;
 import com.netscape.certsrv.cert.CertRevokeRequest;
 import com.netscape.certsrv.cert.CertSearchRequest;
-import com.netscape.certsrv.cert.CertUnrevokeRequest;
 import com.netscape.certsrv.dbs.EDBRecordNotFoundException;
 import com.netscape.certsrv.dbs.certdb.CertId;
 import com.netscape.certsrv.dbs.certdb.ICertRecord;
@@ -181,9 +180,7 @@ public class CertService extends PKIService implements CertResource {
 
         RevocationReason revReason = request.getReason();
         if (revReason == RevocationReason.REMOVE_FROM_CRL) {
-            CertUnrevokeRequest unrevRequest = new CertUnrevokeRequest();
-            unrevRequest.setRequestID(request.getRequestID());
-            return unrevokeCert(id, unrevRequest);
+            return unrevokeCert(id);
         }
 
         RevocationProcessor processor;
@@ -195,7 +192,6 @@ public class CertService extends PKIService implements CertResource {
             processor.setInitiative(AuditFormat.FROMAGENT);
 
             processor.setSerialNumber(id);
-            processor.setRequestID(request.getRequestID());
 
             processor.setRevocationReason(revReason);
             processor.setRequestType(revReason == RevocationReason.CERTIFICATE_HOLD
@@ -301,7 +297,7 @@ public class CertService extends PKIService implements CertResource {
     }
 
     @Override
-    public Response unrevokeCert(CertId id, CertUnrevokeRequest request) {
+    public Response unrevokeCert(CertId id) {
         if (id == null) {
             CMS.debug("unrevokeCert: id is null");
             throw new BadRequestException("Unable to unrevoke cert: invalid id");
@@ -324,7 +320,6 @@ public class CertService extends PKIService implements CertResource {
             processor.setInitiative(AuditFormat.FROMAGENT);
 
             processor.setSerialNumber(id);
-            processor.setRequestID(request.getRequestID());
             processor.setRevocationReason(RevocationReason.CERTIFICATE_HOLD);
             processor.setAuthority(authority);