diff options
Diffstat (limited to 'base/server/cms/src/com')
3 files changed, 2 insertions, 43 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java index 8a7bc556e..1788be303 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -381,7 +381,6 @@ public class DoRevoke extends CMSServlet { processor.setStartTime(startTime); processor.setInitiative(initiative); processor.setSerialNumber(eeSerialNumber == null ? null : new CertId(eeSerialNumber)); - processor.setRequestID(auditRequesterID(req)); RevocationReason revReason = RevocationReason.fromInt(reason); processor.setRevocationReason(revReason); @@ -753,26 +752,6 @@ public class DoRevoke extends CMSServlet { } /** - * Signed Audit Log Requester ID - * - * This method is called to obtain the "RequesterID" for - * a signed audit log message. - * <P> - * - * @param req HTTP request - * @return id string containing the signed audit log message RequesterID - */ - private RequestId auditRequesterID(HttpServletRequest req) { - String requesterID = req.getParameter("requestId"); - - if (requesterID != null) { - return new RequestId(requesterID.trim()); - } else { - return null; - } - } - - /** * This method parses a String serial number into BigInteger. * * @param serialNumber a String containing the un-normalized serial number diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index 723651eb6..e111e8ad8 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -49,7 +49,6 @@ import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.publish.IPublisherProcessor; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; @@ -242,7 +241,6 @@ public class DoUnrevoke extends CMSServlet { processor.setInitiative(initiative); processor.setSerialNumber(auditSerialNumber(serialNumbers[0].toString())); - processor.setRequestID(auditRequesterID(req)); processor.setRevocationReason(RevocationReason.CERTIFICATE_HOLD); processor.setRequestType(RevocationProcessor.OFF_HOLD); @@ -461,26 +459,6 @@ public class DoUnrevoke extends CMSServlet { } /** - * Signed Audit Log Requester ID - * - * This method is called to obtain the "RequesterID" for - * a signed audit log message. - * <P> - * - * @param req HTTP request - * @return id string containing the signed audit log message RequesterID - */ - private RequestId auditRequesterID(HttpServletRequest req) { - String requesterID = req.getParameter("requestId"); - - if (requesterID != null) { - return new RequestId(requesterID.trim()); - } else { - return null; - } - } - - /** * Signed Audit Log Serial Number * * This method is called to obtain the serial number of the certificate diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java index 93b7531c8..e03fc2cfd 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java @@ -296,6 +296,7 @@ public class RevocationProcessor extends CertProcessor { public void createRevocationRequest() throws EBaseException { request = requestQueue.newRequest(IRequest.REVOCATION_REQUEST); + setRequestID(request.getRequestId()); request.setExtData(IRequest.REQ_TYPE, IRequest.REVOCATION_REQUEST); @@ -376,6 +377,7 @@ public class RevocationProcessor extends CertProcessor { public void createUnrevocationRequest() throws EBaseException { request = requestQueue.newRequest(IRequest.UNREVOCATION_REQUEST); + setRequestID(request.getRequestId()); request.setExtData(IRequest.REQ_TYPE, IRequest.UNREVOCATION_REQUEST); |