summaryrefslogtreecommitdiff
path: root/cloudinit/ssh_util.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-01 14:22:00 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-01 14:22:00 -0500
commitceec6724143e950d6ceb9ea0758dbfd1ad33921a (patch)
tree53c89d66b66221052f9bb02423a69c2e5e2ccc60 /cloudinit/ssh_util.py
parent86fe289ceb9b292ea91dbca056e0159e74091e47 (diff)
downloadvyos-cloud-init-ceec6724143e950d6ceb9ea0758dbfd1ad33921a.tar.gz
vyos-cloud-init-ceec6724143e950d6ceb9ea0758dbfd1ad33921a.zip
move function to a static list, comment where it came from
Diffstat (limited to 'cloudinit/ssh_util.py')
-rw-r--r--cloudinit/ssh_util.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
index 863a63e7..082c5bbd 100644
--- a/cloudinit/ssh_util.py
+++ b/cloudinit/ssh_util.py
@@ -33,6 +33,14 @@ LOG = logging.getLogger(__name__)
# See: man 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):
def __init__(self, source, keytype=None, base64=None,
@@ -123,7 +131,7 @@ class AuthKeyLineParser(object):
toks = ent.split(None, 2)
if len(toks) < 2:
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])
# valid key type and 2 or 3 fields:
@@ -149,17 +157,6 @@ class AuthKeyLineParser(object):
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):
lines = []
try: