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

Merge pull request #50873 from Ch3LL/bp-50740

Browse source 
Backport #50740 to 2017.7
This commit is contained in:
Gareth J. Greenaway 2018-12-14 15:59:47 -08:00 • committed by GitHub
commit e7f0ab6f19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/verify.py
View file

@ -490,7 +490,7 @@ def valid_id(opts, id_):
if any(x in id_ for x in ('/', '\\', '\0')):
return False
return bool(clean_path(opts['pki_dir'], id_))
except (AttributeError, KeyError, TypeError):
except (AttributeError, KeyError, TypeError, UnicodeDecodeError):
return False