diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request/CertRequestService.java')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/CertRequestService.java | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java b/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java index 9178d4c9e..e1aa56592 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java @@ -33,13 +33,13 @@ import com.netscape.certsrv.profile.ERejectException; import com.netscape.certsrv.property.EPropertyException; import com.netscape.certsrv.request.RequestId; import com.netscape.cms.servlet.base.BadRequestException; -import com.netscape.cms.servlet.base.CMSException; +import com.netscape.cms.servlet.base.PKIException; import com.netscape.cms.servlet.base.PKIService; -import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData; +import com.netscape.cms.servlet.request.model.CertReviewResponse; import com.netscape.cms.servlet.request.model.CertRequestDAO; import com.netscape.cms.servlet.request.model.CertRequestInfo; import com.netscape.cms.servlet.request.model.CertRequestInfos; -import com.netscape.cms.servlet.request.model.EnrollmentRequestData; +import com.netscape.cms.servlet.request.model.CertEnrollmentRequest; import com.netscape.cmsutil.ldap.LDAPUtil; /** @@ -61,7 +61,7 @@ public class CertRequestService extends PKIService implements CertRequestResourc } catch (EBaseException e) { // log error e.printStackTrace(); - throw new CMSException("Error getting Cert request info!"); + throw new PKIException("Error getting Cert request info!"); } if (info == null) { @@ -74,11 +74,11 @@ public class CertRequestService extends PKIService implements CertRequestResourc // Enrollment - used to test integration with a browser public CertRequestInfos enrollCert(MultivaluedMap<String, String> form) { - EnrollmentRequestData data = new EnrollmentRequestData(form); + CertEnrollmentRequest data = new CertEnrollmentRequest(form); return enrollCert(data); } - public CertRequestInfos enrollCert(EnrollmentRequestData data) { + public CertRequestInfos enrollCert(CertEnrollmentRequest data) { CertRequestInfos infos; if (data == null) { throw new BadRequestException("Bad data input into CertRequestResourceService.enrollCert!"); @@ -89,49 +89,49 @@ public class CertRequestService extends PKIService implements CertRequestResourc infos = dao.submitRequest(data, servletRequest, uriInfo, getLocale()); } catch (EAuthException e) { CMS.debug("enrollCert: authentication failed: " + e); - throw new CMSException(Response.Status.UNAUTHORIZED, e.toString()); + throw new PKIException(Response.Status.UNAUTHORIZED, e.toString()); } catch (EAuthzException e) { CMS.debug("enrollCert: authorization failed: " + e); - throw new CMSException(Response.Status.UNAUTHORIZED, e.toString()); + throw new PKIException(Response.Status.UNAUTHORIZED, e.toString()); } catch (BadRequestDataException e) { CMS.debug("enrollCert: bad request data: " + e); - throw new CMSException(Response.Status.BAD_REQUEST, e.toString()); + throw new PKIException(Response.Status.BAD_REQUEST, e.toString()); } catch (EBaseException e) { - throw new CMSException(e.toString()); + throw new PKIException(e.toString()); } return infos; } - public void approveRequest(RequestId id, AgentEnrollmentRequestData data) { + public void approveRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "approve"); } - public void rejectRequest(RequestId id, AgentEnrollmentRequestData data) { + public void rejectRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "reject"); } - public void cancelRequest(RequestId id, AgentEnrollmentRequestData data) { + public void cancelRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "cancel"); } - public void updateRequest(RequestId id, AgentEnrollmentRequestData data) { + public void updateRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "update"); } - public void validateRequest(RequestId id, AgentEnrollmentRequestData data) { + public void validateRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "validate"); } - public void unassignRequest(RequestId id, AgentEnrollmentRequestData data) { + public void unassignRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "unassign"); } - public void assignRequest(RequestId id, AgentEnrollmentRequestData data) { + public void assignRequest(RequestId id, CertReviewResponse data) { changeRequestState(id, data, "assign"); } - public void changeRequestState(RequestId id, AgentEnrollmentRequestData data, String op) { + public void changeRequestState(RequestId id, CertReviewResponse data, String op) { if (id == null) { throw new BadRequestException("Bad data input in CertRequestResourceService. op:" + op); } @@ -140,36 +140,36 @@ public class CertRequestService extends PKIService implements CertRequestResourc dao.changeRequestState(id, servletRequest, data, getLocale(), op); } catch (ERejectException e) { CMS.debug("changeRequestState: execution rejected " + e); - throw new CMSException(Response.Status.BAD_REQUEST, + throw new PKIException(Response.Status.BAD_REQUEST, CMS.getUserMessage(getLocale(), "CMS_PROFILE_REJECTED", e.toString())); } catch (EDeferException e) { CMS.debug("changeRequestState: execution defered " + e); // TODO do we throw an exception here? - throw new CMSException(Response.Status.BAD_REQUEST, + throw new PKIException(Response.Status.BAD_REQUEST, CMS.getUserMessage(getLocale(), "CMS_PROFILE_DEFERRED", e.toString())); } catch (BadRequestDataException e) { CMS.debug("changeRequestState: bad request data: " + e); - throw new CMSException(Response.Status.BAD_REQUEST, e.toString()); + throw new PKIException(Response.Status.BAD_REQUEST, e.toString()); } catch (EPropertyException e) { CMS.debug("changeRequestState: execution error " + e); - throw new CMSException(CMS.getUserMessage(getLocale(), + throw new PKIException(CMS.getUserMessage(getLocale(), "CMS_PROFILE_PROPERTY_ERROR", e.toString())); } catch (EProfileException e) { CMS.debug("ProfileProcessServlet: execution error " + e); - throw new CMSException(CMS.getUserMessage(getLocale(), "CMS_INTERNAL_ERROR")); + throw new PKIException(CMS.getUserMessage(getLocale(), "CMS_INTERNAL_ERROR")); } catch (EBaseException e) { e.printStackTrace(); - throw new CMSException("Problem approving request in CertRequestResource.assignRequest! " + e); + throw new PKIException("Problem approving request in CertRequestResource.assignRequest! " + e); } catch (RequestNotFoundException e) { CMS.debug(e); - throw new CMSException(Response.Status.BAD_REQUEST, + throw new PKIException(Response.Status.BAD_REQUEST, CMS.getUserMessage(getLocale(), "CMS_REQUEST_NOT_FOUND", id.toString())); } } - public AgentEnrollmentRequestData reviewRequest(@PathParam("id") RequestId id) { + public CertReviewResponse reviewRequest(@PathParam("id") RequestId id) { // auth and authz - AgentEnrollmentRequestData info; + CertReviewResponse info; CertRequestDAO dao = new CertRequestDAO(); try { @@ -177,7 +177,7 @@ public class CertRequestService extends PKIService implements CertRequestResourc } catch (EBaseException e) { // log error e.printStackTrace(); - throw new CMSException("Error getting Cert request info!"); + throw new PKIException("Error getting Cert request info!"); } if (info == null) { @@ -211,7 +211,7 @@ public class CertRequestService extends PKIService implements CertRequestResourc } catch (EBaseException e) { CMS.debug("listRequests: error in obtaining request results" + e); e.printStackTrace(); - throw new CMSException("Error listing cert requests!"); + throw new PKIException("Error listing cert requests!"); } return requests; } |