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

Refactor ssh verify line to smartly parse extra options

Browse Source 
Lines in an ssh auth key can begin like this:
tunnel="1",command="sh /etc/netstart tun1" ssh-rsa
Need to separate the parsing of options from the key. This patch groups the ssh
auth key line into two parts, [{options}* key]
This commit is contained in:
Andrew Kuhnhausen 2012-03-20 13:01:23 -06:00
parent cbe04a5095
commit 2d9b2ba86b
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/ssh.py
View File

@ -3,6 +3,7 @@ Manage client ssh components
'''
import os
import re
def _refine_enc(enc):
@ -138,13 +139,16 @@ def _validate_keys(key_file):
if line.startswith('#'):
# Commented Line
continue
comps = line.split()
ln = re.search('(.*?)\s?((?:ssh\-|ecds).+)$');
opts = ln.group(1)
comps = ln.group(2).split()
if len(comps) < 2:
# Not a valid line
continue
if comps[0][:4:] not in ['ssh-', 'ecds']:
if opts:
# It has options, grab them
options = comps[0].split(',')
options = opts.split(',')
else:
options = []
if not options:
@ -194,14 +198,17 @@ def rm_auth_key(user, key, config='.ssh/authorized_keys'):
# Commented Line
lines.append(line)
continue
comps = line.split()
ln = re.search('(.*?)\s?((?:ssh\-|ecds).+)$');
opts = ln.group(1)
comps = ln.group(2).split()
if len(comps) < 2:
# Not a valid line
lines.append(line)
continue
if comps[0][:4:] not in ['ssh-', 'ecds']:
if opts:
# It has options, grab them
options = comps[0].split(',')
options = opts.split(',')
else:
options = []
if not options: