Merge branch 'feature/udb_CMIX-451' into 'master'

Feature/udb cmix 451

See merge request privategrity/integration!11

.gitlab-ci.yml

@@ -23,6 +23,7 @@ variables:
   SERVER_URL: $PRIVATEGRITY_REPOS/server/$DL_URL_FRAG/server.linux64?job=build
   CLIENT_URL: $PRIVATEGRITY_REPOS/client/$DL_URL_FRAG/client.linux64?job=build
   CHANNELBOT_URL: $PRIVATEGRITY_REPOS/channelbot/$DL_URL_FRAG/channelbot.linux64?job=build
+  UDB_URL: $PRIVATEGRITY_REPOS/user-discovery-bot/$DL_URL_FRAG/udb.linux64?job=build
 
 before_script:
   ##
@@ -51,6 +52,8 @@ installbinaries:
     - chmod +x bin/client
     - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/channelbot $CHANNELBOT_URL"
     - chmod +x bin/channelbot
+    - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/udb $UDB_URL"
+    - chmod +x bin/udb
     - echo $PWD
     - find bin/ -type f -exec file {} \;
   artifacts:

basice2e/clients.goldoutput/client6.out

+Sending Message to 13, UDB: PUSHKEY testkeyid 0 PQc4L1rz532d0TM7pjzn76w/VPbnpGM9cQqASqV21iEj5Ioi2E0GbsIY3TNKk92chm8uDplIufqFhWrxYIDMtv8nFY4zcElX8d5MdkIHn9VeoKm1v2O7VfjO2nTHCMSho/2ElHHxsmW3k6lNlTa4jMabnOCWWyRsJkHghZzmpdk=
+Message from 13, UDB Received: PUSHKEY ACK NEED 128
+Sending Message to 13, UDB: PUSHKEY testkeyid 128 95EywPjbzEf0k2Zjd9uXk3YrXjnxXKMulznM16YQaEF7pFwKPqmc0UQm+CSXm0JbmeZeOihb1otHvWAI9TbnIlJ8r22Jd1H36nAQ2CgDZD0t8Cy49kC1ACPRJW82sUh2WNhRVPdR9dtH48dDU5OW4ZWb209mBqQ4QPvSEzn/UOk=
+Message from 13, UDB Received: PUSHKEY COMPLETE Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE=
+Sending Message to 13, UDB: REGISTER EMAIL jake@privategrity.com Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE=
+Message from 13, UDB Received: REGISTRATION COMPLETE

basice2e/registration-commands.txt

+PUSHKEY testkeyid 0 PQc4L1rz532d0TM7pjzn76w/VPbnpGM9cQqASqV21iEj5Ioi2E0GbsIY3TNKk92chm8uDplIufqFhWrxYIDMtv8nFY4zcElX8d5MdkIHn9VeoKm1v2O7VfjO2nTHCMSho/2ElHHxsmW3k6lNlTa4jMabnOCWWyRsJkHghZzmpdk=
+PUSHKEY testkeyid 128 95EywPjbzEf0k2Zjd9uXk3YrXjnxXKMulznM16YQaEF7pFwKPqmc0UQm+CSXm0JbmeZeOihb1otHvWAI9TbnIlJ8r22Jd1H36nAQ2CgDZD0t8Cy49kC1ACPRJW82sUh2WNhRVPdR9dtH48dDU5OW4ZWb209mBqQ4QPvSEzn/UOk=
+REGISTER EMAIL jake@privategrity.com Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE=

basice2e/run.sh

@@ -11,6 +11,7 @@ SERVERLOGS=results/servers
 CLIENTOUT=results/clients
 CHANNELOUT=results/channelbot.console
 DUMMYOUT=results/dummy.console
+UDBOUT=results/udb.console
 
 mkdir -p $SERVERLOGS
 mkdir -p $CLIENTOUT
@@ -90,19 +91,36 @@ runclients() {
 }
 
 # Start a channelbot server
-CHANNELCMD="../bin/channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
-eval $CHANNELCMD >> $CHANNELOUT 2>&1 &
+CHANNELCMD="../bin/channelbot -v -i 31 --nick #General --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
+$CHANNELCMD >> $CHANNELOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids
 echo "$CHANNELCMD -- $PIDVAL"
 
+# Start a user discovery bot server
+UDBCMD="../bin/udb --config udb.yaml"
+$UDBCMD >> $UDBOUT 2>&1 &
+PIDVAL=$!
+echo $PIDVAL >> results/serverpids
+echo "$UDBCMD -- $PIDVAL"
+
 # Start a dummy client
 DUMMYCMD="../bin/client -i 35 -d 35 -s $LASTNODE --numnodes 5 -m \"dummy\" --nick \"dummy\" --dummyfrequency 0.5 --noratchet -f blobdummy"
-eval $DUMMYCMD >> $DUMMYOUT 2>&1 &
+$DUMMYCMD >> $DUMMYOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids
 echo "$DUMMYCMD -- $PIDVAL"
 
+# Send a registration command
+cat registration-commands.txt | while read LINE
+do
+    CLIENTCMD="timeout 60s ../bin/client -f blob6 --numnodes 5 -s $LASTNODE -i 6 -d 13 -m \"$LINE\" --nick Jake --noratchet"
+    eval $CLIENTCMD >> $CLIENTOUT/client6.out 2>&1 &
+    PIDVAL=$!
+    echo "$CLIENTCMD -- $PIDVAL"
+    wait $PIDVAL
+done
+
 # Send a channel message that all clients will receive
 CLIENTCMD="timeout 60s ../bin/client -f blob5 --numnodes 5 -s $LASTNODE -i 5 -d 31 -m \"Channel, Hello\" --nick Spencer --noratchet"
 eval $CLIENTCMD >> $CLIENTOUT/client5.out 2>&1 &

basice2e/udb.yaml

+# UDB Config for E2E Integration test
+logPath: "logfile.log"
+numNodes: 5
+serverAddr: "localhost:50004"