From 32a7b4ce71b3d1872b5e48916eaf0dc769c07eac Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 2 Nov 2016 21:33:21 -0400 Subject: [PATCH] only validate extensions when using dir loading fixes #18223 --- lib/ansible/plugins/action/include_vars.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/plugins/action/include_vars.py b/lib/ansible/plugins/action/include_vars.py index 8749af43f5..ebe29b2f14 100644 --- a/lib/ansible/plugins/action/include_vars.py +++ b/lib/ansible/plugins/action/include_vars.py @@ -226,7 +226,7 @@ class ActionModule(ActionBase): return success return success - def _load_files(self, filename): + def _load_files(self, filename, validate_extensions=False): """ Loads a file and converts the output into a valid Python dict. Args: filename (str): The source file. @@ -237,7 +237,7 @@ class ActionModule(ActionBase): results = dict() failed = False err_msg = '' - if not self._is_valid_file_ext(filename): + if validate_extensions and not self._is_valid_file_ext(filename): failed = True err_msg = ( '{0} does not have a valid extension: {1}' @@ -287,7 +287,7 @@ class ActionModule(ActionBase): if not stop_iter and not failed: if path.exists(filepath) and not self._ignore_file(filename): - failed, err_msg, loaded_data = self._load_files(filepath) + failed, err_msg, loaded_data = self._load_files(filepath, validate_extensions=True) if not failed: results.update(loaded_data)