From c3ff1122d3bf2e4494621801907b1a39e5caa306 Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Thu, 13 Feb 2020 22:59:22 +0000
Subject: [PATCH] Update golds, comment out all the horribleness that we were
doing to the client outputs, and do some sane things instead. Finally,
disable rekey since that is known to be broken right now.
---
basice2e/clients.goldoutput/client18.txt | 3 --
basice2e/clients.goldoutput/client42.txt | 2 +-
basice2e/clients.goldoutput/client43.txt | 2 +-
basice2e/clients.goldoutput/client45.txt | 3 +-
basice2e/clients.goldoutput/client56.txt | 3 +-
basice2e/clients.goldoutput/client67.txt | 3 +-
basice2e/clients.goldoutput/client74.txt | 3 +-
basice2e/clients.goldoutput/client9.txt | 5 ++-
basice2e/run.sh | 41 +++++++++++++-----------
9 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 9be1b32..e69de29 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,3 +0,0 @@
-Message from 9, Spencer Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index f24f5d7..c98ed71 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -1,2 +1,2 @@
- Hello from Rick42, with E2E Encryption
Received: Hello from Ben43, with E2E Encryption
+Sent: Hello from Rick42, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index 0463ff2..a4c82de 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,2 +1,2 @@
- Hello from Ben43, with E2E Encryption
Received: Hello from Rick42, 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 bbbbb13..364c8e1 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,3 +1,2 @@
Message from 7, Rick Received: Hello, 4
-Received: Hello, 4
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5
+Sending Message to 5, Ben: Hello, 5
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 356b9a4..1384be5 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,3 +1,2 @@
Message from 4, Jim Received: Hello, 5
-Received: Hello, 5
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6
+Sending Message to 6, Steph: Hello, 6
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 5c9fdd1..37a4dcd 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,3 +1,2 @@
Message from 5, Ben Received: Hello, 6
-Received: Hello, 6
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7
+Sending Message to 7, Rick: Hello, 7
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index c293c40..05887b8 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,3 +1,2 @@
Message from 6, Steph Received: Hello, 7
-Received: Hello, 7
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4
+Sending Message to 4, Jim: Hello, 4
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 1314bc6..43b019e 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,3 +1,2 @@
-Message from 18, Bernardo Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=, Bernardo: Hello, 18, with E2E Encryption
+Message from 9, Spencer Received: Hi
+Sending Message to 9, Spencer: Hi
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 2ef3001..c952e00 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -199,29 +199,34 @@ wait $PIDVAL2
# FIXME: Go into client and clean up it's output so this is not necessary
-for C in $(ls -1 $CLIENTOUT); do
- # Remove the [CLIENT] Lines and cut them down
- strings $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
- # Take the clean lines and add them
- strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
- strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true
-done
+# for C in $(ls -1 $CLIENTOUT); do
+# # Remove the [CLIENT] Lines and cut them down
+# strings $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
+# # Take the clean lines and add them
+# strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
+# strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true
+# done
# only expect up to 10c messages from the e2e clients
-head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client9.txt || true
-head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client18.txt || true
-rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
+# head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client9.txt || true
+# head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client18.txt || true
+# rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
+
+
+# strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
+# strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
+# strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true
+# mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt
+# mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt
+
+cp $CLIENTOUT/*.txt $CLIENTCLEAN/
-strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
-strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
-strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true
-mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt
-mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt
-mv $CLIENTCLEAN/client74-clean.txt $CLIENTCLEAN/client74.txt
+# Ignore rekey for now
+rm $CLIENTCLEAN/*_rekey.txt
-sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client42.txt
-sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client43.txt
+sed -i 's/Sending\ Message\ to\ .*,\ :/Sent:/g' $CLIENTCLEAN/client4[23].txt
+sed -i 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client4[23].txt
for C in $(ls -1 $CLIENTCLEAN); do
sort -o tmp $CLIENTCLEAN/$C || true
--
GitLab