|
55 | 55 | .listen(SERVER_PORT); |
56 | 56 |
|
57 | 57 | // create a http server |
58 | | -const server = http.createServer(credentials, (request, response) => { |
59 | | - logger.debug(new Date() + ` Received request for ${request.url}`); |
60 | | - response.writeHead(404); |
61 | | - response.end(); |
| 58 | +const server = http.createServer(credentials, (req, res) => { |
| 59 | + fs.readFile(__dirname + '/../' + req.url, function (err,data) { |
| 60 | + if (err) { |
| 61 | + res.writeHead(404); |
| 62 | + res.end(JSON.stringify(err)); |
| 63 | + return; |
| 64 | + } |
| 65 | + res.writeHead(200); |
| 66 | + res.end(data); |
| 67 | + }); |
62 | 68 | }); |
63 | 69 | server.listen(WEBSOCKET_PORT, () => { |
64 | 70 | logger.info( |
@@ -123,16 +129,17 @@ function originIsAllowed(origin) { |
123 | 129 | }); |
124 | 130 | })(); |
125 | 131 |
|
126 | | -wsServer.on('request', (request) => { |
127 | | - if (!originIsAllowed(request.origin)) { |
| 132 | +wsServer.on('request', (req) => { |
| 133 | + const url = new URL(req.origin); |
| 134 | + if (!originIsAllowed(url.hostname)) { |
128 | 135 | // Make sure we only accept requests from an allowed origin |
129 | | - request.reject(); |
| 136 | + req.reject(); |
130 | 137 | logger.warn( |
131 | | - new Date() + ` Connection from origin ${request.origin} rejected.`, |
| 138 | + new Date() + ` Connection from origin ${req.origin} rejected.`, |
132 | 139 | ); |
133 | 140 | return; |
134 | 141 | } |
135 | | - const connection = request.accept('echo-protocol', request.origin); |
| 142 | + const connection = req.accept('echo-protocol', req.origin); |
136 | 143 | connections.push(connection); |
137 | 144 | connection.on('message', (message) => { |
138 | 145 | if (message.type === 'utf8') { |
|
0 commit comments