summaryrefslogtreecommitdiffstats
path: root/pki/base
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-01-06 15:17:20 -0500
committerAde Lee <alee@redhat.com>2012-01-13 16:18:48 -0500
commite7ffc2b51be1e0826f93889896e3601b5f1d3f57 (patch)
tree02d358724e37ae78a3d8ba418a3b548936e7c6d3 /pki/base
parentdbfa1508770473ae5c27049b967abb67956c6572 (diff)
downloadpki-e7ffc2b51be1e0826f93889896e3601b5f1d3f57.tar.gz
pki-e7ffc2b51be1e0826f93889896e3601b5f1d3f57.tar.xz
pki-e7ffc2b51be1e0826f93889896e3601b5f1d3f57.zip
Added initial code for retrieving transport cert.
Resources now extend CMSResource. Addressed following review comments: * check for null pointers in SystemCertificateResource * move logic from CertificatData constructor to CMSServlet builder method * remove unused field uriInfo and replace hard-coded cache constant * fixed some formatting issues
Diffstat (limited to 'pki/base')
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java88
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/base/CMSResource.java69
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java53
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java3
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java4
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java5
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java5
7 files changed, 221 insertions, 6 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java b/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java
new file mode 100644
index 000000000..b1e47ec3a
--- /dev/null
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java
@@ -0,0 +1,88 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// (C) 2012 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
+package com.netscape.cms.servlet.admin;
+
+import java.security.cert.CertificateEncodingException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+
+import com.netscape.certsrv.apps.CMS;
+import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
+import com.netscape.certsrv.security.ITransportKeyUnit;
+import com.netscape.cms.servlet.base.CMSResource;
+import com.netscape.cms.servlet.cert.model.CertificateData;
+
+/**
+ * This is the class used to list, retrieve and modify system certificates for all Java subsystems.
+ *
+ * @author alee
+ *
+ */
+@Path("/config/cert")
+public class SystemCertificateResource extends CMSResource {
+
+ @Context
+ Request request;
+
+ /**
+ * Used to retrieve the transport certificate
+ */
+ @GET
+ @Path("/transport")
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
+ public Response getTransportCert() {
+ CertificateData cert = null;
+ IKeyRecoveryAuthority kra = null;
+
+ // auth and authz
+
+ kra = (IKeyRecoveryAuthority) CMS.getSubsystem("kra");
+ if (kra == null) {
+ // no KRA
+ throw new WebApplicationException(Response.Status.NOT_FOUND);
+ }
+
+ ITransportKeyUnit tu = kra.getTransportKeyUnit();
+ if (tu == null) {
+ CMS.debug("getTransportCert: transport key unit is null");
+ throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
+ }
+ org.mozilla.jss.crypto.X509Certificate transportCert = tu.getCertificate();
+ if (transportCert == null) {
+ CMS.debug("getTransportCert: transport cert is null");
+ throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
+ }
+ try {
+ cert = createCertificateData(transportCert);
+ } catch (CertificateEncodingException e) {
+ CMS.debug("getTransportCert: certificate encoding exception with transport cert");
+ e.printStackTrace();
+ throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
+ }
+ return sendConditionalGetResponse(DEFAULT_LONG_CACHE_LIFETIME, cert, request);
+ }
+
+}
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSResource.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSResource.java
new file mode 100644
index 000000000..48b04859b
--- /dev/null
+++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSResource.java
@@ -0,0 +1,69 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// (C) 2012 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package com.netscape.cms.servlet.base;
+
+import java.security.cert.CertificateEncodingException;
+
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+
+import com.netscape.certsrv.apps.CMS;
+import com.netscape.cms.servlet.cert.model.CertificateData;
+
+/**
+ * Base class for CMS RESTful resources
+ *
+ * @author alee
+ *
+ */
+public class CMSResource {
+ protected static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
+ protected static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
+
+ // caching parameters
+ protected static final int DEFAULT_LONG_CACHE_LIFETIME = 1000;
+
+ protected Response sendConditionalGetResponse(int ctime, Object object, Request request) {
+ CacheControl cc = new CacheControl();
+ cc.setMaxAge(ctime);
+ EntityTag tag = new EntityTag(Integer.toString(object.hashCode()));
+
+ ResponseBuilder builder = request.evaluatePreconditions(tag);
+ if (builder != null) {
+ builder.cacheControl(cc);
+ return builder.build();
+ }
+
+ builder = Response.ok(object);
+ builder.cacheControl(cc);
+ builder.tag(tag);
+ return builder.build();
+ }
+
+ public CertificateData createCertificateData(org.mozilla.jss.crypto.X509Certificate cert)
+ throws CertificateEncodingException {
+ CertificateData data = new CertificateData();
+ String b64 = HEADER + CMS.BtoA(cert.getEncoded()) + TRAILER;
+ data.setB64(b64);
+ return data;
+ }
+
+}
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java b/pki/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
new file mode 100644
index 000000000..14c537098
--- /dev/null
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
@@ -0,0 +1,53 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// (C) 2012 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package com.netscape.cms.servlet.cert.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * @author alee
+ *
+ */
+@XmlRootElement(name = "CertificateData")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class CertificateData {
+ @XmlElement
+ private String b64;
+
+ public CertificateData() {
+ // required for jaxb
+ }
+
+ /**
+ * @return the b64
+ */
+ public String getB64() {
+ return b64;
+ }
+
+ /**
+ * @param b64 the b64 to set
+ */
+ public void setB64(String b64) {
+ this.b64 = b64;
+ }
+
+}
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java
index fef29f9cb..3f8e8b2cf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import com.netscape.cms.servlet.base.CMSResource;
import com.netscape.cms.servlet.key.model.KeyDAO;
import com.netscape.cms.servlet.key.model.KeyData;
import com.netscape.cms.servlet.request.model.KeyRequestDAO;
@@ -42,7 +43,7 @@ import com.netscape.certsrv.base.EBaseException;
*
*/
@Path("/key")
-public class KeyResource {
+public class KeyResource extends CMSResource {
@Context
UriInfo uriInfo;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java
index 38a124e9a..98f12ae5a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.UriInfo;
import java.util.List;
import com.netscape.certsrv.base.EBaseException;
+import com.netscape.cms.servlet.base.CMSResource;
import com.netscape.cms.servlet.key.model.KeyDAO;
import com.netscape.cms.servlet.key.model.KeyDataInfo;
@@ -40,7 +41,8 @@ import com.netscape.cms.servlet.key.model.KeyDataInfo;
*
*/
@Path("/keys")
-public class KeysResource {
+public class KeysResource extends CMSResource {
+
@Context
UriInfo uriInfo;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java b/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java
index 3a213495b..154986624 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import com.netscape.certsrv.base.EBaseException;
+import com.netscape.cms.servlet.base.CMSResource;
import com.netscape.cms.servlet.request.model.ArchivalRequestData;
import com.netscape.cms.servlet.request.model.KeyRequestDAO;
import com.netscape.cms.servlet.request.model.KeyRequestInfo;
@@ -41,8 +42,8 @@ import com.netscape.cms.servlet.request.model.RecoveryRequestData;
*
*/
@Path("/keyrequest")
-public class KeyRequestResource {
-
+public class KeyRequestResource extends CMSResource {
+
@Context
UriInfo uriInfo;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java b/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java
index c5641cb1a..3624b1bd6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.UriInfo;
import com.netscape.certsrv.apps.CMS;
import com.netscape.certsrv.base.EBaseException;
+import com.netscape.cms.servlet.base.CMSResource;
import com.netscape.cms.servlet.request.model.KeyRequestDAO;
import com.netscape.cms.servlet.request.model.KeyRequestInfo;
@@ -39,8 +40,8 @@ import com.netscape.cms.servlet.request.model.KeyRequestInfo;
*
*/
@Path("/keyrequests")
-public class KeyRequestsResource {
-
+public class KeyRequestsResource extends CMSResource {
+
@Context
UriInfo uriInfo;