X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fcharging-station%2Fui-server%2FUIHttpServer.ts;h=d6ce53103e31c38bed3910fef957acb56bd282af;hb=93af3fe9f9da216cf90e6873d51a056a5b9a51c0;hp=a6a6313e02182b6dbd0e1e4c5aaaf417f9ee9728;hpb=60ddad538d0a01ece43f4f70928a9decf3531dda;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ui-server/UIHttpServer.ts b/src/charging-station/ui-server/UIHttpServer.ts
index a6a6313e..d6ce5310 100644
--- a/src/charging-station/ui-server/UIHttpServer.ts
+++ b/src/charging-station/ui-server/UIHttpServer.ts
@@ -1,9 +1,9 @@
-import { IncomingMessage, RequestListener, Server, ServerResponse } from 'http';
+import type { IncomingMessage, RequestListener, ServerResponse } from 'http';
 
 import { StatusCodes } from 'http-status-codes';
 
 import BaseError from '../../exception/BaseError';
-import type { ServerOptions } from '../../types/ConfigurationData';
+import type { UIServerConfiguration } from '../../types/ConfigurationData';
 import {
   ProcedureName,
   Protocol,
@@ -13,11 +13,9 @@ import {
   RequestPayload,
   ResponseStatus,
 } from '../../types/UIProtocol';
-import Configuration from '../../utils/Configuration';
 import logger from '../../utils/Logger';
 import Utils from '../../utils/Utils';
 import { AbstractUIServer } from './AbstractUIServer';
-import UIServiceFactory from './ui-services/UIServiceFactory';
 import { UIServiceUtils } from './ui-services/UIServiceUtils';
 
 const moduleName = 'UIHttpServer';
@@ -27,22 +25,24 @@ type responseHandler = { procedureName: ProcedureName; res: ServerResponse };
 export default class UIHttpServer extends AbstractUIServer {
   private readonly responseHandlers: Map<string, responseHandler>;
 
-  public constructor(private options?: ServerOptions) {
-    super();
-    this.server = new Server(this.requestListener.bind(this) as RequestListener);
+  public constructor(protected readonly uiServerConfiguration: UIServerConfiguration) {
+    super(uiServerConfiguration);
     this.responseHandlers = new Map<string, responseHandler>();
   }
 
   public start(): void {
-    if ((this.server as Server).listening === false) {
-      (this.server as Server).listen(this.options ?? Configuration.getUIServer().options);
+    this.httpServer.on('connection', (socket) => {
+      this.sockets.add(socket);
+      socket.on('close', () => {
+        this.sockets.delete(socket);
+      });
+    });
+    this.httpServer.on('request', this.requestListener.bind(this) as RequestListener);
+    if (this.httpServer.listening === false) {
+      this.httpServer.listen(this.uiServerConfiguration.options);
     }
   }
 
-  public stop(): void {
-    this.chargingStations.clear();
-  }
-
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   public sendRequest(request: ProtocolRequest): void {
     // This is intentionally left blank
@@ -50,12 +50,12 @@ export default class UIHttpServer extends AbstractUIServer {
 
   public sendResponse(response: ProtocolResponse): void {
     const [uuid, payload] = response;
-    const statusCode = this.responseStatusToStatusCode(payload.status);
     if (this.responseHandlers.has(uuid) === true) {
       const { res } = this.responseHandlers.get(uuid);
-      res.writeHead(statusCode, { 'Content-Type': 'application/json' });
-      res.write(JSON.stringify(payload));
-      res.end();
+      res.writeHead(this.responseStatusToStatusCode(payload.status), {
+        'Content-Type': 'application/json',
+      });
+      res.end(JSON.stringify(payload));
       this.responseHandlers.delete(uuid);
     } else {
       logger.error(
@@ -72,6 +72,13 @@ export default class UIHttpServer extends AbstractUIServer {
   }
 
   private requestListener(req: IncomingMessage, res: ServerResponse): void {
+    if (this.authenticate(req) === false) {
+      res.setHeader('Content-Type', 'text/plain');
+      res.setHeader('WWW-Authenticate', 'Basic realm=users');
+      res.writeHead(StatusCodes.UNAUTHORIZED);
+      res.end(`${StatusCodes.UNAUTHORIZED} Unauthorized`);
+      return;
+    }
     // Expected request URL pathname: /ui/:version/:procedureName
     const [protocol, version, procedureName] = req.url?.split('/').slice(1) as [
       Protocol,
@@ -84,15 +91,13 @@ export default class UIHttpServer extends AbstractUIServer {
       if (UIServiceUtils.isProtocolAndVersionSupported(protocol, version) === false) {
         throw new BaseError(`Unsupported UI protocol version: '/${protocol}/${version}'`);
       }
+      this.registerProtocolVersionUIService(version);
       req.on('error', (error) => {
         logger.error(
           `${this.logPrefix(moduleName, 'requestListener.req.onerror')} Error on HTTP request:`,
           error
         );
       });
-      if (this.uiServices.has(version) === false) {
-        this.uiServices.set(version, UIServiceFactory.getUIServiceImplementation(version, this));
-      }
       if (req.method === 'POST') {
         const bodyBuffer = [];
         req
@@ -122,6 +127,16 @@ export default class UIHttpServer extends AbstractUIServer {
     }
   }
 
+  private authenticate(req: IncomingMessage): boolean {
+    if (this.isBasicAuthEnabled() === true) {
+      if (this.isValidBasicAuth(req) === true) {
+        return true;
+      }
+      return false;
+    }
+    return true;
+  }
+
   private responseStatusToStatusCode(status: ResponseStatus): StatusCodes {
     switch (status) {
       case ResponseStatus.SUCCESS: