Fixes #5021 safely split hostkeys with quotes

11 years ago · 407d6041b3
parent 6b1780d637
commit 407d6041b3
1 changed files with 6 additions and 1 deletions
--- a/system/authorized_key
+++ b/system/authorized_key
@ -209,7 +209,12 @@ def parsekey(raw_key):
    key_type   = None   # type of ssh key
    type_index = None   # index of keytype in key string|list

-    key_parts = shlex.split(raw_key)
+    # split key safely
+    lex = shlex.shlex(raw_key)
+    lex.quotes = ["'", '"']
+    lex.whitespace_split = True
+    key_parts = list(lex)
+
    for i in range(0, len(key_parts)):
        if key_parts[i] in VALID_SSH2_KEY_TYPES:
            type_index = i