diff options
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/servlet')
15 files changed, 36 insertions, 182 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java index 662a3e9da..5b136be2f 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -953,8 +953,6 @@ public class AdminServlet extends HttpServlet { * @param msg signed audit log message */ protected void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters if (auditor == null) { return; diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 8d28408a3..7ddb0c8db 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -105,8 +105,6 @@ public final class CMSAdminServlet extends AdminServlet { private final static String PROP_SMTP = "smtp"; private final static String PROP_INTERNAL_DB = "internaldb"; - private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); - // CMS must be instantiated before this admin servlet. /** @@ -3304,10 +3302,6 @@ public final class CMSAdminServlet extends AdminServlet { * @return key string containing the public key */ private String auditPublicKey(KeyPair object) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } if (object == null) { return ILogger.SIGNED_AUDIT_EMPTY_VALUE; diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java index c10620549..84ac2ea31 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -78,6 +78,8 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.common.AuthCredentials; import com.netscape.cms.servlet.common.CMSFileLoader; import com.netscape.cms.servlet.common.CMSGateway; @@ -114,9 +116,9 @@ import netscape.security.x509.X509CertImpl; * @version $Revision$, $Date$ */ public abstract class CMSServlet extends HttpServlet { - /** - * - */ + + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + private static final long serialVersionUID = -3886300199374147160L; // servlet init params // xxxx todo:Should enforce init param value checking! @@ -247,7 +249,6 @@ public abstract class CMSServlet extends HttpServlet { protected String mAclMethod = null; protected String mAuthzResourceName = null; - protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); protected String mOutputTemplatePath = null; private IUGSubsystem mUG = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG); @@ -2022,18 +2023,7 @@ public abstract class CMSServlet extends HttpServlet { * @param msg signed audit log message */ protected void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters - - if (mSignedAuditLogger == null) { - return; - } - - mSignedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - msg); + signedAuditLogger.log(msg); } protected void audit(AuditEvent event) { @@ -2057,10 +2047,6 @@ public abstract class CMSServlet extends HttpServlet { * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } CMS.debug("CMSServlet: in auditSubjectID"); String subjectID = null; @@ -2097,10 +2083,6 @@ public abstract class CMSServlet extends HttpServlet { * @return id string containing the signed audit log message SubjectID */ protected String auditGroupID() { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } CMS.debug("CMSServlet: in auditGroupID"); String groupID = null; @@ -2138,10 +2120,6 @@ public abstract class CMSServlet extends HttpServlet { * with the "auditSubjectID()" */ private String auditGroups(String SubjectID) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } if ((SubjectID == null) || (SubjectID.equals(ILogger.UNIDENTIFIED))) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index a66cd9574..7dad38820 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -981,10 +981,6 @@ public class CMCRevReqServlet extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; @@ -1011,10 +1007,6 @@ public class CMCRevReqServlet extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditSerialNumber(String eeSerialNumber) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String serialNumber = null; @@ -1044,10 +1036,6 @@ public class CMCRevReqServlet extends CMSServlet { * @return string containing REVOKE or ON_HOLD */ private String auditRequestType(int reason) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requestType = null; 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 a9a62389f..eab05edff 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 @@ -847,10 +847,6 @@ public class DoRevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; @@ -878,10 +874,6 @@ public class DoRevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditSerialNumber(String eeSerialNumber) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String serialNumber = null; @@ -909,10 +901,6 @@ public class DoRevokeTPS extends CMSServlet { * @return string containing REVOKE or ON_HOLD */ private String auditRequestType(int reason) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requestType = null; 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 36a6802d6..6a83fcefe 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 @@ -557,10 +557,6 @@ public class DoUnrevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; @@ -588,10 +584,6 @@ public class DoUnrevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditSerialNumber(String eeSerialNumber) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String serialNumber = null; diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 150c36fb7..e31ed1b2e 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -87,6 +87,8 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.profile.SSLClientCertProvider; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.scep.CRSPKIMessage; @@ -136,10 +138,11 @@ import netscape.security.x509.X509Key; * @version $Revision$, $Date$ */ public class CRSEnrollment extends HttpServlet { - /** - * - */ + + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + private static final long serialVersionUID = 8483002540957382369L; + protected IProfileSubsystem mProfileSubsystem = null; protected String mProfileId = null; protected ICertAuthority mAuthority; @@ -1502,12 +1505,7 @@ public class CRSEnrollment extends HttpServlet { req.getTransactionID(), "CRSEnrollment", ILogger.SIGNED_AUDIT_EMPTY_VALUE); - ILogger signedAuditLogger = CMS.getSignedAuditLogger(); - if (signedAuditLogger != null) { - signedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, auditMessage); - } + signedAuditLogger.log(auditMessage); return null; } else { diff --git a/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java index 1e509d3b3..656d3d758 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java +++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java @@ -72,7 +72,6 @@ import org.mozilla.jss.pkix.primitive.Name; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.ISharedToken; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.dbs.certdb.ICertRecord; @@ -86,6 +85,8 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cmsutil.crypto.CryptoUtil; import netscape.security.x509.CRLExtensions; @@ -104,7 +105,8 @@ import netscape.security.x509.X509Key; * @version $ $, $Date$ */ public class CMCOutputTemplate { - protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); + + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); public CMCOutputTemplate() { } @@ -1086,7 +1088,7 @@ public class CMCOutputTemplate { return bpid; } - String sharedSecret = + String sharedSecret = sharedSecret = tokenClass.getSharedToken(revokeSerial); if (sharedSecret == null) { @@ -1333,18 +1335,7 @@ public class CMCOutputTemplate { } protected void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters - - if (mSignedAuditLogger == null) { - return; - } - - mSignedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - msg); + signedAuditLogger.log(msg); } private RevocationReason toRevocationReason(ENUMERATED n) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index 82f3071cd..a547eec3f 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -59,6 +59,8 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; @@ -83,9 +85,10 @@ import netscape.security.x509.X509CertInfo; * @version $Revision$, $Date$ */ public class ConnectorServlet extends CMSServlet { - /** - * - */ + + private static ILogger mLogger = CMS.getLogger(); + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + private static final long serialVersionUID = 1221916495803185863L; public static final String INFO = "Connector Servlet"; public final static String PROP_AUTHORITY = "authority"; @@ -93,9 +96,7 @@ public class ConnectorServlet extends CMSServlet { protected IAuthority mAuthority = null; protected IRequestEncoder mReqEncoder = null; protected IAuthSubsystem mAuthSubsystem = null; - protected ILogger mLogger = CMS.getLogger(); - protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); private final static String SIGNED_AUDIT_PROTECTION_METHOD_SSL = "ssl"; public ConnectorServlet() { @@ -986,18 +987,7 @@ public class ConnectorServlet extends CMSServlet { * @param msg signed audit log message */ protected void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters - - if (mSignedAuditLogger == null) { - return; - } - - mSignedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - msg); + signedAuditLogger.log(msg); } protected void audit(AuditEvent event) { @@ -1021,10 +1011,6 @@ public class ConnectorServlet extends CMSServlet { * @return id string containing the signed audit log message ProfileID */ protected String auditProfileID() { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String profileID = getId(); diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java index bc5b9b5a1..79bd7c4c6 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java @@ -68,6 +68,8 @@ import com.netscape.certsrv.usrgrp.ICertUserLocator; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.common.AuthCredentials; import com.netscape.cms.servlet.common.CMSGateway; import com.netscape.cms.servlet.common.ServletUtils; @@ -76,6 +78,8 @@ import netscape.security.x509.X509CertImpl; public class CAProcessor extends Processor { + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + public final static String ARG_REQUEST_OWNER = "requestOwner"; public final static String HDR_LANG = "accept-language"; public final static String ARG_PROFILE = "profile"; @@ -137,7 +141,6 @@ public class CAProcessor extends Processor { //logging and stats - protected ILogger signedAuditLogger = CMS.getSignedAuditLogger(); protected LinkedHashSet<String> statEvents = new LinkedHashSet<String>(); public CAProcessor(String id, Locale locale) throws EPropertyNotFound, EBaseException { @@ -885,18 +888,7 @@ public class CAProcessor extends Processor { * AUDIT FUNCTIONS (to be moved to Auditor?) ******************************************/ protected void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters - - if (signedAuditLogger == null) { - return; - } - - signedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - msg); + signedAuditLogger.log(msg); } protected void audit(AuditEvent event) { @@ -920,10 +912,6 @@ public class CAProcessor extends Processor { * @return id string containing the signed audit log message RequesterID */ protected String auditRequesterID(IRequest request) { - // if no signed audit object exists, bail - if (signedAuditLogger == null) { - return null; - } String requesterID = ILogger.UNIDENTIFIED; @@ -940,10 +928,6 @@ public class CAProcessor extends Processor { } protected String auditSubjectID() { - // if no signed audit object exists, bail - if (signedAuditLogger == null) { - return null; - } CMS.debug("CMSServlet: in auditSubjectID"); String subjectID = null; @@ -970,10 +954,6 @@ public class CAProcessor extends Processor { } protected String auditGroupID() { - // if no signed audit object exists, bail - if (signedAuditLogger == null) { - return null; - } CMS.debug("CMSServlet: in auditGroupID"); String groupID = null; @@ -1011,10 +991,6 @@ public class CAProcessor extends Processor { * with the "auditSubjectID()" */ protected String auditGroups(String SubjectID) { - // if no signed audit object exists, bail - if (signedAuditLogger == null) { - return null; - } if ((SubjectID == null) || (SubjectID.equals(ILogger.UNIDENTIFIED))) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java index e60c30a27..fb4389528 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -34,6 +34,8 @@ import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.LogCategory; import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.ECMSGWException; @@ -50,6 +52,8 @@ import netscape.security.x509.X509CertInfo; */ public class PKIProcessor implements IPKIProcessor { + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + public final static String ADMIN_ENROLL_SERVLET_ID = "caadminEnroll"; public static final String SUBJECT_NAME = "subject"; public static final String OLD_CERT_TYPE = "csrCertType"; @@ -63,8 +67,6 @@ public class PKIProcessor implements IPKIProcessor { protected String mServletId = null; protected CMSServlet mServlet = null; - protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); - public PKIProcessor() { } @@ -304,18 +306,7 @@ public class PKIProcessor implements IPKIProcessor { * @param msg signed audit log message */ protected void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters - - if (mSignedAuditLogger == null) { - return; - } - - mSignedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - msg); + signedAuditLogger.log(msg); } protected void audit(AuditEvent event) { @@ -339,10 +330,6 @@ public class PKIProcessor implements IPKIProcessor { * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String subjectID = null; diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java index f56c37866..4af131450 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java @@ -472,10 +472,6 @@ public class ProfileApproveServlet extends ProfileServlet { * @return id string containing the signed audit log message ProfileID */ private String auditProfileID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String profileID = null; @@ -503,10 +499,6 @@ public class ProfileApproveServlet extends ProfileServlet { * or SIGNED_AUDIT_EMPTY_VALUE */ private String auditProfileOp(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } if (mProfileSubId == null || mProfileSubId.equals("")) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java index 233d9a710..50034834a 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -160,8 +160,6 @@ public class ProfileServlet extends CMSServlet { protected LogSource mLogCategory = ILogger.S_OTHER; protected String mProfileSubId = null; - protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); - // stats protected LinkedHashSet<String> statEvents = new LinkedHashSet<String>(); diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index d0871628a..ded237b8d 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -41,8 +41,6 @@ import org.mozilla.jss.pkix.cmc.OtherInfo; import org.mozilla.jss.pkix.cmc.TaggedAttribute; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.EInvalidCredentials; -import com.netscape.certsrv.authentication.EMissingCredential; import com.netscape.certsrv.authentication.IAuthManager; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; @@ -1012,10 +1010,6 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(IRequest request) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = ILogger.UNIDENTIFIED; diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java index c229263dc..3fcf60ab1 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -1733,15 +1733,9 @@ public class ProcessCertReq extends CMSServlet { * @return id string containing the signed audit log message InfoName */ private String auditInfoName(String type) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters (this is done below) String infoName = ILogger.UNIDENTIFIED; - if (mSignedAuditLogger == null) { - return infoName; - } - if (type != null) { type = type.trim(); |