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

update check_key to be more concice, step towards #1083

Browse Source
This commit is contained in:
Thomas S Hatch 2012-04-16 21:13:45 -06:00
parent 75b2eb8be6
commit 08b68d48c2
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/modules/ssh.py
View File

@ -185,11 +185,17 @@ def check_key_file(user, keysource, config='.ssh/authorized_keys'):
return ret
s_keys = _validate_keys(keyfile)
for key in s_keys:
ret[key] = check_key(user, k_keys[key], config)
ret[key] = check_key(
user,
key,
s_keys['enc'],
s_keys['comment'],
s_keys['options'],
config)
return ret
def check_key(user, key, config='.ssh/authorized_keys'):
def check_key(user, key, enc, comment, options, config='.ssh/authorized_keys'):
'''
Check to see if a key needs updating, returns "update", "add" or "exists"
@ -198,14 +204,15 @@ def check_key(user, key, config='.ssh/authorized_keys'):
salt '*' ssh.check_key <user> <key>
'''
current = auth_keys(user, config)
nline = _format_auth_line(key, enc, comment, options)
if key in current:
if not set(current[key]['options']) == set(options):
cline = _format_auth_line(
key,
current['enc'],
current['comment'],
current['options'])
if cline != nline:
return 'update'
if not current[key]['enc'] == enc:
return 'update'
if not current[key]['comment'] == comment:
if comment:
return 'update'
else:
return 'add'
return 'exists'
@ -316,7 +323,7 @@ def set_auth_key(
enc = _refine_enc(enc)
uinfo = __salt__['user.info'](user)
status = check_key(user, key, config)
status = check_key(user, key, enc, comment, options, config)
if status == 'update':
_replace_auth_key(
user,