Validate args for includes in handlers too (#57537) (#69448)

(cherry picked from commit 9645304da3)

changelogs/fragments/validate-include-args-in-handlers.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Validate include args in handlers.

lib/ansible/playbook/handler_task_include.py

@@ -31,4 +31,9 @@ class HandlerTaskInclude(Handler, TaskInclude):
     @staticmethod
     def load(data, block=None, role=None, task_include=None, variable_manager=None, loader=None):
         t = HandlerTaskInclude(block=block, role=role, task_include=task_include)
-        return t.load_data(data, variable_manager=variable_manager, loader=loader)
+        handler = t.check_options(
+            t.load_data(data, variable_manager=variable_manager, loader=loader),
+            data
+        )
+
+        return handler

lib/ansible/playbook/task_include.py

@@ -58,13 +58,24 @@ class TaskInclude(Task):
     @staticmethod
     def load(data, block=None, role=None, task_include=None, variable_manager=None, loader=None):
         ti = TaskInclude(block=block, role=role, task_include=task_include)
-        task = ti.load_data(data, variable_manager=variable_manager, loader=loader)
+        task = ti.check_options(
+            ti.load_data(data, variable_manager=variable_manager, loader=loader),
+            data
+        )
+
+        return task
 
-        # Validate options
+    def check_options(self, task, data):
+        '''
+        Method for options validation to use in 'load_data' for TaskInclude and HandlerTaskInclude
+        since they share the same validations. It is not named 'validate_options' on purpose
+        to prevent confusion with '_validate_*" methods. Note that the task passed might be changed
+        as a side-effect of this method.
+        '''
         my_arg_names = frozenset(task.args.keys())
 
         # validate bad args, otherwise we silently ignore
-        bad_opts = my_arg_names.difference(TaskInclude.VALID_ARGS)
+        bad_opts = my_arg_names.difference(self.VALID_ARGS)
         if bad_opts and task.action in ('include_tasks', 'import_tasks'):
             raise AnsibleParserError('Invalid options for %s: %s' % (task.action, ','.join(list(bad_opts))), obj=data)
 

test/integration/targets/include_import/valid_include_keywords/playbook.yml

@@ -1,7 +1,8 @@
 - hosts: localhost
   gather_facts: false
   handlers:
-    - include_tasks: include_me_listen.yml
+    - include_tasks:
+        file: include_me_listen.yml
       listen:
         - include_me_listen