mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Use correct Dogtag configuration in get_pin and get_ca_certchain
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:
committed by
Martin Kosek
parent
1d3ddeff54
commit
d157413675
@@ -353,13 +353,15 @@ def remove_principal_from_cas():
|
||||
fp.close()
|
||||
|
||||
# Routines specific to renewing dogtag CA certificates
|
||||
def get_pin(token):
|
||||
def get_pin(token, dogtag_constants=None):
|
||||
"""
|
||||
Dogtag stores its NSS pin in a file formatted as token:PIN.
|
||||
|
||||
The caller is expected to handle any exceptions raised.
|
||||
"""
|
||||
with open(dogtag.configured_constants().PASSWORD_CONF_PATH, 'r') as f:
|
||||
if dogtag_constants is None:
|
||||
dogtag_constants = dogtag.configured_constants()
|
||||
with open(dogtag_constants.PASSWORD_CONF_PATH, 'r') as f:
|
||||
for line in f:
|
||||
(tok, pin) = line.split('=', 1)
|
||||
if token == tok:
|
||||
|
||||
@@ -149,15 +149,17 @@ def error_from_xml(doc, message_template):
|
||||
return errors.RemoteRetrieveError(reason=message_template % e)
|
||||
|
||||
|
||||
def get_ca_certchain(ca_host=None):
|
||||
def get_ca_certchain(ca_host=None, dogtag_constants=None):
|
||||
"""
|
||||
Retrieve the CA Certificate chain from the configured Dogtag server.
|
||||
"""
|
||||
if ca_host is None:
|
||||
ca_host = api.env.ca_host
|
||||
if dogtag_constants is None:
|
||||
dogtag_constants = configured_constants()
|
||||
chain = None
|
||||
conn = httplib.HTTPConnection(ca_host,
|
||||
api.env.ca_install_port or configured_constants().UNSECURE_PORT)
|
||||
api.env.ca_install_port or dogtag_constants.UNSECURE_PORT)
|
||||
conn.request("GET", "/ca/ee/ca/getCertChain")
|
||||
res = conn.getresponse()
|
||||
doc = None
|
||||
|
||||
Reference in New Issue
Block a user