From 70681bc83ccc25639da1b87940661b2649044629 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Tue, 24 Jul 2012 15:35:34 -0400 Subject: Cert CLI - cert-request-review and cert-request-approve implementations --- base/common/src/com/netscape/cms/servlet/base/CMSServlet.java | 4 +--- base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java | 1 - .../com/netscape/cms/servlet/request/CertRequestResourceService.java | 4 ++-- .../src/com/netscape/cms/servlet/request/model/CertRequestDAO.java | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet') diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index 2273abc21..a4922ab25 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -830,9 +830,7 @@ public abstract class CMSServlet extends HttpServlet { /** * get ssl client authenticated certificate */ - protected X509Certificate - getSSLClientCertificate(HttpServletRequest httpReq) - throws EBaseException { + protected X509Certificate getSSLClientCertificate(HttpServletRequest httpReq) throws EBaseException { X509Certificate cert = null; diff --git a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java index 9bb0c4b64..57e33f3a5 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java @@ -81,7 +81,6 @@ public class RequestProcessor extends CertProcessor { public void processRequest(HttpServletRequest request, AgentEnrollmentRequestData data, IRequest req, String op) throws EBaseException { try { - startTiming("approval"); IAuthToken authToken = null; diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java b/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java index 47f63ff6c..d107e2191 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java @@ -135,7 +135,6 @@ public class CertRequestResourceService extends CMSResourceService implements Ce if (id == null) { throw new BadRequestException("Bad data input in CertRequestResourceService. op:" + op); } - CertRequestDAO dao = new CertRequestDAO(); try { dao.changeRequestState(id, servletRequest, data, getLocale(), op); @@ -160,8 +159,9 @@ public class CertRequestResourceService extends CMSResourceService implements Ce throw new CMSException(CMS.getUserMessage(getLocale(), "CMS_INTERNAL_ERROR")); } catch (EBaseException e) { e.printStackTrace(); - throw new CMSException("Problem approving request in CertRequestResource.assignRequest!"); + throw new CMSException("Problem approving request in CertRequestResource.assignRequest! " + e); } catch (RequestNotFoundException e) { + CMS.debug(e); throw new CMSException(Response.Status.BAD_REQUEST, CMS.getUserMessage(getLocale(), "CMS_REQUEST_NOT_FOUND", id.toString())); } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java index 193a53c89..4ebfc251f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java @@ -146,7 +146,6 @@ public class CertRequestDAO extends CMSRequestDAO { } String profileId = request.getExtDataInString("profileId"); IProfile profile = ps.getProfile(profileId); - AgentEnrollmentRequestData info = AgentEnrollmentRequestDataFactory.create(request, profile, uriInfo, locale); if (ca.noncesEnabled()) { addNonce(info, servletRequest); -- cgit