IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use correct Dogtag configuration in get_pin and get_ca_certchain

Browse Source 
Some install utilities used Dogtag configuration before Dogtag
was configured. Fix by passing the relevant dogtag_constants
where they're needed.
This commit is contained in:
Petr Viktorin
2012-10-31 10:37:33 -04:00
committed by Martin Kosek
parent 1d3ddeff54
commit d157413675
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ipaserver/install/cainstance.py
View File

@@ -1091,7 +1091,8 @@ class CAInstance(service.Service):
def __get_ca_chain(self):
try:
return dogtag.get_ca_certchain(ca_host=self.fqdn)
return dogtag.get_ca_certchain(ca_host=self.fqdn,
dogtag_constants=self.dogtag_constants)
except Exception, e:
raise RuntimeError("Unable to retrieve CA chain: %s" % str(e))
@@ -1387,11 +1388,16 @@ class CAInstance(service.Service):
with open(HTTPD_CONFD + "ipa-pki-proxy.conf", "w") as fd:
fd.write(template)
def track_servercert(self):
def __get_ca_pin(self):
try:
pin = certmonger.get_pin('internal')
return certmonger.get_pin('internal',
dogtag_constants=self.dogtag_constants)
except IOError, e:
raise RuntimeError('Unable to determine PIN for CA instance: %s' % str(e))
raise RuntimeError(
'Unable to determine PIN for CA instance: %s' % str(e))
def track_servercert(self):
pin = self.__get_ca_pin()
certmonger.dogtag_start_tracking(
'dogtag-ipa-renew-agent', 'Server-Cert cert-pki-ca', pin, None,
self.dogtag_constants.ALIAS_DIR,
@@ -1403,10 +1409,7 @@ class CAInstance(service.Service):
ipaservices.knownservices.messagebus.start()
cmonger.start()
try:
pin = certmonger.get_pin('internal')
except IOError, e:
raise RuntimeError('Unable to determine PIN for CA instance: %s' % str(e))
pin = self.__get_ca_pin()
# Server-Cert cert-pki-ca is renewed per-server
for nickname in ['auditSigningCert cert-pki-ca',
@@ -1449,10 +1452,7 @@ class CAInstance(service.Service):
certificate is available. If it is then it gets installed.
"""
try:
pin = certmonger.get_pin('internal')
except IOError, e:
raise RuntimeError('Unable to determine PIN for CA instance: %s' % str(e))
pin = self.__get_ca_pin()
# Server-Cert cert-pki-ca is renewed per-server
for nickname in ['auditSigningCert cert-pki-ca',