From 8ea1652c64956eea6dd0708f61b3330befcf1a31 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Sat, 21 Nov 2020 08:47:57 +1100 Subject: [PATCH] Prevent set_directive from clobbering other keys `set_directive` only looks for a prefix of the line matching the given directive (key). If a directive is encountered for which the given key is prefix, it will be vanquished. This occurs in the case of `{ca,kra}.sslserver.cert[req]`; the `cert` directive gets updated after certificate renewal, and the `certreq` directive gets clobbered. This can cause failures later on during KRA installation, and possibly cloning. Match the whole directive to avoid this issue. Fixes: https://pagure.io/freeipa/issue/7288 Reviewed-By: Florence Blanc-Renaud --- ipaserver/install/cainstance.py | 2 +- ipaserver/install/dogtaginstance.py | 2 +- ipaserver/install/installutils.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 62f79b28000b015edb66f4c39a270097ab3ed666..f45d2c8b89ba4b81be5acbbe85f256e85ef630fb 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -931,7 +931,7 @@ class CAInstance(DogtagInstance): installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.enable', 'true', quotes=False, separator='=') installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.mapper', 'NoMap', quotes=False, separator='=') installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.pluginName', 'Rule', quotes=False, separator='=') - installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.predicate=', '', quotes=False, separator='') + installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.predicate', '', quotes=False, separator='=') installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.publisher', 'FileBaseCRLPublisher', quotes=False, separator='=') installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.type', 'crl', quotes=False, separator='=') diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py index 1fdc3e50a46877374e4f1aa8435d09f6b4e62180..9470e1a13608a8a84aab8a36c269a708e3f3e9f4 100644 --- a/ipaserver/install/dogtaginstance.py +++ b/ipaserver/install/dogtaginstance.py @@ -212,7 +212,7 @@ class DogtagInstance(service.Service): separator='=') # Remove internaldb password as is not needed anymore installutils.set_directive(paths.PKI_TOMCAT_PASSWORD_CONF, - 'internaldb', None) + 'internaldb', None, separator='=') def uninstall(self): if self.is_installed(): diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 01930c4de6f0edd16b31aeba1c926fe581e9635b..821609beb533fcc9064500a88ccd07b35142f1df 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -433,7 +433,7 @@ def set_directive(filename, directive, value, quotes=True, separator=' '): A value of None means to drop the directive. - This has only been tested with nss.conf + Does not tolerate (or put) spaces around the separator. :param filename: input filename :param directive: directive name @@ -442,7 +442,7 @@ def set_directive(filename, directive, value, quotes=True, separator=' '): any existing double quotes are first escaped to avoid unparseable directives. :param separator: character serving as separator between directive and - value + value. Correct value required even when dropping a directive. """ new_directive_value = "" @@ -457,7 +457,7 @@ def set_directive(filename, directive, value, quotes=True, separator=' '): fd = open(filename) newfile = [] for line in fd: - if line.lstrip().startswith(directive): + if re.match(r'\s*{}'.format(re.escape(directive + separator)), line): valueset = True if value is not None: newfile.append(new_directive_value) -- 2.13.6