@j3r3mcdev/oast-server 1.1.5 → 1.1.6

package/src/core/event.normalizer.ts

@@ -1,147 +1,147 @@
-import {
-  RawEvent,
-  RawDnsEvent,
-  RawSmtpEvent,
-  RawTcpEvent,
-  RawSsrfEvent,
-  NormalizedHttpEvent,
-  NormalizedDnsEvent,
-  NormalizedSmtpEvent,
-  NormalizedTcpEvent,
-  NormalizedSsrfEvent,
-  NormalizedWebhookEvent,
-  RawWebhookEvent,
-  NormalizedWebSocketEvent,
-  RawWebSocketEvent,
-} from "../types/event.types";
-
-import { IdGenerator } from "./id-generator";
-
-export class EventNormalizer {
-  //
-  // -------------------------
-  // DNS
-  // -------------------------
-  //
-  static normalizeDns(event: RawDnsEvent): NormalizedDnsEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "dns",
-      timestamp: Date.now(),
-      ip: event.ip ?? "",
-      query: event.query ?? "",
-      recordType: event.recordType ?? "",
-      raw: event.raw,
-    };
-  }
-
-  //
-  // -------------------------
-  // HTTP
-  // -------------------------
-  //
-  static normalizeHttp(event: RawEvent): NormalizedHttpEvent {
-    const sourceIp = event.ip && event.ip.trim() !== "" ? event.ip : "unknown";
-
-    return {
-      id: IdGenerator.generate(),
-      type: "http",
-      timestamp: Date.now(),
-      sourceIp,
-      request: {
-        method: event.method,
-        path: event.path,
-        headers: event.headers,
-        query: event.query,
-        body: event.body,
-      },
-    };
-  }
-
-  //
-  // -------------------------
-  // SMTP
-  // -------------------------
-  //
-  static normalizeSmtp(event: RawSmtpEvent): NormalizedSmtpEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "smtp",
-      timestamp: Date.now(),
-      ip: event.ip ?? "",
-      from: event.from ?? "",
-      to: event.to ?? [],
-      subject: event.subject ?? "",
-      body: event.body ?? "",
-      raw: event.raw,
-    };
-  }
-
-  //
-  // -------------------------
-  // TCP
-  // -------------------------
-  //
-  static normalizeTcp(event: RawTcpEvent): NormalizedTcpEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "tcp",
-      timestamp: Date.now(),
-      ip: event.ip ?? "",
-      port: event.port ?? 0,
-      data: event.data ?? "",
-      raw: event.raw,
-    };
-  }
-
-  //
-  // -------------------------
-  // SSRF
-  // -------------------------
-  //
-  static normalizeSsrf(raw: RawSsrfEvent): NormalizedSsrfEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "ssrf",
-      timestamp: Date.now(),
-      sourceIp: raw.ip,
-      request: {
-        method: raw.method,
-        path: raw.path,
-        headers: raw.headers,
-        query: raw.query,
-      },
-    };
-  }
-
-  //
-  // -------------------------
-  // webhook
-  // -------------------------
-  //
-  static normalizeWebhook(raw: RawWebhookEvent): NormalizedWebhookEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "webhook",
-      timestamp: Date.now(),
-      sourceIp: raw.ip,
-      headers: raw.headers,
-      body: raw.body,
-    };
-  }
-
-  //
-  // -------------------------
-  // websocket
-  // -------------------------
-  //
-  static normalizeWebSocket(raw: RawWebSocketEvent): NormalizedWebSocketEvent {
-    return {
-      id: IdGenerator.generate(),
-      type: "websocket",
-      timestamp: Date.now(),
-      sourceIp: raw.ip,
-      message: raw.message,
-    };
-  }
-}
+import {
+  RawEvent,
+  RawDnsEvent,
+  RawSmtpEvent,
+  RawTcpEvent,
+  RawSsrfEvent,
+  NormalizedHttpEvent,
+  NormalizedDnsEvent,
+  NormalizedSmtpEvent,
+  NormalizedTcpEvent,
+  NormalizedSsrfEvent,
+  NormalizedWebhookEvent,
+  RawWebhookEvent,
+  NormalizedWebSocketEvent,
+  RawWebSocketEvent,
+} from "../types/event.types";
+
+import { IdGenerator } from "./id-generator";
+
+export class EventNormalizer {
+  //
+  // -------------------------
+  // DNS
+  // -------------------------
+  //
+  static normalizeDns(event: RawDnsEvent): NormalizedDnsEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "dns",
+      timestamp: Date.now(),
+      ip: event.ip ?? "",
+      query: event.query ?? "",
+      recordType: event.recordType ?? "",
+      raw: event.raw,
+    };
+  }
+
+  //
+  // -------------------------
+  // HTTP
+  // -------------------------
+  //
+  static normalizeHttp(event: RawEvent): NormalizedHttpEvent {
+    const sourceIp = event.ip && event.ip.trim() !== "" ? event.ip : "unknown";
+
+    return {
+      id: IdGenerator.generate(),
+      type: "http",
+      timestamp: Date.now(),
+      sourceIp,
+      request: {
+        method: event.method,
+        path: event.path,
+        headers: event.headers,
+        query: event.query,
+        body: event.body,
+      },
+    };
+  }
+
+  //
+  // -------------------------
+  // SMTP
+  // -------------------------
+  //
+  static normalizeSmtp(event: RawSmtpEvent): NormalizedSmtpEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "smtp",
+      timestamp: Date.now(),
+      ip: event.ip ?? "",
+      from: event.from ?? "",
+      to: event.to ?? [],
+      subject: event.subject ?? "",
+      body: event.body ?? "",
+      raw: event.raw,
+    };
+  }
+
+  //
+  // -------------------------
+  // TCP
+  // -------------------------
+  //
+  static normalizeTcp(event: RawTcpEvent): NormalizedTcpEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "tcp",
+      timestamp: Date.now(),
+      ip: event.ip ?? "",
+      port: event.port ?? 0,
+      data: event.data ?? "",
+      raw: event.raw,
+    };
+  }
+
+  //
+  // -------------------------
+  // SSRF
+  // -------------------------
+  //
+  static normalizeSsrf(raw: RawSsrfEvent): NormalizedSsrfEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "ssrf",
+      timestamp: Date.now(),
+      sourceIp: raw.ip,
+      request: {
+        method: raw.method,
+        path: raw.path,
+        headers: raw.headers,
+        query: raw.query,
+      },
+    };
+  }
+
+  //
+  // -------------------------
+  // webhook
+  // -------------------------
+  //
+  static normalizeWebhook(raw: RawWebhookEvent): NormalizedWebhookEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "webhook",
+      timestamp: Date.now(),
+      sourceIp: raw.ip,
+      headers: raw.headers,
+      body: raw.body,
+    };
+  }
+
+  //
+  // -------------------------
+  // websocket
+  // -------------------------
+  //
+  static normalizeWebSocket(raw: RawWebSocketEvent): NormalizedWebSocketEvent {
+    return {
+      id: IdGenerator.generate(),
+      type: "websocket",
+      timestamp: Date.now(),
+      sourceIp: raw.ip,
+      message: raw.message,
+    };
+  }
+}

package/src/core/event.router.ts

@@ -1,13 +1,13 @@
-import { EventNormalizer } from "./event.normalizer";
-import { Storage } from "../storage-adapters/storage.interface";
-import { RawEvent, NormalizedHttpEvent } from "../types/event.types";
-
-export class EventRouter {
-  constructor(private storage: Storage) {}
-
-  async handleHttp(event: RawEvent): Promise<NormalizedHttpEvent> {
-    const normalized = EventNormalizer.normalizeHttp(event);
-    await this.storage.save(normalized);
-    return normalized;
-  }
-}
+import { EventNormalizer } from "./event.normalizer";
+import { Storage } from "../storage-adapters/storage.interface";
+import { RawEvent, NormalizedHttpEvent } from "../types/event.types";
+
+export class EventRouter {
+  constructor(private storage: Storage) {}
+
+  async handleHttp(event: RawEvent): Promise<NormalizedHttpEvent> {
+    const normalized = EventNormalizer.normalizeHttp(event);
+    await this.storage.save(normalized);
+    return normalized;
+  }
+}

package/src/core/http/__tests__/adapter-node.test.ts

@@ -1,52 +1,52 @@
-import { NodeAdapter } from "../adapter-node";
-import { MiddlewarePipeline } from "../middleware";
-import { Router } from "../router";
-import { Request } from "../request";
-import { Response } from "../response";
-import { describe, it, expect, jest } from "@jest/globals";
-import * as Build from "../buildRequest";
-
-describe("NodeAdapter.handle", () => {
-  it("appelle le handler quand la route match", async () => {
-    const router = new Router();
-    const pipeline = new MiddlewarePipeline();
-
-    // mock buildRequest
-    const buildRequestMock = jest
-      .spyOn(Build, "buildRequest")
-      .mockImplementation(
-        (raw: any, params?: Record<string, string>) =>
-          new Request({
-            method: "GET",
-            path: "/test",
-            headers: {},
-            params: params ?? {},
-          }),
-      );
-
-    const handler = jest.fn();
-
-    router.match = jest.fn(() => ({
-      handler,
-      params: { id: "42" },
-      middlewares: [],
-    })) as any;
-
-    pipeline.run = jest.fn(async () => {}) as any;
-
-    const res = {
-      writableEnded: false,
-      setHeader: jest.fn(),
-      end: jest.fn(),
-      statusCode: 200,
-    };
-
-    const adapter = new NodeAdapter(router, pipeline);
-
-    await adapter.handle({ url: "/test", method: "GET", headers: {} }, res);
-
-    expect(handler).toHaveBeenCalled();
-    expect(pipeline.run).toHaveBeenCalled();
-    expect(buildRequestMock).toHaveBeenCalledTimes(2);
-  });
-});
+import { NodeAdapter } from "../adapter-node";
+import { MiddlewarePipeline } from "../middleware";
+import { Router } from "../router";
+import { Request } from "../request";
+import { Response } from "../response";
+import { describe, it, expect, jest } from "@jest/globals";
+import * as Build from "../buildRequest";
+
+describe("NodeAdapter.handle", () => {
+  it("appelle le handler quand la route match", async () => {
+    const router = new Router();
+    const pipeline = new MiddlewarePipeline();
+
+    // mock buildRequest
+    const buildRequestMock = jest
+      .spyOn(Build, "buildRequest")
+      .mockImplementation(
+        (raw: any, params?: Record<string, string>) =>
+          new Request({
+            method: "GET",
+            path: "/test",
+            headers: {},
+            params: params ?? {},
+          }),
+      );
+
+    const handler = jest.fn();
+
+    router.match = jest.fn(() => ({
+      handler,
+      params: { id: "42" },
+      middlewares: [],
+    })) as any;
+
+    pipeline.run = jest.fn(async () => {}) as any;
+
+    const res = {
+      writableEnded: false,
+      setHeader: jest.fn(),
+      end: jest.fn(),
+      statusCode: 200,
+    };
+
+    const adapter = new NodeAdapter(router, pipeline);
+
+    await adapter.handle({ url: "/test", method: "GET", headers: {} }, res);
+
+    expect(handler).toHaveBeenCalled();
+    expect(pipeline.run).toHaveBeenCalled();
+    expect(buildRequestMock).toHaveBeenCalledTimes(2);
+  });
+});

package/src/core/http/__tests__/body-parser-multipart.test.ts

@@ -1,41 +1,41 @@
-import { bodyParserMultipart } from "../middleware";
-import { Request } from "../request";
-import { Response } from "../response";
-import { describe, it, expect } from "@jest/globals";
-
-describe("bodyParserMultipart", () => {
-  it("parse un champ texte et un fichier", async () => {
-    const boundary = "----1234";
-
-    const raw = {
-      headers: { "content-type": `multipart/form-data; boundary=${boundary}` },
-      [Symbol.asyncIterator]: async function* () {
-        yield Buffer.from(
-          `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="username"\r\n\r\n` +
-            `jeremy\r\n` +
-            `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="file"; filename="test.txt"\r\n` +
-            `Content-Type: text/plain\r\n\r\n` +
-            `Hello world\r\n` +
-            `--${boundary}--`,
-        );
-      },
-    };
-
-    const req = new Request({
-      method: "POST",
-      path: "/upload",
-      headers: raw.headers,
-      raw,
-    });
-
-    const res = new Response({});
-
-    await bodyParserMultipart(req, res);
-
-    expect(req.form?.username).toBe("jeremy");
-    expect(req.files?.[0].filename).toBe("test.txt");
-    expect(req.files?.[0].data.toString()).toBe("Hello world");
-  });
-});
+import { bodyParserMultipart } from "../middleware";
+import { Request } from "../request";
+import { Response } from "../response";
+import { describe, it, expect } from "@jest/globals";
+
+describe("bodyParserMultipart", () => {
+  it("parse un champ texte et un fichier", async () => {
+    const boundary = "----1234";
+
+    const raw = {
+      headers: { "content-type": `multipart/form-data; boundary=${boundary}` },
+      [Symbol.asyncIterator]: async function* () {
+        yield Buffer.from(
+          `--${boundary}\r\n` +
+            `Content-Disposition: form-data; name="username"\r\n\r\n` +
+            `jeremy\r\n` +
+            `--${boundary}\r\n` +
+            `Content-Disposition: form-data; name="file"; filename="test.txt"\r\n` +
+            `Content-Type: text/plain\r\n\r\n` +
+            `Hello world\r\n` +
+            `--${boundary}--`,
+        );
+      },
+    };
+
+    const req = new Request({
+      method: "POST",
+      path: "/upload",
+      headers: raw.headers,
+      raw,
+    });
+
+    const res = new Response({});
+
+    await bodyParserMultipart(req, res);
+
+    expect(req.form?.username).toBe("jeremy");
+    expect(req.files?.[0].filename).toBe("test.txt");
+    expect(req.files?.[0].data.toString()).toBe("Hello world");
+  });
+});

package/src/core/http/__tests__/body-parser-raw.test.ts

@@ -1,28 +1,28 @@
-import { bodyParserRaw } from "../middleware";
-import { Request } from "../request";
-import { Response } from "../response";
-import { describe, it, expect } from "@jest/globals";
-
-describe("bodyParserRaw", () => {
-  it("lit le body brut", async () => {
-    const raw = {
-      headers: { "content-type": "application/octet-stream" },
-      [Symbol.asyncIterator]: async function* () {
-        yield Buffer.from([1, 2, 3, 4]);
-      },
-    };
-
-    const req = new Request({
-      method: "POST",
-      path: "/",
-      headers: raw.headers,
-      raw,
-    });
-
-    const res = new Response({});
-
-    await bodyParserRaw(req, res);
-
-    expect(req.bodyRaw).toEqual(Buffer.from([1, 2, 3, 4]));
-  });
-});
+import { bodyParserRaw } from "../middleware";
+import { Request } from "../request";
+import { Response } from "../response";
+import { describe, it, expect } from "@jest/globals";
+
+describe("bodyParserRaw", () => {
+  it("lit le body brut", async () => {
+    const raw = {
+      headers: { "content-type": "application/octet-stream" },
+      [Symbol.asyncIterator]: async function* () {
+        yield Buffer.from([1, 2, 3, 4]);
+      },
+    };
+
+    const req = new Request({
+      method: "POST",
+      path: "/",
+      headers: raw.headers,
+      raw,
+    });
+
+    const res = new Response({});
+
+    await bodyParserRaw(req, res);
+
+    expect(req.bodyRaw).toEqual(Buffer.from([1, 2, 3, 4]));
+  });
+});

package/src/core/http/__tests__/body-parser-text.test.ts

@@ -1,28 +1,28 @@
-import { bodyParserText } from "../middleware";
-import { Request } from "../request";
-import { Response } from "../response";
-import { describe, it, expect } from "@jest/globals";
-
-describe("bodyParserText", () => {
-  it("lit le body text", async () => {
-    const raw = {
-      headers: { "content-type": "text/plain" },
-      [Symbol.asyncIterator]: async function* () {
-        yield Buffer.from("Hello world");
-      },
-    };
-
-    const req = new Request({
-      method: "POST",
-      path: "/",
-      headers: raw.headers,
-      raw,
-    });
-
-    const res = new Response({});
-
-    await bodyParserText(req, res);
-
-    expect(req.bodyText).toBe("Hello world");
-  });
-});
+import { bodyParserText } from "../middleware";
+import { Request } from "../request";
+import { Response } from "../response";
+import { describe, it, expect } from "@jest/globals";
+
+describe("bodyParserText", () => {
+  it("lit le body text", async () => {
+    const raw = {
+      headers: { "content-type": "text/plain" },
+      [Symbol.asyncIterator]: async function* () {
+        yield Buffer.from("Hello world");
+      },
+    };
+
+    const req = new Request({
+      method: "POST",
+      path: "/",
+      headers: raw.headers,
+      raw,
+    });
+
+    const res = new Response({});
+
+    await bodyParserText(req, res);
+
+    expect(req.bodyText).toBe("Hello world");
+  });
+});