X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIWebSocketServer.ts;h=d6240e31ef2dadb43f7ccbc2121a6442903252be;hb=27e40a3b65c82807a3bf15a0e56b6f24fceb89f8;hp=1b060783021450c367243f80df06050f74b15717;hpb=fd3c56d100bd07942aa29905b8efd1e47c58c494;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index 1b060783..d6240e31 100644
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -2,16 +2,15 @@ import type { IncomingMessage } from 'http';
 import type internal from 'stream';
 
 import { StatusCodes } from 'http-status-codes';
-import * as uuid from 'uuid';
 import WebSocket, { type RawData, WebSocketServer } from 'ws';
 
+import { AbstractUIServer } from './AbstractUIServer';
+import { UIServerUtils } from './UIServerUtils';
 import type { UIServerConfiguration } from '../../types/ConfigurationData';
 import type { ProtocolRequest, ProtocolResponse } from '../../types/UIProtocol';
 import { WebSocketCloseEventStatusCode } from '../../types/WebSocket';
 import logger from '../../utils/Logger';
 import Utils from '../../utils/Utils';
-import { AbstractUIServer } from './AbstractUIServer';
-import { UIServerUtils } from './UIServerUtils';
 
 const moduleName = 'UIWebSocketServer';
 
@@ -50,7 +49,7 @@ export default class UIWebSocketServer extends AbstractUIServer {
         this.responseHandlers.set(requestId, ws);
         this.uiServices
           .get(version)
-          .requestHandler(request)
+          ?.requestHandler(request)
           .catch(() => {
             /* Error caught by AbstractUIService */
           });
@@ -69,6 +68,13 @@ export default class UIWebSocketServer extends AbstractUIServer {
         );
       });
     });
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    this.httpServer.on('connect', (req: IncomingMessage, socket: internal.Duplex, head: Buffer) => {
+      if (req.headers?.connection !== 'Upgrade' || req.headers?.upgrade !== 'websocket') {
+        socket.write(`HTTP/1.1 ${StatusCodes.BAD_REQUEST} Bad Request\r\n\r\n`);
+        socket.destroy();
+      }
+    });
     this.httpServer.on(
       'upgrade',
       (req: IncomingMessage, socket: internal.Duplex, head: Buffer): void => {
@@ -78,9 +84,19 @@ export default class UIWebSocketServer extends AbstractUIServer {
             socket.destroy();
             return;
           }
-          this.webSocketServer.handleUpgrade(req, socket, head, (ws: WebSocket) => {
-            this.webSocketServer.emit('connection', ws, req);
-          });
+          try {
+            this.webSocketServer.handleUpgrade(req, socket, head, (ws: WebSocket) => {
+              this.webSocketServer.emit('connection', ws, req);
+            });
+          } catch (error) {
+            logger.error(
+              `${this.logPrefix(
+                moduleName,
+                'start.httpServer.on.upgrade'
+              )} Error at handling connection upgrade:`,
+              error
+            );
+          }
         });
       }
     );
@@ -175,7 +191,7 @@ export default class UIWebSocketServer extends AbstractUIServer {
       return false;
     }
 
-    if (uuid.validate(request[0]) === false) {
+    if (Utils.validateUUID(request[0]) === false) {
       logger.error(
         `${this.logPrefix(
           moduleName,