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 #22578 from hvnsweeting/2014-7-fix-compile-pillar

Browse source 
gracefully handle when salt-minion cannot decrypt key
This commit is contained in:
Thomas S Hatch 2015-04-20 09:24:44 -06:00
commit c45b92bb4b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/transport/__init__.py
View file

@ -242,9 +242,13 @@ class ZeroMQChannel(Channel):
def crypted_transfer_decode_dictentry(self, load, dictkey=None, tries=3, timeout=60):
ret = self.sreq.send('aes', self.auth.crypticle.dumps(load), tries, timeout)
key = self.auth.get_keys()
aes = key.private_decrypt(ret['key'], 4)
pcrypt = salt.crypt.Crypticle(self.opts, aes)
return pcrypt.loads(ret[dictkey])
try:
aes = key.private_decrypt(ret['key'], 4)
except (TypeError, KeyError):
return None
else:
pcrypt = salt.crypt.Crypticle(self.opts, aes)
return pcrypt.loads(ret[dictkey])
def _crypted_transfer(self, load, tries=3, timeout=60):
'''