X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/59d052593e2be428185812b77c9860bdc06bb3a0..c9cb7c0c2f698be97ddafd7575a3859aed9cb518:/server/tests.at
diff --git a/server/tests.at b/server/tests.at
index f22ff062..4aadc309 100644
--- a/server/tests.at
+++ b/server/tests.at
@@ -9,19 +9,18 @@
###
### This file is part of Trivial IP Encryption (TrIPE).
###
-### TrIPE is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### TrIPE is free software: you can redistribute it and/or modify it under
+### the terms of the GNU General Public License as published by the Free
+### Software Foundation; either version 3 of the License, or (at your
+### option) any later version.
###
-### TrIPE is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-### GNU General Public License for more details.
+### TrIPE is distributed in the hope that it will be useful, but WITHOUT
+### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+### FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+### for more details.
###
### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE. If not, see .
m4_define([nl], [
])
@@ -35,9 +34,34 @@ m4_define([SETUPDIR], [
## Running standard programs with useful options.
m4_define([TRIPE],
[env TRIPE_PRIVHELPER=$abs_top_builddir/priv/tripe-privhelper \
- $abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 -talice])
+ $abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 -talice \
+ ${TRIPE_TEST_TRACEOPTS+-T$TRIPE_TEST_TRACEOPTS}])
m4_define([TRIPECTL], [$abs_top_builddir/client/tripectl -d. -aadmin])
m4_define([USLIP], [$abs_top_builddir/uslip/tripe-uslip])
+m4_define([PKSTREAM],
+ [$abs_top_builddir/pkstream/pkstream -b127.0.0.1 -p127.0.0.1])
+m4_define([MITM], [$abs_top_builddir/proxy/tripe-mitm])
+
+## WITH_STRACE(tag, cmd)
+##
+## There's an awful hack here. If a process running under strace exits with
+## a signal, then strace will kill itself with the same signal -- and
+## therefore clobber the original process's core file. So we arrange to run
+## strace in one directory and have the child process run in another.
+m4_define([WITH_STRACE],
+[case "${TRIPE_TEST_STRACE-nil}" in
+ nil)
+ $2
+ ;;
+ *)
+ mkdir -p strace-hack.$1/
+ (ulimit -c hard >/dev/null 2>&1
+ sh -c 'cd strace-hack.$1; exec "$[]@"' - \
+ strace -ff -tt -v -s1024 -o../$1.trace \
+ sh -c 'cd ..; exec "$[]@"' - \
+ $2)
+ ;;
+ esac])
## Sequences. (These are used for testing the replay protection machinery.)
m4_define([R32], [ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 dnl
@@ -81,24 +105,17 @@ mv stdout $1/port
## Test body...
$3
-## End of the test, now run the server. There's an awful hack here. If a
-## process running under strace exits with a signal, then strace will kill
-## itself with the same signal -- and therefore clobber the original
-## process's core file. So we arrange to run strace in one directory and
-## have the child process run in another.
+## End of the test, now run the server.
) && :; } | {
cd $1
- mkdir -p strace-hack/
echo TRIPE $2 >&2
- (cd strace-hack/
- ulimit -c hard >/dev/null 2>&1
- strace -f -o ../tripe.trace \
- TRIPE -d.. $2 >../server-output.full 2>../server-errors)
+ WITH_STRACE([tripe], [TRIPE $2 >server-output.full 2>server-errors.full])
stat=$?
echo $stat >server-status
if test $stat -ne 0; then
- echo "exit status: $stat" >>server-errors
+ echo "exit status: $stat" >>server-errors.full
fi
+ grep -v '^+ tripe: ' server-errors.full >server-errors
## We interrupt this relatively sensible macro for an especially awful
## hack. The tripe server emits warnings which are often caused by lack of
@@ -149,7 +166,7 @@ $3
{
for (i = 0; i < npat; i++) {
n = length(pat[[i]]);
- if (substr($[]0, 0, n) == pat[[i]])
+ if (substr($[]0, 1, n) == pat[[i]])
next;
}
print $[]0;
@@ -172,10 +189,31 @@ m4_define([WITH_TRIPE], [WITH_TRIPEX([.], [$1], [$2])])
m4_define([WITH_2TRIPES],
[WITH_TRIPEX([$1], [$3 $4], [WITH_TRIPEX([$2], [$3 $5], [$6])])])
-## COMMS_EPING(adir, aname, bdir, bname)
+## WITH_3TRIPES(adir, bdir, cdir, allargs, aargs, bargs, cargs, body)
+m4_define([WITH_3TRIPES],
+ [WITH_TRIPEX([$1], [$4 $5],
+ [WITH_TRIPEX([$2], [$4 $6],
+ [WITH_TRIPEX([$3], [$4 $7],
+ [$8])])])])
+
+## RETRY(n, body)
+m4_define([RETRY], [
+ n=0 rc=1
+ while test $n -lt $1; do
+ if $2
+ then rc=0; break
+ fi
+ n=$(( $n + 1 ))
+ done
+ exit $rc
+])
+
+## COMMS_EPING(adir, aname, bdir, bname, [n])
m4_define([COMMS_EPING], [
- AT_CHECK([TRIPECTL -d$1 EPING $4],, [ignore])
- AT_CHECK([TRIPECTL -d$3 EPING $2],, [ignore])
+ AT_CHECK([RETRY([m4_default([$5], [1])],
+ [TRIPECTL -d$1 EPING $4])],, [ignore])
+ AT_CHECK([RETRY([m4_default([$5], [1])],
+ [TRIPECTL -d$3 EPING $2])],, [ignore])
])
## COMMS_SLIP(adir, aname, bdir, bname)
@@ -190,9 +228,13 @@ m4_define([COMMS_SLIP], [
m4_define([AWAIT_KXDONE], [
## Ignore some reports caused by races.
- TRIPECTL -d$3 WARN test PUSH
- TRIPECTL -d$3 WARN test IGNORE WARN KX $2 incorrect cookie
- TRIPECTL -d$3 WARN test IGNORE WARN KX $2 unexpected pre-challenge
+ for i in $1!$4 $3!$2; do
+ d=${i%!*} o=${i#*!}
+ TRIPECTL -d$d WARN test PUSH
+ TRIPECTL -d$d WARN test IGNORE WARN KX $o incorrect cookie
+ TRIPECTL -d$d WARN test IGNORE WARN KX $o unexpected pre-challenge
+ TRIPECTL -d$d WARN test IGNORE WARN KX $o unexpected challenge
+ done
## Watch for the key-exchange completion announcement in the background.
COPROCESSES([wait-$1], [
@@ -203,7 +245,7 @@ m4_define([AWAIT_KXDONE], [
case "$[]1:$[]2:$[]3" in
OK::) ;;
NOTE:KXDONE:$4) break ;;
- NOTE:*) ;;
+ NOTE:* | TRACE:* | WARN:*) ;;
*) exit 63 ;;
esac
done
@@ -218,16 +260,18 @@ m4_define([AWAIT_KXDONE], [
AT_CHECK([echo $waitrc],, [0[]nl])
## Be interested in key-exchange warnings again.
- TRIPECTL -d$4 WARN test POP
+ for d in $1 $3; do TRIPECTL -d$d WARN test POP; done
])
-## ESTABLISH(adir, aname, aopts, bdir, bname, bopts)
+## ESTABLISH(adir, aname, aopts, bdir, bname, bopts, [aport], [bport])
m4_define([ESTABLISH], [
## Set up the establishment.
AWAIT_KXDONE([$1], [$2], [$4], [$5], [
- AT_CHECK([TRIPECTL -d$1 ADD -cork $6 $5 INET 127.0.0.1 $(cat $4/port)])
- AT_CHECK([TRIPECTL -d$4 ADD $3 $2 INET 127.0.0.1 $(cat $1/port)])
+ AT_CHECK([TRIPECTL -d$1 ADD -cork $6 $5 INET 127.0.0.1 \
+ m4_if([$8], [], [$(cat $4/port)], [$8])])
+ AT_CHECK([TRIPECTL -d$4 ADD $3 $2 INET 127.0.0.1 \
+ m4_if([$7], [], [$(cat $1/port)], [$7])])
])
## Check transport pinging.
@@ -338,11 +382,261 @@ AT_SETUP([server communication])
AT_KEYWORDS([comm])
export TRIPE_SLIPIF=USLIP
-for p in alice bob; do (mkdir $p; cd $p; SETUPDIR([alpha])); done
+for k in alpha beta-new; do
+ for p in alice bob; do (
+ rm -rf $p; mkdir $p; cd $p; SETUPDIR([$k])
+ ); done
+ WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [
+ ESTABLISH([alice], [not-alice], [-key alice],
+ [bob], [bob], [])
+ ])
+ for p in alice bob; do rm -rf $p.$k; mv $p $p.$k; done
+done
+
+AT_CLEANUP
+
+###--------------------------------------------------------------------------
+### Mobile peer tracking.
+
+AT_SETUP([peer tracking])
+AT_KEYWORDS([mobile])
+export TRIPE_SLIPIF=USLIP
+
+for p in alice bob carol; do (mkdir $p; cd $p; SETUPDIR([alpha])); done
+
+## WITH_PKSTREAM(adir, aport, bdir, bport, body)
+m4_define([WITH_PKSTREAM], [
+ echo >&2 "pkstream: $1 <--> :$2 <-pkstream-> :$4 <--> $3"
+ PKSTREAM -l$4 127.0.0.1:$4 127.0.0.1:$(cat $3/port)& pkstream_$3_$1=$!
+ sleep 1
+ PKSTREAM -c127.0.0.1:$4 127.0.0.1:$2 127.0.0.1:$(cat $1/port)&
+ pkstream_$1_$3=$!
+ set +x
+ $5
+ kill $pkstream_$3_$1 $pkstream_$1_$3
+])
+
+WITH_3TRIPES([alice], [bob], [carol], [-nslip],
+ [-talice], [-tbob], [-tcarol], [
+
+ ## We need an indirection layer between the two peers so that we can
+ ## simulate the effects of NAT remapping. The nearest thing we have to
+ ## this is pkstream, so we may as well use that.
+ ##
+ ## alice <--> :5311 <-pkstream-> :5312 <--> bob
+ ## alice <--> :5321 <-pkstream-> :5322 <--> carol
+
+ WITH_PKSTREAM([alice], [5311], [bob], [5312], [
+ ESTABLISH([alice], [alice], [], [bob], [bob], [-mobile], [5312], [5311])
+ ])
+
+ WITH_PKSTREAM([alice], [5319], [bob], [5312], [
+ COMMS_EPING([bob], [bob], [alice], [alice])
+ COMMS_SLIP([bob], [bob], [alice], [alice])
+ ])
+
+ WITH_PKSTREAM([alice], [5321], [carol], [5322], [
+ ESTABLISH([alice], [alice], [], [carol], [carol], [-mobile],
+ [5322], [5321])
+ ])
+
+ WITH_PKSTREAM([alice], [5311], [bob], [5312], [
+ WITH_PKSTREAM([alice], [5321], [carol], [5322], [
+ COMMS_EPING([bob], [bob], [alice], [alice])
+ COMMS_EPING([carol], [carol], [alice], [alice])
+ COMMS_SLIP([bob], [bob], [alice], [alice])
+ COMMS_SLIP([carol], [carol], [alice], [alice])
+ ])])
+
+ WITH_PKSTREAM([alice], [5321], [bob], [5312], [
+ WITH_PKSTREAM([alice], [5311], [carol], [5322], [
+ COMMS_EPING([bob], [bob], [alice], [alice])
+ COMMS_EPING([carol], [carol], [alice], [alice])
+ COMMS_SLIP([bob], [bob], [alice], [alice])
+ COMMS_SLIP([carol], [carol], [alice], [alice])
+ ])])
+ wait
+])
+
+AT_CLEANUP
+
+###--------------------------------------------------------------------------
+### Adverse communication.
+
+AT_SETUP([server retry])
+AT_KEYWORDS([backoff])
+export TRIPE_SLIPIF=USLIP
+
+for i in alice bob; do (mkdir $i; cd $i; SETUPDIR([beta])); done
WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [
- ESTABLISH([alice], [not-alice], [-key alice],
- [bob], [bob], [])
+
+ ## Set up the evil proxy.
+ alicemitm=24516 bobmitm=14016
+ mknod pipe-mitmpid p
+ WITH_STRACE([mitm],
+ [sh -c 'echo $$ >pipe-mitmpid; exec "$@"' - \
+ MITM -kalice/keyring.pub >mitm.out 2>mitm.err \
+ peer:alice:$alicemitm:127.0.0.1:$(cat alice/port) \
+ peer:bob:$bobmitm:127.0.0.1:$(cat bob/port) \
+ filt:drop:5 filt:send])&
+ read mitmpid &-
+
+ ## Try to establish keys anyway.
+ AWAIT_KXDONE([alice], [alice], [bob], [bob], [
+ AT_CHECK([TRIPECTL -dalice ADD -cork bob INET 127.0.0.1 $alicemitm])
+ AT_CHECK([TRIPECTL -dbob ADD alice INET 127.0.0.1 $bobmitm])
+ ])
+
+ ## Check pinging.
+ COMMS_EPING([alice], [alice], [bob], [bob], [10])
+ COMMS_EPING([bob], [bob], [alice], [alice], [10])
+
+ ## Tear down the MITM proxy.
+ kill $mitmpid
+])
+
+AT_CLEANUP
+
+###--------------------------------------------------------------------------
+### Key management.
+
+AT_SETUP([server key-management])
+AT_KEYWORDS([keymgmt])
+export TRIPE_SLIPIF=USLIP
+
+## Determine all of the nets and the principals.
+princs=""
+nets=" "
+while read princ pnets; do
+ princs="$princs $princ"
+ for n in $pnets; do
+ case " $nets " in *" $n "*) ;; *) nets="$nets$n " ;; esac
+ done
+done <