From 5a7b5dc06bfd10af60c139318f9a9963dd6f3163 Mon Sep 17 00:00:00 2001 From: "Richard T. Carback III" <rick.carback@gmail.com> Date: Wed, 23 Dec 2020 00:04:01 +0000 Subject: [PATCH] Updates to fix integration --- basice2e/clients.goldoutput/client18.txt | 1 - .../clients.goldoutput/client18_rekey.txt | 1 - basice2e/clients.goldoutput/client42.txt | Bin 1934 -> 1527 bytes basice2e/clients.goldoutput/client43.txt | 4 --- basice2e/clients.goldoutput/client45.txt | 2 -- basice2e/clients.goldoutput/client56.txt | 2 -- basice2e/clients.goldoutput/client67.txt | 2 -- basice2e/clients.goldoutput/client74.txt | 2 -- basice2e/clients.goldoutput/client9.txt | 3 -- basice2e/clients.goldoutput/client9_rekey.txt | 1 - basice2e/run.sh | 28 +++++++++--------- 11 files changed, 14 insertions(+), 32 deletions(-) diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt index 84efb3d..f2dbb82 100644 --- a/basice2e/clients.goldoutput/client18.txt +++ b/basice2e/clients.goldoutput/client18.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network WARNING: unsafe channel creation enabled Adding a Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client18_rekey.txt b/basice2e/clients.goldoutput/client18_rekey.txt index d7d4a9a..fb895dc 100644 --- a/basice2e/clients.goldoutput/client18_rekey.txt +++ b/basice2e/clients.goldoutput/client18_rekey.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt index c4d71014e73d4745f873ff4d2db2bfee78b308fa..a6564b0aba717b68a2feda16ab26638c16a0863b 100644 GIT binary patch delta 60 zcmeC<|IR(xpILn31LcW(12<1(Ok$dRfbH<ay|R-Jut`t;!@@IJnR)YMe`Z~X5Rwcx E0P{r{lmGw# literal 1934 zcmWH}OwUU!DJ@D>C`&EMOv_A8EXmBzQ^+h<NG>f(%`3^NR7lAzPE5*4P0>-vOjD@L zFI7lSEm0`R$ShXKO)V}?Oixt^4)G6A@DFeeat!hG_ftsBOHoM9&nrnx2B}L`NJ%YA z&B-rFEh<(>EK$hIPf0CysHo7(OD!qSFUsZ$PR%Q^Qt(L4$;nqpE6UGR2+B;(HZf8t z$ydm&EKbcy(@`kTEXl|(Em3eaa#e86OD?J`0J)OO7ixb|YI163S!xP-rUXHCD;RPO zg3xf}a^$jR7zH#80bD5#lFrZ*8II&Rs1;KuW8gK#DK*c;7<(WL6@BoGZ#oz<{!mP3 QB)NI0Bnx`G6Db)20NLju$N&HU diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt index 7d07070..2be9319 100644 --- a/basice2e/clients.goldoutput/client43.txt +++ b/basice2e/clients.goldoutput/client43.txt @@ -1,9 +1,6 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network WARNING: unsafe channel creation enabled Adding a -Timed out! Received 0 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption @@ -15,7 +12,6 @@ Message received: Hello from Rick42, with E2E Encryption Message received: Hello from Rick42, with E2E Encryption Message received: Hello from Rick42, with E2E Encryption Received 5 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt index 94bbda3..bf2db33 100644 --- a/basice2e/clients.goldoutput/client45.txt +++ b/basice2e/clients.goldoutput/client45.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 @@ -40,7 +39,6 @@ Message received: Hello, 4 Message received: Hello, 4 Message received: Hello, 4 Received 20 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt index e8d6207..010ac2e 100644 --- a/basice2e/clients.goldoutput/client56.txt +++ b/basice2e/clients.goldoutput/client56.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 @@ -40,7 +39,6 @@ Message received: Hello, 5 Message received: Hello, 5 Message received: Hello, 5 Received 20 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt index 0ac9000..0f8eb45 100644 --- a/basice2e/clients.goldoutput/client67.txt +++ b/basice2e/clients.goldoutput/client67.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 @@ -40,7 +39,6 @@ Message received: Hello, 6 Message received: Hello, 6 Message received: Hello, 6 Received 20 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt index 1490ff1..7f5416d 100644 --- a/basice2e/clients.goldoutput/client74.txt +++ b/basice2e/clients.goldoutput/client74.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 @@ -40,7 +39,6 @@ Message received: Hello, 7 Message received: Hello, 7 Message received: Hello, 7 Received 20 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt index a224b2a..ac3d28f 100644 --- a/basice2e/clients.goldoutput/client9.txt +++ b/basice2e/clients.goldoutput/client9.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network WARNING: unsafe channel creation enabled Adding a Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption @@ -6,13 +5,11 @@ Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encry Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption Received 2 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption Received 2 -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network WARNING: unsafe channel creation enabled Adding a Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client9_rekey.txt b/basice2e/clients.goldoutput/client9_rekey.txt index bc7b2a0..62a6668 100644 --- a/basice2e/clients.goldoutput/client9_rekey.txt +++ b/basice2e/clients.goldoutput/client9_rekey.txt @@ -1,4 +1,3 @@ -Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption diff --git a/basice2e/run.sh b/basice2e/run.sh index 1f1e4cd..aed56e8 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -22,7 +22,7 @@ DUMMYOUT=results/dummy-console.txt UDBOUT=results/udb-console.txt CLIENTCLEAN=results/clients-cleaned -CLIENTOPTS="--password hello --ndf ndf.json --waitTimeout 70 --unsafe-channel-creation --verbose" +CLIENTOPTS="--password hello --ndf ndf.json --waitTimeout 90 --unsafe-channel-creation --verbose" mkdir -p $SERVERLOGS mkdir -p $GATEWAYLOGS @@ -139,7 +139,7 @@ runclients() { eval NICK=\${NICK${cid}} # Send a regular message mkdir -p blob$cid - CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client$cid$nid.log -s blob$cid/blob$cid --unsafe --sendid $cid --destid $nid --sendCount 20 --receiveCount 20 -m \"Hello, $nid\"" + CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client$cid$nid.log -s blob$cid/blob$cid --unsafe --sendid $cid --destid $nid --sendCount 20 --receiveCount 20 -m \"Hello, $nid\"" eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.txt 2>&1 & PIDVAL=$! eval CLIENTS${CTR}=$PIDVAL @@ -166,23 +166,23 @@ runclients mkdir -p blob9 mkdir -p blob18 echo "TEST E2E WITH PRECANNED USERS..." -CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL -CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL # Send E2E messages between two users -CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob9/blob9 --sendid 9 --destid 18 -m \"Hi 9->18, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob9/blob9 --sendid 9 --destid 18 -m \"Hi 9->18, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & PIDVAL1=$! echo "$CLIENTCMD -- $PIDVAL" -CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob18/blob18 --sendid 18 --destid 9 -m \"Hi 18->9, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob18/blob18 --sendid 18 --destid 9 -m \"Hi 18->9, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client18.txt 2>&1 & PIDVAL2=$! echo "$CLIENTCMD -- $PIDVAL" @@ -192,11 +192,11 @@ wait $PIDVAL2 # Send multiple E2E encrypted messages between users that discovered each other echo "SENDING MESSAGES TO PRECANNED USERS AND FORCING A REKEY..." -CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18_rekey.log --sendCount 20 --receiveCount 20 --destid 9 -s blob18/blob18 -m \"Hello, 9, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18_rekey.log --sendCount 20 --receiveCount 20 --destid 9 -s blob18/blob18 -m \"Hello, 9, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client18_rekey.txt 2>&1 || true & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" -CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9_rekey.log --sendCount 20 --receiveCount 20 --destid 18 -s blob9/blob9 -m \"Hello, 18, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9_rekey.log --sendCount 20 --receiveCount 20 --destid 18 -s blob9/blob9 -m \"Hello, 18, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.txt 2>&1 || true & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" @@ -205,12 +205,12 @@ wait $PIDVAL || true # Non-precanned E2E user messaging echo "SENDING E2E MESSAGES TO NEW USERS..." -CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --writeContact rick42-contact.json --unsafe -m \"Hello from Rick42 to myself, without E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --writeContact rick42-contact.json --unsafe -m \"Hello from Rick42 to myself, without E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL -CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --writeContact ben43-contact.json --destfile rick42-contact.json --sendCount 0 --receiveCount 0 -m \"Hello from Ben43, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --writeContact ben43-contact.json --destfile rick42-contact.json --sendCount 0 --receiveCount 0 -m \"Hello from Ben43, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true & PIDVAL2=$! echo "$CLIENTCMD -- $PIDVAL" @@ -223,21 +223,21 @@ BENID=${TMPID} echo "BEN ID: $BENID" # Test destid syntax too, note wait for 11 messages to catch the message from above ^^^ -CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" -CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true & PIDVAL2=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL wait $PIDVAL2 -CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" -CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\"" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\"" eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true & PIDVAL2=$! echo "$CLIENTCMD -- $PIDVAL" -- GitLab