From e7bf3c46846499557fef14d1b9d688d0501521f0 Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 9 Sep 2022 13:03:08 +0200 Subject: [PATCH] corrected most bugs --- certif/server.crt | 33 ++++++++++++++++++++++++++++++ certif/server.csr | 29 +++++++++++++++++++++++++++ certif/server.key | 51 +++++++++++++++++++++++++++++++++++++++++++++++ map.html | 17 +++++++++------- traque.js | 21 +++++++++++++++---- 5 files changed, 140 insertions(+), 11 deletions(-) create mode 100644 certif/server.crt create mode 100644 certif/server.csr create mode 100644 certif/server.key diff --git a/certif/server.crt b/certif/server.crt new file mode 100644 index 0000000..8b6e8dd --- /dev/null +++ b/certif/server.crt @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFuzCCA6MCFFf0hYvQbhdf9bsR7jRMEwCjLZCtMA0GCSqGSIb3DQEBCwUAMIGZ +MQswCQYDVQQGEwJGUjEWMBQGA1UECAwNaWxlIGRlIGZyYW5jZTEOMAwGA1UEBwwF +UGFyaXMxDDAKBgNVBAoMA0VOUzESMBAGA1UECwwJY2x1YiBqZXV4MRUwEwYDVQQD +DAxyZXNwbyB0cmFxdWUxKTAnBgkqhkiG9w0BCQEWGmxiYWlsbHlAY2xpcHBlci5l +bnMucHNsLmV1MB4XDTIyMDkwOTA4MDIyMloXDTIzMDkwOTA4MDIyMlowgZkxCzAJ +BgNVBAYTAkZSMRYwFAYDVQQIDA1pbGUgZGUgZnJhbmNlMQ4wDAYDVQQHDAVQYXJp +czEMMAoGA1UECgwDRU5TMRIwEAYDVQQLDAljbHViIGpldXgxFTATBgNVBAMMDHJl +c3BvIHRyYXF1ZTEpMCcGCSqGSIb3DQEJARYabGJhaWxseUBjbGlwcGVyLmVucy5w +c2wuZXUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2CRx4KgrmUc2/ +MIW68AiNjCjZ+nN9WKCvVfPIrL0EeCyjEwScRfcG3gGYIl7CWQUuG9looWTnuxUD +wT92I6PI2mz5CjxzogvNIht4ZumbFesFWzWS58HUhUHDW1yijilmbxNoPnxIC+zo +XsO0vGD10fqBXsOonIs+ccsvfV0p9e1No4LuA6KvMGlMdHMIgYYiloCf7sZkgFRV +BVOJYwHGA2Se02zCR1zd7rEd1yJQIIixz6jHG5aGidS9FYu8M8wWyZdNFmneQEKx +Y3jY9CZkey7w0BzGdfJ9nBkt9VJYX69RgdIMfHzJnLUNTrC5DKqXprzPEGzGWVDx +6VCGwX+DpiQtW4z85pzTKIOA+Cb6LGANLCFLKgsSSis4GKDW9AXlzJfPjYp5Cw6+ +8RayJP1S9ncYiS8JtS4mdZXKfaPMvwbjbWPBWs+sbNcKGG3FUEtL7JgjZzQfJz9R +2aOKLwTMU1/uXCBg7Io4sDTIEEAW44208cnvoFFodtAadR+b3cRo0gwKHosKRLSt +Yd4/IwfAIPISNuWrKTHKHHRncbhaOm6JxUROs5zN+5hzjmoDdurDL8tMAsP63D6u +2rZYLqOd3kTlqav81+izA+NzBMH48Mr4iootagLlhXk0AnG5Zdn9wvsVSbG3MdCr +dcwJJN/XWeZ6g9hzP1kRwCCvYR2AiwIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBg +F+Im+80oMiTjTop3URNtiVSuKfNzFk0vk3J0PfPDWKp1s4ybo1pkokE5wsU48cot +RzGfbGxilyUj5zmO57pKtrVkm+bJlk67MIuLmlmo1P+dqJEURUvwm1ORaC16Xazm +loa/0s9qalg35vTm3qxn+whAsQocmHpVLx67dwhk3TH6E6dCe8bHk0f5OpFkZZ/m +mtm9Zhuc6n3ZiSb15eHoDErSgO8FE4m6s0jk+NQRwVpIOFJ+2mx2BzLN7lEDCdCK +uAOU1oay7fA4Gh6VGplxZNEO8063OPfUjSSdohmHi5/LVuaRf/RoholPIag0lylY +1Q2GJ1ckyobnReRHa1D0fjVJeUgih/bUX5dw9d5b4MCYcV+lL/YtRPb9uKIWoBDb +aE66k/e4ixfr2uvO5rG0qqgq6nNfZT6njlpK9Ek+qNjorre+ndDhQuF/R/3HRSfh +YuWQAgO/uqNSrykT7rWxH533GfG/HJEnC0AI99TOprapYOrX0LOuU1PxlZLdBGBS +VFUjkhfgf9IDmipRLLRvG7+lfeyc5tXasUBlD3s3tY2VRv+5i94T8VLnCJTUvnom +u2fP6GKXcyog0PoCLAGiw218uSS7XX6VON8YBecjThttb425mpxJUejPbbuNEiZ2 +Psoqzb88BRGpUr5r2PQoE2AQEPU3PLSo8EUIUGEn/w== +-----END CERTIFICATE----- diff --git a/certif/server.csr b/certif/server.csr new file mode 100644 index 0000000..4a32500 --- /dev/null +++ b/certif/server.csr @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIE3zCCAscCAQAwgZkxCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1pbGUgZGUgZnJh +bmNlMQ4wDAYDVQQHDAVQYXJpczEMMAoGA1UECgwDRU5TMRIwEAYDVQQLDAljbHVi +IGpldXgxFTATBgNVBAMMDHJlc3BvIHRyYXF1ZTEpMCcGCSqGSIb3DQEJARYabGJh +aWxseUBjbGlwcGVyLmVucy5wc2wuZXUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +ggIKAoICAQC2CRx4KgrmUc2/MIW68AiNjCjZ+nN9WKCvVfPIrL0EeCyjEwScRfcG +3gGYIl7CWQUuG9looWTnuxUDwT92I6PI2mz5CjxzogvNIht4ZumbFesFWzWS58HU +hUHDW1yijilmbxNoPnxIC+zoXsO0vGD10fqBXsOonIs+ccsvfV0p9e1No4LuA6Kv +MGlMdHMIgYYiloCf7sZkgFRVBVOJYwHGA2Se02zCR1zd7rEd1yJQIIixz6jHG5aG +idS9FYu8M8wWyZdNFmneQEKxY3jY9CZkey7w0BzGdfJ9nBkt9VJYX69RgdIMfHzJ +nLUNTrC5DKqXprzPEGzGWVDx6VCGwX+DpiQtW4z85pzTKIOA+Cb6LGANLCFLKgsS +Sis4GKDW9AXlzJfPjYp5Cw6+8RayJP1S9ncYiS8JtS4mdZXKfaPMvwbjbWPBWs+s +bNcKGG3FUEtL7JgjZzQfJz9R2aOKLwTMU1/uXCBg7Io4sDTIEEAW44208cnvoFFo +dtAadR+b3cRo0gwKHosKRLStYd4/IwfAIPISNuWrKTHKHHRncbhaOm6JxUROs5zN ++5hzjmoDdurDL8tMAsP63D6u2rZYLqOd3kTlqav81+izA+NzBMH48Mr4iootagLl +hXk0AnG5Zdn9wvsVSbG3MdCrdcwJJN/XWeZ6g9hzP1kRwCCvYR2AiwIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBAFv2kTU0axKJJ3VJpL2aVe7ApO0NMjiEVF+BdNHl +FunEix38l113MvLyS7RVIoSGc9QUZ0yU8zw6UpiBmiiDKaTg6SHUxkXGlm0GbgXL +cS2jfZUKfxwAQFmNJXeBnqmeTKWchbXt312SkNrx3VAVNOiG7mk6SS9vdyl9Z6Mo +hx0TUAyFVvF7QGrSSxrYQkL105lD3VvhYk3upKULDMaPgOFwHmJItlUFKjNnKtuF +l1pHYyErI6HTqo1/BvC6Gn1fHqk/Kro5JLEscFBrp029U4tCGL3iMXeFallOhd02 +0T8ktd6ZrZZ8e7Y1DxCFmex39+rGGRnF18/RZD3gBoSmK5kd/lpF5ctxkwims5iY +XhKcF4emHt145p5/rXvPaLDpBO2O7r91iCK4eeCNNbCQD+VpCEMx6UQB52FFmdcA +3eSFFKZ8NrQsc3mThnAaGV2KhwpLcsZ+SpGHwkAhkqpz4UFFlvrsMzHKh4WWE+6G +otbmWTvXrXWrAlF3mAakgxZ6LhVxyfxsscXLWYcFPGBly4xruZ18r/g28IWBDEj4 ++UlhYicNF43dWVL19/xKR2CV8kQLvqMJDzDSeZPvoxU6a+lYptotUgSxXKa8/LRB +ApWOhyxQvVpPMc8uLGRtrwIkJhg7HTxGy1PumKYg/1jd5blpYzdTkYYHrbV37shE +I5rS +-----END CERTIFICATE REQUEST----- diff --git a/certif/server.key b/certif/server.key new file mode 100644 index 0000000..94dd7c3 --- /dev/null +++ b/certif/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/map.html b/map.html index d65285d..e7ca931 100644 --- a/map.html +++ b/map.html @@ -24,13 +24,15 @@


-
+
- \ No newline at end of file + diff --git a/traque.js b/traque.js index 919c906..d24fa13 100644 --- a/traque.js +++ b/traque.js @@ -20,14 +20,19 @@ Les messages à transmettre par le serveur : var equipes = []; // require = include -var http = require('http'); +var http = require('https');//require('http'); var url = require('url'); var fs = require('fs'); console.log("Setup http server"); +const option = { + key: fs.readFileSync('certif/server.key'), + cert: fs.readFileSync('certif/server.crt') +}; + // The server -var server = http.createServer(function(req, res){ +var server = http.createServer(option, function(req, res){ var q = url.parse(req.url, true); var filename = "." + q.pathname; if(q.pathname == "/") @@ -49,30 +54,38 @@ var io = new Server(server); console.log("Setup handlers"); io.sockets.on('connection', function(socket){ + console.log("connection !"); socket.id = equipes.length; equipes.push(socket); - socket.shown = false; + socket.shown = true; socket.color = 0; socket.on('geoLoc', function(d){ + console.log("new loc :", d); socket.position = d.position; if(socket.shown) for(i in equipes) equipes[i].emit('moving', {"id": socket.id, "position": d.position}); }); socket.on('changeColor', function(d){ - socket.color = d.color; + console.log(d); + socket.color = d.color - 0; + console.log("new color2"); if(d.color == -1) socket.shown = false; else{ + console.log("new color3"); if(!socket.shown) for(i in equipes) equipes[i].emit('moving', {"id": socket.id, "position": socket.position}); socket.shown = true; + console.log("new color4"); } for(i in equipes) equipes[i].emit('changeColor', {"id": socket.id, "color": d.color}); + console.log("new color5"); }); socket.on('setName', function(d){ + console.log("new name"); socket.name = d.name; for(i in equipes) equipes[i].emit('setName', {"id": socket.id, "name": d.name});