itTidy up validate_test.go. - tordam - A library for peer discovery inside the Tor network	Err	parazyd.org	70
hgit clone https://git.parazyd.org/tordam	URL:https://git.parazyd.org/tordam	parazyd.org	70
1Log	/git/tordam/log.gph	parazyd.org	70
1Files	/git/tordam/files.gph	parazyd.org	70
1Refs	/git/tordam/refs.gph	parazyd.org	70
1README	/git/tordam/file/README.md.gph	parazyd.org	70
1LICENSE	/git/tordam/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 43be00486d49717117eb9afefb875b149b579628	/git/tordam/commit/43be00486d49717117eb9afefb875b149b579628.gph	parazyd.org	70
1parent 575503dd4c007aa9fbd26eaa5504cd5a55baa9d9	/git/tordam/commit/575503dd4c007aa9fbd26eaa5504cd5a55baa9d9.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Thu,  1 Nov 2018 13:34:44 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
iTidy up validate_test.go.	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M pkg/damlib/validate_test.go         |      54 ++++++++++++++-----------------	Err	parazyd.org	70
i	Err	parazyd.org	70
i1 file changed, 25 insertions(+), 29 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/pkg/damlib/validate_test.go b/pkg/damlib/validate_test.go	/git/tordam/file/pkg/damlib/validate_test.go.gph	parazyd.org	70
it@@ -25,6 +25,16 @@ import (	Err	parazyd.org	70
i         "testing"	Err	parazyd.org	70
i )	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+func makeReq() map[string]string {	Err	parazyd.org	70
i+        return map[string]string{	Err	parazyd.org	70
i+                "address":   "gphjf5g3d5ywehwrd7cv3czymtdc6ha67bqplxwbspx7tioxt7gxqiid.onion",	Err	parazyd.org	70
i+                "pubkey":    "M86S9NsfcWIe0R/FXYs4ZMYvHB74YPXewZPv+aHXn80=",	Err	parazyd.org	70
i+                "message":   "I am a DAM node!",	Err	parazyd.org	70
i+                "signature": "CWqptO9ZRIvYMIHd3XHXaVny+W23P8FGkfbn5lvUqeJbDcY3G8+B4G8iCCIQiZkxkMofe6RbstHn3L1x88c3AA==",	Err	parazyd.org	70
i+                "secret":    "",	Err	parazyd.org	70
i+        }	Err	parazyd.org	70
i+}	Err	parazyd.org	70
i+	Err	parazyd.org	70
i func TestValidateOnionAddress(t *testing.T) {	Err	parazyd.org	70
i         if !(ValidateOnionAddress("gphjf5g3d5ywehwrd7cv3czymtdc6ha67bqplxwbspx7tioxt7gxqiid.onion")) {	Err	parazyd.org	70
i                 t.Fatal("Validating a valid address failed.")	Err	parazyd.org	70
it@@ -35,42 +45,30 @@ func TestValidateOnionAddress(t *testing.T) {	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func TestValidValidateFirstHandshake(t *testing.T) {	Err	parazyd.org	70
i-        req := map[string]string{	Err	parazyd.org	70
i-                "address":   "gphjf5g3d5ywehwrd7cv3czymtdc6ha67bqplxwbspx7tioxt7gxqiid.onion",	Err	parazyd.org	70
i-                "pubkey":    "M86S9NsfcWIe0R/FXYs4ZMYvHB74YPXewZPv+aHXn80=",	Err	parazyd.org	70
i-                "message":   "I am a DAM node!",	Err	parazyd.org	70
i-                "signature": "CWqptO9ZRIvYMIHd3XHXaVny+W23P8FGkfbn5lvUqeJbDcY3G8+B4G8iCCIQiZkxkMofe6RbstHn3L1x88c3AA==",	Err	parazyd.org	70
i-                "secret":    "",	Err	parazyd.org	70
i-        }	Err	parazyd.org	70
i-	Err	parazyd.org	70
i         cmd, _ := StartRedis("../../contrib/redis.conf")	Err	parazyd.org	70
i-        valid, _ := ValidateFirstHandshake(req)	Err	parazyd.org	70
i-        if !(valid) {	Err	parazyd.org	70
i+        defer cmd.Process.Kill()	Err	parazyd.org	70
i+	Err	parazyd.org	70
i+        if valid, _ := ValidateFirstHandshake(makeReq()); !(valid) {	Err	parazyd.org	70
i                 t.Fatal("Failed to validate first handshake.")	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i-        cmd.Process.Kill()	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func TestInvalidValidateFirstHandshake(t *testing.T) {	Err	parazyd.org	70
i+        cmd, _ := StartRedis("../../contrib/redis.conf")	Err	parazyd.org	70
i+        defer cmd.Process.Kill()	Err	parazyd.org	70
i+	Err	parazyd.org	70
i         // Invalid message for this signature.	Err	parazyd.org	70
i-        req := map[string]string{	Err	parazyd.org	70
i-                "address":   "gphjf5g3d5ywehwrd7cv3czymtdc6ha67bqplxwbspx7tioxt7gxqiid.onion",	Err	parazyd.org	70
i-                "pubkey":    "M86S9NsfcWIe0R/FXYs4ZMYvHB74YPXewZPv+aHXn80=",	Err	parazyd.org	70
i-                "message":   "I am a bad DAM node!",	Err	parazyd.org	70
i-                "signature": "CWqptO9ZRIvYMIHd3XHXaVny+W23P8FGkfbn5lvUqeJbDcY3G8+B4G8iCCIQiZkxkMofe6RbstHn3L1x88c3AA==",	Err	parazyd.org	70
i-                "secret":    "",	Err	parazyd.org	70
i-        }	Err	parazyd.org	70
i+        req := makeReq()	Err	parazyd.org	70
i+        req["message"] = "I am a bad DAM node!"	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-        cmd, _ := StartRedis("../../contrib/redis.conf")	Err	parazyd.org	70
i-        valid, _ := ValidateFirstHandshake(req)	Err	parazyd.org	70
i-        if valid {	Err	parazyd.org	70
i+        if valid, _ := ValidateFirstHandshake(req); valid {	Err	parazyd.org	70
i                 t.Fatal("Invalid request passed as valid.")	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i-        cmd.Process.Kill()	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func TestValidValidateSecondHandshake(t *testing.T) {	Err	parazyd.org	70
i         cmd, _ := StartRedis("../../contrib/redis.conf")	Err	parazyd.org	70
i+        defer cmd.Process.Kill()	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         pk, sk, _ := GenEd25519()	Err	parazyd.org	70
i         onionaddr := OnionFromPubkeyEd25519(pk)	Err	parazyd.org	70
it@@ -100,6 +98,7 @@ func TestValidValidateSecondHandshake(t *testing.T) {	Err	parazyd.org	70
i                 t.Fatal(err)	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i         encodedSig = base64.StdEncoding.EncodeToString(sig)	Err	parazyd.org	70
i+	Err	parazyd.org	70
i         req = map[string]string{	Err	parazyd.org	70
i                 "address":   string(onionaddr),	Err	parazyd.org	70
i                 "pubkey":    encodedPub,	Err	parazyd.org	70
it@@ -108,15 +107,14 @@ func TestValidValidateSecondHandshake(t *testing.T) {	Err	parazyd.org	70
i                 "secret":    secret,	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-        valid, _ = ValidateSecondHandshake(req)	Err	parazyd.org	70
i-        if !(valid) {	Err	parazyd.org	70
i+        if valid, _ = ValidateSecondHandshake(req); !(valid) {	Err	parazyd.org	70
i                 t.Fatal("Failed to validate second handshake.")	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i-        cmd.Process.Kill()	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func TestInValidValidateSecondHandshake(t *testing.T) {	Err	parazyd.org	70
i         cmd, _ := StartRedis("../../contrib/redis.conf")	Err	parazyd.org	70
i+        defer cmd.Process.Kill()	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         pk, sk, _ := GenEd25519()	Err	parazyd.org	70
i         onionaddr := OnionFromPubkeyEd25519(pk)	Err	parazyd.org	70
it@@ -157,9 +155,7 @@ func TestInValidValidateSecondHandshake(t *testing.T) {	Err	parazyd.org	70
i                 "secret":    secret,	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-        valid, _ = ValidateSecondHandshake(req)	Err	parazyd.org	70
i-        if !(valid) {	Err	parazyd.org	70
i-                t.Fatal("Failed to validate second handshake.")	Err	parazyd.org	70
i+        if valid, _ = ValidateSecondHandshake(req); valid {	Err	parazyd.org	70
i+                t.Fatal("Invalid second handshake passed as valid.")	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i-        cmd.Process.Kill()	Err	parazyd.org	70
i }	Err	parazyd.org	70
.