Merge pull request #508 from AikidoSec/dont-report-zero-port

Only capture hostname if the port is known

Author: willem-delbare

library/agent/Agent.ts

@@ -485,7 +485,7 @@ export class Agent {
     this.logger.log(`Failed to wrap file ${filename} in module ${module}`);
   }
 
-  onConnectHostname(hostname: string, port: number | undefined) {
+  onConnectHostname(hostname: string, port: number) {
     this.hostnames.add(hostname, port);
   }
 

library/agent/Hostnames.test.ts

@@ -21,23 +21,24 @@ t.test("it works", async () => {
     { hostname: "google.com", port: 80, hits: 1 },
   ]);
 
-  hostnames.add("google.com", undefined);
+  hostnames.add("google.com", 0);
+  hostnames.add("google.com", -1);
   t.same(hostnames.asArray(), [
+    { hostname: "aikido.dev", port: 443, hits: 1 },
     { hostname: "aikido.dev", port: 80, hits: 1 },
     { hostname: "google.com", port: 80, hits: 1 },
-    { hostname: "google.com", port: undefined, hits: 1 },
   ]);
 
   hostnames.add("github.com", 80);
   t.same(hostnames.asArray(), [
+    { hostname: "aikido.dev", port: 80, hits: 1 },
     { hostname: "google.com", port: 80, hits: 1 },
-    { hostname: "google.com", port: undefined, hits: 1 },
     { hostname: "github.com", port: 80, hits: 1 },
   ]);
 
   hostnames.add("jetbrains.com", 80);
   t.same(hostnames.asArray(), [
-    { hostname: "google.com", port: undefined, hits: 1 },
+    { hostname: "google.com", port: 80, hits: 1 },
     { hostname: "github.com", port: 80, hits: 1 },
     { hostname: "jetbrains.com", port: 80, hits: 1 },
   ]);

library/agent/Hostnames.ts

@@ -5,7 +5,11 @@ export class Hostnames {
 
   constructor(private readonly maxEntries: number = 200) {}
 
-  add(hostname: string, port: number | undefined = -1) {
+  add(hostname: string, port: number) {
+    if (port <= 0) {
+      return;
+    }
+
     if (!this.map.has(hostname)) {
       this.map.set(hostname, new Map([[port, 1]]));
     } else {
@@ -46,7 +50,7 @@ export class Hostnames {
       Array.from(ports.entries()).map(([port, hits]) => {
         return {
           hostname,
-          port: port === -1 ? undefined : port,
+          port,
           hits,
         };
       })

library/sinks/Fetch.ts

@@ -21,7 +21,9 @@ export class Fetch implements Wrapper {
   ): InterceptorResult {
     // Let the agent know that we are connecting to this hostname
     // This is to build a list of all hostnames that the application is connecting to
-    agent.onConnectHostname(hostname, port);
+    if (typeof port === "number" && port > 0) {
+      agent.onConnectHostname(hostname, port);
+    }
     const context = getContext();
 
     if (!context) {

library/sinks/HTTPRequest.ts

@@ -23,7 +23,9 @@ export class HTTPRequest implements Wrapper {
   ): InterceptorResult {
     // Let the agent know that we are connecting to this hostname
     // This is to build a list of all hostnames that the application is connecting to
-    agent.onConnectHostname(url.hostname, port);
+    if (typeof port === "number" && port > 0) {
+      agent.onConnectHostname(url.hostname, port);
+    }
     const context = getContext();
 
     if (!context) {

library/sinks/Undici.ts

@@ -31,7 +31,9 @@ export class Undici implements Wrapper {
   ): InterceptorResult {
     // Let the agent know that we are connecting to this hostname
     // This is to build a list of all hostnames that the application is connecting to
-    agent.onConnectHostname(hostname, port);
+    if (typeof port === "number" && port > 0) {
+      agent.onConnectHostname(hostname, port);
+    }
     const context = getContext();
 
     if (!context) {