diff --git a/basice2e/crust.sh b/basice2e/crust.sh index f521cb9b5d3c1e99f8ab52efad2edc5f2723d752..13505ce7510c724bc657bbb019e7ac949d4a78ec 100755 --- a/basice2e/crust.sh +++ b/basice2e/crust.sh @@ -13,7 +13,6 @@ set -e rm -fr results.bak || true mv results results.bak || rm -fr results || true -rm -fr blob* || true rm *-contact.json || true rm server-5.qdstrm || true rm server-5.qdrep || true @@ -33,11 +32,16 @@ DEBUGLEVEL=${DEBUGLEVEL-1} SERVERLOGS=results/servers GATEWAYLOGS=results/gateways +UDBOUT=results/udb-console.txt CLIENTOUT=results/clients CLIENTCLEAN=results/clients-cleaned CLIENTOPTS="--password hello --ndf results/ndf.json --verify-sends --sendDelay 100 --waitTimeout 360 -v $DEBUGLEVEL" CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL" +CLIENTALTUDOPTS="--alternateUd --altUdCert crustUd.crt --altUdContactFile crustUdContact.bin --altUdAddress 18.198.117.203:11420" + +CLIENTID=310 +ACCOUNTNAME=crustIntegrationTest$CLIENTID mkdir -p $SERVERLOGS mkdir -p $GATEWAYLOGS @@ -48,6 +52,22 @@ mkdir -p $CLIENTCLEAN ## Network Set Up ################################################################################ +# removeUser will remove the user from the UD +removeUser() { + CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS $CLIENTALTUDOPTS -l $CLIENTOUT/client$CLIENTID.log -s blob$CLIENTID --remove $ACCOUNTNAME" + eval $CLIENTCMD >> $CLIENTOUT/client$CLIENTID.txt & + PIDVAL=$! + echo "$CLIENTCMD -- $PIDVAL" + wait $PIDVAL + +} + +#removeUser + +# Ensure removeUser is called whenever this script closes, on success or failure +#trap removeUser EXIT +#trap removeUser INT + if [ "$NETWORKENTRYPOINT" == "betanet" ] then @@ -114,22 +134,24 @@ fi echo "TESTING CRUST..." # Register username with UD -CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client300.log -s blob300 --register josh300" -eval $CLIENTCMD >> $CLIENTOUT/client300.txt & +# fixme: must find way to make this replicable in integration testing, possibly have +# fixme: a way to remove this account via CLI +CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS $CLIENTALTUDOPTS -l $CLIENTOUT/client$CLIENTID.log -s blob$CLIENTID --register $ACCOUNTNAME" +eval $CLIENTCMD >> $CLIENTOUT/client$CLIENTID.txt & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL # Upload file to Crust -CLIENTCMD="timeout 240s ../bin/client crust -l $CLIENTUDOPTS $CLIENTOUT/client300.log -s blob300 --upload --file LoremIpsum.txt" -eval $CLIENTCMD >> $CLIENTOUT/client300.txt & +CLIENTCMD="timeout 240s ../bin/client crust $CLIENTUDOPTS $CLIENTALTUDOPTS -l $CLIENTOUT/client$CLIENTID.log -s blob$CLIENTID --upload --file LoremIpsum.txt" +eval $CLIENTCMD >> $CLIENTOUT/client$CLIENTID.txt & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL # Recover file from Crust -CLIENTCMD="timeout 240s ../bin/client crust -l $CLIENTUDOPTS $CLIENTOUT/client300.log -s blob300 --recover --file LoremIpsum.txt" -eval $CLIENTCMD >> $CLIENTOUT/client300.txt & +CLIENTCMD="timeout 240s ../bin/client crust $CLIENTUDOPTS $CLIENTALTUDOPTS -l $CLIENTOUT/client$CLIENTID.log -s blob$CLIENTID --recover --file LoremIpsum.txt" +eval $CLIENTCMD >> $CLIENTOUT/client$CLIENTID.txt & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL diff --git a/basice2e/crustUd.crt b/basice2e/crustUd.crt new file mode 100644 index 0000000000000000000000000000000000000000..9900bcdca9926c42e7d4af1df03b852fd24870de --- /dev/null +++ b/basice2e/crustUd.crt @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFqTCCA5GgAwIBAgIUEVshfaLgjzuVfLlyk0mTsXIkVewwDQYJKoZIhvcNAQEL +BQAwgYAxCzAJBgNVBAYTAktZMRQwEgYDVQQHDAtHZW9yZ2UgVG93bjETMBEGA1UE +CgwKeHggbmV0d29yazEPMA0GA1UECwwGRGV2T3BzMRMwEQYDVQQDDAp4eC5uZXR3 +b3JrMSAwHgYJKoZIhvcNAQkBFhFhZG1pbnNAeHgubmV0d29yazAeFw0yMTA1MDcx +NTExNTVaFw0zMTA1MDUxNTExNTVaMIGAMQswCQYDVQQGEwJLWTEUMBIGA1UEBwwL +R2VvcmdlIFRvd24xEzARBgNVBAoMCnh4IG5ldHdvcmsxDzANBgNVBAsMBkRldk9w +czETMBEGA1UEAwwKeHgubmV0d29yazEgMB4GCSqGSIb3DQEJARYRYWRtaW5zQHh4 +Lm5ldHdvcmswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1dYoVYmYA +L4TaKC9g3cTM8LqTD7Ofdo4LKkkluqPKadX6rZyrvO90LtOtcH/1yxipTOnaKF0J +9/kTrxgTroKgIrHuzHOE7w87hcV4zPveYX+4nc8OBQRkVh0slIfPGUWQMSAx0ojv +Aqstkrk8SapcSJK0AJi2wHephJhSnmnKbq56NSD4VwGbT9O8YAqsrU0FzGxTcers +QILgQY3BdcnzJL3VRjzMaLT3oCbXS2FPD6Z46JVs/jCc+fg7TT7N1VJwsNJ0w7gR +nV3iB5XG/9Em/khQ2Ne2mPRoh4xaXPFeAmXYhiREFI2t4LrgeHwySuRhsRLolYA+ +95nSZ1FCuPabV+jv2UURLN581VzLjgOA8Ad60P1yKfyP6N2BcR/99xD/Y+pBvsn5 +wgSVbPTxq15M3WehPLVvoie66pg25uLo+EdyvkzFIBjdy8oNW5qKB6IhrqM5OKsp +xvdh/nQ/6bikIZxmdJqhTs0slhD6NlY+RnHNg/9xyDU/aoU/tn06cL9xlhVA88A/ +I1Tz5JJdF6G05O/MaTe5FaCJJly6+uY3R6O9f4eKdeuwVdvLHjKvFHir78djG5wq +xYieGaiUSxy6kr0b283pVNxWlWVPUxlRQpr9EWB9cfKzjuMie83xdCGfJOgfiw1q +KOirdiO3Y/goSsndolKrARWRO5Af4P4f/wIDAQABoxkwFzAVBgNVHREEDjAMggp4 +eC5uZXR3b3JrMA0GCSqGSIb3DQEBCwUAA4ICAQAIUMML1m+NXFF2qnXrkbJUrr0Y +kMejzFkSrx0PypqXThDUwdCdkYZkNzcfTB/jvNMn6PfU7uR5OYqTgKjHyGxG7ZZs +RhxL21jTUYq9H45aMRYJzOZ/jOag2QbrV+46YsbCMJoZhD9da2qVOLNPHyG1pYfY +HzlObq+uy23iNQSL9dNSw9PbvPY8UVMqkY9dXEqFtOuivLoacUU6+ZiOnp/Cbed8 +E+oIhP7U3Zlnl1WMyMM94ltdVOqpzyiaNuqLE1S7ngN1qukiu63B50JH7YCxiwuC +IrcyRErwrCPFdpjxsgJViH3cQG3Y07Eof2KJRYoyJ1NF9UgXfTpZ3P7lDSEtDre2 +YLKZbAPJRYwnyrPmw/Gs1PNIf02C+UglgqhtcpvTLQ+PxJp0u58JJfKqUDqzOAYl +OtVJJ71coADrz9ON1W9TsJ154sHIQVF/wjLic9mUOnn0zsWuk2ClcGJp67UF8ZSe +eWbnQipc/rxcsh9KF/n+lG7thmEaJ10tntr0X5vYR4e1FjIlfc2wk46yH7+pIl/3 +R9quX/3zRxxNKNugkz+Jp+WeL6oP2ozzh4Nr9H1rdAsgkj89t2RKteXp4XZ8Pp1i +uXO9ulyHkAvQxyehoFk44Q0Z2AEkSDbNCtQ5yRKTKoeeL04vbAvn7L0XWQ7jDJje +xHGnyrYJGhiR8Sp20w== +-----END CERTIFICATE----- diff --git a/basice2e/crustUdContact.bin b/basice2e/crustUdContact.bin new file mode 100644 index 0000000000000000000000000000000000000000..923dbd2e4d760cfba2dbe4082211857c0c1d4ab5 --- /dev/null +++ b/basice2e/crustUdContact.bin @@ -0,0 +1 @@ +<xxc(2)LF2ccT+sdqh0AIKlFFeDOJdnxzbQQYhGStgxhOXmijIDkAZiB9kZo+Dl3bRSbBi5pXZ82rOu2IQXz9+5sspChvoccZqgC/dXGhlesmiNy/EbKxWtptTF4tcNyQxtnmCXg1p/HwKey4G2XDekTw86lq6Lpmj72jozvRWlQisqvWz/5deiPaeFGKDKC0OrrDFnIib7WnKqdYt4XyTKdmObnmbvdCbliZq0zBl7J40qKy5FypYXGlZjStIm0R1qtD4XHMZMsrMJEGxdM55zJdSzknXbR8MNahUrGMyUOTivXLHzojYLht0gFQifKMVWhrDjUoVQV43KOLPmdBwY/2Kc5KvVloDeuDXYY0i7tD63gNIp9JA3gJQUJymDdwqbS13riT1DMHHkdTzKEyGdHS+v2l7AVSlJBiTKuyM00FBNuXhhIcFR7ONFCf8cRPOPPBx3Q6iHNsvsca3KPNhwOJBgaQvHSkjIMsudiR954QbwG9rbi2vxVobIgWYMl5j6vlBS/9rfbE/uLdTEQZfNsLKDCIVCCI4I1bYZxZrDLPrfXTrN6W0sCLE7a/kRBQAAAgA7+LwJqiv9O1ogLnS4TYkSEg==xxc> \ No newline at end of file