@j3r3mcdev/oast-server 1.1.1 → 1.1.2

package/src/listeners/smtp/smtp.extractor.ts

@@ -1,18 +1,18 @@
-export class SmtpExtractor {
-  static extract(session: any, body: string) {
-    const envelope = session?.envelope ?? {};
-    const mailFrom = envelope.mailFrom ?? {};
-    const rcptTo = Array.isArray(envelope.rcptTo) ? envelope.rcptTo : [];
-
-    return {
-      ip: session?.remoteAddress ?? "",
-      from: mailFrom.address ?? "",
-      to: rcptTo[0]?.address ?? "",
-      subject: session?.headers?.subject ?? "",
-      raw: {
-        session,
-        body,
-      },
-    };
-  }
-}
+export class SmtpExtractor {
+  static extract(session: any, body: string) {
+    const envelope = session?.envelope ?? {};
+    const mailFrom = envelope.mailFrom ?? {};
+    const rcptTo = Array.isArray(envelope.rcptTo) ? envelope.rcptTo : [];
+
+    return {
+      ip: session?.remoteAddress ?? "",
+      from: mailFrom.address ?? "",
+      to: rcptTo[0]?.address ?? "",
+      subject: session?.headers?.subject ?? "",
+      raw: {
+        session,
+        body,
+      },
+    };
+  }
+}

package/src/listeners/smtp/smtp.listener.ts

@@ -1,60 +1,60 @@
-import { CoreRouter } from "../../core/router";
-import { EventNormalizer } from "../../core/event.normalizer";
-import { Logger } from "../../core/logger";
-
-export class SmtpListener {
-  private router: CoreRouter;
-  private server: any;
-  private logger: Logger;
-
-  constructor(router: CoreRouter, options: { server: any; logger?: Logger }) {
-    this.router = router;
-    this.server = options.server;
-    this.logger = options.logger ?? new Logger({ context: "SmtpListener" });
-  }
-
-  async start() {
-    this.logger.info("SMTP Listener started");
-
-    this.server.onData = async (stream: any, session: any, callback: any) => {
-      let chunks: string[] = [];
-
-      stream.on("data", (chunk: any) => {
-        chunks.push(chunk.toString());
-      });
-
-      stream.on("end", async () => {
-        const body = chunks.join("");
-
-        let event;
-        try {
-          event = EventNormalizer.normalizeSmtp({
-            ip: session.remoteAddress,
-            from: session.envelope.mailFrom.address,
-            to: session.envelope.rcptTo.map((r: any) => r.address),
-            subject: session.headers.subject,
-            body,
-            raw: session,
-          });
-        } catch (err: any) {
-          callback(new Error(err.message));
-          return;
-        }
-
-        try {
-          await this.router.dispatch(event);
-          callback(null);
-        } catch (err) {
-          callback(new Error("dispatch failed")); // ✔ EXACTEMENT ce que ton test attend
-        }
-      });
-    };
-  }
-
-  async stop() {
-    if (this.server?.close) {
-      this.server.close();
-      this.logger.info("SMTP Listener stopped");
-    }
-  }
-}
+import { CoreRouter } from "../../core/router";
+import { EventNormalizer } from "../../core/event.normalizer";
+import { Logger } from "../../core/logger";
+
+export class SmtpListener {
+  private router: CoreRouter;
+  private server: any;
+  private logger: Logger;
+
+  constructor(router: CoreRouter, options: { server: any; logger?: Logger }) {
+    this.router = router;
+    this.server = options.server;
+    this.logger = options.logger ?? new Logger({ context: "SmtpListener" });
+  }
+
+  async start() {
+    this.logger.info("SMTP Listener started");
+
+    this.server.onData = async (stream: any, session: any, callback: any) => {
+      let chunks: string[] = [];
+
+      stream.on("data", (chunk: any) => {
+        chunks.push(chunk.toString());
+      });
+
+      stream.on("end", async () => {
+        const body = chunks.join("");
+
+        let event;
+        try {
+          event = EventNormalizer.normalizeSmtp({
+            ip: session.remoteAddress,
+            from: session.envelope.mailFrom.address,
+            to: session.envelope.rcptTo.map((r: any) => r.address),
+            subject: session.headers.subject,
+            body,
+            raw: session,
+          });
+        } catch (err: any) {
+          callback(new Error(err.message));
+          return;
+        }
+
+        try {
+          await this.router.dispatch(event);
+          callback(null);
+        } catch (err) {
+          callback(new Error("dispatch failed")); // ✔ EXACTEMENT ce que ton test attend
+        }
+      });
+    };
+  }
+
+  async stop() {
+    if (this.server?.close) {
+      this.server.close();
+      this.logger.info("SMTP Listener stopped");
+    }
+  }
+}

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

@@ -1,41 +1,41 @@
-import { SsrfExtractor } from "../ssrf.extractor";
-import { describe, it, expect } from "@jest/globals";
-
-describe("SsrfExtractor", () => {
-  it("extrait correctement toutes les données", () => {
-    const req: any = {
-      ip: "1.2.3.4",
-      method: "GET",
-      path: "/test",
-      headers: { host: "example.com" },
-      query: { a: 1 },
-      raw: { foo: "bar" },
-    };
-
-    const extracted = SsrfExtractor.extract(req);
-
-    expect(extracted).toEqual({
-      ip: "1.2.3.4",
-      method: "GET",
-      path: "/test",
-      headers: { host: "example.com" },
-      query: { a: 1 },
-      raw: req,
-    });
-  });
-
-  it("retourne une structure complète même si des champs manquent", () => {
-    const req: any = {};
-
-    const extracted = SsrfExtractor.extract(req);
-
-    expect(extracted).toEqual({
-      ip: "",
-      method: undefined,
-      path: undefined,
-      headers: {},
-      query: {},
-      raw: req,
-    });
-  });
-});
+import { SsrfExtractor } from "../ssrf.extractor";
+import { describe, it, expect } from "@jest/globals";
+
+describe("SsrfExtractor", () => {
+  it("extrait correctement toutes les données", () => {
+    const req: any = {
+      ip: "1.2.3.4",
+      method: "GET",
+      path: "/test",
+      headers: { host: "example.com" },
+      query: { a: 1 },
+      raw: { foo: "bar" },
+    };
+
+    const extracted = SsrfExtractor.extract(req);
+
+    expect(extracted).toEqual({
+      ip: "1.2.3.4",
+      method: "GET",
+      path: "/test",
+      headers: { host: "example.com" },
+      query: { a: 1 },
+      raw: req,
+    });
+  });
+
+  it("retourne une structure complète même si des champs manquent", () => {
+    const req: any = {};
+
+    const extracted = SsrfExtractor.extract(req);
+
+    expect(extracted).toEqual({
+      ip: "",
+      method: undefined,
+      path: undefined,
+      headers: {},
+      query: {},
+      raw: req,
+    });
+  });
+});

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

@@ -1,87 +1,87 @@
-import http from "http";
-import { SsrfListener } from "../ssrf.listener";
-import { SsrfExtractor } from "../ssrf.extractor";
-import { EventNormalizer } from "../../../core/event.normalizer";
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  jest,
-} from "@jest/globals";
-
-jest.mock("../ssrf.extractor");
-jest.mock("../../../core/event.normalizer");
-
-describe("SsrfListener", () => {
-  let router: any;
-  let port: number;
-  let listener: SsrfListener;
-
-  beforeEach((done) => {
-    router = { dispatch: jest.fn() };
-
-    port = 12000 + Math.floor(Math.random() * 2000);
-
-    (SsrfExtractor.extract as jest.Mock).mockReturnValue({
-      ip: "1.2.3.4",
-      method: "GET",
-      path: "/ssrf",
-      headers: {},
-      query: {},
-      raw: {},
-    });
-
-    (EventNormalizer.normalizeSsrf as jest.Mock).mockReturnValue({
-      id: "123",
-      type: "ssrf",
-      timestamp: 111,
-      sourceIp: "1.2.3.4",
-      request: {
-        method: "GET",
-        path: "/ssrf",
-        headers: {},
-        query: {},
-      },
-    });
-
-    listener = new SsrfListener(router, port);
-
-    // 🔥 On attend que le serveur soit prêt
-    listener["server"].on("listening", done);
-  });
-
-  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: "/ssrf", method: "GET" },
-        (res) => {
-          expect(res.statusCode).toBe(200);
-          expect(router.dispatch).toHaveBeenCalledTimes(1);
-          resolve();
-        },
-      );
-      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: "/ssrf", method: "GET" },
-        (res) => {
-          expect(res.statusCode).toBe(500);
-          resolve();
-        },
-      );
-      req.end();
-    });
-  });
-});
+import http from "http";
+import { SsrfListener } from "../ssrf.listener";
+import { SsrfExtractor } from "../ssrf.extractor";
+import { EventNormalizer } from "../../../core/event.normalizer";
+import {
+  describe,
+  it,
+  expect,
+  beforeEach,
+  afterEach,
+  jest,
+} from "@jest/globals";
+
+jest.mock("../ssrf.extractor");
+jest.mock("../../../core/event.normalizer");
+
+describe("SsrfListener", () => {
+  let router: any;
+  let port: number;
+  let listener: SsrfListener;
+
+  beforeEach((done) => {
+    router = { dispatch: jest.fn() };
+
+    port = 12000 + Math.floor(Math.random() * 2000);
+
+    (SsrfExtractor.extract as jest.Mock).mockReturnValue({
+      ip: "1.2.3.4",
+      method: "GET",
+      path: "/ssrf",
+      headers: {},
+      query: {},
+      raw: {},
+    });
+
+    (EventNormalizer.normalizeSsrf as jest.Mock).mockReturnValue({
+      id: "123",
+      type: "ssrf",
+      timestamp: 111,
+      sourceIp: "1.2.3.4",
+      request: {
+        method: "GET",
+        path: "/ssrf",
+        headers: {},
+        query: {},
+      },
+    });
+
+    listener = new SsrfListener(router, port);
+
+    // 🔥 On attend que le serveur soit prêt
+    listener["server"].on("listening", done);
+  });
+
+  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: "/ssrf", method: "GET" },
+        (res) => {
+          expect(res.statusCode).toBe(200);
+          expect(router.dispatch).toHaveBeenCalledTimes(1);
+          resolve();
+        },
+      );
+      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: "/ssrf", method: "GET" },
+        (res) => {
+          expect(res.statusCode).toBe(500);
+          resolve();
+        },
+      );
+      req.end();
+    });
+  });
+});

package/src/listeners/ssrf/ssrf.extractor.ts

@@ -1,14 +1,14 @@
-export class SsrfExtractor {
-  static extract(req: any) {
-    const headers = req.headers ?? {};
-
-    return {
-      ip: req.ip ?? headers["x-forwarded-for"] ?? "",
-      method: req.method,
-      path: req.path ?? req.url,
-      headers,
-      query: req.query ?? {},
-      raw: req,
-    };
-  }
-}
+export class SsrfExtractor {
+  static extract(req: any) {
+    const headers = req.headers ?? {};
+
+    return {
+      ip: req.ip ?? headers["x-forwarded-for"] ?? "",
+      method: req.method,
+      path: req.path ?? req.url,
+      headers,
+      query: req.query ?? {},
+      raw: req,
+    };
+  }
+}

package/src/listeners/ssrf/ssrf.listener.ts

@@ -1,37 +1,37 @@
-import { CoreRouter } from "../../core/router";
-import { SsrfExtractor } from "./ssrf.extractor";
-import { EventNormalizer } from "../../core/event.normalizer";
-import { Logger } from "../../core/logger";
-import http from "http";
-
-export class SsrfListener {
-  private router: CoreRouter;
-  private server: http.Server;
-  private logger: Logger;
-
-  constructor(router: CoreRouter, port: number) {
-    this.router = router;
-    this.logger = new Logger({ context: "SsrfListener" });
-
-    this.server = http.createServer(async (req, res) => {
-      try {
-        const extracted = SsrfExtractor.extract(req);
-        const event = EventNormalizer.normalizeSsrf(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("SSRF Listener stopped");
-  }
-}
+import { CoreRouter } from "../../core/router";
+import { SsrfExtractor } from "./ssrf.extractor";
+import { EventNormalizer } from "../../core/event.normalizer";
+import { Logger } from "../../core/logger";
+import http from "http";
+
+export class SsrfListener {
+  private router: CoreRouter;
+  private server: http.Server;
+  private logger: Logger;
+
+  constructor(router: CoreRouter, port: number) {
+    this.router = router;
+    this.logger = new Logger({ context: "SsrfListener" });
+
+    this.server = http.createServer(async (req, res) => {
+      try {
+        const extracted = SsrfExtractor.extract(req);
+        const event = EventNormalizer.normalizeSsrf(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("SSRF Listener stopped");
+  }
+}

package/src/listeners/tcp/tcp.extractor.ts

@@ -1,16 +1,16 @@
-import { RawTcpEvent, NormalizedTcpEvent } from "../../types/event.types";
-import { IdGenerator } from "../../core/id-generator";
-
-export class TcpExtractor {
-  static normalize(raw: RawTcpEvent): NormalizedTcpEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "tcp",
-      timestamp: Date.now(),
-      ip: raw.ip ?? "",
-      port: raw.port ?? 0,
-      data: raw.data ?? "",
-      raw,
-    };
-  }
-}
+import { RawTcpEvent, NormalizedTcpEvent } from "../../types/event.types";
+import { IdGenerator } from "../../core/id-generator";
+
+export class TcpExtractor {
+  static normalize(raw: RawTcpEvent): NormalizedTcpEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "tcp",
+      timestamp: Date.now(),
+      ip: raw.ip ?? "",
+      port: raw.port ?? 0,
+      data: raw.data ?? "",
+      raw,
+    };
+  }
+}

package/src/listeners/tcp/tcp.listener.ts

@@ -1,61 +1,61 @@
-import net from "net";
-import { Listener } from "../listener.interface";
-import { CoreRouter } from "../../core/router";
-import { StorageManager } from "../../core/storage";
-import { Logger } from "../../core/logger";
-import { TcpExtractor } from "./tcp.extractor";
-import { RawTcpEvent } from "../../types/event.types";
-
-export interface TcpListenerOptions {
-  port: number;
-  logger?: Logger;
-}
-
-export class TcpListener implements Listener {
-  private server: net.Server;
-  private logger: Logger;
-
-  constructor(
-    private router: CoreRouter,
-    private storage: StorageManager,
-    private options: TcpListenerOptions,
-  ) {
-    this.logger = options.logger ?? new Logger({ context: "TcpListener" });
-    this.server = net.createServer();
-  }
-
-  async start(): Promise<void> {
-    this.server.on("connection", (socket) => {
-      const ip = socket.remoteAddress ?? "unknown";
-      const port = socket.remotePort ?? 0;
-
-      socket.on("data", async (buffer) => {
-        const data = buffer.toString("utf8");
-
-        const rawEvent: RawTcpEvent = {
-          ip,
-          port,
-          data,
-          raw: { ip, port, data },
-        };
-        const normalized = TcpExtractor.normalize(rawEvent);
-
-        await this.storage.save(normalized);
-        this.router.dispatch(normalized);
-      });
-
-      socket.on("error", (err) => {
-        this.logger.error("TCP socket error", { error: err.message });
-      });
-    });
-
-    this.server.listen(this.options.port, () => {
-      this.logger.info(`TCP Listener started on port ${this.options.port}`);
-    });
-  }
-
-  async stop(): Promise<void> {
-    this.server.close();
-    this.logger.info("TCP Listener stopped");
-  }
-}
+import net from "net";
+import { Listener } from "../listener.interface";
+import { CoreRouter } from "../../core/router";
+import { StorageManager } from "../../core/storage";
+import { Logger } from "../../core/logger";
+import { TcpExtractor } from "./tcp.extractor";
+import { RawTcpEvent } from "../../types/event.types";
+
+export interface TcpListenerOptions {
+  port: number;
+  logger?: Logger;
+}
+
+export class TcpListener implements Listener {
+  private server: net.Server;
+  private logger: Logger;
+
+  constructor(
+    private router: CoreRouter,
+    private storage: StorageManager,
+    private options: TcpListenerOptions,
+  ) {
+    this.logger = options.logger ?? new Logger({ context: "TcpListener" });
+    this.server = net.createServer();
+  }
+
+  async start(): Promise<void> {
+    this.server.on("connection", (socket) => {
+      const ip = socket.remoteAddress ?? "unknown";
+      const port = socket.remotePort ?? 0;
+
+      socket.on("data", async (buffer) => {
+        const data = buffer.toString("utf8");
+
+        const rawEvent: RawTcpEvent = {
+          ip,
+          port,
+          data,
+          raw: { ip, port, data },
+        };
+        const normalized = TcpExtractor.normalize(rawEvent);
+
+        await this.storage.save(normalized);
+        this.router.dispatch(normalized);
+      });
+
+      socket.on("error", (err) => {
+        this.logger.error("TCP socket error", { error: err.message });
+      });
+    });
+
+    this.server.listen(this.options.port, () => {
+      this.logger.info(`TCP Listener started on port ${this.options.port}`);
+    });
+  }
+
+  async stop(): Promise<void> {
+    this.server.close();
+    this.logger.info("TCP Listener stopped");
+  }
+}