From 882bd048dbe01d3b879dc450d2eab7b0a3f0c2ba Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 12 May 2016 20:30:56 +0200 Subject: Added log messages for pre-op mode. To help troubleshooting the code has been modified to log more detailed information in pre-op mode. https://fedorahosted.org/pki/ticket/1654 --- .../cmscore/authentication/AuthSubsystem.java | 10 ++++--- .../authentication/PasswdUserDBAuthentication.java | 4 ++- .../cmscore/authorization/AuthzSubsystem.java | 10 ++++--- .../cmscore/cert/CrossCertPairSubsystem.java | 24 ++++++++++------- .../src/com/netscape/cmscore/dbs/DBSubsystem.java | 31 ++++++++++++---------- .../cmscore/selftests/SelfTestSubsystem.java | 2 +- .../com/netscape/cmscore/usrgrp/UGSubsystem.java | 6 ++++- 7 files changed, 54 insertions(+), 33 deletions(-) (limited to 'base/server/cmscore') diff --git a/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java index 8e2c59c26..bb42f5f4d 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -258,10 +258,14 @@ public class AuthSubsystem implements IAuthSubsystem { } } log(ILogger.LL_INFO, CMS.getLogMessage("INIT_DONE", getId())); - } catch (EBaseException ee) { - if (CMS.isPreOpMode()) + + } catch (EBaseException e) { + CMS.debug(e); + if (CMS.isPreOpMode()) { + CMS.debug("AuthSubsystem.init(): Swallow exception in pre-op mode"); return; - throw ee; + } + throw e; } } diff --git a/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java index 07092aa07..908df691e 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java +++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java @@ -84,8 +84,10 @@ public class PasswdUserDBAuthentication implements IAuthManager, IPasswdUserDBAu /* internal database directory used */ DBSubsystem dbs = (DBSubsystem) DBSubsystem.getInstance(); LdapConnInfo ldapinfo = dbs.getLdapConnInfo(); - if (ldapinfo == null && CMS.isPreOpMode()) + if (ldapinfo == null && CMS.isPreOpMode()) { + CMS.debug("PasswdUserDBAuthentication.init(): Abort due to missing LDAP connection info in pre-op mode"); return; + } mAnonConnFactory = new LdapAnonConnFactory("PasswdUserDBAuthentication", 3, 20, ldapinfo); diff --git a/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 70dad2040..31d5e71b4 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -177,10 +177,14 @@ public class AuthzSubsystem implements IAuthzSubsystem { Debug.trace("loaded authz instance " + insName + " impl " + implName); } } - } catch (EBaseException ee) { - if (CMS.isPreOpMode()) + + } catch (EBaseException e) { + CMS.debug(e); + if (CMS.isPreOpMode()) { + CMS.debug("AuthzSubsystem.init(): Swallow exception in pre-op mode"); return; - throw ee; + } + throw e; } log(ILogger.LL_INFO, CMS.getLogMessage("INIT_DONE", getId())); diff --git a/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 29ec0f54f..7f30c8458 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -25,15 +25,6 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Enumeration; -import netscape.ldap.LDAPAttribute; -import netscape.ldap.LDAPConnection; -import netscape.ldap.LDAPEntry; -import netscape.ldap.LDAPException; -import netscape.ldap.LDAPModification; -import netscape.ldap.LDAPModificationSet; -import netscape.ldap.LDAPSearchResults; -import netscape.ldap.LDAPv2; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -46,6 +37,15 @@ import com.netscape.certsrv.publish.IPublisherProcessor; import com.netscape.certsrv.publish.IXcertPublisherProcessor; import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + /** * Subsystem for handling cross certificate pairing and publishing * Intended use: @@ -128,9 +128,13 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { PROP_LDAP)); return; } + } catch (EBaseException e) { - if (CMS.isPreOpMode()) + CMS.debug(e); + if (CMS.isPreOpMode()) { + CMS.debug("CrossCertPairSubsystem.init(): Swallow exception in pre-op mode"); return; + } throw e; } } diff --git a/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java index 2de9945f7..50c07af25 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -20,19 +20,6 @@ package com.netscape.cmscore.dbs; import java.math.BigInteger; import java.util.Hashtable; -import netscape.ldap.LDAPAttribute; -import netscape.ldap.LDAPAttributeSchema; -import netscape.ldap.LDAPAttributeSet; -import netscape.ldap.LDAPConnection; -import netscape.ldap.LDAPEntry; -import netscape.ldap.LDAPException; -import netscape.ldap.LDAPModification; -import netscape.ldap.LDAPObjectClassSchema; -import netscape.ldap.LDAPSchema; -import netscape.ldap.LDAPSearchResults; -import netscape.ldap.LDAPv3; -import netscape.security.x509.CertificateValidity; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotDefined; @@ -53,6 +40,19 @@ import com.netscape.cmscore.ldapconn.LdapAuthInfo; import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; import com.netscape.cmscore.ldapconn.LdapConnInfo; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSchema; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPObjectClassSchema; +import netscape.ldap.LDAPSchema; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv3; +import netscape.security.x509.CertificateValidity; + /** * A class represents the database subsystem that manages * the backend data storage. @@ -640,10 +640,13 @@ public class DBSubsystem implements IDBSubsystem { tmpConfig = (IConfigStore) (((PropConfigStore) mConfig).clone()); tmpConfig.putString(PROP_BASEDN, mBaseDN); + } catch (EBaseException e) { CMS.debug(e); - if (CMS.isPreOpMode()) + if (CMS.isPreOpMode()) { + CMS.debug("DBSubsystem.init(): Swallow exception in pre-op mode"); return; + } throw e; } diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 4b89aa49e..ff938dd7b 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -1793,7 +1793,7 @@ public class SelfTestSubsystem } if (CMS.isPreOpMode()) { - // do not run selftests in pre-op mode + CMS.debug("SelfTestSubsystem.startup(): Do not run selftests in pre-op mode"); return; } diff --git a/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index a11c551e5..910c58697 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -139,9 +139,13 @@ public final class UGSubsystem implements IUGSubsystem { mLdapConnFactory = new LdapBoundConnFactory("UGSubsystem"); mLdapConnFactory.init(ldapConfig); + } catch (EBaseException e) { - if (CMS.isPreOpMode()) + CMS.debug(e); + if (CMS.isPreOpMode()) { + CMS.debug("UGSubsystem.init(): Swallow exception in pre-op mode"); return; + } throw e; } } -- cgit