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

Gracefully exit if client fails to authenticate

Browse Source
This commit is contained in:
Thomas S Hatch 2012-08-17 22:24:32 -06:00
parent c55442406a
commit 015c898da5
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/client.py
View File

@ -296,6 +296,11 @@ class LocalClient(object):
ret,
jid=jid,
timeout=timeout)
if not pub_data:
err = ('Failed to authenticate, is this user permitted to execute '
'commands?')
sys.stderr.write(err)
sys.exit(4)
if pub_data['jid'] == '0':
# Failed to connect to the master and send the pub
return {}
@ -335,6 +340,11 @@ class LocalClient(object):
ret,
jid=jid,
timeout=timeout)
if not pub_data:
err = ('Failed to authenticate, is this user permitted to execute '
'commands?')
sys.stderr.write(err)
sys.exit(4)
if pub_data['jid'] == '0':
print('Failed to connect to the Master, is the Salt Master running?')
yield {}
@ -380,6 +390,11 @@ class LocalClient(object):
ret,
jid=jid,
timeout=timeout)
if not pub_data:
err = ('Failed to authenticate, is this user permitted to execute '
'commands?')
sys.stderr.write(err)
sys.exit(4)
if pub_data['jid'] == '0':
# Failed to connect to the master and send the pub
yield {}
@ -420,6 +435,11 @@ class LocalClient(object):
ret,
jid=jid,
timeout=timeout)
if not pub_data:
err = ('Failed to authenticate, is this user permitted to execute '
'commands?')
sys.stderr.write(err)
sys.exit(4)
if pub_data['jid'] == '0':
# Failed to connect to the master and send the pub
yield {}
@ -459,6 +479,11 @@ class LocalClient(object):
ret,
jid=jid,
timeout=timeout)
if not pub_data:
err = ('Failed to authenticate, is this user permitted to execute '
'commands?')
sys.stderr.write(err)
sys.exit(4)
if pub_data['jid'] == '0':
# Failed to connect to the master and send the pub
return {}