Skip to content

Commit

Permalink
Prevent ansible_failed_task from further templating (#74290)
Browse files Browse the repository at this point in the history
* Prevent ansible_failed_task from further templating

Fixes #74036

* Add changelog
  • Loading branch information
mkrizek committed Apr 15, 2021
1 parent c6945de commit 664531d
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
@@ -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
Expand Up @@ -50,6 +50,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 @@ -572,7 +573,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
Expand Up @@ -103,3 +103,5 @@ rm -f role_complete_test.out

# test notify inheritance
ansible-playbook inherit_notify.yml "$@"

ansible-playbook unsafe_failed_task.yml "$@"
17 changes: 17 additions & 0 deletions test/integration/targets/blocks/unsafe_failed_task.yml
@@ -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 664531d

Please sign in to comment.