Merge pull request #16 from AikidoSec/dev

Dev

benchmarks/express-mongodb/package.json

@@ -2,7 +2,7 @@
   "name": "express-mongodb-bench",
   "private": true,
   "dependencies": {
-    "@aikidosec/guard": "^1.0.0",
+    "@aikidosec/guard": "file:../../library",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.4.3",
     "express": "^4.18.2",

benchmarks/mongodb/package.json

@@ -2,7 +2,7 @@
   "name": "mongodb-bench",
   "private": true,
   "dependencies": {
-    "@aikidosec/guard": "^1.0.0",
+    "@aikidosec/guard": "file:../../library",
     "mongodb": "^6.3.0"
   }
 }

library/.npmignore

@@ -3,4 +3,7 @@
 *
 
 # Allowed files
+!/README.md
+!/LICENSE
 !/package.json
+!/dist/**/*

library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aikidosec/guard",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "description": "Aikido guard protects your application against NoSQL injections and more",
   "keywords": [
     "security",

library/src/agent/Agent.test.ts

@@ -1,9 +1,9 @@
 import { hostname, platform, release } from "node:os";
 import * as t from "tap";
+import { ip } from "../helpers/ipAddress";
 import { Agent } from "./Agent";
 import { APIForTesting, Token } from "./API";
 import { LoggerNoop } from "./Logger";
-import { address } from "ip";
 
 t.test("it sends started event", async (t) => {
   const logger = new LoggerNoop();
@@ -23,13 +23,14 @@ t.test("it sends started event", async (t) => {
       agent: {
         dryMode: false,
         hostname: hostname(),
-        version: "1.0.0",
-        ipAddress: address(),
+        version: "0.0.0",
+        ipAddress: ip(),
         packages: {
           mongodb: "4.0.0",
         },
         preventedPrototypePollution: false,
         nodeEnv: "",
+        serverless: false,
         os: {
           name: platform(),
           version: release(),

library/src/agent/Agent.ts

@@ -1,10 +1,10 @@
 import { hostname, platform, release } from "node:os";
+import { ip } from "../helpers/ipAddress";
 import { API, AgentInfo, Token, Stats, Kind } from "./API";
 import { Logger } from "./Logger";
 import { Context } from "./Context";
 import { resolve } from "path";
 import { Source } from "./Source";
-import { address } from "ip";
 
 export class Agent {
   private heartbeatIntervalInMS = 60 * 60 * 1000;
@@ -182,7 +182,7 @@ export class Agent {
       dryMode: !this.block,
       hostname: hostname() || "",
       version: this.getAgentVersion(),
-      ipAddress: address() || "",
+      ipAddress: ip() || "",
       packages: Object.keys(this.wrappedPackages).reduce(
         (packages: Record<string, string>, pkg) => {
           const details = this.wrappedPackages[pkg];