cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes cache file modules with bad path permissions

Browse source 
now module will fail to load and report an error (turned into warning as this should not be fatal)
fixes #13093
This commit is contained in:
Brian Coca 2017-03-08 10:23:07 -05:00 committed by Brian Coca
parent 770ab76ed0
commit 406505bfe5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/cache/base.py vendored
View file

@ -91,8 +91,11 @@ class BaseFileCacheModule(BaseCacheModule):
try:
os.makedirs(self._cache_dir)
except (OSError,IOError) as e:
display.warning("error in '%s' cache plugin while trying to create cache dir %s : %s" % (self.plugin_name, self._cache_dir, to_bytes(e)))
return None
raise AnsibleError("error in '%s' cache plugin while trying to create cache dir %s : %s" % (self.plugin_name, self._cache_dir, to_bytes(e)))
else:
for x in (os.R_OK, os.W_OK, os.X_OK):
if not os.access(self._cache_dir, x):
raise AnsibleError("error in '%s' cache, configured path (%s) does not have necessary permissions (rwx), disabling plugin" % (self.plugin_name, self._cache_dir))
def get(self, key):
""" This checks the in memory cache first as the fact was not expired at 'gather time'
@ -146,7 +149,7 @@ class BaseFileCacheModule(BaseCacheModule):
return False
else:
display.warning("error in '%s' cache plugin while trying to stat %s : %s" % (self.plugin_name, cachefile, to_bytes(e)))
pass
return False
if time.time() - st.st_mtime <= self._timeout:
return False