From 0170c439166b3edde0fb969d3847dadc8d9137ef Mon Sep 17 00:00:00 2001
From: DeathByDenim <jarno@jarno.ca>
Date: Fri, 12 Aug 2022 15:17:52 -0400
Subject: [PATCH] Use authentication for websockets

---
 scripts/deploy_armagetron_advanced.sh | 2 +-
 scripts/deploy_bzflag.sh              | 2 +-
 scripts/deploy_mindustry.sh           | 2 +-
 scripts/deploy_teeworlds.sh           | 2 +-
 scripts/deploy_unvanquished.sh        | 2 +-
 scripts/deploy_webserver.sh           | 1 +
 scripts/deploy_xonotic-br.sh          | 2 +-
 scripts/deploy_xonotic.sh             | 2 +-
 website/js/consoles.js                | 1 +
 9 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/deploy_armagetron_advanced.sh b/scripts/deploy_armagetron_advanced.sh
index e33603a..2de26f6 100755
--- a/scripts/deploy_armagetron_advanced.sh
+++ b/scripts/deploy_armagetron_advanced.sh
@@ -12,7 +12,7 @@ mkdir -p /etc/systemd/system/armagetronad-dedicated.service.d
 cat > /etc/systemd/system/armagetronad-dedicated.service.d/override.conf <<EOF
 [Service]
 ExecStart=
-ExecStart=/usr/bin/console2web -p 62551 /usr/games/armagetronad-dedicated.real --datadir /usr/share/games/armagetronad --configdir /etc/armagetronad --userdatadir /var/games/armagetronad
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62551 /usr/games/armagetronad-dedicated.real --datadir /usr/share/games/armagetronad --configdir /etc/armagetronad --userdatadir /var/games/armagetronad
 EOF
 systemctl daemon-reload
 
diff --git a/scripts/deploy_bzflag.sh b/scripts/deploy_bzflag.sh
index 9e03cdc..c942756 100755
--- a/scripts/deploy_bzflag.sh
+++ b/scripts/deploy_bzflag.sh
@@ -50,7 +50,7 @@ After=bzflag.service
 Requires=bzflag.service
 
 [Service]
-ExecStart=/usr/bin/console2web -p 62553 /usr/games/bzadmin admin@localhost -ui stdboth "/password ${systempassword}"
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62553 /usr/games/bzadmin admin@localhost -ui stdboth "/password ${systempassword}"
 Restart=on-failure
 User=${systemuser}
 
diff --git a/scripts/deploy_mindustry.sh b/scripts/deploy_mindustry.sh
index 93c3e1f..b9cbb3b 100755
--- a/scripts/deploy_mindustry.sh
+++ b/scripts/deploy_mindustry.sh
@@ -22,7 +22,7 @@ After=network.target
 
 [Service]
 WorkingDirectory=/var/lib/mindustry
-ExecStart=/usr/bin/console2web -p 62548 /usr/lib/jvm/java-11-openjdk-amd64/bin/java -jar /opt/mindustry-${mindustry_version}/mindustry.jar "config autosave true","config autosaveSpacing 120","host"
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62548 /usr/lib/jvm/java-11-openjdk-amd64/bin/java -jar /opt/mindustry-${mindustry_version}/mindustry.jar "config autosave true","config autosaveSpacing 120","host"
 Restart=on-failure
 User=${systemuser}
 
diff --git a/scripts/deploy_teeworlds.sh b/scripts/deploy_teeworlds.sh
index 48d7e5d..66f9cd4 100755
--- a/scripts/deploy_teeworlds.sh
+++ b/scripts/deploy_teeworlds.sh
@@ -76,7 +76,7 @@ Requires=teeworlds.service
 Conflicts=teeworlds-ddrace-rcon.service
 
 [Service]
-ExecStart=/usr/bin/console2web -p 62552 -b "${systempassword}" telnet localhost 8123
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62552 -b "${systempassword}" telnet localhost 8123
 Restart=on-failure
 User=${systemuser}
 
diff --git a/scripts/deploy_unvanquished.sh b/scripts/deploy_unvanquished.sh
index b46cc8a..8eaf865 100755
--- a/scripts/deploy_unvanquished.sh
+++ b/scripts/deploy_unvanquished.sh
@@ -46,7 +46,7 @@ Description=Unvanquished server
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/console2web -p 62549 ${unvanquished_directory}/bin/daemonded -pakpath ${unvanquished_directory}/share/pkg/ -libpath ${unvanquished_directory}/bin/ -homepath \${HOME}/unvanquished_home/ +exec unvanquished.cfg
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62549 ${unvanquished_directory}/bin/daemonded -pakpath ${unvanquished_directory}/share/pkg/ -libpath ${unvanquished_directory}/bin/ -homepath \${HOME}/unvanquished_home/ +exec unvanquished.cfg
 Restart=on-failure
 User=${systemuser}
 
diff --git a/scripts/deploy_webserver.sh b/scripts/deploy_webserver.sh
index c522eb2..3c60ec8 100755
--- a/scripts/deploy_webserver.sh
+++ b/scripts/deploy_webserver.sh
@@ -32,6 +32,7 @@ if [ x"$NOSSL" != "x" ] && [ $NOSSL -eq 1 ]; then
     sed -i $file -e s/"https:"/"http:"/g
   done
 fi
+sed -i /var/www/html/js/consoles.js -e s/"MD5GAMEPASSWORD"/"$(echo -n "${systempassword}" | md5sum | cut -d' ' -f1)"/g
 
 # Patch the NGINX configuration for the web sockets
 cp /etc/nginx/sites-available/default /etc/nginx/sites-available/default.bak
diff --git a/scripts/deploy_xonotic-br.sh b/scripts/deploy_xonotic-br.sh
index ff7ddf6..2a25b84 100755
--- a/scripts/deploy_xonotic-br.sh
+++ b/scripts/deploy_xonotic-br.sh
@@ -48,7 +48,7 @@ Conflicts=xonotic.service
 
 [Service]
 WorkingDirectory=${xonotic_directory}
-ExecStart=/usr/bin/console2web -p 62550 ${xonotic_directory}/all run dedicated +serverconfig server.cfg -userdir ${systemuserhome}/xonotic-br
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62550 ${xonotic_directory}/all run dedicated +serverconfig server.cfg -userdir ${systemuserhome}/xonotic-br
 Restart=on-failure
 User=${systemuser}
 
diff --git a/scripts/deploy_xonotic.sh b/scripts/deploy_xonotic.sh
index 91f44ab..0a1b3e0 100755
--- a/scripts/deploy_xonotic.sh
+++ b/scripts/deploy_xonotic.sh
@@ -45,7 +45,7 @@ Conflicts=xonotic-br.service
 
 [Service]
 WorkingDirectory=${xonotic_directory}/Xonotic
-ExecStart=/usr/bin/console2web -p 62550 ${xonotic_directory}/Xonotic/xonotic-linux64-dedicated +serverconfig server.cfg -userdir ${systemuserhome}/xonotic
+ExecStart=/usr/bin/console2web -a "${systempassword}" -p 62550 ${xonotic_directory}/Xonotic/xonotic-linux64-dedicated +serverconfig server.cfg -userdir ${systemuserhome}/xonotic
 Restart=on-failure
 User=${systemuser}
 
diff --git a/website/js/consoles.js b/website/js/consoles.js
index b151e69..4ecf871 100644
--- a/website/js/consoles.js
+++ b/website/js/consoles.js
@@ -93,6 +93,7 @@ function createConsole(root, game_name, text_colour_function, initial_command, h
 }
 
 function consoles_init() {
+  document.cookie = 'token=MD5GAMEPASSWORD; SameSite=Strict';
   const root = document.getElementById('console-div');
   createConsole(
     root,