X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/d5cdcb8a4f5f6f30d2e6f2f5d16d438a430e3cb6..HEAD:/server/tests.at diff --git a/server/tests.at b/server/tests.at index 3fd2e47b..ef2039ae 100644 --- a/server/tests.at +++ b/server/tests.at @@ -39,6 +39,12 @@ m4_define([TRIPE], m4_define([TRIPECTL], [$abs_top_builddir/client/tripectl -d. -aadmin]) m4_define([USLIP], [$abs_top_builddir/uslip/tripe-uslip]) m4_define([MITM], [$abs_top_builddir/proxy/tripe-mitm]) +m4_define([BULKTEST], + [$abs_top_builddir/server/tripe-test \ + ${TRIPE_TEST_TRACEOPTS+-T$TRIPE_TEST_TRACEOPTS}]) + +## Pause for a bit. +m4_define([SLEEP], [sleep 0.2]) ## WITH_STRACE(tag, cmd) ## @@ -106,7 +112,7 @@ $3 ## End of the test, now run the server. ) && :; } | { cd $1 - echo TRIPE $2 >&2 + echo "TRIPE $2" >&2 WITH_STRACE([tripe], [TRIPE $2 >server-output.full 2>server-errors.full]) stat=$? echo $stat >server-status @@ -236,7 +242,7 @@ m4_define([AWAIT_KXDONE], [ ## Watch for the key-exchange completion announcement in the background. COPROCESSES([wait-$1], [ - echo WATCH +n + echo "WATCH +n" while read line; do set x $line; shift echo >&2 ">>> $line" @@ -314,7 +320,7 @@ m4_define([TRIPECTL_COMMAND], [ AT_SETUP([server basics]) SETUPDIR([alpha]) -AT_CHECK([echo port | TRIPE -p54321],, [INFO 54321[]nl[]OK[]nl]) +AT_CHECK([echo "port" | TRIPE -p54321],, [INFO 54321[]nl[]OK[]nl]) AT_CLEANUP ###-------------------------------------------------------------------------- @@ -332,7 +338,7 @@ WITH_TRIPE(, [ ## server chose the same key is negligible.) AT_CHECK([TRIPECTL checkchal AAAAAHyoOL+HMaE0Y9B3ivuszt0], [1],, [tripectl: invalid-challenge[]nl]) - echo WARN CHAL incorrect-tag >>expected-server-output + echo "WARN CHAL incorrect-tag" >>expected-server-output ## A duplicated challenge. AT_CHECK([ @@ -340,7 +346,7 @@ WITH_TRIPE(, [ TRIPECTL CHECKCHAL $chal TRIPECTL CHECKCHAL $chal ], [1],, [tripectl: invalid-challenge[]nl]) - echo WARN CHAL replay duplicated-sequence >>expected-server-output + echo "WARN CHAL replay duplicated-sequence" >>expected-server-output ## Out-of-order reception. There should be a window of 32 challenges; we ## make 33 and check them in a strange order. @@ -404,13 +410,19 @@ for p in alice bob carol; do (mkdir $p; cd $p; SETUPDIR([alpha])); done ## WITH_MITM(adir, aport, bdir, bport, body) m4_define([WITH_MITM], [ - echo >&2 "mitm: $1 <--> :$2 <-mitm-> :$4 <--> $3" + aspec="$2" bspec="$4" + case $aspec in =*) aport="?$1/$3.mitm" ;; *) aport=$aspec ;; esac + case $bspec in =*) bport="?$3/$1.mitm" ;; *) bport=$bspec ;; esac MITM -k$1/keyring.pub \ - peer:$1:$2:127.0.0.1:$(cat $1/port) \ - peer:$3:$4:127.0.0.1:$(cat $3/port) \ + peer:$1:$aport:127.0.0.1:$(cat $1/port) \ + peer:$3:$bport:127.0.0.1:$(cat $3/port) \ filt:send& mitmpid_$1_$3=$! + SLEEP + case $aspec in =*) aport=$(cat ${aport#\?}); eval ${aspec#=}=\$aport ;; esac + case $bspec in =*) bport=$(cat ${bport#\?}); eval ${bspec#=}=\$bport ;; esac + echo >&2 "mitm: $1 <--> :$aport <-mitm-> :$bport <--> $3" trap 'kill $mitmpid_$1_$3; exit 127' EXIT INT QUIT TERM HUP - sleep 1 + SLEEP $5 kill $mitmpid_$1_$3; trap - EXIT INT QUIT TERM HUP ]) @@ -425,30 +437,33 @@ WITH_3TRIPES([alice], [bob], [carol], [-nslip], ## alice <--> :5311 <-mitm-> :5312 <--> bob ## alice <--> :5321 <-mitm-> :5322 <--> carol - WITH_MITM([alice], [5311], [bob], [5312], [ - ESTABLISH([alice], [alice], [], [bob], [bob], [-mobile], [5312], [5311]) + WITH_MITM([alice], [=bob_from_alice], [bob], [=alice_from_bob], [ + ESTABLISH([alice], [alice], [], + [bob], [bob], [-mobile], + [$alice_from_bob], [$bob_from_alice]) ]) - WITH_MITM([alice], [5319], [bob], [5312], [ + WITH_MITM([alice], [=new_bob_from_alice], [bob], [$alice_from_bob], [ COMMS_EPING([bob], [bob], [alice], [alice]) COMMS_SLIP([bob], [bob], [alice], [alice]) ]) - WITH_MITM([alice], [5321], [carol], [5322], [ - ESTABLISH([alice], [alice], [], [carol], [carol], [-mobile], - [5322], [5321]) + WITH_MITM([alice], [=carol_from_alice], [carol], [=alice_from_carol], [ + ESTABLISH([alice], [alice], [], + [carol], [carol], [-mobile], + [$alice_from_carol], [$carol_from_alice]) ]) - WITH_MITM([alice], [5311], [bob], [5312], [ - WITH_MITM([alice], [5321], [carol], [5322], [ + WITH_MITM([alice], [$bob_from_alice], [bob], [$alice_from_bob], [ + WITH_MITM([alice], [$carol_from_alice], [carol], [$alice_from_carol], [ 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_MITM([alice], [5321], [bob], [5312], [ - WITH_MITM([alice], [5311], [carol], [5322], [ + WITH_MITM([alice], [$carol_from_alice], [bob], [$alice_from_bob], [ + WITH_MITM([alice], [$bob_from_alice], [carol], [$alice_from_carol], [ COMMS_EPING([bob], [bob], [alice], [alice]) COMMS_EPING([carol], [carol], [alice], [alice]) COMMS_SLIP([bob], [bob], [alice], [alice]) @@ -471,15 +486,16 @@ for i in alice bob; do (mkdir $i; cd $i; SETUPDIR([beta])); done WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [ ## 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) \ + peer:alice:\?alice.mitm:127.0.0.1:$(cat alice/port) \ + peer:bob:\?bob.mitm:127.0.0.1:$(cat bob/port) \ filt:drop:5 filt:send])& read mitmpid &- @@ -656,7 +672,7 @@ WITH_TRIPE(, [ ## Run a simple service. rm -f svc-test-running tripectl-status COPROCESSES([svc], [ - echo SVCCLAIM test 1.0.0 + echo "SVCCLAIM test 1.0.0" read line case "$line" in OK) @@ -666,19 +682,19 @@ WITH_TRIPE(, [ exit 1 ;; esac - echo ok >svc-test-running + echo "ok" >svc-test-running while read line; do set -- $line case "$[]1,$[]3,$[]4" in SVCJOB,test,HELP) - echo SVCINFO try not to use this service for anything useful - echo SVCOK $[]2 + echo "SVCINFO try not to use this service for anything useful" + echo "SVCOK $[]2" ;; SVCJOB,test,GOOD) - echo SVCOK $[]2 + echo "SVCOK $[]2" ;; SVCJOB,test,BAD) - echo SVCFAIL $[]2 this-command-always-fails + echo "SVCFAIL $[]2 this-command-always-fails" ;; SVCJOB,test,UGLY) tag=$2 @@ -697,11 +713,11 @@ WITH_TRIPE(, [ firsttag=$[]2 ;; SVCJOB,test,SECOND) - echo SVCOK $firsttag - echo SVCOK $[]2 + echo "SVCOK $firsttag" + echo "SVCOK $[]2" ;; SVCJOB,*) - echo SVCFAIL $[]2 unknown-svc-command $[]4 + echo "SVCFAIL $[]2 unknown-svc-command $[]4" ;; SVCCLAIM,*) break @@ -761,7 +777,7 @@ export TRIPE_SLIPIF=USLIP for i in alice bob; do (mkdir $i; cd $i; SETUPDIR([gamma])); done WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [ - WITH_MITM([alice], [5311], [bob], [5312], [ + WITH_MITM([alice], [=bob_from_alice], [bob], [=alice_from_bob], [ COPROCESSES([wait-knock], [ echo WATCH +n @@ -779,21 +795,21 @@ WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [ TRIPECTL -dalice ])& waiter=$! - AT_CHECK([TRIPECTL -dbob ADD -knock bob alice INET 127.0.0.1 5312]) + AT_CHECK([TRIPECTL -dbob ADD -knock bob -ephemeral alice INET 127.0.0.1 $alice_from_bob]) wait $waiter; waitrc=$? AT_CHECK([echo $waitrc],, [0[]nl]) - AT_CHECK([cat knock-addr],, [INET 127.0.0.1 5311[]nl]) + AT_CHECK_UNQUOTED([cat knock-addr],, [INET 127.0.0.1 $bob_from_alice[]nl]) AWAIT_KXDONE([alice], [alice], [bob], [bob], [ - AT_CHECK([TRIPECTL -dalice ADD -ephemeral bob INET 127.0.0.1 5311]) + AT_CHECK([TRIPECTL -dalice ADD -ephemeral bob INET 127.0.0.1 $bob_from_alice]) ]) COMMS_EPING([alice], [alice], [bob], [bob]) COMMS_SLIP([alice], [alice], [bob], [bob]) ]) - WITH_MITM([alice], [5319], [bob], [5312], [ + WITH_MITM([alice], [=new_bob_from_alice], [bob], [$alice_from_bob], [ AWAIT_KXDONE([alice], [alice], [bob], [bob], [ AT_CHECK([TRIPECTL -dalice FORCEKX bob]) AT_CHECK([TRIPECTL -dbob FORCEKX alice]) @@ -806,4 +822,32 @@ WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [ AT_CLEANUP +###-------------------------------------------------------------------------- +### Key-exchange ad bulk crypto round trip. + +AT_SETUP([server roundtrip]) +AT_KEYWORDS([roundtrip]) + +while read label genalg paramalg spec; do + paramopts=${spec%--*} attrs=${spec#*--} + key -kkeyring.$label add -a$paramalg -eforever $paramopts -tparam tripe-param $attrs + key -kkeyring.$label add -a$genalg -pparam -eforever -talice tripe + key -kkeyring.$label extract -f-secret keyring.$label-pub + { sh -c "echo $$"; date; } >msg + AT_CHECK([BULKTEST -kkeyring.$label -talice \ + ies-encrypt 99 "$(cat msg)nl"], [0], [stdout], [stderr]) + cp msg expout; mv stdout ct + AT_CHECK([BULKTEST -kkeyring.$label -talice \ + ies-decrypt 99 "$(cat ct)"], [0], [expout], [stderr]) +done <