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

renew agent: respect CA renewal master setting

Browse Source 
Do not bypass the renewal master check when a non-virtual profile is used
in dogtag-ipa-ca-renew-agent-submit.

This fixes dogtag-ipa-ca-renew-agent not respecting the CA renewal master
setting for certificates tracked with a real profile. (Note that there
currently aren't any such certificates tracked by us.)

Request the RA certificate using dogtag-submit rather than
dogtag-ipa-ca-renew-agent-submit as the CA renewal master setting is not
available so early in the install process.

https://pagure.io/freeipa/issue/5799

Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Jan Cholasta
2017-04-24 05:24:24 +00:00
committed by David Kupka
parent f3e1efdcf5
commit ce9eefe53b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/certmonger/dogtag-ipa-ca-renew-agent-submit
View File

@@ -535,7 +535,7 @@ def main():
profile = os.environ.get('CERTMONGER_CA_PROFILE') profile = os.environ.get('CERTMONGER_CA_PROFILE')
if is_replicated(): if is_replicated():
if profile or is_renewal_master(): if is_renewal_master():
handler = request_and_store_cert handler = request_and_store_cert
else: else:
handler = retrieve_cert_continuous handler = retrieve_cert_continuous

2
ipaserver/install/cainstance.py
View File

@@ -822,7 +822,7 @@ class CAInstance(DogtagInstance):
"-out", chain_file.name, "-out", chain_file.name,
], stdin=data, capture_output=False) ], stdin=data, capture_output=False)
agent_args = [paths.DOGTAG_IPA_CA_RENEW_AGENT_SUBMIT, agent_args = [paths.CERTMONGER_DOGTAG_SUBMIT,
"--dbdir", self.tmp_agent_db, "--dbdir", self.tmp_agent_db,
"--nickname", "ipa-ca-agent", "--nickname", "ipa-ca-agent",
"--cafile", chain_file.name, "--cafile", chain_file.name,