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

upgrade: always add profile to tracking requests

Browse Source 
The profile for every Dogtag system cert tracking request is now
explicitly specified.  So remove the code that handled unspecified
profiles.

Part of: https://pagure.io/freeipa/issue/7991

Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Fraser Tweedale
2019-06-26 13:52:20 +10:00
parent 588f1ddce2
commit 4f4e2f96b0
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipaserver/install/dogtaginstance.py
View File

@@ -97,7 +97,7 @@ class DogtagInstance(service.Service):
# Mapping of nicknames for tracking requests, and the profile to # Mapping of nicknames for tracking requests, and the profile to
# use for that certificate. 'configure_renewal()' reads this # use for that certificate. 'configure_renewal()' reads this
# dict and adds the profile if configured. # dict. The profile MUST be specified.
tracking_reqs = dict() tracking_reqs = dict()
# token for CA and subsystem certificates. For now, only internal token # token for CA and subsystem certificates. For now, only internal token

6
ipaserver/install/server/upgrade.py
View File

@@ -974,7 +974,7 @@ def certificate_renewal_update(ca, ds, http):
requests = [] requests = []
for nick in cainstance.CAInstance.tracking_reqs: for nick, profile in cainstance.CAInstance.tracking_reqs.items():
req = { req = {
'cert-database': paths.PKI_TOMCAT_ALIAS_DIR, 'cert-database': paths.PKI_TOMCAT_ALIAS_DIR,
'cert-nickname': nick, 'cert-nickname': nick,
@@ -982,10 +982,8 @@ def certificate_renewal_update(ca, ds, http):
'cert-presave-command': template % 'stop_pkicad', 'cert-presave-command': template % 'stop_pkicad',
'cert-postsave-command': 'cert-postsave-command':
(template % 'renew_ca_cert "{}"'.format(nick)), (template % 'renew_ca_cert "{}"'.format(nick)),
'template-profile': profile,
} }
profile = cainstance.CAInstance.tracking_reqs.get(nick)
if profile:
req['template-profile'] = profile
requests.append(req) requests.append(req)
requests.append( requests.append(