Merge pull request #19 from AikidoSec/dev

Rewrite e2e logic

end2end/package.json

@@ -5,6 +5,6 @@
     "tap": "^18.7.0"
   },
   "scripts": {
-    "test": "tap tests/*.js"
+    "test": "tap tests/*.js --allow-empty-coverage"
   }
 }

end2end/tests/express-mongodb.test.js

@@ -1,108 +1,102 @@
 const t = require("tap");
 const { spawn } = require("node:child_process");
 const { resolve } = require("node:path");
+const timeout = require("../timeout");
 
 const pathToApp = resolve(
   __dirname,
   "../../sample-apps/express-mongodb",
   "app.js"
 );
 
-async function timeout(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
+t.test("it blocks in blocking mode", (t) => {
+  const server = spawn(`node`, [pathToApp, "4000"]);
 
-async function kill(server) {
-  return new Promise((resolve) => {
-    if (!server.connected || server.killed || !server.pid) {
-      resolve();
-    }
-
-    server.on("close", resolve);
-    server.on("exit", resolve);
-    server.on("error", resolve);
-    server.on("disconnect", resolve);
-    server.kill();
+  server.on("close", () => {
+    t.end();
   });
-}
 
-t.test("it blocks in blocking mode", async () => {
-  const server = spawn(`node`, [pathToApp, "4000"], { shell: true });
+  server.on("error", (err) => {
+    t.fail(err.message);
+  });
 
   let stdout = "";
   server.stdout.on("data", (data) => {
     stdout += data.toString();
-    console.log("stdout", data.toString());
   });
 
   let stderr = "";
   server.stderr.on("data", (data) => {
     stderr += data.toString();
-    console.log("stderr", data.toString());
   });
 
   // Wait for the server to start
-  await timeout(1000);
-
-  try {
-    const [noSQLInjection, normalSearch] = await Promise.all([
-      fetch("http://localhost:4000/?search[$ne]=null", {
-        signal: AbortSignal.timeout(5000),
-      }),
-      fetch("http://localhost:4000/?search=title", {
-        signal: AbortSignal.timeout(5000),
-      }),
-    ]);
-
-    t.equal(noSQLInjection.status, 500);
-    t.equal(normalSearch.status, 200);
-    t.match(stdout, /Starting agent/);
-    t.match(stderr, /Aikido guard has blocked a NoSQL injection/);
-  } catch (error) {
-    t.fail(error.message);
-  } finally {
-    await kill(server);
-  }
+  timeout(2000)
+    .then(() => {
+      return Promise.all([
+        fetch("http://localhost:4000/?search[$ne]=null", {
+          signal: AbortSignal.timeout(5000),
+        }),
+        fetch("http://localhost:4000/?search=title", {
+          signal: AbortSignal.timeout(5000),
+        }),
+      ]);
+    })
+    .then(([noSQLInjection, normalSearch]) => {
+      t.equal(noSQLInjection.status, 500);
+      t.equal(normalSearch.status, 200);
+      t.match(stdout, /Starting agent/);
+      t.match(stderr, /Aikido guard has blocked a NoSQL injection/);
+    })
+    .catch((error) => {
+      t.fail(error.message);
+    })
+    .finally(() => {
+      server.kill();
+    });
 });
 
-t.test("it does not block in dry mode", async () => {
+t.test("it does not block in dry mode", (t) => {
   const server = spawn(`node`, [pathToApp, "4001"], {
     env: { ...process.env, AIKIDO_NO_BLOCKING: "true" },
-    shell: true,
+  });
+
+  server.on("close", () => {
+    t.end();
   });
 
   let stdout = "";
   server.stdout.on("data", (data) => {
     stdout += data.toString();
-    console.log("stdout", data.toString());
   });
 
   let stderr = "";
   server.stderr.on("data", (data) => {
     stderr += data.toString();
-    console.log("stderr", data.toString());
   });
 
   // Wait for the server to start
-  await timeout(1000);
-
-  try {
-    const [noSQLInjection, normalSearch] = await Promise.all([
-      fetch("http://localhost:4001/?search[$ne]=null", {
-        signal: AbortSignal.timeout(5000),
-      }),
-      fetch("http://localhost:4001/?search=title", {
-        signal: AbortSignal.timeout(5000),
-      }),
-    ]);
-
-    t.equal(noSQLInjection.status, 200);
-    t.equal(normalSearch.status, 200);
-    t.match(stdout, /Starting agent/);
-    t.notMatch(stderr, /Aikido guard has blocked a NoSQL injection/);
-  } catch (error) {
-    t.fail(error.message);
-  } finally {
-    await kill(server);
-  }
+  timeout(2000)
+    .then(() =>
+      Promise.all([
+        fetch("http://localhost:4001/?search[$ne]=null", {
+          signal: AbortSignal.timeout(5000),
+        }),
+        fetch("http://localhost:4001/?search=title", {
+          signal: AbortSignal.timeout(5000),
+        }),
+      ])
+    )
+    .then(([noSQLInjection, normalSearch]) => {
+      t.equal(noSQLInjection.status, 200);
+      t.equal(normalSearch.status, 200);
+      t.match(stdout, /Starting agent/);
+      t.notMatch(stderr, /Aikido guard has blocked a NoSQL injection/);
+    })
+    .catch((error) => {
+      t.fail(error.message);
+    })
+    .finally(() => {
+      server.kill();
+    });
 });

end2end/timeout.js

@@ -0,0 +1,3 @@
+module.exports = async function timeout(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+};