From 2947acb77c5c3191c4a66224fed4ddb4d1d903b5 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 12:48:33 +0200
Subject: [PATCH] gconftool2: improvements (#4647) (#4666)
* gconftool2: improvements
* added changelog fragment
* typo
* Update changelogs/fragments/4647-gconftool2-command-arg.yaml
Per recommendation from Felix. Danke!
(cherry picked from commit fbff98c5f2db060a1baf07569eb8b0c54bfb2b26)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
---
.../4647-gconftool2-command-arg.yaml | 2 ++
plugins/modules/system/gconftool2.py | 32 ++++++++-----------
2 files changed, 16 insertions(+), 18 deletions(-)
create mode 100644 changelogs/fragments/4647-gconftool2-command-arg.yaml
diff --git a/changelogs/fragments/4647-gconftool2-command-arg.yaml b/changelogs/fragments/4647-gconftool2-command-arg.yaml
new file mode 100644
index 0000000000..12913a0b90
--- /dev/null
+++ b/changelogs/fragments/4647-gconftool2-command-arg.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+ - gconftool2 - properly escape values when passing them to ``gconftool-2`` (https://github.com/ansible-collections/community.general/pull/4647).
diff --git a/plugins/modules/system/gconftool2.py b/plugins/modules/system/gconftool2.py
index 6b9ce71213..86bb2f9259 100644
--- a/plugins/modules/system/gconftool2.py
+++ b/plugins/modules/system/gconftool2.py
@@ -99,45 +99,41 @@ class GConf2Preference(object):
def call(self, call_type, fail_onerr=True):
""" Helper function to perform gconftool-2 operations """
- config_source = ''
- direct = ''
+ config_source = []
+ direct = []
changed = False
out = ''
# If the configuration source is different from the default, create
# the argument
if self.config_source is not None and len(self.config_source) > 0:
- config_source = "--config-source " + self.config_source
+ config_source = ["--config-source", self.config_source]
# If direct is true, create the argument
if self.direct:
- direct = "--direct"
+ direct = ["--direct"]
# Execute the call
- cmd = "gconftool-2 "
+ cmd = ["gconftool-2"]
try:
# If the call is "get", then we don't need as many parameters and
# we can ignore some
if call_type == 'get':
- cmd += "--get {0}".format(self.key)
+ cmd.extend(["--get", self.key])
# Otherwise, we will use all relevant parameters
elif call_type == 'set':
- cmd += "{0} {1} --type {2} --{3} {4} \"{5}\"".format(direct,
- config_source,
- self.value_type,
- call_type,
- self.key,
- self.value)
+ cmd.extend(direct)
+ cmd.extend(config_source)
+ cmd.extend(["--type", self.value_type, "--{3}".format(call_type), self.key, self.value])
elif call_type == 'unset':
- cmd += "--unset {0}".format(self.key)
+ cmd.extend(["--unset", self.key])
# Start external command
- rc, out, err = self.ansible.run_command(cmd, use_unsafe_shell=True)
+ rc, out, err = self.ansible.run_command(cmd)
- if len(err) > 0:
- if fail_onerr:
- self.ansible.fail_json(msg='gconftool-2 failed with '
- 'error: %s' % (str(err)))
+ if err and fail_onerr:
+ self.ansible.fail_json(msg='gconftool-2 failed with '
+ 'error: %s' % (str(err)))
else:
changed = True