diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/connector')
4 files changed, 52 insertions, 52 deletions
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 f9085a5bc..467cc1cf4 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java @@ -60,7 +60,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * Clone servlet - part of the Clone Authority (CLA) * processes Revoked certs from its dependant clone CAs * service request and return status. - * + * * @version $Revision$, $Date$ */ public class CloneServlet extends CMSServlet { @@ -123,7 +123,7 @@ public class CloneServlet extends CMSServlet { IPKIMessage msg = null; IPKIMessage replymsg = null; - // NOTE must read all bufer before redoing handshake for + // NOTE must read all bufer before redoing handshake for // ssl client auth for client auth to work. // get request method @@ -152,8 +152,8 @@ public class CloneServlet extends CMSServlet { // force client auth handshake, validate clone CA (CCA) // and get CCA's Id. - // NOTE must do this after all contents are read for ssl - // redohandshake to work + // NOTE must do this after all contents are read for ssl + // redohandshake to work X509Certificate peerCert; @@ -231,7 +231,7 @@ public class CloneServlet extends CMSServlet { // decode request. CMS.debug("Cloneservlet: before decoding request, encodedreq= " + encodedreq); msg = (IPKIMessage) mReqEncoder.decode(encodedreq); - // process request + // process request CMS.debug("Cloneservlet: decoded request"); replymsg = processRequest(CCA_Id, CCAUserId, msg, token); } catch (IOException e) { @@ -247,7 +247,7 @@ public class CloneServlet extends CMSServlet { return; } - // encode reply + // encode reply String encodedrep = mReqEncoder.encode(replymsg); resp.setStatus(HttpServletResponse.SC_OK); @@ -269,9 +269,9 @@ public class CloneServlet extends CMSServlet { X509Certificate peerCert) throws EBaseException { try { - // XXX using agent authentication now since we're only - // verifying that the cert belongs to a user in the db. - // XXX change this to ACL in the future. + // XXX using agent authentication now since we're only + // verifying that the cert belongs to a user in the db. + // XXX change this to ACL in the future. // build JAVA X509Certificate from peerCert. X509CertImpl cert = new X509CertImpl(peerCert.getEncoded()); @@ -417,10 +417,10 @@ public class CloneServlet extends CMSServlet { // Get the certificate(s) from the request X509CertImpl issuedCerts[] = (X509CertImpl[])thisreq.get(IRequest.ISSUED_CERTS); - // return potentially more than one certificates. + // return potentially more than one certificates. if (issuedCerts != null) { for (int i = 0; i < issuedCerts.length; i++) { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.FORMAT, @@ -436,7 +436,7 @@ public class CloneServlet extends CMSServlet { ); } } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, @@ -458,7 +458,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.RENEWALFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , authMgr , "completed", @@ -468,7 +468,7 @@ public class CloneServlet extends CMSServlet { renewed_cert.getSerialNumber().toString(16)} ); } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, @@ -492,7 +492,7 @@ public class CloneServlet extends CMSServlet { Extension ext = (Extension) enum.nextElement(); if (ext instanceof CRLReasonExtension) { reason = ((CRLReasonExtension)ext).getReason().toInt - (); + (); break; } } @@ -502,7 +502,7 @@ public class CloneServlet extends CMSServlet { Integer result = (Integer)thisreq.get(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { EBaseException ex = (EBaseException)thisreq.get(IRequest.ERROR); - EBaseException[] svcErrors = + EBaseException[] svcErrors = (EBaseException[])thisreq.get(IRequest.SVCERRORS); if (svcErrors != null && svcErrors.length > 0) { for (int i = 0; i < svcErrors.length; i++) { @@ -515,7 +515,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.DOREVOKEFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , "completed with error: " + err.toString() , @@ -536,7 +536,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.DOREVOKEFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , "completed" , oldCerts[j].getSubjectDN() , @@ -547,7 +547,7 @@ public class CloneServlet extends CMSServlet { } } } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, 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 e8d4f898f..c566753b6 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -76,7 +76,7 @@ import com.netscape.cmsutil.util.Utils; * Connector servlet * process requests from remote authority - * service request or return status. - * + * * @version $Revision$, $Date$ */ public class ConnectorServlet extends CMSServlet { @@ -158,7 +158,7 @@ public class ConnectorServlet extends CMSServlet { IPKIMessage msg = null; IPKIMessage replymsg = null; - // NOTE must read all bufer before redoing handshake for + // NOTE must read all bufer before redoing handshake for // ssl client auth for client auth to work. // get request method @@ -186,8 +186,8 @@ public class ConnectorServlet extends CMSServlet { } // force client auth handshake, validate RA and get RA's Id. - // NOTE must do this after all contents are read for ssl - // redohandshake to work + // NOTE must do this after all contents are read for ssl + // redohandshake to work X509Certificate peerCert; @@ -206,7 +206,7 @@ public class ConnectorServlet extends CMSServlet { return; } - // authenticate RA + // authenticate RA String RA_Id = null; String raUserId = null; @@ -260,7 +260,7 @@ public class ConnectorServlet extends CMSServlet { try { // decode request. msg = (IPKIMessage) mReqEncoder.decode(encodedreq); - // process request + // process request replymsg = processRequest(RA_Id, raUserId, msg, token); } catch (IOException e) { CMS.debug("ConnectorServlet: service " + e.toString()); @@ -283,7 +283,7 @@ public class ConnectorServlet extends CMSServlet { CMS.debug("ConnectorServlet: done processRequest"); - // encode reply + // encode reply try { String encodedrep = mReqEncoder.encode(replymsg); @@ -373,7 +373,7 @@ public class ConnectorServlet extends CMSServlet { CMS.getSubsystem("profile"); IEnrollProfile profile = null; - // profile subsystem may not be available. In case of KRA for + // profile subsystem may not be available. In case of KRA for // example if (ps == null) { CMS.debug("ConnectorServlet: Profile Subsystem not found "); @@ -394,13 +394,13 @@ public class ConnectorServlet extends CMSServlet { /** * Process request * <P> - * + * * (Certificate Request - all "agent" profile cert requests made through a connector) * <P> - * + * * (Certificate Request Processed - all automated "agent" profile based cert acceptance made through a connector) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST used when a profile cert request is made (before * approval process) @@ -409,7 +409,7 @@ public class ConnectorServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS used when inter-CIMC_Boundary data transfer is * successful (this is used when data does not need to be captured) * </ul> - * + * * @param source string containing source * @param sourceUserId string containing source user ID * @param msg PKI message @@ -753,7 +753,7 @@ public class ConnectorServlet extends CMSServlet { x509Certs = thisreq.getExtDataInCertArray(IRequest.ISSUED_CERTS); - // return potentially more than one certificates. + // return potentially more than one certificates. if (x509Certs != null) { for (int i = 0; i < x509Certs.length; i++) { mLogger.log(ILogger.EV_AUDIT, @@ -1003,11 +1003,11 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1027,12 +1027,12 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log Profile ID - * + * * This method is inherited by all extended "EnrollProfile"s, * and is called to obtain the "ProfileID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message ProfileID */ protected String auditProfileID() { @@ -1054,11 +1054,11 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request a Request containing an X509CertImpl * @return cert string containing the certificate */ 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 bb787c7ad..597b50741 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * GenerateKeyPairServlet * handles "server-side key pair generation" requests from the * netkey RA. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -64,7 +64,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * Constructs GenerateKeyPair servlet. - * + * */ public GenerateKeyPairServlet() { super(); @@ -84,7 +84,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -94,7 +94,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /* * processServerSideKeyGen - * handles netkey DRM serverside keygen. - * netkey operations: + * netkey operations: * 1. generate keypair (archive user priv key) * 2. unwrap des key with transport key, then url decode it * 3. wrap user priv key with des key @@ -219,8 +219,8 @@ public class GenerateKeyPairServlet extends CMSServlet { } } - /* - + /* + * For GenerateKeyPair: * * input: @@ -277,9 +277,9 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * XXX remember tocheck peer SSL cert and get RA id later - * + * * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ 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 337b24259..0f79d6394 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * TokenKeyRecoveryServlet * handles "key recovery service" requests from the * netkey TPS - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -63,7 +63,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Constructs TokenKeyRecovery servlet. - * + * */ public TokenKeyRecoveryServlet() { super(); @@ -83,7 +83,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -92,7 +92,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param s The URL to decode */ protected String URLdecode(String s) { @@ -127,7 +127,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { * wrapped with DRM transport key * cert - the user cert corresponding to the key to be recovered * - * operations: + * operations: * 1. unwrap des key with transport key, then url decode it * 2. retrieve user private key * 3. wrap user priv key with des key @@ -269,7 +269,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { } } - /* + /* * For TokenKeyRecovery * * input: |