Basic SSL Support

config.gahoot

@@ -23,10 +23,11 @@
 addr: 0.0.0.0
 port: 8080
 proxies: []
+ssl: false
 
 // Directory for quiz archive files. Must be present at startup.
 // Can be relative (to cwd at startup), or absolute.
 quiz_dir: quizzes
 
 // Gameplay settings
-game_timeout: 2700
+game_timeout: 2700

config/conf.go

@@ -19,6 +19,7 @@ type Config struct {
 	ListenAddr     string   `validate:"ip_addr|hostname"`
 	ListenPort     uint64   `validate:"gte=1,lte=65535"`
 	TrustedProxies []string `validate:"dive,ip_addr"`
+	HasSSL         bool
 
 	QuizPath string `validate:"dir"`
 
@@ -31,6 +32,14 @@ func (c Config) FullAddr() string {
 	return fmt.Sprintf("%s:%d", c.ListenAddr, c.ListenPort)
 }
 
+func (c Config) WSProto() string {
+	if c.HasSSL {
+		return "wss"
+	}
+
+	return "ws"
+}
+
 func New(path string, validator *validator.Validate) (Config, error) {
 	c := Config{}
 	err := parse(&c, path)

config/parse.go

@@ -105,6 +105,9 @@ func parse(c *Config, path string) error {
 		case "game_timeout":
 			i, e := strconv.ParseInt(trail, 10, 32)
 			c.GameTimeout, err = time.Second*time.Duration(i), e
+		case "ssl":
+			lc := strings.ToLower(trail)
+			c.HasSSL = (lc == "true" || lc == "yes")
 		default:
 			err = fmt.Errorf("unknown key: %q", key)
 		}

frontend/src/common.ts

@@ -6,8 +6,8 @@
  */
 
 // Endpoint locations
-export const PlayEndpoint = "ws://" + location.host + "/api/play/"
-export const HostEndpoint = "ws://" + location.host + "/api/host/"
+export const PlayEndpoint = ws_proto + "://" + location.host + "/api/play/"
+export const HostEndpoint = ws_proto + "://" + location.host + "/api/host/"
 
 // Common icon resource paths
 export const iconpath: string = "/static/assets/"
@@ -46,4 +46,4 @@ export interface GameState<T> {
 // Sends a properly formatted message over ws
 export function SendMessage(ws: WebSocket, action: string, body: any) {
     ws.send(action + " " + JSON.stringify(body))
-}
+}

frontend/src/global.d.ts

@@ -7,4 +7,8 @@ declare global {
     var uid: number
     var pin: number
     var title: string
-}
+
+    // Websocket protocol definition.
+    // Set by server to support both SSL and non-SSL servers.
+    var ws_proto: string
+}

frontend/templates/host.gohtml

@@ -9,6 +9,8 @@
 		<script>
 			window.pin = {{.Pin}};
 			window.title = {{.Title}};
+
+			window.ws_proto = {{.WebsocketProto}};
 		</script>
 		<script type="module" src="/static/js/host.js"></script>
 	</head>
@@ -83,4 +85,4 @@
 		</div>
 	</body>
 
-</html>
+</html>

frontend/templates/play.gohtml

@@ -9,6 +9,8 @@
 		<script>
 			window.uid = {{.UID}};
 			window.pin = {{.Pin}};
+
+			window.ws_proto = {{.WebsocketProto}};
 		</script>
 		<script type="module" src="/static/js/play.js"></script>
 	</head>
@@ -54,4 +56,4 @@
 
 	</body>
 
-</html>
+</html>

game/action.go

@@ -346,7 +346,7 @@ func (a Answer) Perform(game *Game) {
 
 type SendResults struct{}
 
-func (s SendResults) Perform(game *Game) {
+func (s SendResults) Perform(_ *Game) {
 }
 
 // EndGame shuts down the game runner, thereby terminating the current

main.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"log"
-	"math/rand"
 	"net/http"
 	"os"
 	"os/signal"
@@ -54,10 +53,6 @@ func main() {
 		log.Fatal(err)
 	}
 
-	// Seed random
-	// MUST be done before game coordinator
-	rand.Seed(time.Now().UnixMilli())
-
 	// Init configs
 	vd = validator.New()
 	Config, err = config.New(PathConfig, vd)

play.go

@@ -16,9 +16,10 @@ import (
 // UI.
 func handleHost(c *gin.Context) {
 	dat := struct {
-		Title string
-		Pin   uint32
-	}{}
+		Title          string
+		Pin            uint32
+		WebsocketProto string
+	}{WebsocketProto: Config.WSProto()}
 
 	spin := c.Param("pin")
 	if spin == "" {
@@ -56,9 +57,10 @@ func handleHost(c *gin.Context) {
 func handleGame(c *gin.Context) {
 	dat := struct {
 		// NOTE: Must be uint32, as game.GamePin is formatted as a JS string
-		Pin uint32
-		UID int
-	}{}
+		Pin            uint32
+		UID            int
+		WebsocketProto string
+	}{WebsocketProto: Config.WSProto()}
 
 	id, pin := c.Param("pin"), game.Pin(0)
 	uid, intuid := c.Query("plr"), int(0)