valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cache channel auth based on master_uri and minion_id

Browse Source
This commit is contained in:
Thomas Jackson 2015-01-08 14:37:00 -08:00
parent f5347be759
commit 48aa021067
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/transport/__init__.py
View File

@ -226,6 +226,12 @@ class ZeroMQChannel(Channel):
)
# TODO: change SAuth to return a singleton, so we don't have to do this
@property
def auth_key(self):
return (self.master_uri, # which master you want to talk to
self.opts['id'], # which minion you are
)
@property
def auth(self):
'''
@ -234,9 +240,9 @@ class ZeroMQChannel(Channel):
Note: auth is only cached keyed by master_uri, this means we assume that
a given master_uri has ONE auth mechanism (which seems reasonable enough)
'''
if self.master_uri not in ZeroMQChannel.auth_cache:
ZeroMQChannel.auth_cache[self.master_uri] = salt.crypt.SAuth(self.opts)
return ZeroMQChannel.auth_cache[self.master_uri]
if self.auth_key not in ZeroMQChannel.auth_cache:
ZeroMQChannel.auth_cache[self.auth_key] = salt.crypt.SAuth(self.opts)
return ZeroMQChannel.auth_cache[self.auth_key]
@property
def sreq(self):
@ -311,7 +317,7 @@ class ZeroMQChannel(Channel):
try:
return _do_transfer()
except salt.crypt.AuthenticationError:
del ZeroMQChannel.auth_cache[self.master_uri]
del ZeroMQChannel.auth_cache[self.auth_key]
return _do_transfer()
def _uncrypted_transfer(self, load, tries=3, timeout=60):