Fix error handling at OCPP message sending

[e-mobility-charging-stations-simulator.git] / src / charging-station / ui-server / AbstractUIServer.ts

diff --git a/src/charging-station/ui-server/AbstractUIServer.ts b/src/charging-station/ui-server/AbstractUIServer.ts
index f6e2010f8edf923fad117ea3ec8fb5c088f46944..d8ef6340296b5b2ddefa4dbd471529e197a72f40 100644 (file)
--- a/src/charging-station/ui-server/AbstractUIServer.ts
+++ b/src/charging-station/ui-server/AbstractUIServer.ts
@@ -1,5 +1,4 @@
-import { type IncomingMessage, Server } from 'http';
-import type { Socket } from 'net';
+import { type IncomingMessage, Server, type ServerResponse } from 'http';
 
 import type { WebSocket } from 'ws';
 
@@ -19,14 +18,14 @@ import UIServiceFactory from './ui-services/UIServiceFactory';
 
 export abstract class AbstractUIServer {
   public readonly chargingStations: Map<string, ChargingStationData>;
-  protected httpServer: Server;
-  protected sockets: Set<Socket | WebSocket>;
+  protected readonly httpServer: Server;
+  protected readonly responseHandlers: Map<string, ServerResponse | WebSocket>;
   protected readonly uiServices: Map<ProtocolVersion, AbstractUIService>;
 
   public constructor(protected readonly uiServerConfiguration: UIServerConfiguration) {
     this.chargingStations = new Map<string, ChargingStationData>();
     this.httpServer = new Server();
-    this.sockets = new Set<Socket>();
+    this.responseHandlers = new Map<string, ServerResponse | WebSocket>();
     this.uiServices = new Map<ProtocolVersion, AbstractUIService>();
   }
 
@@ -52,14 +51,24 @@ export abstract class AbstractUIServer {
     }
   }
 
-  protected isBasicAuthEnabled(): boolean {
+  protected authenticate(req: IncomingMessage, next: (err?: Error) => void): void {
+    if (this.isBasicAuthEnabled() === true) {
+      if (this.isValidBasicAuth(req) === false) {
+        next(new Error('Unauthorized'));
+      }
+      next();
+    }
+    next();
+  }
+
+  private isBasicAuthEnabled(): boolean {
     return (
       this.uiServerConfiguration.authentication?.enabled === true &&
       this.uiServerConfiguration.authentication?.type === AuthenticationType.BASIC_AUTH
     );
   }
 
-  protected isValidBasicAuth(req: IncomingMessage): boolean {
+  private isValidBasicAuth(req: IncomingMessage): boolean {
     const authorizationHeader = req.headers.authorization ?? '';
     const authorizationToken = authorizationHeader.split(/\s+/).pop() ?? '';
     const authentication = Buffer.from(authorizationToken, 'base64').toString();