diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2022-05-24 15:54:00 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2022-05-24 15:54:00 +0200 |
| commit | 5482ee343358072ebeeed46cf87c164e5da4e4ec (patch) | |
| tree | 12af4f1845197d1f908787dce1a6e2b12d5ade7e | |
| parent | 90d5d98a73e40409b3ff8a9e197c94424b61dd8a (diff) | |
| download | alpine-conf-5482ee343358072ebeeed46cf87c164e5da4e4ec.zip | |
setup-sshd: fix backwards compat with -c
Do not enter interactive mode if -c was set, for backwards compatiblity.
| -rw-r--r-- | setup-sshd.in | 2 | ||||
| -rwxr-xr-x | tests/setup_sshd_test | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/setup-sshd.in b/setup-sshd.in index 6fd7d90..4dca52f 100644 --- a/setup-sshd.in +++ b/setup-sshd.in @@ -57,7 +57,7 @@ shift $(( $OPTIND - 1 )) case "$1" in openssh|dropbear|none) sshdchoice="$1" ;; - "") interactive=1;; + "") [ -z "$sshdchoice" ] && interactive=1;; *) usage "1" >&2;; esac diff --git a/tests/setup_sshd_test b/tests/setup_sshd_test index d8badac..f6770e0 100755 --- a/tests/setup_sshd_test +++ b/tests/setup_sshd_test @@ -6,6 +6,7 @@ init_tests \ setup_sshd_empty \ setup_sshd_dropbear \ setup_sshd_openssh \ + setup_sshd_openssh_c_compat \ setup_sshd_interactive_openssh_nologin \ setup_sshd_interactive_openssh_prohibitpass \ setup_sshd_interactive_openssh_nokey \ @@ -45,6 +46,17 @@ setup_sshd_openssh_body() { grep 'ssh-id FOOBAR' root/.ssh/authorized_keys || atf_fail "failed to wget ssh key" } +setup_sshd_openssh_c_compat_body() { + init_env + atf_check -s exit:0 \ + -e empty \ + -o match:"^apk add .* openssh" \ + -o match:"service sshd added" \ + -o match:"Starting sshd" \ + -o not-match:"Allow root ssh" \ + setup-sshd -c openssh +} + setup_sshd_interactive_openssh_nologin_body() { init_env mkdir -p etc/ssh |