cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ensure facts marked as unsafe (#55326)

Browse source 
dont rely on plugin layer to do so

(cherry picked from commit aa8d23b42f)
This commit is contained in:
Brian Coca 2019-04-16 15:50:52 -04:00 committed by Toshio Kuratomi
parent ffa7eaa7a7
commit 28348602f8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ensure_facts_safe.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ensure facts are always unsafe objects and don't rely on plugin returns

10
lib/ansible/executor/task_executor.py
View file

@ -692,9 +692,10 @@ class TaskExecutor:
vars_copy.update(result['ansible_facts'])
else:
# TODO: cleaning of facts should eventually become part of taskresults instead of vars
vars_copy.update(namespace_facts(result['ansible_facts']))
af = wrap_var(result['ansible_facts'])
vars_copy.update(namespace_facts(af))
if C.INJECT_FACTS_AS_VARS:
vars_copy.update(clean_facts(result['ansible_facts']))
vars_copy.update(clean_facts(af))
# set the failed property if it was missing.
if 'failed' not in result:
@ -754,9 +755,10 @@ class TaskExecutor:
variables.update(result['ansible_facts'])
else:
# TODO: cleaning of facts should eventually become part of taskresults instead of vars
variables.update(namespace_facts(result['ansible_facts']))
af = wrap_var(result['ansible_facts'])
variables.update(namespace_facts(af))
if C.INJECT_FACTS_AS_VARS:
variables.update(clean_facts(result['ansible_facts']))
variables.update(clean_facts(af))
# save the notification target in the result, if it was specified, as
# this task may be running in a loop in which case the notification