Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
integration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
integration
Commits
387e5730
Commit
387e5730
authored
4 years ago
by
Richard T. Carback III
Browse files
Options
Downloads
Patches
Plain Diff
Update tests for --send-auth-request changes
parent
1c0a2133
No related branches found
No related tags found
1 merge request
!4
Release
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
basice2e/run.sh
+33
-56
33 additions, 56 deletions
basice2e/run.sh
with
33 additions
and
56 deletions
basice2e/run.sh
+
33
−
56
View file @
387e5730
...
...
@@ -272,11 +272,17 @@ eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client43.log -s blob43 --writeContact
$CLIENTOUT
/ben43-contact.bin --destfile
$CLIENTOUT
/rick42-contact.bin --sendCount 0 --receiveCount 0
-m
\"
Hello from Ben43, with E2E Encryption
\"
"
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client43.log -s blob43 --writeContact
$CLIENTOUT
/ben43-contact.bin --destfile
$CLIENTOUT
/rick42-contact.bin
--send-auth-request
--sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL2
while
[
!
-s
$CLIENTOUT
/ben43-contact.bin
]
;
do
sleep
1
echo
-n
"."
done
TMPID
=
$(
cat
$CLIENTOUT
/client42.log |
grep
"User
\:
"
|
awk
-F
' '
'{print $5}'
)
RICKID
=
${
TMPID
}
echo
"RICK ID:
$RICKID
"
...
...
@@ -284,38 +290,30 @@ TMPID=$(cat $CLIENTOUT/client43.log | grep "User\:" | awk -F' ' '{print $5}')
BENID
=
${
TMPID
}
echo
"BEN ID:
$BENID
"
# Client 42 will now wait for client 43's E2E Auth channel request and not do
# anything else.
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client42.log -s blob42 --destid b64:
$RICKID
--sendCount 0 --receiveCount 0 --unsafe"
# Client 42 will now wait for client 43's E2E Auth channel request and confirm
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client42.log -s blob42 --destfile
$CLIENTOUT
/ben43-contact.bin --sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
# Client 43 will now wait for the confirmation.
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client43.log -s blob43 --destid b64:
$BENID
--sendCount 0 --receiveCount 0 --unsafe"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
wait
$PIDVAL2
# Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client42.log -s blob42
--assume-auth-channel
--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 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client43.log -s blob43
--assume-auth-channel
--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 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client42.log -s blob42
--assume-auth-channel
--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 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client43.log -s blob43
--assume-auth-channel
--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
"
...
...
@@ -323,39 +321,25 @@ wait $PIDVAL
wait
$PIDVAL2
echo
"CREATING USERS for REKEY TEST..."
REKEYOPTS
=
"--e2eMaxKeys 15 --e2eMinKeys 10 --e2eNumReKeys 5"
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
$REKEYOPTS
-l
$CLIENTOUT
/client100.log -s blob100 --writeContact
$CLIENTOUT
/Jake100-contact.bin --unsafe -m
\"
Hello from Jake100 to myself, without E2E Encryption
\"
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client100.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
$REKEYOPTS
-l
$CLIENTOUT
/client101.log -s blob101 --writeContact
$CLIENTOUT
/Niamh101-contact.bin --destfile
$CLIENTOUT
/Jake100-contact.bin --sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client101.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL2
TMPID
=
$(
cat
$CLIENTOUT
/client100.log |
grep
"User
\:
"
|
awk
-F
' '
'{print $5}'
)
JAKEID
=
${
TMPID
}
JAKEID
=
$(
../bin/client init
-s
blob100
-l
$CLIENTOUT
/client100.log
--password
hello
--ndf
results/ndf.json
--writeContact
$CLIENTOUT
/Jake100-contact.bin
-v
$DEBUGLEVEL
)
NIAMHID
=
$(
../bin/client init
-s
blob101
-l
$CLIENTOUT
/client101.log
--password
hello
--ndf
results/ndf.json
--writeContact
$CLIENTOUT
/Niamh101-contact.bin
-v
$DEBUGLEVEL
)
echo
"JAKE ID:
$JAKEID
"
TMPID
=
$(
cat
$CLIENTOUT
/client101.log |
grep
"User
\:
"
|
awk
-F
' '
'{print $5}'
)
NIAMHID
=
${
TMPID
}
echo
"NIAMH ID:
$NIAMHID
"
# Client 100 will now wait for client 101's E2E Auth channel request and not do
# anything else.
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client100.log -s blob100 --destid b64:
$NIAMHID
--sendCount 0 --receiveCount 0 --unsafe"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client100.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
# Client 101 will now wait for the confirmation.
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client101.log -s blob101 --destid b64:
$JAKEID
--sendCount 0 --receiveCount 0 --unsafe"
REKEYOPTS
=
"--e2eMaxKeys 15 --e2eMinKeys 10 --e2eNumReKeys 5"
# Client 101 will now send auth request
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
$REKEYOPTS
-l
$CLIENTOUT
/client101.log -s blob101 --writeContact
$CLIENTOUT
/Niamh101-contact.bin --destfile
$CLIENTOUT
/Jake100-contact.bin --send-auth-request --sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client101.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
# Client 100 will now wait for client 101's E2E Auth channel request and confirm
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client100.log -s blob100 --destid b64:
$NIAMHID
--sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client100.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
wait
$PIDVAL2
echo
"RUNNING REKEY TEST..."
# Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
...
...
@@ -451,32 +435,25 @@ then
wait
$PIDVAL2
# Send auth chan request
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client13.log -s blob13 --destfile
$CLIENTOUT
/josh31.bin --sendCount 0 --receiveCount 0"
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client13.log -s blob13 --destfile
$CLIENTOUT
/josh31.bin
--send-auth-request
--sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client13.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL2
"
wait
$PIDVAL2
# Approve request
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client31.log -s blob31 --destfile
$CLIENTOUT
/josh31.bin --sendCount 0 --receiveCount 0
--unsafe
"
# Approve request
and confirm
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client31.log -s blob31 --destfile
$CLIENTOUT
/josh31.bin --sendCount 0 --receiveCount 0"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client31.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL2
"
wait
$PIDVAL2
# Register confirmation
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client13.log -s blob13 --destfile
$CLIENTOUT
/josh13.bin --sendCount 0 --receiveCount 0 --unsafe"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client13.txt
||
true
&
PIDVAL2
=
$!
PIDVAL1
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL2
"
wait
$PIDVAL1
wait
$PIDVAL2
# now test
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client31.log -s blob31
--assume-auth-channel
--destfile
$CLIENTOUT
/josh13.bin --sendCount 5 --receiveCount 5 -m
\"
Hello from Josh31, with E2E Encryption
\"
"
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client31.log -s blob31 --destfile
$CLIENTOUT
/josh13.bin --sendCount 5 --receiveCount 5 -m
\"
Hello from Josh31, with E2E Encryption
\"
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client31.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client13.log -s blob13
--assume-auth-channel
--destfile
$CLIENTOUT
/josh31.bin --sendCount 5 --receiveCount 5 -m
\"
Hello from Josh13, with E2E Encryption
\"
"
CLIENTCMD
=
"timeout 240s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client13.log -s blob13 --destfile
$CLIENTOUT
/josh31.bin --sendCount 5 --receiveCount 5 -m
\"
Hello from Josh13, with E2E Encryption
\"
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client13.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment