ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Need to convert filenames to byte strings before using them in APIs

Browse source 
Under a non-utf-8 locale (for instance, LC_ALL=C), passing a non-ascii
filename to many APIs will traceback.  Fix that by explicitly converting
to byte strings before passing to external APIs.

May fix #27262
This commit is contained in:
Toshio Kuratomi 2018-04-27 07:36:26 -07:00
parent 3f9e4b16fe
commit 2976b653ce
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/plugins/action/template.py
View file

@ -115,11 +115,12 @@ class ActionModule(ActionBase):
tmp_source = self._loader.get_real_file(source) tmp_source = self._loader.get_real_file(source)
except AnsibleFileNotFound as e: except AnsibleFileNotFound as e:
raise AnsibleActionFail("could not find src=%s, %s" % (source, to_text(e))) raise AnsibleActionFail("could not find src=%s, %s" % (source, to_text(e)))
b_tmp_source = to_bytes(tmp_source, errors='surrogate_or_strict')
# template the source data locally & get ready to transfer # template the source data locally & get ready to transfer
try: try:
with open(tmp_source, 'r') as f: with open(b_tmp_source, 'rb') as f:
template_data = to_text(f.read()) template_data = to_text(f.read(), errors='surrogate_or_strict')
# set jinja2 internal search path for includes # set jinja2 internal search path for includes
searchpath = task_vars.get('ansible_search_path', []) searchpath = task_vars.get('ansible_search_path', [])
@ -159,7 +160,7 @@ class ActionModule(ActionBase):
except Exception as e: except Exception as e:
raise AnsibleActionFail("%s: %s" % (type(e).__name__, to_text(e))) raise AnsibleActionFail("%s: %s" % (type(e).__name__, to_text(e)))
finally: finally:
self._loader.cleanup_tmp_file(tmp_source) self._loader.cleanup_tmp_file(b_tmp_source)
new_task = self._task.copy() new_task = self._task.copy()
# mode is either the mode from task.args or the mode of the source file if the task.args # mode is either the mode from task.args or the mode of the source file if the task.args
@ -177,7 +178,7 @@ class ActionModule(ActionBase):
try: try:
result_file = os.path.join(local_tempdir, os.path.basename(source)) result_file = os.path.join(local_tempdir, os.path.basename(source))
with open(result_file, 'wb') as f: with open(to_bytes(result_file, errors='surrogate_or_strict'), 'wb') as f:
f.write(to_bytes(resultant, errors='surrogate_or_strict')) f.write(to_bytes(resultant, errors='surrogate_or_strict'))
new_task.args.update( new_task.args.update(
@ -196,7 +197,7 @@ class ActionModule(ActionBase):
shared_loader_obj=self._shared_loader_obj) shared_loader_obj=self._shared_loader_obj)
result.update(copy_action.run(task_vars=task_vars)) result.update(copy_action.run(task_vars=task_vars))
finally: finally:
shutil.rmtree(local_tempdir) shutil.rmtree(to_bytes(local_tempdir, errors='surrogate_or_strict'))
except AnsibleAction as e: except AnsibleAction as e:
result.update(e.result) result.update(e.result)