From a5ce23472a23b847c54a71a6408e98b69d9316f6 Mon Sep 17 00:00:00 2001
From: Sepp Jeremiah Morris <git@seppdroid.com>
Date: Tue, 11 Oct 2022 19:28:05 +0200
Subject: [PATCH] Securing websockets for https use

---
 ajax.js                                     |  2 +-
 src/index.js                                |  4 ---
 src/sec_certs/{server.crt => fullchain.pem} |  0
 src/sec_certs/{server.key => privkey.pem}   |  0
 src/server.js                               | 30 ++++++++++-----------
 5 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 src/index.js
 rename src/sec_certs/{server.crt => fullchain.pem} (100%)
 rename src/sec_certs/{server.key => privkey.pem} (100%)

diff --git a/ajax.js b/ajax.js
index a020714..8c01865 100644
--- a/ajax.js
+++ b/ajax.js
@@ -1,4 +1,4 @@
-const ws = new WebSocket("ws://localhost:8989");
+const ws = new WebSocket("wss://HOSTNAMEHERE:443");
 let downloadname
 
 ws.onopen = () => {
diff --git a/src/index.js b/src/index.js
deleted file mode 100644
index 62d0018..0000000
--- a/src/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var server = require('./server')
-var fs = require('fs')
-
-server.createServer();
\ No newline at end of file
diff --git a/src/sec_certs/server.crt b/src/sec_certs/fullchain.pem
similarity index 100%
rename from src/sec_certs/server.crt
rename to src/sec_certs/fullchain.pem
diff --git a/src/sec_certs/server.key b/src/sec_certs/privkey.pem
similarity index 100%
rename from src/sec_certs/server.key
rename to src/sec_certs/privkey.pem
diff --git a/src/server.js b/src/server.js
index 9559da7..89bdd29 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,19 +1,17 @@
+const fs = require('fs');
+const WebSocket = require('ws');
+const https = require('https');
 
-function webServer() {
-    const fs = require('fs');
-    const WebSocket = require('ws');
-	const https = require('https');
+const server = new https.createServer({
+    cert: fs.readFileSync('./sec_certs/fullchain.pem'),
+    key: fs.readFileSync('./sec_certs/privkey.pem')
+});
 
-	const server = new https.createServer({
-    cert: fs.readFileSync('./sec_certs/server.crt'),
-    key: fs.readFileSync('./sec_certs/server.key')
-	});
-    const wss = new WebSocket.Server({
-        port: 8989
-    }, () => {
-        console.log('websocket server started!')
-    })
-    const path = require('path')
+const wss = new WebSocket.Server({server});
+
+console.log('websocket server started!')
+
+const path = require('path')
     const pathPublic = path.join(__dirname, '../source')
     let currentPath = pathPublic
 
@@ -67,7 +65,7 @@ function webServer() {
         })
     })
 
-}
 
 
-exports.createServer = webServer;
\ No newline at end of file
+//Start the server
+server.listen(443);