ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-11 08:34:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[PR #10612/5d3662b2 backport][stable-11] timezone: command args as list rather than string (#10626)

Browse source 
timezone: command args as list rather than string (#10612)

* timezone: command args as list rather than string

* adjust attr `update_timezone`

* add changelog frag

(cherry picked from commit 5d3662b23c)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2025-08-10 13:51:29 +02:00 • committed by GitHub
commit 7901287dd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/10612-timezone-cmd-list.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- timezone - using safer mechanism to run external command (https://github.com/ansible-collections/community.general/pull/10612).

22
plugins/modules/timezone.py
View file

@ -168,17 +168,15 @@ class Timezone(object):
Args:
*commands: The command to execute.
It will be concatenated with single space.
**kwargs: Only 'log' key is checked.
If kwargs['log'] is true, record the command to self.msg.
Returns:
stdout: Standard output of the command.
"""
command = ' '.join(commands)
(rc, stdout, stderr) = self.module.run_command(command, check_rc=True)
(rc, stdout, stderr) = self.module.run_command(list(commands), check_rc=True)
if kwargs.get('log', False):
self.msg.append('executed `%s`' % command)
self.msg.append('executed `%s`' % ' '.join(commands))
return stdout
def diff(self, phase1='before', phase2='after'):
@ -352,7 +350,7 @@ class NosystemdTimezone(Timezone):
planned_tz = self.value['name']['planned']
# `--remove-destination` is needed if /etc/localtime is a symlink so
# that it overwrites it instead of following it.
self.update_timezone = ['%s --remove-destination %s /etc/localtime' % (self.module.get_bin_path('cp', required=True), tzfile)]
self.update_timezone = [[self.module.get_bin_path('cp', required=True), '--remove-destination', tzfile, '/etc/localtime']]
self.update_hwclock = self.module.get_bin_path('hwclock', required=True)
distribution = get_distribution()
self.conf_files['name'] = '/etc/timezone'
@ -362,13 +360,13 @@ class NosystemdTimezone(Timezone):
if self.module.get_bin_path('dpkg-reconfigure') is not None:
# Debian/Ubuntu
if 'name' in self.value:
self.update_timezone = ['%s -sf %s /etc/localtime' % (self.module.get_bin_path('ln', required=True), tzfile),
'%s --frontend noninteractive tzdata' % self.module.get_bin_path('dpkg-reconfigure', required=True)]
self.update_timezone = [[self.module.get_bin_path('ln', required=True), '-sf', tzfile, '/etc/localtime'],
[self.module.get_bin_path('dpkg-reconfigure', required=True), '--frontend', 'noninteractive', 'tzdata']]
self.conf_files['hwclock'] = '/etc/default/rcS'
elif distribution == 'Alpine' or distribution == 'Gentoo':
self.conf_files['hwclock'] = '/etc/conf.d/hwclock'
if distribution == 'Alpine':
self.update_timezone = ['%s -z %s' % (self.module.get_bin_path('setup-timezone', required=True), planned_tz)]
self.update_timezone = [[self.module.get_bin_path('setup-timezone', required=True), '-z', planned_tz]]
else:
# RHEL/CentOS/SUSE
if self.module.get_bin_path('tzdata-update') is not None:
@ -376,7 +374,7 @@ class NosystemdTimezone(Timezone):
# a symlink so we have to use cp to update the time zone which
# was set above.
if not os.path.islink('/etc/localtime'):
self.update_timezone = [self.module.get_bin_path('tzdata-update', required=True)]
self.update_timezone = [[self.module.get_bin_path('tzdata-update', required=True)]]
# else:
# self.update_timezone = 'cp --remove-destination ...' <- configured above
self.conf_files['name'] = '/etc/sysconfig/clock'
@ -561,7 +559,7 @@ class NosystemdTimezone(Timezone):
value=self.tzline_format % value,
key='name')
for cmd in self.update_timezone:
self.execute(cmd)
self.execute(*cmd)
def set_hwclock(self, value):
if value == 'local':
@ -623,7 +621,7 @@ class SmartOSTimezone(Timezone):
will be rejected and we have no further input validation to perform.
"""
if key == 'name':
cmd = 'sm-set-timezone %s' % value
cmd = ['sm-set-timezone', value]
(rc, stdout, stderr) = self.module.run_command(cmd)
@ -839,7 +837,7 @@ class AIXTimezone(Timezone):
self.module.fail_json(msg='Failed to check %s.' % zonefile)
# Now set the TZ using chtz
cmd = 'chtz %s' % value
cmd = ['chtz', value]
(rc, stdout, stderr) = self.module.run_command(cmd)
if rc != 0: