From b39a1e5dab2869d42f3b04227ebf436976dd6c3d Mon Sep 17 00:00:00 2001 From: MarcoWegener <wegener-marco@gmx.de> Date: Thu, 9 Feb 2023 15:48:22 +0100 Subject: [PATCH] fixed issue #3: added SSL certificates and script to add new users --- .gitignore | 27 ++++++++++++++++++--------- Server/SignalingServer/cirrus.js | 2 +- Server/SignalingServer/config.json | 4 ++-- Server/SignalingServer/newUser.bat | 17 +++++++++++++++++ 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 Server/SignalingServer/newUser.bat diff --git a/.gitignore b/.gitignore index f170a97..9ec6828 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,23 @@ -/Server/VA/recordings/ -/Server/recordings/ +# VS Code specific files +/Server/.vscode/ + +# Virtual Acoustics +/Server/VA/ + +# SSL Certificates +/Server/SignalingServer/certificates/ + +# Config files +/Server/config/ + +# Node modules /Server/node_modules/ -/Server/logs/ -/Server/SignalingServer/logs/ /Server/SignalingServer/node_modules/ -/Server/config/ -/Server/SignalingServer/certificates/ + +# SignalingServer /Server/SignalingServer/logs/ /Server/SignalingServer/modules/authentication/db/users.json -/Server/VA/* -/Server/SignalingServerOld/ /Server/SignalingServer/platform_scripts/cmd/coturn/ -/Server/SignalingServer/platform_scripts/cmd/node/ \ No newline at end of file +/Server/SignalingServer/platform_scripts/cmd/node/ +/Server/SignalingServer/SignalingServerOld/ +/Server/SignalingServer/authentication/config.json \ No newline at end of file diff --git a/Server/SignalingServer/cirrus.js b/Server/SignalingServer/cirrus.js index ff672fb..b23ce02 100644 --- a/Server/SignalingServer/cirrus.js +++ b/Server/SignalingServer/cirrus.js @@ -199,7 +199,7 @@ sendGameSessionData(); if(config.UseAuthentication){ if(config.EnableWebserver) { app.get('/login', function(req, res){ - res.sendFile(__dirname + '/login.htm'); + res.sendFile(__dirname + '/public/login.html'); }); } diff --git a/Server/SignalingServer/config.json b/Server/SignalingServer/config.json index 0c2b603..4fa35df 100644 --- a/Server/SignalingServer/config.json +++ b/Server/SignalingServer/config.json @@ -1,8 +1,8 @@ { "UseFrontend": false, "UseMatchmaker": false, - "UseHTTPS": false, - "UseAuthentication": false, + "UseHTTPS": true, + "UseAuthentication": true, "LogToFile": true, "LogVerbose": true, "HomepageFile": "player.html", diff --git a/Server/SignalingServer/newUser.bat b/Server/SignalingServer/newUser.bat new file mode 100644 index 0000000..92bdb32 --- /dev/null +++ b/Server/SignalingServer/newUser.bat @@ -0,0 +1,17 @@ +@echo off + +set "folder=./modules/authentication/db/" +set "script=store_password.js" +set "database=users.json" + +REM: print new line +echo. + +echo ############################# +echo ### Streaming user config ### +echo ############################# + +REM: print new line +echo. + +node %folder%%script% --username %1 --password %2 --usersFile %folder%%database% \ No newline at end of file -- GitLab