Final fix for #35666 Previous PR (#36143) was merged prematurely.

(cherry picked from commit a612137098)
This commit is contained in:
Toshio Kuratomi 2018-02-14 18:44:58 -08:00
parent 71a34d005c
commit 2e91c2b640
3 changed files with 22 additions and 20 deletions

View file

@ -47,6 +47,20 @@ class ShellBase(AnsiblePlugin):
self.tempdir = None
def _normalize_system_temps(self):
# Normalize the temp directory strings. We don't use expanduser/expandvars because those
# can vary between remote user and become user. Therefore the safest practice will be for
# this to always be specified as full paths)
normalized_paths = [d.rstrip('/') for d in self.get_option('system_temps')]
# Make sure all system_temps are absolute otherwise they'd be relative to the login dir
# which is almost certainly going to fail in a cornercase.
if not all(os.path.isabs(d) for d in normalized_paths):
raise AnsibleError('The configured system_temps contains a relative path: {0}. All'
' system_temps must be absolute'.format(to_native(normalized_paths)))
self.set_option('system_temps', normalized_paths)
def set_options(self, task_keys=None, var_options=None, direct=None):
super(ShellBase, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
@ -54,18 +68,13 @@ class ShellBase(AnsiblePlugin):
# set env
self.env.update(self.get_option('environment'))
# Normalize the temp directory strings. We don't use expanduser/expandvars because those
# can vary between remote user and become user. Therefore the safest practice will be for
# this to always be specified as full paths)
normalized_system_temps = [d.rstrip('/') for d in self.get_option('system_temps')]
# Make sure all system_temps are absolute otherwise they'd be relative to the login dir
# which is almost certainly going to fail in a cornercase.
if not all(os.path.isabs(d) for d in normalized_system_temps):
raise AnsibleError('The configured system_temps contains a relative path: {0}. All'
' system_temps must be absolute'.format(to_native(normalized_system_temps)))
self.set_option('system_temps', normalized_system_temps)
# We can remove the try: except in the future when we make ShellBase a proper subset of
# *all* shells. Right now powershell and third party shells which do not use the
# shell_common documentation fragment (and so do not have system_temps) will fail
try:
self._normalize_system_temps()
except AnsibleError:
pass
def env_prefix(self, **kwargs):
return ' '.join(['%s=%s' % (k, shlex_quote(text_type(v))) for k, v in kwargs.items()])

View file

@ -1823,13 +1823,6 @@ class ShellModule(ShellBase):
# TODO: add binary module support
def set_options(self, task_keys=None, var_options=None, direct=None):
super(ShellModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
# set env
self.env.update(self.get_option('environment'))
def assert_safe_env_key(self, key):
if not self.safe_envkey.match(key):
raise AnsibleError("Invalid PowerShell environment key: %s" % key)

View file

@ -19,7 +19,7 @@ options:
- name: ansible_remote_tmp
system_temps:
description:
- List of valid system temporary directories for Ansible to choose when it cannot use ``remote_temp``, normally due to permission issues.
- List of valid system temporary directories for Ansible to choose when it cannot use ``remote_temp``, normally due to permission issues. These must be world readable, writable, and executable.
default: [ /var/tmp, /tmp ]
type: list
env: [{name: ANSIBLE_SYSTEM_TMPS}]