Skip to content

Commit

Permalink
Prevent ansible_failed_task from further templating (#74290) (#74307)
Browse files Browse the repository at this point in the history
(cherry picked from commit 664531d)
  • Loading branch information
mkrizek committed Apr 27, 2021
1 parent cd81edd commit 316dbd5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 1 deletion.
2 changes: 2 additions & 0 deletions changelogs/fragments/74036-unsafe-ansible_failed_task.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- Prevent ``ansible_failed_task`` from further templating (https://github.com/ansible/ansible/issues/74036)
3 changes: 2 additions & 1 deletion lib/ansible/plugins/strategy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from ansible.plugins import loader as plugin_loader
from ansible.template import Templar
from ansible.utils.display import Display
from ansible.utils.unsafe_proxy import wrap_var
from ansible.utils.vars import combine_vars
from ansible.vars.clean import strip_internal_keys, module_response_deepcopy

Expand Down Expand Up @@ -579,7 +580,7 @@ def search_handler_blocks_by_name(handler_name, handler_blocks):
self._variable_manager.set_nonpersistent_facts(
original_host.name,
dict(
ansible_failed_task=original_task.serialize(),
ansible_failed_task=wrap_var(original_task.serialize()),
ansible_failed_result=task_result._result,
),
)
Expand Down
2 changes: 2 additions & 0 deletions test/integration/targets/blocks/runme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,6 @@ cat rc_test.out
[ "$(grep -c 'failed=0' rc_test.out)" -eq 1 ]
rm -f rc_test.out

ansible-playbook unsafe_failed_task.yml "$@"

ansible-playbook finalized_task.yml "$@"
17 changes: 17 additions & 0 deletions test/integration/targets/blocks/unsafe_failed_task.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- hosts: localhost
gather_facts: false
vars:
- data: {}
tasks:
- block:
- name: template error
debug:
msg: "{{ data.value }}"
rescue:
- debug:
msg: "{{ ansible_failed_task.action }}"

- assert:
that:
- ansible_failed_task.name == "template error"
- ansible_failed_task.action == "debug"

0 comments on commit 316dbd5

Please sign in to comment.