diff options
author | Matt Martz <matt@sivel.net> | 2019-09-13 13:14:35 -0500 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-09-16 12:39:52 -0700 |
commit | 7dff7b916bfe99461e082153be6b16cd62d3388b (patch) | |
tree | f3a8997b9c3d7bfa3f26977e8950b1f07a86fd9a /lib/ansible/utils | |
parent | 9d6282e633a10ec24ec0a543e31d620c8a8d0871 (diff) | |
download | ansible-7dff7b916bfe99461e082153be6b16cd62d3388b.tar.gz |
[stable-2.9] Ensure we don't erase unsafe context in TaskExecutor.run on bytes (#62287)
* Ensure we don't erase unsafe context in TaskExecutor.run on bytes. Fixes #62237
* Remove unused import
* Add missing import
* use args splatting for to_unsafe_text/bytes
* Add security issue to changelog
* fix yaml linting issue
(cherry picked from commit 5be0668)
Co-authored-by: Matt Martz <matt@sivel.net>
Diffstat (limited to 'lib/ansible/utils')
-rw-r--r-- | lib/ansible/utils/unsafe_proxy.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ansible/utils/unsafe_proxy.py b/lib/ansible/utils/unsafe_proxy.py index 8b978c67d9..59c805d53e 100644 --- a/lib/ansible/utils/unsafe_proxy.py +++ b/lib/ansible/utils/unsafe_proxy.py @@ -53,7 +53,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible.module_utils._text import to_text +from ansible.module_utils._text import to_bytes, to_text from ansible.module_utils.common._collections_compat import Mapping, MutableSequence, Set from ansible.module_utils.six import string_types, binary_type, text_type @@ -126,3 +126,11 @@ def wrap_var(v): v = AnsibleUnsafeText(v) return v + + +def to_unsafe_bytes(*args, **kwargs): + return wrap_var(to_bytes(*args, **kwargs)) + + +def to_unsafe_text(*args, **kwargs): + return wrap_var(to_text(*args, **kwargs)) |