diff --git a/basice2e/clients.goldoutput/client85.txt b/basice2e/clients.goldoutput/client85.txt new file mode 100644 index 0000000000000000000000000000000000000000..bb2505b4747ec344a08df43f741f7253ea305dcb --- /dev/null +++ b/basice2e/clients.goldoutput/client85.txt @@ -0,0 +1,14 @@ +Adding +Message received: Hello Jono from Sydney, with E2E Encryption +Message received: Hello Jono from Sydney, with E2E Encryption +Message received: Hello Jono from Sydney, with E2E Encryption +Message received: Hello Jono from Sydney, with E2E Encryption +Message received: Hello Jono from Sydney, with E2E Encryption +Received 0 +Received 5 +Sent: Hello Sydney from Jono, with E2E Encryption +Sent: Hello Sydney from Jono, with E2E Encryption +Sent: Hello Sydney from Jono, with E2E Encryption +Sent: Hello Sydney from Jono, with E2E Encryption +Sent: Hello Sydney from Jono, with E2E Encryption +WARNING: unsafe channel creation enabled diff --git a/basice2e/clients.goldoutput/client86.txt b/basice2e/clients.goldoutput/client86.txt new file mode 100644 index 0000000000000000000000000000000000000000..64530c5ddc59f8cba975e6288ac9361f79600259 --- /dev/null +++ b/basice2e/clients.goldoutput/client86.txt @@ -0,0 +1,14 @@ +Adding +Message received: Hello Sydney from Jono, with E2E Encryption +Message received: Hello Sydney from Jono, with E2E Encryption +Message received: Hello Sydney from Jono, with E2E Encryption +Message received: Hello Sydney from Jono, with E2E Encryption +Message received: Hello Sydney from Jono, with E2E Encryption +Received 0 +Received 5 +Sent: Hello Jono from Sydney, with E2E Encryption +Sent: Hello Jono from Sydney, with E2E Encryption +Sent: Hello Jono from Sydney, with E2E Encryption +Sent: Hello Jono from Sydney, with E2E Encryption +Sent: Hello Jono from Sydney, with E2E Encryption +WARNING: unsafe channel creation enabled diff --git a/basice2e/run.sh b/basice2e/run.sh index 84b72ef5f85e40a5ce92ba65938e49e99101f7f7..21627c4183e0fc0afe9bc1bdc09a7501d044b30e 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -421,6 +421,40 @@ echo "NOTE: The command above causes an EXPECTED failure to confirm authenticati wait $PIDVAL2 +echo "CREATING USERS for SIMULTANEOUSAUTH TEST..." +JONOID=$(../bin/client init -s blob85 -l $CLIENTOUT/client85.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/jono85-contact.bin -v $DEBUGLEVEL) +SYDNEYID=$(../bin/client init -s blob86 -l $CLIENTOUT/client86.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/sydney86-contact.bin -v $DEBUGLEVEL) +echo "JONO ID: $JONOID" +echo "SYDNEY ID: $SYDNEYID" + +# Attempt to send an auth request at the same time. It's not guaranteed that +# one side won't send and the other won't receive before sending their request +# but this method has proven to be reasonably reliable. +echo "STARTING SIMULTANEOUSAUTH TEST..." +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client85.log -s blob85 --destfile $CLIENTOUT/sydney86-contact.bin --send-auth-request --sendCount 0 --receiveCount 0" +eval $CLIENTCMD >> $CLIENTOUT/client85.txt || true & +PIDVAL1=$! +echo "$CLIENTCMD -- $PIDVAL1" +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client86.log -s blob86 --destfile $CLIENTOUT/jono85-contact.bin --send-auth-request --sendCount 0 --receiveCount 0" +eval $CLIENTCMD >> $CLIENTOUT/client86.txt || true & +PIDVAL2=$! +echo "$CLIENTCMD -- $PIDVAL2" +wait $PIDVAL1 +wait $PIDVAL2 + +# Send a couple messages +echo "TESTING SIMULTANEOUSAUTH MESSAGE SEND..." +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client85.log -s blob85 --destfile $CLIENTOUT/sydney86-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello Sydney from Jono, with E2E Encryption\"" +eval $CLIENTCMD >> $CLIENTOUT/client85.txt || true & +PIDVAL1=$! +echo "$CLIENTCMD -- $PIDVAL1" +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client86.log -s blob86 --destfile $CLIENTOUT/jono85-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello Jono from Sydney, with E2E Encryption\"" +eval $CLIENTCMD >> $CLIENTOUT/client86.txt || true & +PIDVAL2=$! +echo "$CLIENTCMD -- $PIDVAL2" +wait $PIDVAL1 +wait $PIDVAL2 + echo "CREATING USERS for REKEY TEST..." JAKEID=$(../bin/client init -s blob100 -l $CLIENTOUT/client100.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/Jake100-contact.bin -v $DEBUGLEVEL)