Allow SSH keys with no ending newline (fixes #3590)

This commit is contained in:
Tom Parker-Shemilt
2019-06-12 22:16:02 +01:00
parent 3696757e8f
commit a848d92823

View File

@@ -29,7 +29,8 @@ add_keys() {
fi
local count="$(wc -l "$KEY_FILE" | awk '{ print $1; }')"
[[ "$count" -eq 1 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
# Don't check for "-eq 1" as no newlines is also a valid SSH key
[[ "$count" -lt 2 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
ssh-keygen -lf "$KEY_FILE" &>/dev/null || dokku_log_fail "Key specified in is not a valid ssh public key"
create_ssh_key_file
verify_ssh_key_exists