cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing up authorized_keys to accept comments with spaces

Browse source
This commit is contained in:
James Cammarata 2013-10-24 20:12:56 -05:00
parent f61a4c1eb3
commit b58b287fce
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
library/system/authorized_key
View file

@ -199,15 +199,25 @@ def parsekey(raw_key):
of ssh-key options at the beginning of ssh-key options at the beginning
''' '''
VALID_SSH2_KEY_TYPES = [
'ecdsa-sha2-nistp256',
'ecdsa-sha2-nistp384',
'ecdsa-sha2-nistp521',
'ssh-dss',
'ssh-rsa',
]
key_parts = shlex.split(raw_key) key_parts = shlex.split(raw_key)
if len(key_parts) == 4: if len(key_parts) >= 4 and key_parts[1] in VALID_SSH2_KEY_TYPES:
# this line contains options # this line contains options
(options,type,key,comment) = key_parts (options,type,key) = key_parts[0:3]
elif len(key_parts) == 3: comment = " ".join(key_parts[3:])
elif len(key_parts) >= 3 and key_parts[0] in VALID_SSH2_KEY_TYPES:
# this line is just 'type key user@host' # this line is just 'type key user@host'
(type,key,comment) = key_parts (type,key) = key_parts[0:2]
comment = " ".join(key_parts[2:])
options = None options = None
elif len(key_parts) == 2: elif len(key_parts) == 2 and key_parts[0] in VALID_SSH2_KEY_TYPES:
# assuming just a type/key with no comment # assuming just a type/key with no comment
(type,key) = key_parts (type,key) = key_parts
comment = "" comment = ""