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

Catch authentication exceptions on the master

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-30 15:14:05 -06:00
parent 7db30d090a
commit ca0904511f
1 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
salt/master.py
View File

@ -1420,19 +1420,26 @@ class ClearFuncs(object):
if not clear_load['eauth'] in self.opts['external_auth']: if not clear_load['eauth'] in self.opts['external_auth']:
# The eauth system is not enabled, fail # The eauth system is not enabled, fail
return '' return ''
name = self.loadauth.load_name(clear_load) try:
if not name in self.opts['external_auth'][clear_load['eauth']]: name = self.loadauth.load_name(clear_load)
if not name in self.opts['external_auth'][clear_load['eauth']]:
return ''
if not self.loadauth.time_auth(clear_load):
return ''
good = self.ckminions.wheel_check(
self.opts['external_auth'][clear_load['eauth']][name],
clear_load['fun'])
if not good:
return ''
return self.wheel_.call_func(
clear_load.pop('fun'),
**clear_load)
except Exception as exc:
log.error(
('Exception occured in the wheel system: {0}'
).format(exc)
)
return '' return ''
if not self.loadauth.time_auth(clear_load):
return ''
good = self.ckminions.wheel_check(
self.opts['external_auth'][clear_load['eauth']][name],
clear_load['fun'])
if not good:
return ''
return self.wheel_.call_func(
clear_load.pop('fun'),
**clear_load)
def mk_token(self, clear_load): def mk_token(self, clear_load):
''' '''
@ -1444,12 +1451,19 @@ class ClearFuncs(object):
if not clear_load['eauth'] in self.opts['external_auth']: if not clear_load['eauth'] in self.opts['external_auth']:
# The eauth system is not enabled, fail # The eauth system is not enabled, fail
return '' return ''
name = self.loadauth.load_name(clear_load) try:
if not name in self.opts['external_auth'][clear_load['eauth']]: name = self.loadauth.load_name(clear_load)
if not name in self.opts['external_auth'][clear_load['eauth']]:
return ''
if not self.loadauth.time_auth(clear_load):
return ''
return self.loadauth.mk_token(clear_load)
except Exception as exc:
log.error(
('Exception occured while authenticating: {0}'
).format(exc)
)
return '' return ''
if not self.loadauth.time_auth(clear_load):
return ''
return self.loadauth.mk_token(clear_load)
def publish(self, clear_load): def publish(self, clear_load):
''' '''
@ -1460,7 +1474,14 @@ class ClearFuncs(object):
# Check for external auth calls # Check for external auth calls
if extra.get('token', False): if extra.get('token', False):
# A token was passwd, check it # A token was passwd, check it
token = self.loadauth.get_tok(extra['token']) try:
token = self.loadauth.get_tok(extra['token'])
except Exception as exc:
log.error(
('Exception occured when generating auth token: {0}'
).format(exc)
)
return ''
if not token: if not token:
return '' return ''
if not token['eauth'] in self.opts['external_auth']: if not token['eauth'] in self.opts['external_auth']:
@ -1480,10 +1501,17 @@ class ClearFuncs(object):
if not extra['eauth'] in self.opts['external_auth']: if not extra['eauth'] in self.opts['external_auth']:
# The eauth system is not enabled, fail # The eauth system is not enabled, fail
return '' return ''
name = self.loadauth.load_name(extra) try:
if not name in self.opts['external_auth'][extra['eauth']]: name = self.loadauth.load_name(extra)
return '' if not name in self.opts['external_auth'][extra['eauth']]:
if not self.loadauth.time_auth(extra): return ''
if not self.loadauth.time_auth(extra):
return ''
except Exception:
log.error(
('Exception occured while authenticating: {0}'
).format(exc)
)
return '' return ''
good = self.ckminions.auth_check( good = self.ckminions.auth_check(
self.opts['external_auth'][extra['eauth']][name], self.opts['external_auth'][extra['eauth']][name],