From 18359b0cecf5b3cd55cb2171787cfd6861ba6f51 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 22 Feb 2018 11:53:40 -0500 Subject: [PATCH] protect against plugins using verify incorrectly assume false on any errors (cherry picked from commit ef40e5e3b21fe05df3ed5691360ea51ce84a66c2) --- lib/ansible/inventory/manager.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py index 237bd1ae806..696fac384e1 100644 --- a/lib/ansible/inventory/manager.py +++ b/lib/ansible/inventory/manager.py @@ -254,8 +254,13 @@ class InventoryManager(object): plugin_name = to_native(getattr(plugin, '_load_name', getattr(plugin, '_original_path', ''))) display.debug(u'Attempting to use plugin %s (%s)' % (plugin_name, plugin._original_path)) - # initialize - if plugin.verify_file(source): + # initialize and figure out if plugin wants to attempt parsing this file + try: + plugin_wants = bool(plugin.verify_file(source)) + except Exception: + plugin_wants = False + + if plugin_wants: try: plugin.parse(self._inventory, self._loader, source, cache=cache) parsed = True