From 69a62d16fff808ef79e2b4e813ff8949295309e5 Mon Sep 17 00:00:00 2001 From: jbhusson <jonah@elixxir.io> Date: Wed, 14 Sep 2022 13:59:20 -0400 Subject: [PATCH] Uncomment backup test & update goldoutput --- basice2e/clients.goldoutput/client120.txt | 28 +++++++--- basice2e/clients.goldoutput/client121.txt | 30 +++++++---- basice2e/run.sh | 62 +++++++++++------------ 3 files changed, 72 insertions(+), 48 deletions(-) diff --git a/basice2e/clients.goldoutput/client120.txt b/basice2e/clients.goldoutput/client120.txt index 8e43db3..d38775a 100644 --- a/basice2e/clients.goldoutput/client120.txt +++ b/basice2e/clients.goldoutput/client120.txt @@ -1,16 +1,28 @@ - +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client120 to myself, without E2E Encryption Message received: Hello from Client120 to myself, without E2E Encryption +Received 1 +Authentication channel request from: k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D +Received 0 +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption Message received: Hello from Client121, with E2E Encryption Message received: Hello from Client121, with E2E Encryption Message received: Hello from Client121, with E2E Encryption Message received: Hello from Client121, with E2E Encryption Message received: Hello from Client121, with E2E Encryption +Received 5 Received 0 -Received 1 +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup +Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup +Message received: Hello from Client121, with E2E Encryption after 121 restoring backup +Message received: Hello from Client121, with E2E Encryption after 121 restoring backup +Message received: Hello from Client121, with E2E Encryption after 121 restoring backup +Message received: Hello from Client121, with E2E Encryption after 121 restoring backup +Message received: Hello from Client121, with E2E Encryption after 121 restoring backup Received 5 -Sent: Hello from Client120 to myself, without E2E Encryption -Sent: Hello from Client120, with E2E Encryption -Sent: Hello from Client120, with E2E Encryption -Sent: Hello from Client120, with E2E Encryption -Sent: Hello from Client120, with E2E Encryption -Sent: Hello from Client120, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client121.txt b/basice2e/clients.goldoutput/client121.txt index 6dfb3b6..d71bf17 100644 --- a/basice2e/clients.goldoutput/client121.txt +++ b/basice2e/clients.goldoutput/client121.txt @@ -1,17 +1,29 @@ -Adding -Backup update received. -Backup update received. +WARNING: unsafe channel creation enabled +Adding authenticated channel for: zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD +Received 0 +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption Message received: Hello from Client120, with E2E Encryption Message received: Hello from Client120, with E2E Encryption Message received: Hello from Client120, with E2E Encryption Message received: Hello from Client120, with E2E Encryption Message received: Hello from Client120, with E2E Encryption +Received 5 +Backup update received. +Backup update received. Received 0 Received 0 +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup +Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup +Message received: Hello from Client120, with E2E Encryption after 121 restoring backup +Message received: Hello from Client120, with E2E Encryption after 121 restoring backup +Message received: Hello from Client120, with E2E Encryption after 121 restoring backup +Message received: Hello from Client120, with E2E Encryption after 121 restoring backup +Message received: Hello from Client120, with E2E Encryption after 121 restoring backup Received 5 -Sent: Hello from Client121, with E2E Encryption -Sent: Hello from Client121, with E2E Encryption -Sent: Hello from Client121, with E2E Encryption -Sent: Hello from Client121, with E2E Encryption -Sent: Hello from Client121, with E2E Encryption -WARNING: unsafe channel creation enabled diff --git a/basice2e/run.sh b/basice2e/run.sh index 5e74c0e..50677fa 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -584,37 +584,37 @@ echo "$CLIENTCMD -- $PIDVAL" echo "FIXME: The above exits uncleanly, but a backup file is created. The rest of the test fails...It should be FIXED!" wait $PIDVAL -# rm -fr blob121 - -# CLIENTCMD="timeout 60s ../bin/client $CLIENTBACKUPOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --backupIn $CLIENTOUT/client121A.backup --backupPass hello --backupJsonOut $CLIENTOUT/client121B.backup.json --backupIdList $CLIENTOUT/client121Partners.json --sendCount 0 --receiveCount 0" -# eval $CLIENTCMD >> $CLIENTOUT/client121.txt & -# PIDVAL=$! -# echo "$CLIENTCMD -- $PIDVAL" -# wait $PIDVAL - -# CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --batchadd $CLIENTOUT/client121Partners.json --unsafe-channel-creation" -# eval $CLIENTCMD >> $CLIENTOUT/client121.txt & -# PIDVAL=$! -# echo "$CLIENTCMD -- $PIDVAL" - -# CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client120.log -s blob120 --force-legacy --destfile $CLIENTOUT/client121-contact.bin --sendCount 0 --receiveCount 0 --unsafe-channel-creation" -# eval $CLIENTCMD >> $CLIENTOUT/client120.txt & -# PIDVAL2=$! -# echo "$CLIENTCMD -- $PIDVAL2" -# wait $PIDVAL -# wait $PIDVAL2 - -# # Send messages to each other -# CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client120.log -s blob120 --force-legacy --destfile $CLIENTOUT/client121-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello from Client120, with E2E Encryption after 121 restoring backup\" --unsafe-channel-creation" -# eval $CLIENTCMD >> $CLIENTOUT/client120.txt || true & -# PIDVAL=$! -# echo "$CLIENTCMD -- $PIDVAL" -# CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --destfile $CLIENTOUT/client120-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello from Client121, with E2E Encryption after 121 restoring backup\" --unsafe-channel-creation" -# eval $CLIENTCMD >> $CLIENTOUT/client121.txt || true & -# PIDVAL2=$! -# echo "$CLIENTCMD -- $PIDVAL" -# wait $PIDVAL -# wait $PIDVAL2 +rm -fr blob121 + +CLIENTCMD="timeout 60s ../bin/client $CLIENTBACKUPOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --backupIn $CLIENTOUT/client121A.backup --backupPass hello --backupJsonOut $CLIENTOUT/client121B.backup.json --backupIdList $CLIENTOUT/client121Partners.json --sendCount 0 --receiveCount 0" +eval $CLIENTCMD >> $CLIENTOUT/client121.txt & +PIDVAL=$! +echo "$CLIENTCMD -- $PIDVAL" +wait $PIDVAL + +CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --batchadd $CLIENTOUT/client121Partners.json --unsafe-channel-creation" +eval $CLIENTCMD >> $CLIENTOUT/client121.txt & +PIDVAL=$! +echo "$CLIENTCMD -- $PIDVAL" + +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client120.log -s blob120 --force-legacy --destfile $CLIENTOUT/client121-contact.bin --sendCount 0 --receiveCount 0 --unsafe-channel-creation" +eval $CLIENTCMD >> $CLIENTOUT/client120.txt & +PIDVAL2=$! +echo "$CLIENTCMD -- $PIDVAL2" +wait $PIDVAL +wait $PIDVAL2 + +# Send messages to each other +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client120.log -s blob120 --force-legacy --destfile $CLIENTOUT/client121-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello from Client120, with E2E Encryption after 121 restoring backup\" --unsafe-channel-creation" +eval $CLIENTCMD >> $CLIENTOUT/client120.txt || true & +PIDVAL=$! +echo "$CLIENTCMD -- $PIDVAL" +CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --destfile $CLIENTOUT/client120-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello from Client121, with E2E Encryption after 121 restoring backup\" --unsafe-channel-creation" +eval $CLIENTCMD >> $CLIENTOUT/client121.txt || true & +PIDVAL2=$! +echo "$CLIENTCMD -- $PIDVAL" +wait $PIDVAL +wait $PIDVAL2 # TODO: Add test that backs up and restore client 120. To do this, you need to be able to delete old requests -- GitLab