a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

protect against plugins using verify incorrectly 

assume false on any errors
pull/4420/head
Brian Coca 2018-02-22 11:53:40 -05:00 committed by Brian Coca
parent 076ea07bb5
commit ef40e5e3b2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/inventory/manager.py
View File

@ -257,8 +257,13 @@ class InventoryManager(object):
plugin_name = to_native(getattr(plugin, '_load_name', getattr(plugin, '_original_path', ''))) 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)) display.debug(u'Attempting to use plugin %s (%s)' % (plugin_name, plugin._original_path))
# initialize # initialize and figure out if plugin wants to attempt parsing this file
if plugin.verify_file(source): try:
plugin_wants = bool(plugin.verify_file(source))
except Exception:
plugin_wants = False
if plugin_wants:
try: try:
# in case plugin fails 1/2 way we dont want partial inventory # in case plugin fails 1/2 way we dont want partial inventory
plugin.parse(self._inventory, self._loader, source, cache=cache) plugin.parse(self._inventory, self._loader, source, cache=cache)