diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-05-04 01:47:53 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-05-08 13:33:00 +1000 |
| commit | 38b8272f823dc1dd4e29dbcee83943ed48bb12fa (patch) | |
| tree | 24779380e1b4cc9ec3e0df5e2a7fa3a7f2ca6312 | |
| parent | 297060f42d5189a4065ea1b6f0afdf6371fb0507 (diff) | |
upstream commit
Use diff w/out -u for better portability
| -rw-r--r-- | regress/cfgparse.sh | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/regress/cfgparse.sh b/regress/cfgparse.sh new file mode 100644 index 00000000..95bd9a8a --- /dev/null +++ b/regress/cfgparse.sh @@ -0,0 +1,60 @@ +# $OpenBSD: cfgparse.sh,v 1.4 2015/05/04 01:51:39 dtucker Exp $ +# Placed in the Public Domain. + +tid="config parse" + +# We need to use the keys generated for the regression test because sshd -T +# will fail if we're not running with SUDO (no permissions for real keys) or +# if we are # running tests on a system that has never had sshd installed +# (keys won't exist). + +grep "HostKey " $OBJ/sshd_config > $OBJ/sshd_config_minimal +SSHD_KEYS="`cat $OBJ/sshd_config_minimal`" + +verbose "reparse minimal config" +($SUDO ${SSHD} -T -f $OBJ/sshd_config_minimal >$OBJ/sshd_config.1 && + $SUDO ${SSHD} -T -f $OBJ/sshd_config.1 >$OBJ/sshd_config.2 && + diff $OBJ/sshd_config.1 $OBJ/sshd_config.2) || fail "reparse minimal config" + +verbose "reparse regress config" +($SUDO ${SSHD} -T -f $OBJ/sshd_config >$OBJ/sshd_config.1 && + $SUDO ${SSHD} -T -f $OBJ/sshd_config.1 >$OBJ/sshd_config.2 && + diff $OBJ/sshd_config.1 $OBJ/sshd_config.2) || fail "reparse regress config" + +verbose "listenaddress order" +# expected output +cat > $OBJ/sshd_config.0 <<EOD +listenaddress 1.2.3.4:1234 +listenaddress 1.2.3.4:5678 +listenaddress [::1]:1234 +listenaddress [::1]:5678 +EOD +# test input sets. should all result in the output above. +# test 1: addressfamily and port first +cat > $OBJ/sshd_config.1 <<EOD +${SSHD_KEYS} +addressfamily any +port 1234 +port 5678 +listenaddress 1.2.3.4 +listenaddress ::1 +EOD +($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \ + grep 'listenaddress ' >$OBJ/sshd_config.2 && + diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ + fail "listenaddress order 1" +# test 2: listenaddress first +cat > $OBJ/sshd_config.1 <<EOD +listenaddress 1.2.3.4 +listenaddress ::1 +port 1234 +port 5678 +addressfamily any +EOD +($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \ + grep 'listenaddress ' >$OBJ/sshd_config.2 && + diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ + fail "listenaddress order 2" + +# cleanup +rm -f $OBJ/sshd_config.[012] |