summaryrefslogtreecommitdiff
path: root/lib/ansible/template
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2019-10-11 09:17:10 -0500
committerGitHub <noreply@github.com>2019-10-11 09:17:10 -0500
commit7f4befdea77045fa83b5f2b304bd5e16b219f74c (patch)
treea6d23e2f80dc207731d07e4dcfdba89dd5b72859 /lib/ansible/template
parent73febd4ea68ac1f15dd0e5bd49875681afa934ca (diff)
downloadansible-7f4befdea77045fa83b5f2b304bd5e16b219f74c.tar.gz
Wrap CLI Passwords with AnsibleUnsafeText, ensure unsafe context is not lost during encode/decode (#63351)
* Wrap .encode and .decode on AnsibleUnsafe objects * runme.sh needs to be executable * ci_complete * Update changelog with CVE
Diffstat (limited to 'lib/ansible/template')
-rw-r--r--lib/ansible/template/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py
index 1503c82ea7..fa4b11afe1 100644
--- a/lib/ansible/template/__init__.py
+++ b/lib/ansible/template/__init__.py
@@ -272,7 +272,7 @@ class AnsibleContext(Context):
for item in val:
if self._is_unsafe(item):
return True
- elif isinstance(val, string_types) and hasattr(val, '__UNSAFE__'):
+ elif hasattr(val, '__UNSAFE__'):
return True
return False