diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-26 20:40:08 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-03 17:07:13 -0500 |
commit | eca4d635e67eaf3c6878d35acfaaf11df53151e2 (patch) | |
tree | 32d947e0eeec6a36ea9cc1e7ebf0804b487da7e2 /base/common/src/com/netscape/cms/servlet/request | |
parent | 1d85941aa2f80f3da619504fe4310fe47cb5b036 (diff) | |
download | pki-eca4d635e67eaf3c6878d35acfaaf11df53151e2.tar.gz pki-eca4d635e67eaf3c6878d35acfaaf11df53151e2.tar.xz pki-eca4d635e67eaf3c6878d35acfaaf11df53151e2.zip |
Moved REST services into separate URLs.
To support different access control configurations the REST
services have been separated by roles. Services that don't
need authentication will be available under /rest. Services
that require agent rights will be available under /rest/agent.
Services that require admin rights will be available under
/rest/admin.
Ticket #107
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java | 35 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java | 21 |
2 files changed, 29 insertions, 27 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java b/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java index f35074738..fc06e5e10 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java @@ -34,7 +34,7 @@ import com.netscape.cms.servlet.request.model.CertRequestInfo; import com.netscape.cms.servlet.request.model.CertRequestInfos; import com.netscape.cms.servlet.request.model.EnrollmentRequestData; -@Path("/certrequests") +@Path("") public interface CertRequestResource { public static final int DEFAULT_START = 0; @@ -46,7 +46,8 @@ public interface CertRequestResource { * Used to generate list of cert requests based on the search parameters */ @GET - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Path("agent/certrequests") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public CertRequestInfos listRequests(@QueryParam("requestState") String requestState, @QueryParam("requestType") String requestType, @DefaultValue("" + DEFAULT_START) @QueryParam("start") RequestId start, @@ -58,60 +59,60 @@ public interface CertRequestResource { * Used to retrieve cert request info for a specific request */ @GET - @Path("{id}") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Path("certrequests/{id}") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public CertRequestInfo getRequestInfo(@PathParam("id") RequestId id); @GET - @Path("{id}/agentView") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Path("agent/certrequests/{id}") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public AgentEnrollmentRequestData reviewRequest(@PathParam("id") RequestId id); // Enrollment - used to test integration with a browser @POST - @Path("enroll") - @Produces({ MediaType.TEXT_XML }) + @Path("certrequests") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_FORM_URLENCODED }) public CertRequestInfos enrollCert(MultivaluedMap<String, String> form); @POST - @Path("enroll") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Path("certrequests") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public CertRequestInfos enrollCert(EnrollmentRequestData data); @POST - @Path("{id}/approve") + @Path("agent/certrequests/{id}/approve") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void approveRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); @POST - @Path("{id}/reject") + @Path("agent/certrequests/{id}/reject") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void rejectRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); @POST - @Path("{id}/cancel") + @Path("agent/certrequests/{id}/cancel") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void cancelRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); @POST - @Path("{id}/update") + @Path("agent/certrequests/{id}/update") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void updateRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); @POST - @Path("{id}/validate") + @Path("agent/certrequests/{id}/validate") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void validateRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); @POST - @Path("{id}/unassign") + @Path("agent/certrequests/{id}/unassign") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void unassignRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); @POST - @Path("{id}/assign") + @Path("agent/certrequests/{id}/assign") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void assignRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data); } diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java index cf326540d..9ed2eb2a1 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java @@ -17,8 +17,9 @@ import com.netscape.cms.servlet.request.model.KeyRequestInfo; import com.netscape.cms.servlet.request.model.KeyRequestInfos; import com.netscape.cms.servlet.request.model.RecoveryRequestData; -@Path("/keyrequests") +@Path("agent/keyrequests") public interface KeyRequestResource { + public final String SYMMETRIC_KEY_TYPE = "symmetricKey"; public final String PASS_PHRASE_TYPE = "passPhrase"; public final String ASYMMETRIC_KEY_TYPE = "asymmetricKey"; @@ -32,7 +33,7 @@ public interface KeyRequestResource { * Used to generate list of key requests based on the search parameters */ @GET - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyRequestInfos listRequests(@QueryParam("requestState") String requestState, @QueryParam("requestType") String requestType, @QueryParam("clientID") String clientID, @@ -47,45 +48,45 @@ public interface KeyRequestResource { */ @GET @Path("{id}") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyRequestInfo getRequestInfo(@PathParam("id") RequestId id); // Archiving - used to test integration with a browser @POST @Path("archive") - @Produces({ MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) public KeyRequestInfo archiveKey(MultivaluedMap<String, String> form); @POST @Path("archive") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyRequestInfo archiveKey(ArchivalRequestData data); //Recovery - used to test integration with a browser @POST @Path("recover") - @Produces({ MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) public KeyRequestInfo recoverKey(MultivaluedMap<String, String> form); @POST @Path("recover") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyRequestInfo recoverKey(RecoveryRequestData data); @POST - @Path("approve/{id}") + @Path("{id}/approve") public void approveRequest(@PathParam("id") RequestId id); @POST - @Path("reject/{id}") + @Path("{id}/reject") public void rejectRequest(@PathParam("id") RequestId id); @POST - @Path("cancel/{id}") + @Path("{id}/cancel") public void cancelRequest(@PathParam("id") RequestId id); } |