diff options
Diffstat (limited to 'base/server/cms/src/com')
4 files changed, 52 insertions, 42 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index 63806e659..39eb976a1 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -63,6 +63,8 @@ import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.common.ECMSGWException; +import org.dogtagpki.server.connector.IRemoteRequest; + /** * Revoke a Certificate * @@ -184,24 +186,24 @@ public class DoRevokeTPS extends CMSServlet { CMSTemplateParams argSet = new CMSTemplateParams(header, ctx); try { - if (req.getParameter("revocationReason") != null) { + if (req.getParameter(IRemoteRequest.CA_REVOCATION_REASON) != null) { reason = Integer.parseInt(req.getParameter( - "revocationReason")); + IRemoteRequest.CA_REVOCATION_REASON)); } - if (req.getParameter("totalRecordCount") != null) { + if (req.getParameter(IRemoteRequest.CA_REVOKE_COUNT) != null) { totalRecordCount = Integer.parseInt(req.getParameter( - "totalRecordCount")); + IRemoteRequest.CA_REVOKE_COUNT)); } - if (req.getParameter("invalidityDate") != null) { + if (req.getParameter(IRemoteRequest.CA_REVOKE_INVALID_DATE) != null) { long l = Long.parseLong(req.getParameter( - "invalidityDate")); + IRemoteRequest.CA_REVOKE_INVALID_DATE)); if (l > 0) { invalidityDate = new Date(l); } } - revokeAll = req.getParameter("revokeAll"); - String comments = req.getParameter(IRequest.REQUESTOR_COMMENTS); + revokeAll = req.getParameter(IRemoteRequest.CA_REVOKE_ALL); + String comments = req.getParameter(IRemoteRequest.CA_REVOKE_REQUESTER_COMMENTS); //for audit log. String initiative = null; @@ -261,9 +263,9 @@ public class DoRevokeTPS extends CMSServlet { errorString = "error=" + error.toString(); } - String pp = o_status + "\n" + errorString; + String pp = o_status + "&" + errorString; byte[] b = pp.getBytes(); - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); resp.setContentLength(b.length); OutputStream os = resp.getOutputStream(); os.write(b); @@ -858,7 +860,8 @@ public class DoRevokeTPS extends CMSServlet { String requesterID = null; // Obtain the requesterID - requesterID = req.getParameter("requestId"); + //TODO: should use tps subsystem user id + requesterID = req.getParameter(IRemoteRequest.CA_REVOKE_REQUESTER_ID); if (requesterID != null) { requesterID = requesterID.trim(); diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 0437a2e0e..39ccb4932 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -53,6 +53,8 @@ import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ECMSGWException; +import org.dogtagpki.server.connector.IRemoteRequest; + /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) @@ -169,9 +171,9 @@ public class DoUnrevokeTPS extends CMSServlet { cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); o_status = "status=3"; errorString = "error=unauthorized"; - String pp = o_status + "\n" + errorString; + String pp = o_status + "&" + errorString; byte[] b = pp.getBytes(); - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); resp.setContentLength(b.length); OutputStream os = resp.getOutputStream(); os.write(b); @@ -197,9 +199,9 @@ public class DoUnrevokeTPS extends CMSServlet { errorString = "error=" + error.toString(); } - String pp = o_status + "\n" + errorString; + String pp = o_status + "&" + errorString; byte[] b = pp.getBytes(); - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); resp.setContentLength(b.length); OutputStream os = resp.getOutputStream(); os.write(b); @@ -516,7 +518,7 @@ public class DoUnrevokeTPS extends CMSServlet { private BigInteger[] getSerialNumbers(HttpServletRequest req) throws NumberFormatException { - String serialNumString = req.getParameter("serialNumber"); + String serialNumString = req.getParameter(IRemoteRequest.CA_UNREVOKE_SERIAL); StringTokenizer snList = new StringTokenizer(serialNumString, " "); Vector<BigInteger> biList = new Vector<BigInteger>(); @@ -569,7 +571,8 @@ public class DoUnrevokeTPS extends CMSServlet { String requesterID = null; // Obtain the requesterID - requesterID = req.getParameter("requestId"); + // TODO: should use tps subsystem user id + requesterID = req.getParameter(IRemoteRequest.CA_REVOKE_REQUESTER_ID); if (requesterID != null) { requesterID = requesterID.trim(); diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index 3d0ad4c62..83f159a83 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -41,6 +41,8 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; +import org.dogtagpki.server.connector.IRemoteRequest; + /** * GenerateKeyPairServlet * handles "server-side key pair generation" requests from the @@ -134,13 +136,13 @@ public class GenerateKeyPairServlet extends CMSServlet { CMS.debug("processServerSideKeyGen begins:"); - String rCUID = req.getParameter("CUID"); - String rUserid = req.getParameter("userid"); - String rdesKeyString = req.getParameter("drm_trans_desKey"); - String rArchive = req.getParameter("archive"); - String rKeysize = req.getParameter("keysize"); - String rKeytype = req.getParameter("keytype"); - String rKeycurve = req.getParameter("eckeycurve"); + String rCUID = req.getParameter(IRemoteRequest.TOKEN_CUID); + String rUserid = req.getParameter(IRemoteRequest.KRA_UserId); + String rdesKeyString = req.getParameter(IRemoteRequest.KRA_Trans_DesKey); + String rArchive = req.getParameter(IRemoteRequest.KRA_KEYGEN_Archive); + String rKeysize = req.getParameter(IRemoteRequest.KRA_KEYGEN_KeySize); + String rKeytype = req.getParameter(IRemoteRequest.KRA_KEYGEN_KeyType); + String rKeycurve = req.getParameter(IRemoteRequest.KRA_KEYGEN_EC_KeyCurve); if ((rCUID == null) || (rCUID.equals(""))) { CMS.debug("GenerateKeyPairServlet: processServerSideKeygen(): missing request parameter: CUID"); @@ -215,7 +217,7 @@ public class GenerateKeyPairServlet extends CMSServlet { String value = ""; - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); String wrappedPrivKeyString = ""; String publicKeyString = ""; @@ -236,15 +238,15 @@ public class GenerateKeyPairServlet extends CMSServlet { status = "4"; */ if (!status.equals("0")) - value = "status=" + status; + value = IRemoteRequest.RESPONSE_STATUS +"=" + status; else { StringBuffer sb = new StringBuffer(); - sb.append("status=0&"); - sb.append("wrapped_priv_key="); + sb.append(IRemoteRequest.RESPONSE_STATUS +"=0&"); + sb.append(IRemoteRequest.KRA_RESPONSE_Wrapped_PrivKey+ "="); sb.append(wrappedPrivKeyString); - sb.append("&iv_param="); + sb.append("&"+ IRemoteRequest.KRA_RESPONSE_IV_Param+ "="); sb.append(ivString); - sb.append("&public_key="); + sb.append("&"+ IRemoteRequest.KRA_RESPONSE_PublicKey+ "="); sb.append(publicKeyString); value = sb.toString(); @@ -294,7 +296,7 @@ public class GenerateKeyPairServlet extends CMSServlet { if (authzToken == null) { try { - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); String value = "unauthorized="; CMS.debug("GenerateKeyPairServlet: Unauthorized"); diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index cd3c22adf..d38bf969d 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -39,6 +39,8 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; +import org.dogtagpki.server.connector.IRemoteRequest; + /** * TokenKeyRecoveryServlet * handles "key recovery service" requests from the @@ -154,11 +156,11 @@ public class TokenKeyRecoveryServlet extends CMSServlet { CMS.debug("processTokenKeyRecovery begins:"); - String rCUID = req.getParameter("CUID"); - String rUserid = req.getParameter("userid"); - String rKeyid = req.getParameter("keyid"); - String rdesKeyString = req.getParameter("drm_trans_desKey"); - String rCert = req.getParameter("cert"); + String rCUID = req.getParameter(IRemoteRequest.TOKEN_CUID); + String rUserid = req.getParameter(IRemoteRequest.KRA_UserId); + String rKeyid = req.getParameter(IRemoteRequest.KRA_RECOVERY_KEYID); + String rdesKeyString = req.getParameter(IRemoteRequest.KRA_Trans_DesKey); + String rCert = req.getParameter(IRemoteRequest.KRA_RECOVERY_CERT); if ((rCUID == null) || (rCUID.equals(""))) { CMS.debug("TokenKeyRecoveryServlet: processTokenKeyRecovery(): missing request parameter: CUID"); @@ -218,7 +220,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { String value = ""; - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); String wrappedPrivKeyString = ""; String publicKeyString = ""; @@ -256,12 +258,12 @@ public class TokenKeyRecoveryServlet extends CMSServlet { value = "status=" + status; else { StringBuffer sb = new StringBuffer(); - sb.append("status=0&"); - sb.append("wrapped_priv_key="); + sb.append(IRemoteRequest.RESPONSE_STATUS +"=0&"); + sb.append(IRemoteRequest.KRA_RESPONSE_Wrapped_PrivKey +"="); sb.append(wrappedPrivKeyString); - sb.append("&public_key="); + sb.append("&"+ IRemoteRequest.KRA_RESPONSE_PublicKey +"="); sb.append(publicKeyString); - sb.append("&iv_param="); + sb.append("&"+ IRemoteRequest.KRA_RESPONSE_IV_Param +"="); sb.append(ivString); value = sb.toString(); @@ -310,7 +312,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { if (authzToken == null) { try { - resp.setContentType("text/html"); + resp.setContentType("application/x-www-form-urlencoded"); String value = "unauthorized="; CMS.debug("TokenKeyRecoveryServlet: Unauthorized"); |