From a848d92823ffab898220045616f2d5529c967810 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Wed, 12 Jun 2019 22:16:02 +0100 Subject: [PATCH] Allow SSH keys with no ending newline (fixes #3590) --- plugins/ssh-keys/subcommands/add | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add index dd3ba7afc..b6fa76bce 100755 --- a/plugins/ssh-keys/subcommands/add +++ b/plugins/ssh-keys/subcommands/add @@ -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 " + # 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 " 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