protect against plugins using verify incorrectly

assume false on any errors (cherry picked from commit ef40e5e) backport of #36591
ansible · Apr 30, 2018 · 8048609 · 8048609
1 parent 27b1044
commit 8048609
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/changelogs/fragments/protect_bad_verify.yml b/changelogs/fragments/protect_bad_verify.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - protect against bad plugin verify method https://github.com/ansible/ansible/pull/36591
diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py
@@ -257,8 +257,13 @@ def parse_source(self, source, cache=False):
                 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:
                         # in case plugin fails 1/2 way we dont want partial inventory
                         plugin.parse(self._inventory, self._loader, source, cache=cache)