From 445be5f7ff52396df4cb8b711110b3c45e9dcc55 Mon Sep 17 00:00:00 2001
From: Sylvain Gay <sgay@clipper.ens.fr>
Date: Mon, 12 Sep 2022 13:49:35 +0200
Subject: [PATCH] =?UTF-8?q?Facilit=C3=A9=20maj=20site,=20ajout=C3=A9=20rep?=
 =?UTF-8?q?=20"static"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ajouté répertoire static, defaut pour aller chercher les fichiers
- ajouté sample_config.js, cf README
---
 .gitignore                    |   3 ++-
 README.md                     |   7 +++++++
 map.html                      |   6 +++---
 sample_config.js              |   7 +++++++
 def.png => static/def.png     | Bin
 invi.png => static/invi.png   | Bin
 track.png => static/track.png | Bin
 traque.js                     |  11 +++++++----
 8 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 sample_config.js
 rename def.png => static/def.png (100%)
 rename invi.png => static/invi.png (100%)
 rename track.png => static/track.png (100%)

diff --git a/.gitignore b/.gitignore
index 25c8fdb..9b8304d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-package-lock.json
\ No newline at end of file
+package-lock.json
+config.js
diff --git a/README.md b/README.md
index 9ad69ef..51004ac 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,13 @@ cd traque
 npm install
 ```
 
+## Configuration
+
+```bash
+cp -p sample_config.js config.js
+```
+Then edit manually `config.js`.
+
 ## Run server
 
 ```bash
diff --git a/map.html b/map.html
index 1f57b8a..6c89910 100644
--- a/map.html
+++ b/map.html
@@ -28,9 +28,9 @@
 
 	<script type="text/javascript">
 
-		var protocol = "https";
-		var server = "localhost";
-		var port = "9000";
+		var protocol = location.protocol;
+		var server = location.hostname;
+		var port = location.port;
 		var socket = io.connect({rejectUnauthorized: false},
             protocol+"://"+server+":"+port);
 
diff --git a/sample_config.js b/sample_config.js
new file mode 100644
index 0000000..269b485
--- /dev/null
+++ b/sample_config.js
@@ -0,0 +1,7 @@
+// Configuration file for the server
+
+module.exports = {
+	"port": 9000,
+	"key": "certif/server.key",
+	"cert": "certif/server.crt"
+}
\ No newline at end of file
diff --git a/def.png b/static/def.png
similarity index 100%
rename from def.png
rename to static/def.png
diff --git a/invi.png b/static/invi.png
similarity index 100%
rename from invi.png
rename to static/invi.png
diff --git a/track.png b/static/track.png
similarity index 100%
rename from track.png
rename to static/track.png
diff --git a/traque.js b/traque.js
index 685ce00..a09b941 100644
--- a/traque.js
+++ b/traque.js
@@ -23,18 +23,21 @@ var equipes = [];
 var http = require('https');//require('http');
 var url = require('url');
 var fs = require('fs');
+var config = require('./config.js');
 
 console.log("Setup http server");
 
 const option = {
-  key: fs.readFileSync('certif/server.key'),
-  cert: fs.readFileSync('certif/server.crt')
+  key: fs.readFileSync(config.key),
+  cert: fs.readFileSync(config.cert)
 };
 
 // The server
 var server = http.createServer(option, function(req, res){
     var q = url.parse(req.url, true);
-    var filename = "." + q.pathname;
+    var filename = "static" + q.pathname;
+    if(q.pathname.includes(".."))
+        filename = "static/dotdot.html";
     if(q.pathname == "/")
         filename = "map.html";
     fs.readFile(filename, function(err, data) {
@@ -104,5 +107,5 @@ io.sockets.on('connection', function(socket){
 });
 
 console.log("Launch server");
-server.listen(9000);
+server.listen(config.port, "::");
 console.log("Running !");