diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2013-07-17 13:20:25 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2013-07-22 09:55:10 -0400 |
| commit | dbf97dfa2f163094b5ce0af299ec4bd902ed3488 (patch) | |
| tree | d7b745e776cbcd47889904d70c135fdc0627eb9d /base/common/src/com/netscape/cms/servlet | |
| parent | 4aa89a9c421a08f7a1367343ced9dcdbcddd849e (diff) | |
| download | pki-dbf97dfa2f163094b5ce0af299ec4bd902ed3488.tar.gz pki-dbf97dfa2f163094b5ce0af299ec4bd902ed3488.tar.xz pki-dbf97dfa2f163094b5ce0af299ec4bd902ed3488.zip | |
Fixed dependency issue on CMSRequest.
The CMSRequest is a server class but it's used by the ICommandQueue
that belongs in the base package. To fix the dependency issue the
CMSRequest has been refactored to implement a new interface
ICMSRequest in the base package. Some constants in CMSRequest have
also been moved into ICMSRequest. All code referencing CMSRequest
has been adjusted accordingly.
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet')
74 files changed, 395 insertions, 335 deletions
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 744a000e3..56a37b34d 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -71,6 +71,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -492,7 +493,7 @@ public abstract class CMSServlet extends HttpServlet { try { if (iCommandQueue.registerProcess(cmsRequest, this) == false) { - cmsRequest.setStatus(CMSRequest.ERROR); + cmsRequest.setStatus(ICMSRequest.ERROR); renderResult(cmsRequest); SessionContext.releaseContext(); return; @@ -708,7 +709,7 @@ public abstract class CMSServlet extends HttpServlet { try { Locale[] locale = new Locale[1]; CMSLoadTemplate loadTempl = - mTemplates.get(CMSRequest.EXCEPTION); + mTemplates.get(ICMSRequest.EXCEPTION); CMSTemplate template = getTemplate(loadTempl.mTemplateName, cmsReq.getHttpReq(), locale); ICMSTemplateFiller filler = loadTempl.mFiller; @@ -718,7 +719,7 @@ public abstract class CMSServlet extends HttpServlet { // will leave the requestStatus value set to something other // than CMSRequest.EXCEPTION, so force the requestStatus to // EXCEPTION since it must be that if we're here. - cmsReq.setStatus(CMSRequest.EXCEPTION); + cmsReq.setStatus(ICMSRequest.EXCEPTION); if (filler != null) { templateParams = filler.getTemplateParams( @@ -1253,37 +1254,37 @@ public abstract class CMSServlet extends HttpServlet { } mTemplates.put( - CMSRequest.UNAUTHORIZED, + ICMSRequest.UNAUTHORIZED, new CMSLoadTemplate( PROP_UNAUTHORIZED_TEMPLATE, PROP_UNAUTHOR_TEMPLATE_FILLER, unauthorizedTemplate, null)); mTemplates.put( - CMSRequest.SUCCESS, + ICMSRequest.SUCCESS, new CMSLoadTemplate( PROP_SUCCESS_TEMPLATE, PROP_SUCCESS_TEMPLATE_FILLER, successTemplate, new GenSuccessTemplateFiller())); mTemplates.put( - CMSRequest.PENDING, + ICMSRequest.PENDING, new CMSLoadTemplate( PROP_PENDING_TEMPLATE, PROP_PENDING_TEMPLATE_FILLER, pendingTemplate, new GenPendingTemplateFiller())); mTemplates.put( - CMSRequest.SVC_PENDING, + ICMSRequest.SVC_PENDING, new CMSLoadTemplate( PROP_SVC_PENDING_TEMPLATE, PROP_SVC_PENDING_TEMPLATE_FILLER, svcpendingTemplate, new GenSvcPendingTemplateFiller())); mTemplates.put( - CMSRequest.REJECTED, + ICMSRequest.REJECTED, new CMSLoadTemplate( PROP_REJECTED_TEMPLATE, PROP_REJECTED_TEMPLATE_FILLER, rejectedTemplate, new GenRejectedTemplateFiller())); mTemplates.put( - CMSRequest.ERROR, + ICMSRequest.ERROR, new CMSLoadTemplate( PROP_ERROR_TEMPLATE, PROP_ERROR_TEMPLATE_FILLER, errorTemplate, new GenErrorTemplateFiller())); mTemplates.put( - CMSRequest.EXCEPTION, + ICMSRequest.EXCEPTION, new CMSLoadTemplate( PROP_EXCEPTION_TEMPLATE, PROP_EXCEPTION_TEMPLATE_FILLER, unexpectedErrorTemplate, new GenUnexpectedErrorTemplateFiller())); diff --git a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java index 895e099fb..52b1258eb 100644 --- a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java @@ -27,6 +27,7 @@ import javax.servlet.ServletException; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; @@ -53,7 +54,7 @@ public class DisplayHtmlServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); mHTMLPath = sc.getInitParameter(PROP_HTML_PATH); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/common/src/com/netscape/cms/servlet/base/GetStats.java index 8c32e78c3..5fbed7bbc 100644 --- a/base/common/src/com/netscape/cms/servlet/base/GetStats.java +++ b/base/common/src/com/netscape/cms/servlet/base/GetStats.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.util.IStatsSubsystem; import com.netscape.certsrv.util.StatsEvent; @@ -74,7 +75,7 @@ public class GetStats extends CMSServlet { if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -102,7 +103,7 @@ public class GetStats extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -116,7 +117,7 @@ public class GetStats extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -141,15 +142,15 @@ public class GetStats extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java index bdb02cae3..c81005b3b 100644 --- a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java @@ -25,6 +25,7 @@ import javax.servlet.ServletException; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.common.CMSGateway; import com.netscape.cms.servlet.common.CMSRequest; @@ -63,7 +64,7 @@ public class IndexServlet extends CMSServlet { PROP_SUCCESS_TEMPLATE, PROP_SUCCESS_TEMPLATE_FILLER, mTemplateName, new IndexTemplateFiller())); */ - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } public CMSRequest newCMSRequest() { @@ -105,6 +106,6 @@ public class IndexServlet extends CMSServlet { CMS.getLogMessage("CMSG_ERROR_DISPLAY_TEMPLATE")); } } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } diff --git a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java index 1e4f0913e..4b1b48108 100644 --- a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java @@ -28,6 +28,7 @@ import org.w3c.dom.Node; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cmsutil.xml.XMLObject; @@ -49,8 +50,8 @@ public class PortsServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override these to output directly ourselves. - mTemplates.remove(CMSRequest.SUCCESS); - mTemplates.remove(CMSRequest.ERROR); + mTemplates.remove(ICMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.ERROR); } /** diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index b45f46d12..71c10ead9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -49,6 +49,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -121,7 +122,7 @@ public class CMCRevReqServlet extends CMSServlet { mFormPath = "/" + authorityId + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mAuthority instanceof ICertificateAuthority) { mCertDB = ((ICertificateAuthority) mAuthority).getCertificateRepository(); } @@ -181,7 +182,7 @@ public class CMCRevReqServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -290,7 +291,7 @@ public class CMCRevReqServlet extends CMSServlet { ServletOutputStream out = resp.getOutputStream(); if ((serialNoArray == null) || (serialNoArray.length == 0)) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); EBaseException ee = new EBaseException("No matched certificate is found"); cmsReq.setError(ee); @@ -301,7 +302,7 @@ public class CMCRevReqServlet extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index 0b59fdc97..097035be1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -48,6 +48,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -113,7 +114,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { mFormPath = "/" + authorityId + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mAuthority instanceof ICertificateAuthority) { mCertDB = ((ICertificateAuthority) mAuthority).getCertificateRepository(); } @@ -202,7 +203,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -273,7 +274,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { } if (serialNoArray.length == 0) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); EBaseException ee = new EBaseException("No matched certificate is found"); cmsReq.setError(ee); @@ -284,7 +285,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java index aa7abc92e..bf5fc490f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java @@ -31,6 +31,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; @@ -94,7 +95,7 @@ public class CloneRedirect extends CMSServlet { mCA = (ICertificateAuthority) mAuthority; // override success to do output with our own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -131,7 +132,7 @@ public class CloneRedirect extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java index aa48a7ca9..66c2aa268 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.cms.authentication.HashAuthentication; @@ -77,7 +78,7 @@ public class DirAuthServlet extends CMSServlet { } catch (Exception e) { } - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -100,7 +101,7 @@ public class DirAuthServlet extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getLogMessage("CMSGW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -114,7 +115,7 @@ public class DirAuthServlet extends CMSServlet { CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE")); cmsReq.setError(new ECMSGWException( CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -134,7 +135,7 @@ public class DirAuthServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -154,7 +155,7 @@ public class DirAuthServlet extends CMSServlet { if (!enable) { printError(cmsReq, "0"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } if (lastlogin == 0) @@ -162,7 +163,7 @@ public class DirAuthServlet extends CMSServlet { else if (diff > timeout) { mgr.disable(reqHost); printError(cmsReq, "2"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -184,15 +185,15 @@ public class DirAuthServlet extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -204,7 +205,7 @@ public class DirAuthServlet extends CMSServlet { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); header.addStringValue("authority", "Registration Manager"); header.addStringValue("errorCode", errorCode); String formPath = TPL_ERROR_FILE; @@ -219,7 +220,7 @@ public class DirAuthServlet extends CMSServlet { CMS.getLogMessage("ADMIN_SRVLT_ERR_GET_TEMPLATE", formPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -228,13 +229,13 @@ public class DirAuthServlet extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } } diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java index 8794143fa..4b195c282 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.cms.authentication.HashAuthentication; @@ -70,7 +71,7 @@ public class DisableEnrollResult extends CMSServlet { // coming from agent mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } protected CMSRequest newCMSRequest() { @@ -97,7 +98,7 @@ public class DisableEnrollResult extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -113,7 +114,7 @@ public class DisableEnrollResult extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getLogMessage("CMSGW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -127,7 +128,7 @@ public class DisableEnrollResult extends CMSServlet { CMS.getLogMessage("ADMIN_SRVLT_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -158,15 +159,15 @@ public class DisableEnrollResult extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java index 1b7524e19..da7f01ca5 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -53,6 +53,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.ICertPrettyPrint; import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.EDBRecordNotFoundException; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -119,7 +120,7 @@ public class DisplayBySerial extends CMSServlet { // override success and error templates to null - // handle templates locally. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -154,7 +155,7 @@ public class DisplayBySerial extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -204,10 +205,10 @@ public class DisplayBySerial extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java index 73b6e8456..3c9d5778c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -40,6 +40,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.ICRLPrettyPrint; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.dbs.crldb.ICRLRepository; import com.netscape.certsrv.logging.ILogger; @@ -91,7 +92,7 @@ public class DisplayCRL extends CMSServlet { if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -121,7 +122,7 @@ public class DisplayCRL extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -157,7 +158,7 @@ public class DisplayCRL extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java index e65082f4d..6c1d6f5f4 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.cms.authentication.HashAuthentication; @@ -77,7 +78,7 @@ public class DisplayHashUserEnroll extends CMSServlet { } catch (Exception e) { } - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } protected CMSRequest newCMSRequest() { @@ -103,7 +104,7 @@ public class DisplayHashUserEnroll extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -113,7 +114,7 @@ public class DisplayHashUserEnroll extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ERR_GET_TEMPLATE")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -130,7 +131,7 @@ public class DisplayHashUserEnroll extends CMSServlet { if (!isEnable) { printError(cmsReq, "0"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -145,7 +146,7 @@ public class DisplayHashUserEnroll extends CMSServlet { else if (diff > timeout) { mgr.disable(reqHost); printError(cmsReq, "2"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -161,7 +162,7 @@ public class DisplayHashUserEnroll extends CMSServlet { CMS.getLogMessage("ADMIN_SRVLT_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -170,15 +171,15 @@ public class DisplayHashUserEnroll extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_OUT_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -190,7 +191,7 @@ public class DisplayHashUserEnroll extends CMSServlet { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); header.addStringValue("authority", "Registration Manager"); header.addStringValue("errorCode", errorCode); String formPath = TPL_ERROR_FILE; @@ -205,7 +206,7 @@ public class DisplayHashUserEnroll extends CMSServlet { CMS.getLogMessage("ADMIN_SRVLT_ERR_GET_TEMPLATE", formPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -214,14 +215,14 @@ public class DisplayHashUserEnroll extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_BAD_SERV_OUT_STREAM", "", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } } } diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index 8f88e0c09..64a9856fc 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -54,6 +54,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -116,7 +117,7 @@ public class DoRevoke extends CMSServlet { mPublisherProcessor = ((ICertAuthority) mAuthority).getPublisherProcessor(); } - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -228,7 +229,7 @@ public class DoRevoke extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -309,12 +310,12 @@ public class DoRevoke extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else if (!authorized) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index 65abd8a22..63806e659 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -48,6 +48,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.AuditFormat; @@ -113,7 +114,7 @@ public class DoRevokeTPS extends CMSServlet { } mQueue = mAuthority.getRequestQueue(); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; mRenderResult = false; @@ -221,7 +222,7 @@ public class DoRevokeTPS extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index cca8381fd..142fea3c8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -43,6 +43,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.AuditFormat; @@ -96,7 +97,7 @@ public class DoUnrevoke extends CMSServlet { mPublisherProcessor = ((ICertAuthority) mAuthority).getPublisherProcessor(); } - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -167,7 +168,7 @@ public class DoUnrevoke extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -190,10 +191,10 @@ public class DoUnrevoke extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index ff383bbb4..0437a2e0e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -41,6 +41,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; @@ -99,7 +100,7 @@ public class DoUnrevokeTPS extends CMSServlet { } mQueue = mAuthority.getRequestQueue(); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mRenderResult = false; } @@ -165,7 +166,7 @@ public class DoUnrevokeTPS extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); o_status = "status=3"; errorString = "error=unauthorized"; String pp = o_status + "\n" + errorString; diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java index 5adf9f9f1..4904ec9b7 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -36,6 +36,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.cms.authentication.HashAuthentication; @@ -74,7 +75,7 @@ public class EnableEnrollResult extends CMSServlet { // coming from agent mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); random = new Random(); } @@ -102,7 +103,7 @@ public class EnableEnrollResult extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -118,7 +119,7 @@ public class EnableEnrollResult extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -132,7 +133,7 @@ public class EnableEnrollResult extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -169,15 +170,15 @@ public class EnableEnrollResult extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java index a0f73d33b..16e2ab840 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -52,6 +52,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.KeyGenInfo; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -241,7 +242,7 @@ public class EnrollServlet extends CMSServlet { } // override success template to allow direct import of keygen certs. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); try { // determine the service ID for signed audit log messages @@ -639,7 +640,7 @@ public class EnrollServlet extends CMSServlet { if (result.equals(IRequest.RES_ERROR)) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(req.getExtDataInString(IRequest.ERROR)); String[] svcErrors = req.getExtDataInStringArray(IRequest.SVCERRORS); @@ -757,7 +758,7 @@ public class EnrollServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); // store a message in the signed audit log file // (either an "admin" cert request for an admin certificate, @@ -1362,7 +1363,7 @@ public class EnrollServlet extends CMSServlet { if (httpParams.getValueAsString(OLD_CERT_TYPE, null) != null) { try { renderServerEnrollResult(cmsReq); - cmsReq.setStatus(CMSRequest.SUCCESS); // no default render + cmsReq.setStatus(ICMSRequest.SUCCESS); // no default render issuedCerts = cmsReq.getIRequest().getExtDataInCertArray( @@ -1382,7 +1383,7 @@ public class EnrollServlet extends CMSServlet { audit(auditMessage); } } catch (IOException ex) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); // (automated "agent" cert request processed - "rejected") auditMessage = CMS.getLogMessage( @@ -1419,7 +1420,7 @@ public class EnrollServlet extends CMSServlet { } // service success - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); issuedCerts = req.getExtDataInCertArray(IRequest.ISSUED_CERTS); String initiative = null; @@ -1457,7 +1458,7 @@ public class EnrollServlet extends CMSServlet { // return cert as mime type binary if requested. if (checkImportCertToNav(cmsReq.getHttpResp(), httpParams, issuedCerts[0])) { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); for (int i = 0; i < issuedCerts.length; i++) { // (automated "agent" cert request processed - "accepted") @@ -1480,7 +1481,7 @@ public class EnrollServlet extends CMSServlet { cmsReq.setResult(issuedCerts); renderTemplate(cmsReq, mEnrollSuccessTemplate, mEnrollSuccessFiller); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); for (int i = 0; i < issuedCerts.length; i++) { // (automated "agent" cert request processed - "accepted") diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java index 51b7f783f..2ea7da7c6 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -44,6 +44,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; @@ -101,7 +102,7 @@ public class GetBySerial extends CMSServlet { // override success and error templates to null - // handle templates locally. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); ICertificateAuthority mCa = (ICertificateAuthority) CMS.getSubsystem("ca"); if (mCa == null) { @@ -141,7 +142,7 @@ public class GetBySerial extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -159,7 +160,7 @@ public class GetBySerial extends CMSServlet { CMS.getLogMessage("CMSGW_INVALID_SERIAL_NUMBER")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_INVALID_SERIAL_NUMBER"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -169,7 +170,7 @@ public class GetBySerial extends CMSServlet { CMS.getLogMessage("CMSGW_CERT_SERIAL_NOT_FOUND_1", serialNo.toString(16))); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CERT_SERIAL_NOT_FOUND", "0x" + serialNo.toString(16)))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -202,7 +203,7 @@ public class GetBySerial extends CMSServlet { CMS.getLogMessage("CMSGW_CERT_SERIAL_NOT_FOUND_1", serialNo.toString(16))); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CERT_SERIAL_NOT_FOUND", "0x" + serialNo.toString(16)))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } } @@ -245,7 +246,7 @@ public class GetBySerial extends CMSServlet { try { CMSTemplate form = getTemplate(mIETemplate, req, locale); ServletOutputStream out = response.getOutputStream(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); response.setContentType("text/html"); form.renderOutput(out, argSet); return; @@ -265,7 +266,7 @@ public class GetBySerial extends CMSServlet { if (crmfReqId == null && checkImportCertToNav( cmsReq.getHttpResp(), cmsReq.getHttpParams(), cert)) { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -274,7 +275,7 @@ public class GetBySerial extends CMSServlet { cmsReq.setResult(certs); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); // XXX follow request in cert record to set certtype, which will // import cert only if it's client. For now assume "client" if diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index 6fd8be8ea..9ffb54671 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.base.UserInfo; @@ -73,7 +74,7 @@ public class GetCAChain extends CMSServlet { super.init(sc); // override success to display own output. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); // coming from ee mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; } @@ -107,7 +108,7 @@ public class GetCAChain extends CMSServlet { CMS.getUserMessage("CMS_GW_NO_OPTIONS_SELECTED")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); AuthzToken authzToken = null; @@ -124,7 +125,7 @@ public class GetCAChain extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -142,7 +143,7 @@ public class GetCAChain extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -183,7 +184,7 @@ public class GetCAChain extends CMSServlet { try { bytes = caCerts[0].getEncoded(); } catch (CertificateEncodingException e) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_GETTING_CACERT_ENCODED", e.toString())); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_GETTING_CA_CERT_ERROR")); @@ -204,7 +205,7 @@ public class GetCAChain extends CMSServlet { certChain.encode(encoded, false); bytes = encoded.toByteArray(); } catch (IOException e) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_ENCODING_CA_CHAIN_1", e.toString())); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_ENCODING_CA_CHAIN_ERROR")); @@ -240,7 +241,7 @@ public class GetCAChain extends CMSServlet { httpResp.setContentLength(bytes.length); httpResp.getOutputStream().flush(); } catch (IOException e) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_DISPLAYING_CACHAIN_1", e.toString())); throw new ECMSGWException( @@ -259,7 +260,7 @@ public class GetCAChain extends CMSServlet { ((ICertAuthority) mAuthority).getCACertChain(); if (certChain == null) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_CHAIN_NOT_AVAILABLE")); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_CA_CHAIN_NOT_AVAILABLE")); @@ -277,7 +278,7 @@ public class GetCAChain extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -366,13 +367,13 @@ public class GetCAChain extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_BAD_SERV_OUT_STREAM", "", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } } diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index 346dd2d34..3ea2297db 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.ICRLPrettyPrint; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -73,7 +74,7 @@ public class GetCRL extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -106,7 +107,7 @@ public class GetCRL extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -117,7 +118,7 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -132,7 +133,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -150,14 +151,14 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_NO_OPTIONS_SELECTED")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NO_OPTIONS_SELECTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } if (crlId == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_NO_CRL_ISSUING_POINT")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NO_CRL_SELECTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -174,7 +175,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_NO_CRL_ISSUING_POINT_FOUND", crlId)); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_FOUND"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } if (crlRecord == null) { @@ -182,7 +183,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_CRL_NOT_YET_UPDATED_1", crlId)); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_UPDATED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -207,7 +208,7 @@ public class GetCRL extends CMSServlet { CMS.getUserMessage( ((crlIP != null && crlIP.isCRLCacheEnabled() && crlIP.isCRLCacheEmpty()) ? "CMS_GW_CRL_CACHE_IS_EMPTY" : "CMS_GW_CRL_CACHE_IS_NOT_ENABLED"), crlId)); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -234,7 +235,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_CRL_NOT_YET_UPDATED_1", crlId)); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_UPDATED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } byte[] bytes = crlbytes; @@ -259,7 +260,7 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_FAILED_DECODE_CRL_1", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DECODE_CRL_FAILED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } if ((op.equals("importDeltaCRL") || (op.equals("displayCRL") && @@ -273,7 +274,7 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_NO_DELTA_CRL_1")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_UPDATED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } } @@ -423,13 +424,13 @@ public class GetCRL extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_OUT_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } return; } else if (op.equals("importCRL") || op.equals("importDeltaCRL")) { @@ -465,7 +466,7 @@ public class GetCRL extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAYING_CRLINFO_ERROR")); } // cmsReq.setResult(null); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index c0c575ad3..af8b3cc02 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.ra.IRegistrationAuthority; @@ -87,7 +88,7 @@ public class GetCertFromRequest extends CMSServlet { */ public void init(ServletConfig sc) throws ServletException { super.init(sc); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mQueue = mAuthority.getRequestQueue(); try { String tmp = sc.getInitParameter( @@ -158,7 +159,7 @@ public class GetCertFromRequest extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -258,7 +259,7 @@ public class GetCertFromRequest extends CMSServlet { // for importsCert to get the crmf_reqid. cmsReq.setIRequest(r); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); if (mImportCert && checkImportCertToNav(cmsReq.getHttpResp(), httpParams, certs[0])) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java index 99bdf2486..0c650cf69 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.cms.authentication.HashAuthentication; @@ -71,7 +72,7 @@ public class GetEnableStatus extends CMSServlet { // coming from agent mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } protected CMSRequest newCMSRequest() { @@ -102,7 +103,7 @@ public class GetEnableStatus extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -112,7 +113,7 @@ public class GetEnableStatus extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -127,7 +128,7 @@ public class GetEnableStatus extends CMSServlet { mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -158,15 +159,15 @@ public class GetEnableStatus extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java index bc9f09976..e82b2046f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.dbs.crldb.ICRLRepository; import com.netscape.certsrv.logging.ILogger; @@ -81,7 +82,7 @@ public class GetInfo extends CMSServlet { mCA = (ICertificateAuthority) mAuthority; // override success to do output our own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -111,7 +112,7 @@ public class GetInfo extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -170,10 +171,10 @@ public class GetInfo extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java index 66d3b4979..a6e9d832e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -68,6 +68,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -135,7 +136,7 @@ public class HashEnrollServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success template to allow direct import of keygen certs. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); try { mEnrollSuccessTemplate = sc.getInitParameter( CMSServlet.PROP_SUCCESS_TEMPLATE); @@ -179,7 +180,7 @@ public class HashEnrollServlet extends CMSServlet { if (host == null || !host.equals(reqHost)) { printError(cmsReq, "0"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -200,7 +201,7 @@ public class HashEnrollServlet extends CMSServlet { if (!enable) { printError(cmsReq, "0"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } if (lastlogin == 0) @@ -208,7 +209,7 @@ public class HashEnrollServlet extends CMSServlet { else if (diff > timeout) { mgr.disable(reqHost); printError(cmsReq, "2"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -234,7 +235,7 @@ public class HashEnrollServlet extends CMSServlet { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); header.addStringValue("authority", "Registration Manager"); header.addStringValue("errorCode", errorCode); String formPath = TPL_ERROR_FILE; @@ -249,7 +250,7 @@ public class HashEnrollServlet extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", formPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } try { @@ -257,14 +258,14 @@ public class HashEnrollServlet extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_BAD_SERV_OUT_STREAM", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } } @@ -339,7 +340,7 @@ public class HashEnrollServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -393,7 +394,7 @@ public class HashEnrollServlet extends CMSServlet { if (authToken == null) { printError(cmsReq, "3"); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } else { authMgr = @@ -609,9 +610,9 @@ public class HashEnrollServlet extends CMSServlet { if (httpParams.getValueAsString(OLD_CERT_TYPE, null) != null) { try { renderServerEnrollResult(cmsReq); - cmsReq.setStatus(CMSRequest.SUCCESS); // no default render + cmsReq.setStatus(ICMSRequest.SUCCESS); // no default render } catch (IOException ex) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } return; } @@ -700,7 +701,7 @@ public class HashEnrollServlet extends CMSServlet { if (result.equals(IRequest.RES_ERROR)) { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(req.getExtDataInString(IRequest.ERROR)); String[] svcErrors = req.getExtDataInStringArray(IRequest.SVCERRORS); @@ -744,7 +745,7 @@ public class HashEnrollServlet extends CMSServlet { } // service success - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); X509CertImpl[] issuedCerts = req.getExtDataInCertArray(IRequest.ISSUED_CERTS); @@ -765,7 +766,7 @@ public class HashEnrollServlet extends CMSServlet { // return cert as mime type binary if requested. if (checkImportCertToNav( cmsReq.getHttpResp(), httpParams, issuedCerts[0])) { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } @@ -774,7 +775,7 @@ public class HashEnrollServlet extends CMSServlet { cmsReq.setResult(issuedCerts); renderTemplate(cmsReq, mEnrollSuccessTemplate, mEnrollSuccessFiller); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_TEMP_REND_ERR", mEnrollSuccessFiller.toString(), e.toString())); diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java index 96b2a9026..185e1fa8e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java @@ -45,6 +45,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; @@ -99,7 +100,7 @@ public class ListCerts extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success to render own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mAuthority instanceof ICertificateAuthority) { ICertificateAuthority ca = (ICertificateAuthority) mAuthority; @@ -214,7 +215,7 @@ public class ListCerts extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -297,7 +298,7 @@ public class ListCerts extends CMSServlet { String queryCertFilter = buildFilter(req); if (queryCertFilter == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -335,12 +336,12 @@ public class ListCerts extends CMSServlet { if (xmlOutput != null && xmlOutput.equals("true")) { outputXML(resp, argSet); } else { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); resp.setContentType("text/html"); form.renderOutput(out, argSet); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java index 814bd4209..305620580 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -38,6 +38,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.ILogger; @@ -88,7 +89,7 @@ public class Monitor extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success to render own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mAuthority instanceof ICertificateAuthority) { ICertificateAuthority ca = (ICertificateAuthority) mAuthority; @@ -134,7 +135,7 @@ public class Monitor extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -183,10 +184,10 @@ public class Monitor extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java index 75e732676..c65c482b1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -41,6 +41,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.ILogger; @@ -92,7 +93,7 @@ public class ReasonToRevoke extends CMSServlet { mRandom = new Random(); } - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -136,7 +137,7 @@ public class ReasonToRevoke extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -199,10 +200,10 @@ public class ReasonToRevoke extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index c76181aa1..3f5434d9e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -44,6 +44,7 @@ import com.netscape.certsrv.authentication.IAuthSubsystem; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; @@ -123,7 +124,7 @@ public class RemoteAuthConfig extends CMSServlet { mAuthSubsystem = (IAuthSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_AUTH); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -256,7 +257,7 @@ public class RemoteAuthConfig extends CMSServlet { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_STREAM_TEMPLATE", e.toString())); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index f0840c408..a697e14e4 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -46,6 +46,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; @@ -95,7 +96,7 @@ public class RenewalServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success template. has same info as enrollment. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); try { mRenewalSuccessTemplate = sc.getInitParameter( PROP_SUCCESS_TEMPLATE); @@ -160,7 +161,7 @@ public class RenewalServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -346,7 +347,7 @@ public class RenewalServlet extends CMSServlet { CMS.debug( "RenewalServlet: Result for request " + req.getRequestId() + " is error."); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(req.getExtDataInString(IRequest.ERROR)); String[] svcErrors = req.getExtDataInStringArray(IRequest.SVCERRORS); @@ -410,7 +411,7 @@ public class RenewalServlet extends CMSServlet { throws EBaseException { cmsReq.setResult(new X509CertImpl[] { renewed_cert } ); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); // check if cert should be imported. // browser must have input type set to nav or cartman since diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index d136c5ff9..ec77d1cec 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -44,6 +44,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.ILogger; @@ -97,7 +98,7 @@ public class RevocationServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success template. has same info as enrollment. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mFormPath = "/" + TPL_FILE; try { @@ -180,7 +181,7 @@ public class RevocationServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -320,7 +321,7 @@ public class RevocationServlet extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_OUT_STREAM_TEMPLATE", e.toString())); diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index 0a04110c2..508a8df70 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -49,6 +49,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.dbs.certdb.IRevocationInfo; @@ -100,7 +101,7 @@ public class SrchCerts extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success to render own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mAuthority instanceof ISubsystem) { ISubsystem sub = mAuthority; @@ -506,7 +507,7 @@ public class SrchCerts extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -564,12 +565,12 @@ public class SrchCerts extends CMSServlet { if (xmlOutput != null && xmlOutput.equals("true")) { outputXML(resp, argSet); } else { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); resp.setContentType("text/html"); form.renderOutput(out, argSet); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java index a3cec570a..e39b66555 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -47,6 +47,7 @@ import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.EErrorPublishCRL; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; @@ -95,7 +96,7 @@ public class UpdateCRL extends CMSServlet { mCA = (ICertificateAuthority) mAuthority; // override success to do output orw own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -134,7 +135,7 @@ public class UpdateCRL extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); if (statsSub != null) { statsSub.endTiming("crl"); } @@ -182,10 +183,10 @@ public class UpdateCRL extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java index 6e580896e..a662f8e7b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -42,6 +42,7 @@ import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; @@ -118,7 +119,7 @@ public class UpdateDir extends CMSServlet { } // override success to do output orw own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) { mFormPath = mOutputTemplatePath; } @@ -150,7 +151,7 @@ public class UpdateDir extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -207,10 +208,10 @@ public class UpdateDir extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java index d7a32d340..5ac640952 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; @@ -37,15 +38,7 @@ import com.netscape.certsrv.request.RequestStatus; * * @version $Revision$, $Date$ */ -public class CMSRequest { - // statuses. the first two are out of band. - public static final Integer UNAUTHORIZED = Integer.valueOf(1); - public static final Integer SUCCESS = Integer.valueOf(2); - public static final Integer PENDING = Integer.valueOf(3); - public static final Integer SVC_PENDING = Integer.valueOf(4); - public static final Integer REJECTED = Integer.valueOf(5); - public static final Integer ERROR = Integer.valueOf(6); - public static final Integer EXCEPTION = Integer.valueOf(7); // unexpected error. +public class CMSRequest implements ICMSRequest { private static final String RESULT = "cmsRequestResult"; @@ -274,19 +267,19 @@ public class CMSRequest { // completed equivalent to success by default. if (status == RequestStatus.COMPLETE) { - mStatus = CMSRequest.SUCCESS; + mStatus = ICMSRequest.SUCCESS; return; } // unexpected resulting request status. if (status == RequestStatus.REJECTED) { - mStatus = CMSRequest.REJECTED; + mStatus = ICMSRequest.REJECTED; return; } // pending or service pending. else if (status == RequestStatus.PENDING) { - mStatus = CMSRequest.PENDING; + mStatus = ICMSRequest.PENDING; return; } else if (status == RequestStatus.SVC_PENDING) { - mStatus = CMSRequest.SVC_PENDING; + mStatus = ICMSRequest.SVC_PENDING; return; } else { RequestId reqId = mRequest.getRequestId(); diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java index 1d768a88f..cf0b0a063 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java @@ -23,6 +23,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; /** * default unexpected error template filler @@ -51,7 +52,7 @@ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { // will leave the requestStatus value set to something other // than CMSRequest.EXCEPTION, so force the requestStatus to // EXCEPTION since it must be that if we're here. - Integer sts = CMSRequest.EXCEPTION; + Integer sts = ICMSRequest.EXCEPTION; if (cmsReq != null) cmsReq.setStatus(sts); fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString()); diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java index 7a2c64d33..5634cfd55 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java @@ -45,6 +45,7 @@ import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.connector.IPKIMessage; import com.netscape.certsrv.connector.IRequestEncoder; import com.netscape.certsrv.logging.AuditFormat; @@ -210,7 +211,7 @@ public class CloneServlet extends CMSServlet { } if (authzToken == null) { - cmsRequest.setStatus(CMSRequest.UNAUTHORIZED); + cmsRequest.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index 63a078a84..5f1fc4805 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -57,6 +57,7 @@ import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.connector.IPKIMessage; import com.netscape.certsrv.connector.IRequestEncoder; import com.netscape.certsrv.logging.AuditFormat; @@ -238,7 +239,7 @@ public class ConnectorServlet extends CMSServlet { } if (authzToken == null) { - cmsRequest.setStatus(CMSRequest.UNAUTHORIZED); + cmsRequest.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index 7c6d50051..52f58afb2 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; @@ -305,7 +306,7 @@ public class GenerateKeyPairServlet extends CMSServlet { CMS.debug("GenerateKeyPairServlet: " + e.toString()); } - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index 860cc68f8..ebcd42c14 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -33,6 +33,7 @@ import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.cms.servlet.base.CMSServlet; @@ -312,7 +313,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { CMS.debug("TokenKeyRecoveryServlet: " + e.toString()); } - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index 78d8dab6b..1e8c65182 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -33,6 +33,7 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.system.InstallToken; import com.netscape.cms.servlet.base.CMSServlet; @@ -69,7 +70,7 @@ public class GetCookie extends CMSServlet { super.init(sc); CMS.debug("GetCookie init"); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mErrorFormPath = sc.getInitParameter("errorTemplatePath"); if (mOutputTemplatePath != null) { mFormPath = mOutputTemplatePath; @@ -155,7 +156,7 @@ public class GetCookie extends CMSServlet { try { ServletOutputStream out = httpResp.getOutputStream(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); httpResp.setContentType("text/html"); form.renderOutput(out, argSet); } catch (IOException ee) { @@ -201,7 +202,7 @@ public class GetCookie extends CMSServlet { try { ServletOutputStream out = httpResp.getOutputStream(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); httpResp.setContentType("text/html"); form.renderOutput(out, argSet); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java index db70d7729..69b2a9d2a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java @@ -30,6 +30,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; @@ -49,8 +50,8 @@ public class MainPageServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); - mTemplates.remove(CMSRequest.SUCCESS); - mTemplates.remove(CMSRequest.ERROR); + mTemplates.remove(ICMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.ERROR); } public void process(CMSRequest cmsReq) throws EBaseException { @@ -85,7 +86,7 @@ public class MainPageServlet extends CMSServlet { try { ServletOutputStream out = response.getOutputStream(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); response.setContentType("text/html"); form.renderOutput(out, argSet); } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 3b5567bdb..e9faca86d 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -86,7 +87,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { mRecoveryService = (IKeyService) mAuthority; mKeyDB = ((IKeyRecoveryAuthority) mAuthority).getKeyRepository(); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -158,7 +159,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java index 9c7454ec9..03af65c1f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -33,6 +33,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -84,7 +85,7 @@ public class DisplayBySerial extends CMSServlet { mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; mKeyDB = ((IKeyRecoveryAuthority) mAuthority).getKeyRepository(); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -124,7 +125,7 @@ public class DisplayBySerial extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index bfe47a957..48cac3785 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -33,6 +33,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -87,7 +88,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { mKeyDB = ((IKeyRecoveryAuthority) mAuthority).getKeyRepository(); mService = (IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -126,7 +127,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -177,7 +178,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java index 5c0fc73e9..81dcff4ce 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java @@ -25,6 +25,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.security.ITransportKeyUnit; @@ -58,7 +59,7 @@ public class DisplayTransport extends CMSServlet { */ public void init(ServletConfig sc) throws ServletException { super.init(sc); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -89,7 +90,7 @@ public class DisplayTransport extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -120,6 +121,6 @@ public class DisplayTransport extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index 008b372e2..cd3988944 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -80,7 +81,7 @@ public class ExamineRecovery extends CMSServlet { mService = (IKeyService) mAuthority; mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -122,7 +123,7 @@ public class ExamineRecovery extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -176,10 +177,10 @@ public class ExamineRecovery extends CMSServlet { ServletOutputStream out = resp.getOutputStream(); resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java index 4d3034741..7d24c7ceb 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -36,6 +36,7 @@ import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.security.Credential; @@ -85,7 +86,7 @@ public class GetApprovalStatus extends CMSServlet { // mFormPath = "/"+authority.getId()+"/"+TPL_FILE; mService = (com.netscape.certsrv.kra.IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -120,14 +121,14 @@ public class GetApprovalStatus extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } CMSTemplate form = null; Locale[] locale = new Locale[1]; - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); IArgBlock header = CMS.createArgBlock(); IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); @@ -230,6 +231,6 @@ public class GetApprovalStatus extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } diff --git a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java index 65f8d2936..773b91e65 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -33,6 +33,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -89,7 +90,7 @@ public class GetAsyncPk12 extends CMSServlet { mFormPath = "/agent/" + mAuthority.getId() + "/" + TPL_FILE; mService = (com.netscape.certsrv.kra.IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -133,7 +134,7 @@ public class GetAsyncPk12 extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -149,7 +150,7 @@ public class GetAsyncPk12 extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); IArgBlock header = CMS.createArgBlock(); IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); @@ -259,6 +260,6 @@ public class GetAsyncPk12 extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } diff --git a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index e22a19b82..c79a82f4d 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -88,7 +89,7 @@ public class GetPk12 extends CMSServlet { mFormPath = "/agent/" + mAuthority.getId() + "/" + TPL_FILE; mService = (com.netscape.certsrv.kra.IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -132,7 +133,7 @@ public class GetPk12 extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -148,7 +149,7 @@ public class GetPk12 extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); IArgBlock header = CMS.createArgBlock(); IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); @@ -253,6 +254,6 @@ public class GetPk12 extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java index 5b5aaaf8e..410039133 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -32,6 +32,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyService; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -81,7 +82,7 @@ public class GrantAsyncRecovery extends CMSServlet { mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; mService = (IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -127,7 +128,7 @@ public class GrantAsyncRecovery extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -170,7 +171,7 @@ public class GrantAsyncRecovery extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index 15d9999ee..9d57fbe7c 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyService; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -84,7 +85,7 @@ public class GrantRecovery extends CMSServlet { mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; mService = (IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -129,7 +130,7 @@ public class GrantRecovery extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -174,7 +175,7 @@ public class GrantRecovery extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index 3b46d8e91..7b961c0b2 100644 --- a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -38,6 +38,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.security.Credential; @@ -99,7 +100,7 @@ public class RecoverBySerial extends CMSServlet { mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; mService = (com.netscape.certsrv.kra.IKeyService) mAuthority; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -144,7 +145,7 @@ public class RecoverBySerial extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -160,7 +161,7 @@ public class RecoverBySerial extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); IArgBlock header = CMS.createArgBlock(); IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); @@ -250,7 +251,7 @@ public class RecoverBySerial extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index b249b663f..5bedf1f58 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -116,7 +117,7 @@ public class SrchKey extends CMSServlet { mKeyDB = ((IKeyRecoveryAuthority) mAuthority).getKeyRepository(); mAuthName = ((IKeyRecoveryAuthority) mAuthority).getX500Name(); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -168,7 +169,7 @@ public class SrchKey extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -230,7 +231,7 @@ public class SrchKey extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } /** diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index adb201c75..897acfc76 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; @@ -114,7 +115,7 @@ public class SrchKeyForRecovery extends CMSServlet { mKeyDB = ((IKeyRecoveryAuthority) mAuthority).getKeyRepository(); mAuthName = ((IKeyRecoveryAuthority) mAuthority).getX500Name(); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -166,7 +167,7 @@ public class SrchKeyForRecovery extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -233,10 +234,10 @@ public class SrchKeyForRecovery extends CMSServlet { ServletOutputStream out = resp.getOutputStream(); resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java index fef1a2e5c..f19a9d646 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java @@ -33,6 +33,7 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; @@ -88,7 +89,7 @@ public class AddCAServlet extends CMSServlet { // override success to display own output. mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mOCSPAuthority = (IOCSPAuthority) mAuthority; if (mOutputTemplatePath != null) @@ -129,7 +130,7 @@ public class AddCAServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -298,7 +299,7 @@ public class AddCAServlet extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java index c144d6e39..ac1aad373 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java @@ -41,6 +41,7 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.dbs.repository.IRepositoryRecord; import com.netscape.certsrv.logging.AuditFormat; @@ -95,7 +96,7 @@ public class AddCRLServlet extends CMSServlet { // override success to display own output. mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mOCSPAuthority = (IOCSPAuthority) mAuthority; if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -147,7 +148,7 @@ public class AddCRLServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( @@ -432,7 +433,7 @@ public class AddCRLServlet extends CMSServlet { resp.getOutputStream().write( "error=Sent CRL is older than the current CRL\n".getBytes()); resp.getOutputStream().flush(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); // NOTE: The signed audit events // LOGGING_SIGNED_AUDIT_CRL_RETRIEVAL and @@ -466,7 +467,7 @@ public class AddCRLServlet extends CMSServlet { resp.getOutputStream().write( "error=Delta CRLs are not supported.\n".getBytes()); resp.getOutputStream().flush(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } catch (Exception e) { @@ -519,7 +520,7 @@ public class AddCRLServlet extends CMSServlet { resp.setContentType("application/text"); resp.getOutputStream().write("status=0".getBytes()); resp.getOutputStream().flush(); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } else { CMS.debug("AddCRLServlet: return result noUI=false"); String xmlOutput = req.getParameter("xml"); @@ -528,7 +529,7 @@ public class AddCRLServlet extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java index cbe9283d3..8f44bf739 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; @@ -91,7 +92,7 @@ public class CheckCertServlet extends CMSServlet { // override success to display own output. mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mOCSPAuthority = (IOCSPAuthority) mAuthority; if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -123,7 +124,7 @@ public class CheckCertServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -204,7 +205,7 @@ public class CheckCertServlet extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java index 65c16d817..593f2de88 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java @@ -32,6 +32,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ocsp.IOCSPService; import com.netscape.cms.servlet.base.CMSServlet; @@ -71,7 +72,7 @@ public class GetOCSPInfo extends CMSServlet { // coming from agent mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -102,7 +103,7 @@ public class GetOCSPInfo extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -110,7 +111,7 @@ public class GetOCSPInfo extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -124,7 +125,7 @@ public class GetOCSPInfo extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -149,15 +150,15 @@ public class GetOCSPInfo extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java index b2365d009..4894c574a 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ocsp.IDefStore; @@ -79,7 +80,7 @@ public class ListCAServlet extends CMSServlet { // override success to display own output. mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mOCSPAuthority = (IOCSPAuthority) mAuthority; if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -107,7 +108,7 @@ public class ListCAServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -186,7 +187,7 @@ public class ListCAServlet extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 1e1b649e6..940bf657c 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -35,6 +35,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.ocsp.IOCSPService; import com.netscape.certsrv.util.IStatsSubsystem; import com.netscape.cms.servlet.base.CMSServlet; @@ -117,7 +118,7 @@ public class OCSPServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java index a5b656cb4..55f688a0b 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java @@ -31,6 +31,7 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ocsp.IDefStore; import com.netscape.certsrv.ocsp.IOCSPAuthority; @@ -78,7 +79,7 @@ public class RemoveCAServlet extends CMSServlet { // override success to display own output. mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mOCSPAuthority = (IOCSPAuthority) mAuthority; if (mOutputTemplatePath != null) @@ -117,7 +118,7 @@ public class RemoveCAServlet extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -202,7 +203,7 @@ public class RemoveCAServlet extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java index f9b5b3f0f..3c5c4080b 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java @@ -63,10 +63,10 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.cms.servlet.base.CMSServlet; -import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; /** @@ -83,14 +83,14 @@ public class CMCProcessor extends PKIProcessor { super(); } - public CMCProcessor(CMSRequest cmsReq, CMSServlet servlet, boolean doEnforcePop) { + public CMCProcessor(ICMSRequest cmsReq, CMSServlet servlet, boolean doEnforcePop) { super(cmsReq, servlet); enforcePop = doEnforcePop; } - public void process(CMSRequest cmsReq) + public void process(ICMSRequest cmsReq) throws EBaseException { } diff --git a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java index 2fbd55460..1da0cf3c4 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java @@ -49,10 +49,10 @@ import com.netscape.certsrv.authentication.AuthToken; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.cms.servlet.base.CMSServlet; -import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; /** @@ -64,7 +64,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; public class CRMFProcessor extends PKIProcessor { @SuppressWarnings("unused") - private CMSRequest mRequest; + private ICMSRequest mRequest; private boolean enforcePop = false; @@ -75,14 +75,14 @@ public class CRMFProcessor extends PKIProcessor { super(); } - public CRMFProcessor(CMSRequest cmsReq, CMSServlet servlet, boolean doEnforcePop) { + public CRMFProcessor(ICMSRequest cmsReq, CMSServlet servlet, boolean doEnforcePop) { super(cmsReq, servlet); enforcePop = doEnforcePop; mRequest = cmsReq; } - public void process(CMSRequest cmsReq) + public void process(ICMSRequest cmsReq) throws EBaseException { } diff --git a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java index 395d30ea9..3fd42db08 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java @@ -18,7 +18,7 @@ package com.netscape.cms.servlet.processors; import com.netscape.certsrv.base.EBaseException; -import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.certsrv.common.ICMSRequest; /** * This represents the request parser. @@ -27,7 +27,7 @@ import com.netscape.cms.servlet.common.CMSRequest; */ public interface IPKIProcessor { - public void process(CMSRequest cmsReq) + public void process(ICMSRequest cmsReq) throws EBaseException; } diff --git a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java index bea447abe..d3f8ba655 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java @@ -31,9 +31,9 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.KeyGenInfo; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; -import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; /** @@ -48,12 +48,12 @@ public class KeyGenProcessor extends PKIProcessor { super(); } - public KeyGenProcessor(CMSRequest cmsReq, CMSServlet servlet) { + public KeyGenProcessor(ICMSRequest cmsReq, CMSServlet servlet) { super(cmsReq, servlet); } - public void process(CMSRequest cmsReq) + public void process(ICMSRequest cmsReq) throws EBaseException { } diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java index 554e0e9ef..184216972 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java @@ -40,9 +40,9 @@ import com.netscape.certsrv.authentication.IAuthSubsystem; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; -import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; /** @@ -63,12 +63,12 @@ public class PKCS10Processor extends PKIProcessor { super(); } - public PKCS10Processor(CMSRequest cmsReq, CMSServlet servlet) { + public PKCS10Processor(ICMSRequest cmsReq, CMSServlet servlet) { super(cmsReq, servlet); } - public void process(CMSRequest cmsReq) + public void process(ICMSRequest cmsReq) throws EBaseException { } diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java index d51494928..bea899368 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -35,10 +35,10 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.cms.servlet.base.CMSServlet; -import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; /** @@ -55,7 +55,7 @@ public class PKIProcessor implements IPKIProcessor { public static final String PKCS10_REQUEST = "pkcs10Request"; public static final String SUBJECT_KEYGEN_INFO = "subjectKeyGenInfo"; - protected CMSRequest mRequest = null; + protected ICMSRequest mRequest = null; protected HttpServletRequest httpReq = null; protected String mServletId = null; @@ -66,7 +66,7 @@ public class PKIProcessor implements IPKIProcessor { public PKIProcessor() { } - public PKIProcessor(CMSRequest cmsReq, CMSServlet servlet) { + public PKIProcessor(ICMSRequest cmsReq, CMSServlet servlet) { mRequest = cmsReq; mServlet = servlet; @@ -79,7 +79,7 @@ public class PKIProcessor implements IPKIProcessor { } - public void process(CMSRequest cmsReq) + public void process(ICMSRequest cmsReq) throws EBaseException { } diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index 386e7911c..246cefd8c 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -67,6 +67,7 @@ import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.ra.IRegistrationAuthority; @@ -128,7 +129,7 @@ public class CheckRequest extends CMSServlet { mAuthorityId = mAuthority.getId(); mFormPath = "/" + mAuthorityId + "/" + TPL_FILE; - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); } /** @@ -167,7 +168,7 @@ public class CheckRequest extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -601,10 +602,10 @@ public class CheckRequest extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java index 9259d40e6..367c558cb 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -61,6 +61,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.publish.IPublisherProcessor; @@ -216,7 +217,7 @@ public class ProcessCertReq extends CMSServlet { // override success and error templates to null - // handle templates locally. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); try { mReqCompletedTemplate = sc.getInitParameter( @@ -339,10 +340,10 @@ public class ProcessCertReq extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } @@ -450,7 +451,7 @@ public class ProcessCertReq extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); // store a message in the signed audit log file if (toDo.equals(SIGNED_AUDIT_CLONING)) { @@ -800,7 +801,7 @@ public class ProcessCertReq extends CMSServlet { if (r.getRequestStatus().equals(RequestStatus.PENDING)) { cmsReq.setResult(r); - cmsReq.setStatus(CMSRequest.PENDING); + cmsReq.setStatus(ICMSRequest.PENDING); if (certInfo != null) { for (int i = 0; i < certInfo.length; i++) { mLogger.log(ILogger.EV_AUDIT, @@ -851,7 +852,7 @@ public class ProcessCertReq extends CMSServlet { r.getRequestStatus().equals( RequestStatus.SVC_PENDING)) { cmsReq.setResult(r); - cmsReq.setStatus(CMSRequest.SVC_PENDING); + cmsReq.setStatus(ICMSRequest.SVC_PENDING); if (certInfo != null) { for (int i = 0; i < certInfo.length; i++) { mLogger.log(ILogger.EV_AUDIT, @@ -899,7 +900,7 @@ public class ProcessCertReq extends CMSServlet { } } else if (r.getRequestStatus().equals( RequestStatus.COMPLETE)) { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); // XXX make the repeat record. // Get the certificate(s) from the request diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java index dc61e1e02..66c7129f6 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; @@ -110,8 +111,8 @@ public class ProcessReq extends CMSServlet { // override success and error templates to null - // handle templates locally. - mTemplates.remove(CMSRequest.SUCCESS); - mTemplates.remove(CMSRequest.ERROR); + mTemplates.remove(ICMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.ERROR); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; } @@ -183,7 +184,7 @@ public class ProcessReq extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -211,11 +212,11 @@ public class ProcessReq extends CMSServlet { } else { resp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } } else { cmsReq.setError(error); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } } catch (IOException e) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java index f1e8ec8b1..09bf3a0b8 100644 --- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; @@ -126,8 +127,8 @@ public class QueryReq extends CMSServlet { // override success and error templates to null - // handle templates locally. - mTemplates.remove(CMSRequest.SUCCESS); - mTemplates.remove(CMSRequest.ERROR); + mTemplates.remove(ICMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.ERROR); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -227,7 +228,7 @@ public class QueryReq extends CMSServlet { CMS.getLogMessage("ADMIN_SRVLT_AUTH_FAILURE", e.toString())); } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -328,7 +329,7 @@ public class QueryReq extends CMSServlet { throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); } - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 10daeeb08..533199ebc 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -36,6 +36,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestList; @@ -87,7 +88,7 @@ public class SearchReqs extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); // override success to render own template. - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); if (mAuthority instanceof ISubsystem) { ISubsystem sub = mAuthority; @@ -135,8 +136,8 @@ public class SearchReqs extends CMSServlet { // override success and error templates to null - // handle templates locally. - mTemplates.remove(CMSRequest.SUCCESS); - mTemplates.remove(CMSRequest.ERROR); + mTemplates.remove(ICMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.ERROR); if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -169,7 +170,7 @@ public class SearchReqs extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -220,12 +221,12 @@ public class SearchReqs extends CMSServlet { if (xmlOutput != null && xmlOutput.equals("true")) { outputXML(resp, argSet); } else { - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); resp.setContentType("text/html"); form.renderOutput(out, argSet); } } else { - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); cmsReq.setError(error); } } catch (IOException e) { |