x/cloudbase-init
Code Issues Proposed changes

Fixes SSH key format issue

Browse Source
This commit is contained in:
Alessandro Pilotti 2013-11-15 12:23:43 +02:00
parent 1e4b0275af
commit bd8c6a3c47
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cloudbaseinit/utils/crypt.py
View File

@ -141,8 +141,15 @@ class CryptManager(object):
def load_ssh_rsa_public_key(self, ssh_pub_key): def load_ssh_rsa_public_key(self, ssh_pub_key):
ssh_rsa_prefix = "ssh-rsa " ssh_rsa_prefix = "ssh-rsa "
if not ssh_pub_key.startswith(ssh_rsa_prefix):
raise CryptException('Invalid SSH key')
s = ssh_pub_key[len(ssh_rsa_prefix):] s = ssh_pub_key[len(ssh_rsa_prefix):]
b64_pub_key = s[:s.index(' ')] idx = s.find(' ')
if idx >= 0:
b64_pub_key = s[:idx]
else:
b64_pub_key = s
pub_key = base64.b64decode(b64_pub_key) pub_key = base64.b64decode(b64_pub_key)