diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request')
5 files changed, 53 insertions, 46 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CMSRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/CMSRequestInfo.java index 07a02cd1c..f06334f6b 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CMSRequestInfo.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CMSRequestInfo.java @@ -20,15 +20,20 @@ package com.netscape.cms.servlet.request.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.request.RequestStatusAdapter; @XmlAccessorType(XmlAccessType.FIELD) public class CMSRequestInfo { + @XmlElement protected String requestType; @XmlElement - protected String requestStatus; + @XmlJavaTypeAdapter(RequestStatusAdapter.class) + protected RequestStatus requestStatus; @XmlElement protected String requestURL; @@ -50,14 +55,14 @@ public class CMSRequestInfo { /** * @return the requestStatus */ - public String getRequestStatus() { + public RequestStatus getRequestStatus() { return requestStatus; } /** * @param requestStatus the requestStatus to set */ - public void setRequestStatus(String requestStatus) { + public void setRequestStatus(RequestStatus requestStatus) { this.requestStatus = requestStatus; } 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 da1c78661..193a53c89 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 @@ -43,6 +43,7 @@ import com.netscape.cms.servlet.cert.RequestProcessor; import com.netscape.cms.servlet.processors.Processor; import com.netscape.cms.servlet.request.RequestNotFoundException; + /** * @author alee * @@ -55,7 +56,6 @@ public class CertRequestDAO extends CMSRequestDAO { private Random random = null; public static final String ATTR_SERIALNO = "serialNumber"; - public static final String REQ_COMPLETE = "complete"; public CertRequestDAO() { super("ca"); @@ -154,7 +154,6 @@ public class CertRequestDAO extends CMSRequestDAO { return info; } - private void addNonce(AgentEnrollmentRequestData info, HttpServletRequest servletRequest) throws EBaseException { if (nonces != null) { long n = random.nextLong(); @@ -209,7 +208,6 @@ public class CertRequestDAO extends CMSRequestDAO { processor.processRequest(request, data, ireq, op); } - @Override public CertRequestInfo createCMSRequestInfo(IRequest request, UriInfo uriInfo) { return CertRequestInfoFactory.create(request, uriInfo); diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfo.java index 20c298136..0754fe547 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfo.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfo.java @@ -29,6 +29,8 @@ import com.netscape.certsrv.dbs.certdb.CertId; @XmlAccessorType(XmlAccessType.FIELD) public class CertRequestInfo extends CMSRequestInfo { + public static final String REQ_COMPLETE = "complete"; + @XmlElement protected String certURL; diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java index 7045f3366..c21ea35c9 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java @@ -1,20 +1,21 @@ -//--- 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. +// --- 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. +// 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. +// 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 --- +// (C) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + package com.netscape.cms.servlet.request.model; import java.math.BigInteger; @@ -25,57 +26,58 @@ import javax.ws.rs.core.UriInfo; import netscape.security.x509.X509CertImpl; +import org.apache.commons.lang.StringUtils; + import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.cert.CertResource; import com.netscape.cms.servlet.request.CertRequestResource; public class CertRequestInfoFactory { - public static final String REQ_COMPLETE = "complete"; - public static CertRequestInfo create(IRequest request, UriInfo uriInfo) { - CertRequestInfo ret = new CertRequestInfo(); + + CertRequestInfo info = new CertRequestInfo(); + String requestType = request.getRequestType(); - String requestStatus = request.getRequestStatus().toString(); + RequestStatus requestStatus = request.getRequestStatus(); - ret.setRequestType(requestType); - ret.setRequestStatus(requestStatus); + info.setRequestType(requestType); + info.setRequestStatus(requestStatus); - ret.setCertRequestType(request.getExtDataInString("cert_request_type")); + info.setCertRequestType(request.getExtDataInString("cert_request_type")); Path certRequestPath = CertRequestResource.class.getAnnotation(Path.class); - RequestId rid = request.getRequestId(); + RequestId requestId = request.getRequestId(); UriBuilder reqBuilder = uriInfo.getBaseUriBuilder(); - reqBuilder.path(certRequestPath.value() + "/" + rid); - ret.setRequestURL(reqBuilder.build().toString()); + reqBuilder.path(certRequestPath.value() + "/" + requestId); + info.setRequestURL(reqBuilder.build().toString()); + + //Get Cert info if issued. - //Get cert info if issued. String serialNoStr = null; - if ((requestType != null) && (requestStatus != null)) { - if (requestStatus.equals(REQ_COMPLETE)) { - X509CertImpl impl[] = new X509CertImpl[1]; - impl[0] = request.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT); + if (requestType != null && requestStatus == RequestStatus.COMPLETE) { + X509CertImpl impl[] = new X509CertImpl[1]; + impl[0] = request.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT); - BigInteger serialNo; - if (impl[0] != null) { - serialNo = impl[0].getSerialNumber(); - serialNoStr = serialNo.toString(); - } + BigInteger serialNo; + if (impl[0] != null) { + serialNo = impl[0].getSerialNumber(); + serialNoStr = serialNo.toString(); } - } - if (serialNoStr != null && !serialNoStr.equals("")) { + if (!StringUtils.isEmpty(serialNoStr)) { Path certPath = CertResource.class.getAnnotation(Path.class); UriBuilder certBuilder = uriInfo.getBaseUriBuilder(); certBuilder.path(certPath.value() + "/" + serialNoStr); - ret.setCertURL(certBuilder.build().toString()); + info.setCertURL(certBuilder.build().toString()); } - return ret; - } + return info; + } } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java index 9def75248..ac54d5cca 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java @@ -216,7 +216,7 @@ public class KeyRequestDAO extends CMSRequestDAO { KeyRequestInfo ret = new KeyRequestInfo(); ret.setRequestType(request.getRequestType()); - ret.setRequestStatus(request.getRequestStatus().toString()); + ret.setRequestStatus(request.getRequestStatus()); Path keyRequestPath = KeyRequestResource.class.getAnnotation(Path.class); RequestId rid = request.getRequestId(); |