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

Catch UnicodeDecodeErrors in id verification

Browse source 
Do not crash if the id cannot be decoded. An invalid id provided by an untrusted client can DOS the master.
This commit is contained in:
Massimiliano Torromeo 2018-12-04 16:09:52 +01:00 • committed by Ch3LL
parent 858cfac113
commit fd73f86c75
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
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