x/cloud-init
Code Issues Proposed changes

move function to a static list, comment where it came from

Browse Source
This commit is contained in:
Scott Moser
2013-03-01 14:22:00 -05:00
parent 09559069b5
commit 7dcdbc15e2
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cloudinit/ssh_util.py
View File

@@ -33,6 +33,14 @@ LOG = logging.getLogger(__name__)
# See: man sshd_config # See: man sshd_config
DEF_SSHD_CFG = "/etc/ssh/sshd_config" DEF_SSHD_CFG = "/etc/ssh/sshd_config"
# taken from openssh source key.c/key_type_from_name
VALID_KEY_TYPES = ("rsa", "dsa", "ssh-rsa", "ssh-dss", "ecdsa",
"ssh-rsa-cert-v00@openssh.com", "ssh-dss-cert-v00@openssh.com",
"ssh-rsa-cert-v00@openssh.com", "ssh-dss-cert-v00@openssh.com",
"ssh-rsa-cert-v01@openssh.com", "ssh-dss-cert-v01@openssh.com",
"ecdsa-sha2-nistp256-cert-v01@openssh.com",
"ecdsa-sha2-nistp384-cert-v01@openssh.com",
"ecdsa-sha2-nistp521-cert-v01@openssh.com")
class AuthKeyLine(object): class AuthKeyLine(object):
def __init__(self, source, keytype=None, base64=None, def __init__(self, source, keytype=None, base64=None,
@@ -123,7 +131,7 @@ class AuthKeyLineParser(object):
toks = ent.split(None, 2) toks = ent.split(None, 2)
if len(toks) < 2: if len(toks) < 2:
raise TypeError("To few fields: %s" % len(toks)) raise TypeError("To few fields: %s" % len(toks))
if not _is_valid_ssh_keytype(toks[0]): if toks[0] not in VALID_KEY_TYPES:
raise TypeError("Invalid keytype %s" % toks[0]) raise TypeError("Invalid keytype %s" % toks[0])
# valid key type and 2 or 3 fields: # valid key type and 2 or 3 fields:
@@ -149,17 +157,6 @@ class AuthKeyLineParser(object):
comment=comment, options=options) comment=comment, options=options)
def _is_valid_ssh_keytype(key):
valid = ("rsa", "dsa", "ssh-rsa", "ssh-dss", "ecdsa",
"ssh-rsa-cert-v00@openssh.com", "ssh-dss-cert-v00@openssh.com",
"ssh-rsa-cert-v01@openssh.com", "ssh-dss-cert-v01@openssh.com",
"ecdsa-sha2-nistp256-cert-v01@openssh.com",
"ecdsa-sha2-nistp384-cert-v01@openssh.com",
"ecdsa-sha2-nistp521-cert-v01@openssh.com")
return key in valid
def parse_authorized_keys(fname): def parse_authorized_keys(fname):
lines = [] lines = []
try: try: