tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2013/04/06 06:00:22 

[regress/rekey.sh regress/test-exec.sh regress/integrity.sh
     regress/multiplex.sh Makefile regress/cfgmatch.sh]
     Split the regress log into 3 parts: the debug output from ssh, the debug
     log from sshd and the output from the client command (ssh, scp or sftp).
     Somewhat functional now, will become more useful when ssh/sshd -E is added.
This commit is contained in:
Darren Tucker 2013-05-17 09:19:10 +10:00
parent 7c8b1e7233
commit 75129025a2
7 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -4,10 +4,16 @@
[regress/proxy-connect.sh] [regress/proxy-connect.sh]
repeat test with a style appended to the username repeat test with a style appended to the username
- dtucker@cvs.openbsd.org 2013/03/23 11:09:43 - dtucker@cvs.openbsd.org 2013/03/23 11:09:43
[test-exec.sh] [regress/test-exec.sh]
Only regenerate host keys if they don't exist or if ssh-keygen has changed Only regenerate host keys if they don't exist or if ssh-keygen has changed
since they were. Reduces test runtime by 5-30% depending on machine since they were. Reduces test runtime by 5-30% depending on machine
speed. speed.
- dtucker@cvs.openbsd.org 2013/04/06 06:00:22
[regress/rekey.sh regress/test-exec.sh regress/integrity.sh
regress/multiplex.sh Makefile regress/cfgmatch.sh]
Split the regress log into 3 parts: the debug output from ssh, the debug
log from sshd and the output from the client command (ssh, scp or sftp).
Somewhat functional now, will become more useful when ssh/sshd -E is added.
20130516 20130516
- (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be

6
regress/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.62 2013/01/18 00:45:29 djm Exp $ # $OpenBSD: Makefile,v 1.63 2013/04/06 06:00:22 dtucker Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
tests: $(REGRESS_TARGETS) tests: $(REGRESS_TARGETS)
@ -82,8 +82,8 @@ CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
putty.rsa2 sshd_proxy_orig ssh_proxy_bak \ putty.rsa2 sshd_proxy_orig ssh_proxy_bak \
key.rsa-* key.dsa-* key.ecdsa-* \ key.rsa-* key.dsa-* key.ecdsa-* \
authorized_principals_${USER} expect actual ready \ authorized_principals_${USER} expect actual ready \
sshd_proxy.* authorized_keys_${USER}.* modpipe revoked-* krl-* sshd_proxy.* authorized_keys_${USER}.* modpipe revoked-* krl-* \
ssh.log sshd.log regress.log
# Enable all malloc(3) randomisations and checks # Enable all malloc(3) randomisations and checks
TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"

4
regress/cfgmatch.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: cfgmatch.sh,v 1.6 2011/06/03 05:35:10 dtucker Exp $ # $OpenBSD: cfgmatch.sh,v 1.7 2013/04/06 06:00:22 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="sshd_config match" tid="sshd_config match"
@ -15,7 +15,7 @@ start_client()
rm -f $pidfile rm -f $pidfile
${SSH} -q -$p $fwd "$@" somehost \ ${SSH} -q -$p $fwd "$@" somehost \
exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' \ exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' \
>>$TEST_SSH_LOGFILE 2>&1 & >>$TEST_REGRESS_LOGFILE 2>&1 &
client_pid=$! client_pid=$!
# Wait for remote end # Wait for remote end
n=0 n=0

4
regress/integrity.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: integrity.sh,v 1.7 2013/02/20 08:27:50 djm Exp $ # $OpenBSD: integrity.sh,v 1.8 2013/04/06 06:00:22 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="integrity" tid="integrity"
@ -22,7 +22,7 @@ config_defined OPENSSL_HAVE_EVPGCM && \
macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com" macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com"
# sshd-command for proxy (see test-exec.sh) # sshd-command for proxy (see test-exec.sh)
cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy"
jot() { jot() {
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }" awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"

14
regress/multiplex.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.17 2012/10/05 02:05:30 dtucker Exp $ # $OpenBSD: multiplex.sh,v 1.18 2013/04/06 06:00:22 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
CTL=/tmp/openssh.regress.ctl-sock.$$ CTL=/tmp/openssh.regress.ctl-sock.$$
@ -55,13 +55,13 @@ cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "sftp transfer over multiplexed connection and check result" trace "sftp transfer over multiplexed connection and check result"
echo "get ${DATA} ${COPY}" | \ echo "get ${DATA} ${COPY}" | \
${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_SSH_LOGFILE 2>&1 ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_REGRESS_LOGFILE 2>&1
test -f ${COPY} || fail "sftp: failed copy ${DATA}" test -f ${COPY} || fail "sftp: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "scp transfer over multiplexed connection and check result" trace "scp transfer over multiplexed connection and check result"
${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_SSH_LOGFILE 2>&1 ${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_REGRESS_LOGFILE 2>&1
test -f ${COPY} || fail "scp: failed copy ${DATA}" test -f ${COPY} || fail "scp: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
@ -87,11 +87,11 @@ for s in 0 1 4 5 44; do
done done
verbose "test $tid: cmd check" verbose "test $tid: cmd check"
${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost >>$TEST_SSH_LOGFILE 2>&1 \ ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost >>$TEST_REGRESS_LOGFILE 2>&1 \
|| fail "check command failed" || fail "check command failed"
verbose "test $tid: cmd exit" verbose "test $tid: cmd exit"
${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost >>$TEST_SSH_LOGFILE 2>&1 \ ${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost >>$TEST_REGRESS_LOGFILE 2>&1 \
|| fail "send exit command failed" || fail "send exit command failed"
# Wait for master to exit # Wait for master to exit
@ -107,9 +107,9 @@ wait_for_mux_master_ready
# start a long-running command then immediately request a stop # start a long-running command then immediately request a stop
${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" \ ${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" \
>>$TEST_SSH_LOGFILE 2>&1 & >>$TEST_REGRESS_LOGFILE 2>&1 &
SLEEP_PID=$! SLEEP_PID=$!
${SSH} -F $OBJ/ssh_config -S $CTL -Ostop otherhost >>$TEST_SSH_LOGFILE 2>&1 \ ${SSH} -F $OBJ/ssh_config -S $CTL -Ostop otherhost >>$TEST_REGRESS_LOGFILE 2>&1 \
|| fail "send stop command failed" || fail "send stop command failed"
# wait until both long-running command and master have exited. # wait until both long-running command and master have exited.

6
regress/rekey.sh
View File

@ -1,11 +1,11 @@
# $OpenBSD: rekey.sh,v 1.1 2003/03/28 13:58:28 markus Exp $ # $OpenBSD: rekey.sh,v 1.2 2013/04/06 06:00:22 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="rekey during transfer data" tid="rekey during transfer data"
DATA=${OBJ}/data DATA=${OBJ}/data
COPY=${OBJ}/copy COPY=${OBJ}/copy
LOG=${OBJ}/log LOG=${TEST_SSH_LOGFILE}
rm -f ${COPY} ${LOG} ${DATA} rm -f ${COPY} ${LOG} ${DATA}
touch ${DATA} touch ${DATA}
@ -29,4 +29,4 @@ for s in 16 1k 128k 256k; do
fail "no rekeying occured" fail "no rekeying occured"
fi fi
done done
rm -f ${COPY} ${LOG} ${DATA} rm -f ${COPY} ${DATA}

33
regress/test-exec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.38 2013/03/23 11:09:43 dtucker Exp $ # $OpenBSD: test-exec.sh,v 1.39 2013/04/06 06:00:22 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -136,9 +136,24 @@ case "$SSHD" in
*) SSHD=`which sshd` ;; *) SSHD=`which sshd` ;;
esac esac
# Logfiles.
# SSH_LOGFILE should be the debug output of ssh(1) only
# SSHD_LOGFILE should be the debug output of sshd(8) only
# REGRESS_LOGFILE is the output of the test itself stdout and stderr
if [ "x$TEST_SSH_LOGFILE" = "x" ]; then if [ "x$TEST_SSH_LOGFILE" = "x" ]; then
TEST_SSH_LOGFILE=/dev/null TEST_SSH_LOGFILE=$OBJ/ssh.log
fi fi
if [ "x$TEST_SSHD_LOGFILE" = "x" ]; then
TEST_SSHD_LOGFILE=$OBJ/sshd.log
fi
if [ "x$TEST_REGRESS_LOGFILE" = "x" ]; then
TEST_REGRESS_LOGFILE=$OBJ/regress.log
fi
# truncate logfiles
>$TEST_SSH_LOGFILE
>$TEST_SSHD_LOGFILE
>$TEST_REGRESS_LOGFILE
# Some data for test copies # Some data for test copies
DATA=$OBJ/testdata DATA=$OBJ/testdata
@ -201,7 +216,7 @@ cleanup ()
trace () trace ()
{ {
echo "trace: $@" >>$TEST_SSH_LOGFILE echo "trace: $@" >>$TEST_REGRESS_LOGFILE
if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then
echo "$@" echo "$@"
fi fi
@ -209,7 +224,7 @@ trace ()
verbose () verbose ()
{ {
echo "verbose: $@" >>$TEST_SSH_LOGFILE echo "verbose: $@" >>$TEST_REGRESS_LOGFILE
if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then
echo "$@" echo "$@"
fi fi
@ -223,14 +238,14 @@ warn ()
fail () fail ()
{ {
echo "FAIL: $@" >>$TEST_SSH_LOGFILE echo "FAIL: $@" >>$TEST_REGRESS_LOGFILE
RESULT=1 RESULT=1
echo "$@" echo "$@"
} }
fatal () fatal ()
{ {
echo "FATAL: $@" >>$TEST_SSH_LOGFILE echo "FATAL: $@" >>$TEST_REGRESS_LOGFILE
echon "FATAL: " echon "FATAL: "
fail "$@" fail "$@"
cleanup cleanup
@ -372,7 +387,7 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
echo "Hostname=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy echo "Hostname=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy
echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy
echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy
echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy
REGRESS_INTEROP_PUTTY=yes REGRESS_INTEROP_PUTTY=yes
fi fi
@ -380,7 +395,7 @@ fi
# create a proxy version of the client config # create a proxy version of the client config
( (
cat $OBJ/ssh_config cat $OBJ/ssh_config
echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy
) > $OBJ/ssh_proxy ) > $OBJ/ssh_proxy
# check proxy config # check proxy config
@ -390,7 +405,7 @@ start_sshd ()
{ {
# start sshd # start sshd
$SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken"
$SUDO ${SSHD} -f $OBJ/sshd_config -e "$@" >>$TEST_SSH_LOGFILE 2>&1 $SUDO ${SSHD} -f $OBJ/sshd_config -e "$@" >>$TEST_SSHD_LOGFILE 2>&1
trace "wait for sshd" trace "wait for sshd"
i=0; i=0;