From 34c054ea9203ffa804bafb20afa236af867ce572 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 15 Oct 2013 17:47:12 +0000 Subject: [PATCH] PKI service restart after CA renewal failed Fix both the service restart procedure and registration of old pki-cad well known service name. This patch was adapted from original patch of Jan Cholasta 178 to fix ticket 4092. https://fedorahosted.org/freeipa/ticket/4092 --- install/restart_scripts/renew_ca_cert | 16 +++++++++------- install/restart_scripts/restart_pkicad | 30 ++++++++++++++++++------------ install/restart_scripts/stop_pkicad | 16 ++++++++-------- ipapython/dogtag.py | 4 ++++ ipapython/platform/base/__init__.py | 2 +- ipaserver/install/cainstance.py | 4 ++-- 6 files changed, 42 insertions(+), 30 deletions(-) diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert index ab394b970eaee28bc386d4d1ba737643414e2680..b10e4b842f3b9a54962402cddce8710eae4538b8 100644 --- a/install/restart_scripts/renew_ca_cert +++ b/install/restart_scripts/renew_ca_cert @@ -49,6 +49,7 @@ api.finalize() configured_constants = dogtag.configured_constants(api) alias_dir = configured_constants.ALIAS_DIR +dogtag_service = ipaservices.knownservices[configured_constants.SERVICE_NAME] dogtag_instance = configured_constants.PKI_INSTANCE_NAME # Fetch the new certificate @@ -106,12 +107,13 @@ if nickname == 'auditSigningCert cert-pki-ca': # off the servlet to verify that the CA is actually up and responding so # when this returns it should be good-to-go. The CA was stopped in the # pre-save state. -syslog.syslog(syslog.LOG_NOTICE, 'Starting %sd' % dogtag_instance) +syslog.syslog(syslog.LOG_NOTICE, 'Starting %s' % dogtag_service.service_name) try: - if configured_constants.DOGTAG_VERSION == 9: - ipaservices.knownservices.pki_cad.start(dogtag_instance) - else: - ipaservices.knownservices.pki_tomcatd.start(dogtag_instance) + dogtag_service.start(dogtag_instance) except Exception, e: - syslog.syslog(syslog.LOG_ERR, "Cannot start %sd: %s" % - (dogtag_instance, str(e))) + syslog.syslog( + syslog.LOG_ERR, + "Cannot start %s: %s" % (dogtag_service.service_name, e)) +else: + syslog.syslog( + syslog.LOG_NOTICE, "Started %s" % dogtag_service.service_name) diff --git a/install/restart_scripts/restart_pkicad b/install/restart_scripts/restart_pkicad index a58c3f31e1bd288587842ba5fc4335c967b9405e..f840aeb1a228aee88b1c498700f733f1b90686f0 100644 --- a/install/restart_scripts/restart_pkicad +++ b/install/restart_scripts/restart_pkicad @@ -33,18 +33,25 @@ api.finalize() configured_constants = dogtag.configured_constants(api) alias_dir = configured_constants.ALIAS_DIR +dogtag_service = ipaservices.knownservices[configured_constants.SERVICE_NAME] dogtag_instance = configured_constants.PKI_INSTANCE_NAME # dogtag opens its NSS database in read/write mode so we need it # shut down so certmonger can open it read/write mode. This avoids # database corruption. It should already be stopped by the pre-command # but lets be sure. -if ipaservices.knownservices.pki_cad.is_running(dogtag_instance): +if dogtag_service.is_running(dogtag_instance): + syslog.syslog( + syslog.LOG_NOTICE, "Stopping %s" % dogtag_service.service_name) try: - ipaservices.knownservices.pki_cad.stop(dogtag_instance) + dogtag_service.stop(dogtag_instance) except Exception, e: - syslog.syslog(syslog.LOG_ERR, "Cannot stop %sd: %s" % - (dogtag_instance, str(e))) + syslog.syslog( + syslog.LOG_ERR, + "Cannot stop %s: %s" % (dogtag_service.service_name, e)) + else: + syslog.syslog( + syslog.LOG_NOTICE, "Stopped %s" % dogtag_service.service_name) # Fix permissions on the audit cert if we're updating it if nickname == 'auditSigningCert cert-pki-ca': @@ -55,14 +62,13 @@ if nickname == 'auditSigningCert cert-pki-ca': ] db.run_certutil(args) +syslog.syslog(syslog.LOG_NOTICE, 'Starting %s' % dogtag_service.service_name) try: - if configured_constants.DOGTAG_VERSION == 9: - ipaservices.knownservices.pki_cad.start(dogtag_instance) - else: - ipaservices.knownservices.pki_tomcatd.start(dogtag_instance) + dogtag_service.start(dogtag_instance) except Exception, e: - syslog.syslog(syslog.LOG_ERR, "Cannot start %sd: %s" % - (dogtag_instance, str(e))) + syslog.syslog( + syslog.LOG_ERR, + "Cannot start %s: %s" % (dogtag_service.service_name, e)) else: - syslog.syslog(syslog.LOG_NOTICE, "certmonger started %sd, nickname '%s'" % - (dogtag_instance, nickname)) + syslog.syslog( + syslog.LOG_NOTICE, "Started %s" % dogtag_service.service_name) diff --git a/install/restart_scripts/stop_pkicad b/install/restart_scripts/stop_pkicad index c8589b286eefbe1c3d79e2a6dab7adfd3ff56b2a..bbaf8895e3a86899ee5bd794eb595fd43316028b 100644 --- a/install/restart_scripts/stop_pkicad +++ b/install/restart_scripts/stop_pkicad @@ -29,15 +29,15 @@ api.bootstrap(context='restart') api.finalize() configured_constants = dogtag.configured_constants(api) +dogtag_service = ipaservices.knownservices[configured_constants.SERVICE_NAME] dogtag_instance = configured_constants.PKI_INSTANCE_NAME -syslog.syslog(syslog.LOG_NOTICE, "certmonger stopping %sd" % dogtag_instance) - +syslog.syslog(syslog.LOG_NOTICE, "Stopping %s" % dogtag_service.service_name) try: - if configured_constants.DOGTAG_VERSION == 9: - ipaservices.knownservices.pki_cad.stop(dogtag_instance) - else: - ipaservices.knownservices.pki_tomcatd.stop(dogtag_instance) + dogtag_service.stop(dogtag_instance) except Exception, e: - syslog.syslog(syslog.LOG_ERR, "Cannot stop %sd: %s" % - (dogtag_instance, str(e))) + syslog.syslog( + syslog.LOG_ERR, "Cannot stop %s: %s" % (dogtag_service.service_name, e)) +else: + syslog.syslog( + syslog.LOG_NOTICE, "Stopped %s" % dogtag_service.service_name) diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py index ea769b0275c4642d5da457996165e5a348cb7299..f829b9340d1ce55b2adae4817018de11b894c92d 100644 --- a/ipapython/dogtag.py +++ b/ipapython/dogtag.py @@ -62,6 +62,8 @@ class Dogtag10Constants(object): SERVICE_PROFILE_DIR = '%s/ca/profiles/ca' % PKI_ROOT ALIAS_DIR = '/etc/pki/pki-tomcat/alias' + SERVICE_NAME = 'pki_tomcatd' + RACERT_LINE_SEP = '\n' IPA_SERVICE_PROFILE = '%s/caIPAserviceCert.cfg' % SERVICE_PROFILE_DIR @@ -92,6 +94,8 @@ class Dogtag9Constants(object): SERVICE_PROFILE_DIR = '%s/profiles/ca' % PKI_ROOT ALIAS_DIR = '%s/alias' % PKI_ROOT + SERVICE_NAME = 'pki-cad' + RACERT_LINE_SEP = '\r\n' ADMIN_SECURE_PORT = 9445 diff --git a/ipapython/platform/base/__init__.py b/ipapython/platform/base/__init__.py index e2aa33faf9ccf182c778dfdbd8fd68d3686deae0..d76bc73a7d159c2dd43e281fa9916f245d88aaf3 100644 --- a/ipapython/platform/base/__init__.py +++ b/ipapython/platform/base/__init__.py @@ -27,7 +27,7 @@ wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc', 'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap', 'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd', - 'rpcidmapd', 'pki_tomcatd', 'pki-cad', 'chronyd'] + 'rpcidmapd', 'pki_tomcatd', 'pki_cad', 'chronyd'] # System may support more time&date services. FreeIPA supports ntpd only, other # services will be disabled during IPA installation diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index ac5c81de8c57194160cbfd2fa79c776bf2f39625..52c91b68c2d073a9b1c6aedc1811aa26db046e6b 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1283,7 +1283,7 @@ def enable_client_auth_to_db(self): """ caconfig = dogtag.install_constants.CS_CFG_PATH - with stopped_service('pki_tomcatd', + with stopped_service(self.dogtag_constants.SERVICE_NAME, instance_name=self.dogtag_constants.PKI_INSTANCE_NAME): # Enable file publishing, disable LDAP @@ -1723,7 +1723,7 @@ def update_cert_config(nickname, cert, dogtag_constants=None): 'subsystemCert cert-pki-ca': 'ca.subsystem.cert', 'Server-Cert cert-pki-ca': 'ca.sslserver.cert'} - with stopped_service('pki_tomcatd', + with stopped_service(dogtag_constants.SERVICE_NAME, instance_name=dogtag_constants.PKI_INSTANCE_NAME): installutils.set_directive(dogtag.configured_constants().CS_CFG_PATH, -- 1.8.4.2