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

ACME: Don't treat pki-server ca-config-show failures as fatal

Browse Source 
Up to PKI 11.5.0 even when a pki-server call failed it had a
return value of 0. This was fixed in 11.5.0 which breaks
ipa-acme-manage pruning. If a configuration value is not set
then the call fails and the tool gives up with an error like:

ERROR: No such parameter: jobsScheduler.job.pruning.certRetentionUnit

In previous versions this resulted in an empty string so the tool
displayed the default value.

So now upon failure look in the stderr output for "No such parameter"
and return an empty string so the behavior is consistent between
both old and new PKI server versions.

Fixes: https://pagure.io/freeipa/issue/9503

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Rob Crittenden 2024-01-04 17:32:45 -05:00
parent 86b073a7f0
commit a44cb09713
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipaserver/install/ipa_acme_manage.py
View File

@ -261,8 +261,13 @@ class IPAACMEManage(AdminTool):
result = run(args, raiseonerr=False, capture_output=True,
capture_error=True)
if result.returncode != 0:
# See if the parameter doesn't exist. If not then no
# user-specified value has been set.
# ERROR: No such parameter: jobsScheduler...
if 'No such parameter' in result.error_output:
return ''
raise RuntimeError(result.error_output)
return result
return result.output.strip()
def ca_config_set(directive, value,
prefix='jobsScheduler.job.pruning'):
@ -274,9 +279,8 @@ class IPAACMEManage(AdminTool):
raise RuntimeError('Updating %s failed' % directive)
def ca_config_show(directive):
result = run_pki_server('ca-config-show', directive,
prefix='jobsScheduler.job.pruning')
return result.output.strip()
return run_pki_server('ca-config-show', directive,
prefix='jobsScheduler.job.pruning')
def config_show():
status = ca_config_show('enabled')