[feature] Add team verification status to UI

Author: g3force

cmd/ssl-team-client/main.go

@@ -6,6 +6,7 @@ import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/client"
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/refproto"
 	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
+	"github.com/golang/protobuf/proto"
 	"log"
 	"net"
 )
@@ -117,7 +118,7 @@ func (c *Client) sendRequest(request *refproto.TeamToController) {
 		request.Signature.Pkcs1V15 = client.Sign(privateKey, request)
 	}
 
-	log.Print("Sending ", request)
+	log.Print("Sending ", proto.MarshalTextString(request))
 
 	if err := sslconn.SendMessage(c.conn, request); err != nil {
 		log.Fatalf("Failed sending request: %v (%v)", request, err)
@@ -128,7 +129,7 @@ func (c *Client) sendRequest(request *refproto.TeamToController) {
 	if err := sslconn.ReceiveMessage(c.conn, &reply); err != nil {
 		log.Fatal("Failed receiving controller reply: ", err)
 	}
-	log.Print("Received reply: ", reply)
+	log.Print("Received reply: ", proto.MarshalTextString(&reply))
 	if reply.GetControllerReply().StatusCode == nil || *reply.GetControllerReply().StatusCode != refproto.ControllerReply_OK {
 		log.Print("Message rejected: ", *reply.GetControllerReply().Reason)
 	}

internal/app/controller/controller.go

@@ -142,7 +142,7 @@ func (c *GameController) publishUiProtocol() {
 // updateOnlineStates checks if teams and autoRefs are online and writes this into the state
 func (c *GameController) updateOnlineStates() {
 	for _, team := range []Team{TeamYellow, TeamBlue} {
-		c.Engine.State.TeamState[team].Connected = c.teamConnected(team)
+		c.Engine.State.TeamState[team].Connected, c.Engine.State.TeamState[team].ConnectionVerified = c.teamConnected(team)
 	}
 	var autoRefs []string
 	for _, autoRef := range c.AutoRefServer.Clients {

internal/app/controller/state.go

@@ -326,6 +326,7 @@ type TeamInfo struct {
 	CanPlaceBall          bool            `json:"canPlaceBall" yaml:"canPlaceBall"`
 	MaxAllowedBots        int             `json:"maxAllowedBots" yaml:"maxAllowedBots"`
 	Connected             bool            `json:"connected" yaml:"connected"`
+	ConnectionVerified    bool            `json:"connectionVerified" yaml:"connectionVerified"`
 	BotSubstitutionIntend bool            `json:"botSubstitutionIntend" yaml:"botSubstitutionIntend"`
 }
 

internal/app/controller/teamConnection.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/refproto"
+	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	"log"
 	"time"
@@ -14,18 +15,22 @@ type TeamChoice struct {
 	IssueTime time.Time
 }
 
-func (c *GameController) teamConnected(team Team) bool {
+func (c *GameController) teamConnected(team Team) (connected bool, verified bool) {
 	teamName := c.Engine.State.TeamState[team].Name
-	if _, ok := c.TeamServer.Clients[teamName]; ok {
-		return true
+	if client, ok := c.TeamServer.Clients[teamName]; ok {
+		connected = true
+		verified = client.VerifiedConnection
+		return
 	}
-	return false
+	connected = false
+	verified = false
+	return
 }
 
 func (c *GameController) ProcessTeamRequests(teamName string, request refproto.TeamToController) error {
 	c.ConnectionMutex.Lock()
 	defer c.ConnectionMutex.Unlock()
-	log.Print("Received request from team: ", request)
+	log.Print("Received request from team: ", proto.MarshalTextString(&request))
 
 	if x, ok := request.GetMsg().(*refproto.TeamToController_AdvantageResponse_); ok {
 		if c.outstandingTeamChoice == nil {

internal/app/rcon/server.go

@@ -21,10 +21,11 @@ type Server struct {
 }
 
 type Client struct {
-	Id     string
-	Conn   net.Conn
-	Token  string
-	PubKey *rsa.PublicKey
+	Id                 string
+	Conn               net.Conn
+	Token              string
+	PubKey             *rsa.PublicKey
+	VerifiedConnection bool
 }
 
 func NewServer() (s *Server) {
@@ -34,12 +35,12 @@ func NewServer() (s *Server) {
 	return
 }
 
-func (s *Server) Listen(address string) error {
+func (s *Server) Listen(address string) {
 	listener, err := net.Listen("tcp", address)
 	if err != nil {
-		return err
+		log.Print("Failed to listen on ", address)
+		return
 	}
-	defer listener.Close()
 	log.Print("Listening on ", address)
 
 	for {
@@ -49,7 +50,6 @@ func (s *Server) Listen(address string) error {
 		} else {
 			go s.ConnectionHandler(conn)
 		}
-
 	}
 }
 
@@ -61,15 +61,21 @@ func (s *Server) CloseConnection(conn net.Conn, id string) {
 func (c *Client) Ok() (reply refproto.ControllerReply) {
 	reply.StatusCode = new(refproto.ControllerReply_StatusCode)
 	*reply.StatusCode = refproto.ControllerReply_OK
+	c.addVerification(&reply)
+	return
+}
+
+func (c *Client) addVerification(reply *refproto.ControllerReply) {
 	reply.Verification = new(refproto.ControllerReply_Verification)
 	if c.Token != "" {
 		reply.NextToken = new(string)
 		*reply.NextToken = c.Token
 		*reply.Verification = refproto.ControllerReply_VERIFIED
+		c.VerifiedConnection = true
 	} else {
 		*reply.Verification = refproto.ControllerReply_UNVERIFIED
+		c.VerifiedConnection = false
 	}
-	return
 }
 
 func (c *Client) Reject(reason string) (reply refproto.ControllerReply) {

src/components/team/TeamOverview.vue

@@ -8,6 +8,13 @@
                         class="fa-xs"
                         icon="signal"/>
             </span>
+            <span v-b-tooltip.hover
+                  title="connection verified"
+                  v-if="team.connectionVerified">
+                <font-awesome-icon
+                        class="fa-xs"
+                        icon="shield-alt"/>
+            </span>
         </h2>
         <div class="content">
             <div>

src/main.js

@@ -18,7 +18,8 @@ import {
     faEdit,
     faSignal,
     faToggleOff,
-    faToggleOn
+    faToggleOn,
+    faShieldAlt
 } from '@fortawesome/free-solid-svg-icons'
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'
 // Connect to the backend with a single websocket that communicates with JSON format and is attached to the store
@@ -37,6 +38,7 @@ library.add(faToggleOn);
 library.add(faToggleOff);
 library.add(faSignal);
 library.add(faCheckCircle);
+library.add(faShieldAlt);
 Vue.component('font-awesome-icon', FontAwesomeIcon);
 
 

src/store.js

@@ -18,6 +18,7 @@ export class TeamState {
     canPlaceBall = true;
     maxAllowedBots = 0;
     connected = false;
+    connectionVerified = false;
 }
 
 export class RefBoxState {