lib/protocol: Remove support for v0.13 hello messages (#5461)

2019-01-17 20:48:43 +01:00
parent c2cc1dadea
commit 76af0cf07b
5 changed files with 37 additions and 255 deletions
--- a/lib/protocol/hello_test.go
+++ b/lib/protocol/hello_test.go
@@ -60,126 +60,39 @@ func TestVersion14Hello(t *testing.T) {
 	}
 }

-func TestVersion13Hello(t *testing.T) {
-	// Tests that we can send and receive a version 0.13 hello message.
+func TestOldHelloMsgs(t *testing.T) {
+	// Tests that we can correctly identify old/missing/unknown hello
+	// messages.

-	expected := Version13HelloMessage{
-		DeviceName:    "test device",
-		ClientName:    "syncthing",
-		ClientVersion: "v0.13.5",
-	}
-	msgBuf := expected.MustMarshalXDR()
-
-	hdrBuf := make([]byte, 8)
-	binary.BigEndian.PutUint32(hdrBuf, Version13HelloMagic)
-	binary.BigEndian.PutUint32(hdrBuf[4:], uint32(len(msgBuf)))
-
-	outBuf := new(bytes.Buffer)
-	outBuf.Write(hdrBuf)
-	outBuf.Write(msgBuf)
-
-	inBuf := new(bytes.Buffer)
-
-	conn := &readWriter{outBuf, inBuf}
-
-	send := Version13HelloMessage{
-		DeviceName:    "this device",
-		ClientName:    "other client",
-		ClientVersion: "v0.13.6",
+	cases := []struct {
+		msg string
+		err error
+	}{
+		{"00010001", ErrTooOldVersion}, // v12
+		{"9F79BC40", ErrTooOldVersion}, // v13
+		{"12345678", ErrUnknownMagic},
 	}

-	res, err := ExchangeHello(conn, send)
-	if err != ErrTooOldVersion13 {
-		t.Errorf("unexpected error %v != ErrTooOldVersion13", err)
-	}
+	for _, tc := range cases {
+		msg, _ := hex.DecodeString(tc.msg)

-	if res.ClientName != expected.ClientName {
-		t.Errorf("incorrect ClientName %q != expected %q", res.ClientName, expected.ClientName)
-	}
-	if res.ClientVersion != expected.ClientVersion {
-		t.Errorf("incorrect ClientVersion %q != expected %q", res.ClientVersion, expected.ClientVersion)
-	}
-	if res.DeviceName != expected.DeviceName {
-		t.Errorf("incorrect DeviceName %q != expected %q", res.DeviceName, expected.DeviceName)
-	}
-}
+		outBuf := new(bytes.Buffer)
+		outBuf.Write(msg)

-func TestVersion12Hello(t *testing.T) {
-	// Tests that we can correctly interpret the lack of a hello message
-	// from a v0.12 client.
+		inBuf := new(bytes.Buffer)

-	// This is the typical v0.12 connection start - our message header for a
-	// ClusterConfig message and then the cluster config message data. Taken
-	// from a protocol dump of a recent v0.12 client.
-	msg, _ := hex.DecodeString(spaceRe.ReplaceAllString(`
-	00010001
-	0000014a
-	7802000070000000027332000100a00973796e637468696e670e00b000000876
-	302e31322e32352400b00000000764656661756c741e00f01603000000204794
-	03ffdef496b5f5e5bc9c0a15221e70073164509fa30761af63094f6f945c3800
-	2073312f00f20b0001000000157463703a2f2f3132372e302e302e313a323230
-	301f00012400080500003000001000f1122064516fb94d24e7b637d20d9846eb
-	aeffb09556ef3968c8276fefc3fe24c144c2640002c0000034000f640002021f
-	00004f00090400003000001100f11220dff67945f05bdab4270acd6057f1eacf
-	a3ac93cade07ce6a89384c181ad6b80e640010332b000fc80007021f00012400
-	080500046400041400f21f2dc2af5c5f28e38384295f2fc2af2052c3a46b736d
-	c3b67267c3a57320e58aa8e4bd9c20d090d0b4d180d0b5d18136001f026c01b8
-	90000000000000000000`, ``))
+		conn := &readWriter{outBuf, inBuf}

-	outBuf := new(bytes.Buffer)
-	outBuf.Write(msg)
+		send := &Hello{
+			DeviceName:    "this device",
+			ClientName:    "other client",
+			ClientVersion: "v1.0.0",
+		}

-	inBuf := new(bytes.Buffer)
-
-	conn := &readWriter{outBuf, inBuf}
-
-	send := Version13HelloMessage{
-		DeviceName:    "this device",
-		ClientName:    "other client",
-		ClientVersion: "v0.13.6",
-	}
-
-	_, err := ExchangeHello(conn, send)
-	if err != ErrTooOldVersion12 {
-		t.Errorf("unexpected error %v != ErrTooOldVersion12", err)
-	}
-}
-
-func TestUnknownHello(t *testing.T) {
-	// Tests that we react correctly to a completely unknown magic number.
-
-	// This is an unknown magic follow byte some message data.
-	msg, _ := hex.DecodeString(spaceRe.ReplaceAllString(`
-	12345678
-	0000014a
-	7802000070000000027332000100a00973796e637468696e670e00b000000876
-	302e31322e32352400b00000000764656661756c741e00f01603000000204794
-	03ffdef496b5f5e5bc9c0a15221e70073164509fa30761af63094f6f945c3800
-	2073312f00f20b0001000000157463703a2f2f3132372e302e302e313a323230
-	301f00012400080500003000001000f1122064516fb94d24e7b637d20d9846eb
-	aeffb09556ef3968c8276fefc3fe24c144c2640002c0000034000f640002021f
-	00004f00090400003000001100f11220dff67945f05bdab4270acd6057f1eacf
-	a3ac93cade07ce6a89384c181ad6b80e640010332b000fc80007021f00012400
-	080500046400041400f21f2dc2af5c5f28e38384295f2fc2af2052c3a46b736d
-	c3b67267c3a57320e58aa8e4bd9c20d090d0b4d180d0b5d18136001f026c01b8
-	90000000000000000000`, ``))
-
-	outBuf := new(bytes.Buffer)
-	outBuf.Write(msg)
-
-	inBuf := new(bytes.Buffer)
-
-	conn := &readWriter{outBuf, inBuf}
-
-	send := Version13HelloMessage{
-		DeviceName:    "this device",
-		ClientName:    "other client",
-		ClientVersion: "v0.13.6",
-	}
-
-	_, err := ExchangeHello(conn, send)
-	if err != ErrUnknownMagic {
-		t.Errorf("unexpected error %v != ErrUnknownMagic", err)
+		_, err := ExchangeHello(conn, send)
+		if err != tc.err {
+			t.Errorf("unexpected error %v != %v", err, tc.err)
+		}
 	}
 }