fix: handle case where there are empty newlines in the authorized_keys file

Previously, an empty line would result in a failing ssh-keys:list call, or a failure to verify the file. Newlines should be ignored.
This commit is contained in:
Jose Diaz-Gonzalez committed 2019-07-05 10:00:52 -04:00
1 parent 8481ea2306
commit 699719b600
2 files changed
+5

No files matched your search

+1
View File
@@ -20,6 +20,7 @@ verify_ssh_key_file() {
while read -r key; do while read -r key; do
line=$((line + 1)) line=$((line + 1))
[[ -z "$key" ]] && continue
echo "$key" >"$TMP_KEY_FILE" echo "$key" >"$TMP_KEY_FILE"
ssh-keygen -lf "$TMP_KEY_FILE" &>/dev/null || dokku_log_fail "${DOKKU_ROOT}/.ssh/authorized_keys line $line failed ssh-keygen check." ssh-keygen -lf "$TMP_KEY_FILE" &>/dev/null || dokku_log_fail "${DOKKU_ROOT}/.ssh/authorized_keys line $line failed ssh-keygen check."
done <"${DOKKU_ROOT}/.ssh/authorized_keys" done <"${DOKKU_ROOT}/.ssh/authorized_keys"
+4
View File
@@ -53,6 +53,10 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c 'echo "" >> "${DOKKU_ROOT:-/home/dokku}/.ssh/authorized_keys"'
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ssh-keys:list | grep name1" run /bin/bash -c "dokku ssh-keys:list | grep name1"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"