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

Also clean template data even if marked unsafe

Browse source 
Fixes #20568
This commit is contained in:
James Cammarata 2017-02-10 09:34:35 -06:00
parent b5bf525828
commit 86beb55a90
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/template/__init__.py
View file

@ -281,7 +281,7 @@ class Templar:
def _clean_data(self, orig_data): def _clean_data(self, orig_data):
''' remove jinja2 template tags from a string ''' ''' remove jinja2 template tags from a string '''
if not isinstance(orig_data, string_types) or hasattr(orig_data, '__ENCRYPTED__') or hasattr(orig_data, '__UNSAFE__'): if not isinstance(orig_data, string_types) or hasattr(orig_data, '__ENCRYPTED__'):
return orig_data return orig_data
with contextlib.closing(StringIO(orig_data)) as data: with contextlib.closing(StringIO(orig_data)) as data:
@ -385,11 +385,12 @@ class Templar:
overrides=overrides, overrides=overrides,
disable_lookups=disable_lookups, disable_lookups=disable_lookups,
) )
unsafe = hasattr(result, '__UNSAFE__')
if convert_data and not self._no_type_regex.match(variable): if convert_data and not self._no_type_regex.match(variable):
# if this looks like a dictionary or list, convert it to such using the safe_eval method # if this looks like a dictionary or list, convert it to such using the safe_eval method
if (result.startswith("{") and not result.startswith(self.environment.variable_start_string)) or \ if (result.startswith("{") and not result.startswith(self.environment.variable_start_string)) or \
result.startswith("[") or result in ("True", "False"): result.startswith("[") or result in ("True", "False"):
unsafe = hasattr(result, '__UNSAFE__')
eval_results = safe_eval(result, locals=self._available_variables, include_exceptions=True) eval_results = safe_eval(result, locals=self._available_variables, include_exceptions=True)
if eval_results[1] is None: if eval_results[1] is None:
result = eval_results[0] result = eval_results[0]