[feature] Reject invalid keeper ids

g3force · g3force · commit 39af53610ad7 · 2018-12-04T22:06:10.000+01:00
diff --git a/internal/app/controller/teamConnection.go b/internal/app/controller/teamConnection.go
@@ -69,6 +69,9 @@ func (c *GameController) ProcessTeamRequests(teamName string, request refproto.T
 	}
 
 	if x, ok := request.GetRequest().(*refproto.TeamToControllerRequest_DesiredKeeper); ok {
+		if x.DesiredKeeper < 0 || x.DesiredKeeper > 15 {
+			return errors.Errorf("Keeper id is invalid: %v", x.DesiredKeeper)
+		}
 		log.Printf("Changing goalie for team %v to %v", team, x.DesiredKeeper)
 		c.Engine.State.TeamState[team].Goalie = int(x.DesiredKeeper)
 	}

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ func (c *GameController) ProcessTeamRequests(teamName string, request refproto.T`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if x, ok := request.GetRequest().(*refproto.TeamToControllerRequest_DesiredKeeper); ok {`
	`72`	`+ if x.DesiredKeeper < 0 \|\| x.DesiredKeeper > 15 {`
	`73`	`+ return errors.Errorf("Keeper id is invalid: %v", x.DesiredKeeper)`
	`74`	`+ }`
`72`	`75`	`log.Printf("Changing goalie for team %v to %v", team, x.DesiredKeeper)`
`73`	`76`	`c.Engine.State.TeamState[team].Goalie = int(x.DesiredKeeper)`
`74`	`77`	`}`