@j3r3mcdev/oast-server 1.1.7 → 1.1.8

package/src/listeners/webhook/__tests__/webhook.listener.test.ts

@@ -1,122 +1,122 @@
-import {
-  describe,
-  it,
-  expect,
-  jest,
-  beforeEach,
-  afterEach,
-} from "@jest/globals";
-
-import http from "http";
-import { WebhookListener } from "../webhook.listener";
-import { WebhookExtractor } from "../webhook.extractor";
-import { EventNormalizer } from "../../../core/event.normalizer";
-
-jest.mock("../webhook.extractor");
-jest.mock("../../../core/event.normalizer");
-
-describe("WebhookListener", () => {
-  let router: any;
-  let port: number;
-  let listener: WebhookListener;
-
-  beforeEach(() => {
-    router = {
-      dispatch: jest.fn(),
-    };
-
-    port = 13000 + Math.floor(Math.random() * 2000);
-
-    (WebhookExtractor.extract as jest.Mock).mockReturnValue({
-      ip: "1.2.3.4",
-      headers: { "x-test": "ok" },
-      body: { hello: "world" },
-      raw: {},
-    });
-
-    (EventNormalizer.normalizeWebhook as jest.Mock).mockReturnValue({
-      id: "abc",
-      type: "webhook",
-      timestamp: 111,
-      sourceIp: "1.2.3.4",
-      headers: { "x-test": "ok" },
-      body: { hello: "world" },
-    });
-
-    listener = new WebhookListener(router, port);
-  });
-
-  afterEach(() => {
-    listener.stop();
-  });
-
-  it("appelle router.dispatch avec l'événement normalisé", async () => {
-    await new Promise<void>((resolve) => {
-      const req = http.request(
-        {
-          hostname: "localhost",
-          port,
-          path: "/",
-          method: "POST",
-          headers: { "content-type": "application/json" },
-        },
-        (res) => {
-          expect(res.statusCode).toBe(200);
-          expect(router.dispatch).toHaveBeenCalledTimes(1);
-          expect(router.dispatch).toHaveBeenCalledWith({
-            id: "abc",
-            type: "webhook",
-            timestamp: 111,
-            sourceIp: "1.2.3.4",
-            headers: { "x-test": "ok" },
-            body: { hello: "world" },
-          });
-          resolve();
-        },
-      );
-
-      req.write(JSON.stringify({ hello: "world" }));
-      req.end();
-    });
-  });
-
-  it("retourne 500 si router.dispatch échoue", async () => {
-    router.dispatch.mockRejectedValue(new Error("fail"));
-
-    await new Promise<void>((resolve) => {
-      const req = http.request(
-        {
-          hostname: "localhost",
-          port,
-          path: "/",
-          method: "POST",
-        },
-        (res) => {
-          expect(res.statusCode).toBe(500);
-          resolve();
-        },
-      );
-
-      req.write("{}");
-      req.end();
-    });
-  });
-
-  it("retourne 405 si la méthode n'est pas POST", async () => {
-    await new Promise<void>((resolve) => {
-      const req = http.request(
-        {
-          hostname: "localhost",
-          port,
-          path: "/",
-          method: "GET",
-        },
-        (res) => {
-          expect(res.statusCode).toBe(405);
-          resolve();
-        },
-      );
-      req.end();
-    });
-  });
-});
+import {
+  describe,
+  it,
+  expect,
+  jest,
+  beforeEach,
+  afterEach,
+} from "@jest/globals";
+
+import http from "http";
+import { WebhookListener } from "../webhook.listener";
+import { WebhookExtractor } from "../webhook.extractor";
+import { EventNormalizer } from "../../../core/event.normalizer";
+
+jest.mock("../webhook.extractor");
+jest.mock("../../../core/event.normalizer");
+
+describe("WebhookListener", () => {
+  let router: any;
+  let port: number;
+  let listener: WebhookListener;
+
+  beforeEach(() => {
+    router = {
+      dispatch: jest.fn(),
+    };
+
+    port = 13000 + Math.floor(Math.random() * 2000);
+
+    (WebhookExtractor.extract as jest.Mock).mockReturnValue({
+      ip: "1.2.3.4",
+      headers: { "x-test": "ok" },
+      body: { hello: "world" },
+      raw: {},
+    });
+
+    (EventNormalizer.normalizeWebhook as jest.Mock).mockReturnValue({
+      id: "abc",
+      type: "webhook",
+      timestamp: 111,
+      sourceIp: "1.2.3.4",
+      headers: { "x-test": "ok" },
+      body: { hello: "world" },
+    });
+
+    listener = new WebhookListener(router, port);
+  });
+
+  afterEach(() => {
+    listener.stop();
+  });
+
+  it("appelle router.dispatch avec l'événement normalisé", async () => {
+    await new Promise<void>((resolve) => {
+      const req = http.request(
+        {
+          hostname: "localhost",
+          port,
+          path: "/",
+          method: "POST",
+          headers: { "content-type": "application/json" },
+        },
+        (res) => {
+          expect(res.statusCode).toBe(200);
+          expect(router.dispatch).toHaveBeenCalledTimes(1);
+          expect(router.dispatch).toHaveBeenCalledWith({
+            id: "abc",
+            type: "webhook",
+            timestamp: 111,
+            sourceIp: "1.2.3.4",
+            headers: { "x-test": "ok" },
+            body: { hello: "world" },
+          });
+          resolve();
+        },
+      );
+
+      req.write(JSON.stringify({ hello: "world" }));
+      req.end();
+    });
+  });
+
+  it("retourne 500 si router.dispatch échoue", async () => {
+    router.dispatch.mockRejectedValue(new Error("fail"));
+
+    await new Promise<void>((resolve) => {
+      const req = http.request(
+        {
+          hostname: "localhost",
+          port,
+          path: "/",
+          method: "POST",
+        },
+        (res) => {
+          expect(res.statusCode).toBe(500);
+          resolve();
+        },
+      );
+
+      req.write("{}");
+      req.end();
+    });
+  });
+
+  it("retourne 405 si la méthode n'est pas POST", async () => {
+    await new Promise<void>((resolve) => {
+      const req = http.request(
+        {
+          hostname: "localhost",
+          port,
+          path: "/",
+          method: "GET",
+        },
+        (res) => {
+          expect(res.statusCode).toBe(405);
+          resolve();
+        },
+      );
+      req.end();
+    });
+  });
+});

package/src/listeners/webhook/webhook.extractor.ts

@@ -1,12 +1,12 @@
-export class WebhookExtractor {
-  static extract(req: any, body: any) {
-    const headers = req.headers ?? {};
-
-    return {
-      ip: req.ip ?? headers["x-forwarded-for"] ?? "",
-      headers,
-      body,
-      raw: req,
-    };
-  }
-}
+export class WebhookExtractor {
+  static extract(req: any, body: any) {
+    const headers = req.headers ?? {};
+
+    return {
+      ip: req.ip ?? headers["x-forwarded-for"] ?? "",
+      headers,
+      body,
+      raw: req,
+    };
+  }
+}

package/src/listeners/webhook/webhook.listener.ts

@@ -1,58 +1,58 @@
-import http from "http";
-import { CoreRouter } from "../../core/router";
-import { WebhookExtractor } from "./webhook.extractor";
-import { EventNormalizer } from "../../core/event.normalizer";
-import { Logger } from "../../core/logger";
-
-export class WebhookListener {
-  private router: CoreRouter;
-  private server: http.Server;
-  private logger: Logger;
-
-  constructor(router: CoreRouter, port: number) {
-    this.router = router;
-    this.logger = new Logger({ context: "WebhookListener" });
-
-    this.server = http.createServer(async (req, res) => {
-      if (req.method !== "POST") {
-        res.writeHead(405);
-        return res.end("Method Not Allowed");
-      }
-
-      let chunks: Buffer[] = [];
-
-      req.on("data", (chunk) => chunks.push(chunk));
-
-      req.on("end", async () => {
-        try {
-          const bodyRaw = Buffer.concat(chunks).toString();
-          let body: any = null;
-
-          try {
-            body = JSON.parse(bodyRaw);
-          } catch {
-            body = bodyRaw;
-          }
-
-          const extracted = WebhookExtractor.extract(req, body);
-          const event = EventNormalizer.normalizeWebhook(extracted);
-
-          await this.router.dispatch(event);
-
-          res.writeHead(200);
-          res.end("OK");
-        } catch (err) {
-          res.writeHead(500);
-          res.end("ERROR");
-        }
-      });
-    });
-
-    this.server.listen(port);
-  }
-
-  stop() {
-    this.server.close();
-    this.logger.info("Webhook Listener stopped");
-  }
-}
+import http from "http";
+import { CoreRouter } from "../../core/router";
+import { WebhookExtractor } from "./webhook.extractor";
+import { EventNormalizer } from "../../core/event.normalizer";
+import { Logger } from "../../core/logger";
+
+export class WebhookListener {
+  private router: CoreRouter;
+  private server: http.Server;
+  private logger: Logger;
+
+  constructor(router: CoreRouter, port: number) {
+    this.router = router;
+    this.logger = new Logger({ context: "WebhookListener" });
+
+    this.server = http.createServer(async (req, res) => {
+      if (req.method !== "POST") {
+        res.writeHead(405);
+        return res.end("Method Not Allowed");
+      }
+
+      let chunks: Buffer[] = [];
+
+      req.on("data", (chunk) => chunks.push(chunk));
+
+      req.on("end", async () => {
+        try {
+          const bodyRaw = Buffer.concat(chunks).toString();
+          let body: any = null;
+
+          try {
+            body = JSON.parse(bodyRaw);
+          } catch {
+            body = bodyRaw;
+          }
+
+          const extracted = WebhookExtractor.extract(req, body);
+          const event = EventNormalizer.normalizeWebhook(extracted);
+
+          await this.router.dispatch(event);
+
+          res.writeHead(200);
+          res.end("OK");
+        } catch (err) {
+          res.writeHead(500);
+          res.end("ERROR");
+        }
+      });
+    });
+
+    this.server.listen(port);
+  }
+
+  stop() {
+    this.server.close();
+    this.logger.info("Webhook Listener stopped");
+  }
+}

package/src/listeners/websocket/__tests__/websocket.extractor.test.ts

@@ -1,33 +1,33 @@
-import { describe, it, expect } from "@jest/globals";
-import { WebSocketExtractor } from "../websocket.extractor";
-
-describe("WebSocketExtractor", () => {
-  it("extrait correctement les données", () => {
-    const ws: any = {};
-    const req: any = {
-      socket: { remoteAddress: "1.2.3.4" },
-      headers: { host: "example.com" },
-    };
-
-    const extracted = WebSocketExtractor.extract(ws, req, "hello");
-
-    expect(extracted).toEqual({
-      ip: "1.2.3.4",
-      message: "hello",
-      raw: { ws, req },
-    });
-  });
-
-  it("retourne une structure complète même si des champs manquent", () => {
-    const ws: any = {};
-    const req: any = {};
-
-    const extracted = WebSocketExtractor.extract(ws, req, "test");
-
-    expect(extracted).toEqual({
-      ip: "",
-      message: "test",
-      raw: { ws, req },
-    });
-  });
-});
+import { describe, it, expect } from "@jest/globals";
+import { WebSocketExtractor } from "../websocket.extractor";
+
+describe("WebSocketExtractor", () => {
+  it("extrait correctement les données", () => {
+    const ws: any = {};
+    const req: any = {
+      socket: { remoteAddress: "1.2.3.4" },
+      headers: { host: "example.com" },
+    };
+
+    const extracted = WebSocketExtractor.extract(ws, req, "hello");
+
+    expect(extracted).toEqual({
+      ip: "1.2.3.4",
+      message: "hello",
+      raw: { ws, req },
+    });
+  });
+
+  it("retourne une structure complète même si des champs manquent", () => {
+    const ws: any = {};
+    const req: any = {};
+
+    const extracted = WebSocketExtractor.extract(ws, req, "test");
+
+    expect(extracted).toEqual({
+      ip: "",
+      message: "test",
+      raw: { ws, req },
+    });
+  });
+});

package/src/listeners/websocket/__tests__/websocket.listener.test.ts

@@ -1,90 +1,90 @@
-import {
-  describe,
-  it,
-  expect,
-  jest,
-  beforeEach,
-  afterEach,
-} from "@jest/globals";
-
-import { WebSocketServer } from "ws";
-import WebSocket from "ws";
-import { WebSocketListener } from "../websocket.listener";
-import { WebSocketExtractor } from "../websocket.extractor";
-import { EventNormalizer } from "../../../core/event.normalizer";
-
-jest.mock("../websocket.extractor");
-jest.mock("../../../core/event.normalizer");
-
-describe("WebSocketListener", () => {
-  let router: any;
-  let port: number;
-  let listener: WebSocketListener;
-
-  beforeEach(() => {
-    router = {
-      dispatch: jest.fn(),
-    };
-
-    port = 14000 + Math.floor(Math.random() * 2000);
-
-    (WebSocketExtractor.extract as jest.Mock).mockReturnValue({
-      ip: "1.2.3.4",
-      message: "hello",
-      raw: {},
-    });
-
-    (EventNormalizer.normalizeWebSocket as jest.Mock).mockReturnValue({
-      id: "ws123",
-      type: "websocket",
-      timestamp: 111,
-      sourceIp: "1.2.3.4",
-      message: "hello",
-    });
-
-    listener = new WebSocketListener(router, port);
-  });
-
-  afterEach(() => {
-    listener.stop();
-  });
-
-  it("appelle router.dispatch quand un message est reçu", async () => {
-    const client = new WebSocket(`ws://localhost:${port}`);
-
-    await new Promise<void>((resolve) => {
-      client.on("open", () => {
-        client.send("hello");
-        setTimeout(() => {
-          expect(router.dispatch).toHaveBeenCalledTimes(1);
-          expect(router.dispatch).toHaveBeenCalledWith({
-            id: "ws123",
-            type: "websocket",
-            timestamp: 111,
-            sourceIp: "1.2.3.4",
-            message: "hello",
-          });
-          client.close();
-          resolve();
-        }, 50);
-      });
-    });
-  });
-
-  it("ne plante pas si dispatch échoue", async () => {
-    router.dispatch.mockRejectedValue(new Error("fail"));
-
-    const client = new WebSocket(`ws://localhost:${port}`);
-
-    await new Promise<void>((resolve) => {
-      client.on("open", () => {
-        client.send("hello");
-        setTimeout(() => {
-          expect(router.dispatch).toHaveBeenCalledTimes(1);
-          client.close();
-          resolve();
-        }, 50);
-      });
-    });
-  });
-});
+import {
+  describe,
+  it,
+  expect,
+  jest,
+  beforeEach,
+  afterEach,
+} from "@jest/globals";
+
+import { WebSocketServer } from "ws";
+import WebSocket from "ws";
+import { WebSocketListener } from "../websocket.listener";
+import { WebSocketExtractor } from "../websocket.extractor";
+import { EventNormalizer } from "../../../core/event.normalizer";
+
+jest.mock("../websocket.extractor");
+jest.mock("../../../core/event.normalizer");
+
+describe("WebSocketListener", () => {
+  let router: any;
+  let port: number;
+  let listener: WebSocketListener;
+
+  beforeEach(() => {
+    router = {
+      dispatch: jest.fn(),
+    };
+
+    port = 14000 + Math.floor(Math.random() * 2000);
+
+    (WebSocketExtractor.extract as jest.Mock).mockReturnValue({
+      ip: "1.2.3.4",
+      message: "hello",
+      raw: {},
+    });
+
+    (EventNormalizer.normalizeWebSocket as jest.Mock).mockReturnValue({
+      id: "ws123",
+      type: "websocket",
+      timestamp: 111,
+      sourceIp: "1.2.3.4",
+      message: "hello",
+    });
+
+    listener = new WebSocketListener(router, port);
+  });
+
+  afterEach(() => {
+    listener.stop();
+  });
+
+  it("appelle router.dispatch quand un message est reçu", async () => {
+    const client = new WebSocket(`ws://localhost:${port}`);
+
+    await new Promise<void>((resolve) => {
+      client.on("open", () => {
+        client.send("hello");
+        setTimeout(() => {
+          expect(router.dispatch).toHaveBeenCalledTimes(1);
+          expect(router.dispatch).toHaveBeenCalledWith({
+            id: "ws123",
+            type: "websocket",
+            timestamp: 111,
+            sourceIp: "1.2.3.4",
+            message: "hello",
+          });
+          client.close();
+          resolve();
+        }, 50);
+      });
+    });
+  });
+
+  it("ne plante pas si dispatch échoue", async () => {
+    router.dispatch.mockRejectedValue(new Error("fail"));
+
+    const client = new WebSocket(`ws://localhost:${port}`);
+
+    await new Promise<void>((resolve) => {
+      client.on("open", () => {
+        client.send("hello");
+        setTimeout(() => {
+          expect(router.dispatch).toHaveBeenCalledTimes(1);
+          client.close();
+          resolve();
+        }, 50);
+      });
+    });
+  });
+});

package/src/listeners/websocket/websocket.extractor.ts

@@ -1,11 +1,11 @@
-export class WebSocketExtractor {
-  static extract(ws: any, req: any, message: string) {
-    const headers = req.headers ?? {};
-
-    return {
-      ip: req.socket?.remoteAddress ?? headers["x-forwarded-for"] ?? "",
-      message,
-      raw: { ws, req },
-    };
-  }
-}
+export class WebSocketExtractor {
+  static extract(ws: any, req: any, message: string) {
+    const headers = req.headers ?? {};
+
+    return {
+      ip: req.socket?.remoteAddress ?? headers["x-forwarded-for"] ?? "",
+      message,
+      raw: { ws, req },
+    };
+  }
+}