7fed9b06e0
* [stable-2.17] Unsafe persistence (#82779) * Ensure that unsafe is more difficult to lose [stable-2.16] (#82293) * Ensure that unsafe is more difficult to lose * Add Task.untemplated_args, and switch assert over to use it * Don't use re in first_found, switch to using native string methods * If nested templating results in unsafe, just error, don't continue * ci_complete (cherry picked from commit270b39f6ff) * Fix various issues in unsafe_proxy (#82326) - Use str/bytes directly instead of text_type/binary_type - Fix AnsibleUnsafeBytes.__str__ implementation - Fix AnsibleUnsafeBytes.__format__ return type - Remove invalid methods from AnsibleUnsafeBytes (casefold, format, format_map) - Use `chars` instead of `bytes` to match stdlib naming - Remove commented out code (cherry picked from commit59aa0145d2) * Additional Unsafe fixes (#82376) * Allow older pickle protocols to pickle unsafe classes. Fixes #82356 * Address issues when iterating or getting single index from AnsibleUnsafeBytes. Fixes #82375 * clog frag (cherry picked from commitafe3fc184f) * [stable-2.16] Enable directly using `AnsibleUnsafeText` with Python `pathlib` (#82510) * Enable directly using `AnsibleUnsafeText` with Python `pathlib`. Fixes #82414 (cherry picked from commitc6a652c081) * Prevent failures due to unsafe plugin name (#82759) (cherry picked from commit56f31126ad) * Address issues from merge conflicts --------- Co-authored-by: Matt Clay <matt@mystile.com> Co-authored-by: Martin Krizek <martin.krizek@gmail.com> (cherry picked from commit9e622ddb67) * rewrite illegal templated conditional in find test --------- Co-authored-by: Matt Martz <matt@sivel.net>
127 lines
3.8 KiB
Python
127 lines
3.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
# (c) 2018 Matt Martz <matt@sivel.net>
|
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
from __future__ import annotations
|
|
|
|
import pathlib
|
|
import sys
|
|
|
|
from ansible.utils.unsafe_proxy import AnsibleUnsafe, AnsibleUnsafeBytes, AnsibleUnsafeText, wrap_var
|
|
from ansible.module_utils.common.text.converters import to_text, to_bytes
|
|
|
|
|
|
def test_wrap_var_text():
|
|
assert isinstance(wrap_var(u'foo'), AnsibleUnsafeText)
|
|
|
|
|
|
def test_wrap_var_bytes():
|
|
assert isinstance(wrap_var(b'foo'), AnsibleUnsafeBytes)
|
|
|
|
|
|
def test_wrap_var_string():
|
|
assert isinstance(wrap_var('foo'), AnsibleUnsafeText)
|
|
|
|
|
|
def test_wrap_var_dict():
|
|
assert isinstance(wrap_var(dict(foo='bar')), dict)
|
|
assert not isinstance(wrap_var(dict(foo='bar')), AnsibleUnsafe)
|
|
assert isinstance(wrap_var(dict(foo=u'bar'))['foo'], AnsibleUnsafeText)
|
|
|
|
|
|
def test_wrap_var_dict_None():
|
|
assert wrap_var(dict(foo=None))['foo'] is None
|
|
assert not isinstance(wrap_var(dict(foo=None))['foo'], AnsibleUnsafe)
|
|
|
|
|
|
def test_wrap_var_list():
|
|
assert isinstance(wrap_var(['foo']), list)
|
|
assert not isinstance(wrap_var(['foo']), AnsibleUnsafe)
|
|
assert isinstance(wrap_var([u'foo'])[0], AnsibleUnsafeText)
|
|
|
|
|
|
def test_wrap_var_list_None():
|
|
assert wrap_var([None])[0] is None
|
|
assert not isinstance(wrap_var([None])[0], AnsibleUnsafe)
|
|
|
|
|
|
def test_wrap_var_set():
|
|
assert isinstance(wrap_var(set(['foo'])), set)
|
|
assert not isinstance(wrap_var(set(['foo'])), AnsibleUnsafe)
|
|
for item in wrap_var(set([u'foo'])):
|
|
assert isinstance(item, AnsibleUnsafeText)
|
|
|
|
|
|
def test_wrap_var_set_None():
|
|
for item in wrap_var(set([None])):
|
|
assert item is None
|
|
assert not isinstance(item, AnsibleUnsafe)
|
|
|
|
|
|
def test_wrap_var_tuple():
|
|
assert isinstance(wrap_var(('foo',)), tuple)
|
|
assert not isinstance(wrap_var(('foo',)), AnsibleUnsafe)
|
|
assert isinstance(wrap_var(('foo',))[0], AnsibleUnsafe)
|
|
|
|
|
|
def test_wrap_var_tuple_None():
|
|
assert wrap_var((None,))[0] is None
|
|
assert not isinstance(wrap_var((None,))[0], AnsibleUnsafe)
|
|
|
|
|
|
def test_wrap_var_None():
|
|
assert wrap_var(None) is None
|
|
assert not isinstance(wrap_var(None), AnsibleUnsafe)
|
|
|
|
|
|
def test_wrap_var_unsafe_text():
|
|
assert isinstance(wrap_var(AnsibleUnsafeText(u'foo')), AnsibleUnsafeText)
|
|
|
|
|
|
def test_wrap_var_unsafe_bytes():
|
|
assert isinstance(wrap_var(AnsibleUnsafeBytes(b'foo')), AnsibleUnsafeBytes)
|
|
|
|
|
|
def test_wrap_var_no_ref():
|
|
thing = {
|
|
'foo': {
|
|
'bar': 'baz'
|
|
},
|
|
'bar': ['baz', 'qux'],
|
|
'baz': ('qux',),
|
|
'none': None,
|
|
'text': 'text',
|
|
}
|
|
wrapped_thing = wrap_var(thing)
|
|
assert thing is not wrapped_thing
|
|
assert thing['foo'] is not wrapped_thing['foo']
|
|
assert thing['bar'][0] is not wrapped_thing['bar'][0]
|
|
assert thing['baz'][0] is not wrapped_thing['baz'][0]
|
|
assert thing['none'] is wrapped_thing['none']
|
|
assert thing['text'] is not wrapped_thing['text']
|
|
|
|
|
|
def test_AnsibleUnsafeText():
|
|
assert isinstance(AnsibleUnsafeText(u'foo'), AnsibleUnsafe)
|
|
|
|
|
|
def test_AnsibleUnsafeBytes():
|
|
assert isinstance(AnsibleUnsafeBytes(b'foo'), AnsibleUnsafe)
|
|
|
|
|
|
def test_to_text_unsafe():
|
|
assert isinstance(to_text(AnsibleUnsafeBytes(b'foo')), AnsibleUnsafeText)
|
|
assert to_text(AnsibleUnsafeBytes(b'foo')) == AnsibleUnsafeText(u'foo')
|
|
|
|
|
|
def test_to_bytes_unsafe():
|
|
assert isinstance(to_bytes(AnsibleUnsafeText(u'foo')), AnsibleUnsafeBytes)
|
|
assert to_bytes(AnsibleUnsafeText(u'foo')) == AnsibleUnsafeBytes(b'foo')
|
|
|
|
|
|
def test_unsafe_with_sys_intern():
|
|
# Specifically this is actually about sys.intern, test of pathlib
|
|
# because that is a specific affected use
|
|
assert sys.intern(AnsibleUnsafeText('foo')) == 'foo'
|
|
assert pathlib.Path(AnsibleUnsafeText('/tmp')) == pathlib.Path('/tmp')
|