saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ignore missing parents as well as unreadable

Browse source 
(cherry picked from commit 1667ba0)
This commit is contained in:
vernoncole 2017-07-17 17:11:24 -06:00
parent 32ebe90fa4
commit 486cb2b7fa
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/client/__init__.py
View file

@ -188,15 +188,15 @@ class LocalClient(object):
key_user = key_user.replace('\\', '_')
keyfile = os.path.join(self.opts['cachedir'],
'.{0}_key'.format(key_user))
# Make sure all key parent directories are accessible
salt.utils.verify.check_path_traversal(self.opts['cachedir'],
key_user,
self.skip_perm_errors)
try:
with salt.utils.files.fopen(keyfile, 'r') as key:
# Make sure all key parent directories are accessible
salt.utils.verify.check_path_traversal(self.opts['cachedir'],
key_user,
self.skip_perm_errors)
with salt.utils.fopen(keyfile, 'r') as key:
return key.read()
except (OSError, IOError):
except (OSError, IOError, SaltClientError):
# Fall back to eauth
return ''