bugfix: More robust bad message parsing in CI connection

g3force · g3force · commit 7416facc3eef · 2020-06-26T19:57:35.000+02:00
diff --git a/cmd/ssl-auto-ref-client/main.go b/cmd/ssl-auto-ref-client/main.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/geom"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/rcon"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/client"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"log"
 	"net"
 	"os"
diff --git a/cmd/ssl-ci-test-client/main.go b/cmd/ssl-ci-test-client/main.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/ci"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/geom"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/tracker"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/odeke-em/go-uuid"
 	"log"
 	"net"
diff --git a/cmd/ssl-remote-control-client/main.go b/cmd/ssl-remote-control-client/main.go
@@ -6,9 +6,9 @@ import (
 	"flag"
 	"fmt"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/rcon"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/client"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/golang/protobuf/proto"
 	"log"
 	"net"
diff --git a/cmd/ssl-team-client/main.go b/cmd/ssl-team-client/main.go
@@ -4,8 +4,8 @@ import (
 	"crypto/rsa"
 	"flag"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/rcon"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/client"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/golang/protobuf/proto"
 	"log"
 	"net"
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/RoboCup-SSL/ssl-game-controller
 go 1.14
 
 require (
-	github.com/RoboCup-SSL/ssl-go-tools v1.0.0
 	github.com/go-test/deep v1.0.5
 	github.com/gobuffalo/packr v1.30.1
 	github.com/golang/protobuf v1.3.5
diff --git a/go.sum b/go.sum
@@ -1,6 +1,4 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/RoboCup-SSL/ssl-go-tools v1.0.0 h1:6cWzHRw3KfdizTxktk5Ne8se2rIC9prEQs7ycNU+hgw=
-github.com/RoboCup-SSL/ssl-go-tools v1.0.0/go.mod h1:W1I/ErdW1PfalvkLIZHC6B7uNJx2YHPHFOUS+ZmyFM8=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@@ -22,7 +20,6 @@ github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wK
 github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk=
 github.com/gobuffalo/packr/v2 v2.5.1 h1:TFOeY2VoGamPjQLiNDT3mn//ytzk236VMO2j7iHxJR4=
 github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
@@ -48,7 +45,6 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/odeke-em/go-uuid v0.0.0-20151221120446-b211d769a9aa h1:XEhClAZN5U0GUTFRgRdPNgAKO4mP++S+zbqXH+Pr9nU=
 github.com/odeke-em/go-uuid v0.0.0-20151221120446-b211d769a9aa/go.mod h1:omlfAqAAOXYL53jxw8wG+G2xH7NqbkJPlDeGP9YpP6g=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/internal/app/ci/ci.go b/internal/app/ci/ci.go
@@ -1,9 +1,9 @@
 package ci
 
 import (
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/tracker"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"log"
 	"net"
 	"sync"
@@ -67,9 +67,12 @@ func (s *Server) serve(conn net.Conn) {
 
 	for {
 		input := CiInput{}
-		if err := sslconn.ReceiveMessage(conn, &input); err != nil {
+		if data, err := sslconn.Receive(conn); err != nil {
 			log.Println("Could not receive message from CI connection: ", err)
 			return
+		} else if err := sslconn.Unmarshal(data, &input); err != nil {
+			log.Println("Could not unmarshal message: ", err)
+			continue
 		}
 
 		if input.TrackerPacket != nil {
diff --git a/internal/app/rcon/server_autoref.go b/internal/app/rcon/server_autoref.go
@@ -2,8 +2,8 @@ package rcon
 
 import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/engine"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/odeke-em/go-uuid"
 	"github.com/pkg/errors"
 	"io"
diff --git a/internal/app/rcon/server_remotecontrol.go b/internal/app/rcon/server_remotecontrol.go
@@ -2,9 +2,9 @@ package rcon
 
 import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/engine"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/statemachine"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/odeke-em/go-uuid"
diff --git a/internal/app/rcon/server_team.go b/internal/app/rcon/server_team.go
@@ -2,9 +2,9 @@ package rcon
 
 import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/engine"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/sslconn"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/statemachine"
-	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/golang/protobuf/proto"
 	"github.com/odeke-em/go-uuid"
 	"github.com/pkg/errors"
diff --git a/internal/app/sslconn/sslconn.go b/internal/app/sslconn/sslconn.go
@@ -0,0 +1,76 @@
+package sslconn
+
+import (
+	"bufio"
+	"encoding/base64"
+	"encoding/binary"
+	"github.com/golang/protobuf/proto"
+	"github.com/pkg/errors"
+	"io"
+	"net"
+)
+
+// readDataLength reads the data length from message header
+// The header is a 4 byte big endian uint32
+func readDataLength(reader io.ByteReader) (length uint32, err error) {
+
+	length64, err := binary.ReadUvarint(reader)
+	length = uint32(length64)
+
+	return
+}
+
+// SendMessage sends a protobuf message to the given connection
+func SendMessage(conn net.Conn, message proto.Message) error {
+
+	data, err := proto.Marshal(message)
+	if err != nil {
+		return err
+	}
+
+	size := uint64(len(data))
+	data = append(proto.EncodeVarint(size), data...)
+
+	if _, err = conn.Write(data); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Receive reads data and the preceding size from the given connection
+func Receive(conn net.Conn) ([]byte, error) {
+
+	reader := bufio.NewReaderSize(conn, 1)
+	dataLength, err := readDataLength(reader)
+	if err != nil {
+		return nil, err
+	}
+
+	data := make([]byte, dataLength)
+	if _, err = io.ReadFull(reader, data); err != nil {
+		return nil, err
+	}
+
+	return data, nil
+}
+
+// Unmarshal a message, adding the encoded data to the error message on failure
+func Unmarshal(data []byte, message proto.Message) error {
+	if err := proto.Unmarshal(data, message); err != nil {
+		encodedMessage := base64.StdEncoding.EncodeToString(data)
+		return errors.Wrapf(err, "Could not unmarshal data: %v", encodedMessage)
+	}
+	return nil
+}
+
+// ReceiveMessage reads a protobuf message and the preceding size from the given connection
+func ReceiveMessage(conn net.Conn, message proto.Message) error {
+
+	data, err := Receive(conn)
+	if err != nil {
+		return err
+	}
+
+	return Unmarshal(data, message)
+}
