Last reverts to not pass operation anymore to the URLCollector

Author: bitterpanda63

agent/src/main/java/dev/aikido/agent/wrappers/HttpURLConnectionWrapper.java

@@ -53,7 +53,7 @@ public static void before(
             // Run report with "argument"
             for (Method method2: clazz.getMethods()) {
                 if(method2.getName().equals("report")) {
-                    method2.invoke(null, url, "HttpUrlConnection");
+                    method2.invoke(null, url);
                     break;
                 }
             }

agent/src/main/java/dev/aikido/agent/wrappers/OkHttpWrapper.java

@@ -50,7 +50,7 @@ public static void before(
             URL url = (URL) toUrlMethod.invoke(urlObject);
 
             // Report the URL
-            URLCollector.report(url, "okhttp3.OkHttpClient.newCall");
+            URLCollector.report(url);
         }
     }
 }

agent_api/src/test/java/vulnerabilities/ssrf/SSRFDetectorTest.java

@@ -55,8 +55,8 @@ public void testSsrfDetectorWithRedirectTo127IP() throws MalformedURLException {
         // Setup context :
         setContextAndLifecycle("http://ssrf-redirects.testssandbox.com/ssrf-test");
 
-        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), "test");
-        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://127.0.0.1:8080"), "test");
+        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"));
+        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://127.0.0.1:8080"));
         Attack attackData = SSRFDetector.run(
                 "127.0.0.1", 8080,
                 List.of("127.0.0.1"),
@@ -79,8 +79,8 @@ public void testSsrfDetectorWithRedirectTo127IPButHostnameCapitalizationDifferen
         // Setup context :
         setContextAndLifecycle("http://Ssrf-redirects.testssandbox.com/ssrf-test");
 
-        URLCollector.report(new URL("http://Ssrf-redirects.testssandbox.com/ssrf-test"), "test");
-        RedirectCollector.report(new URL("http://ssrf-Redirects.testssandbox.com/ssrf-test"), new URL("http://127.0.0.1:8080"), "test");
+        URLCollector.report(new URL("http://Ssrf-redirects.testssandbox.com/ssrf-test"));
+        RedirectCollector.report(new URL("http://ssrf-Redirects.testssandbox.com/ssrf-test"), new URL("http://127.0.0.1:8080"));
         Attack attackData = SSRFDetector.run(
             "127.0.0.1", 8080,
             List.of("127.0.0.1"),
@@ -103,8 +103,8 @@ public void testSsrfDetectorWithRedirectToLocalhost() throws MalformedURLExcepti
         // Setup context :
         setContextAndLifecycle("http://ssrf-redirects.testssandbox.com/");
 
-        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), "test");
-        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://localhost"), "test");
+        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"));
+        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://localhost"));
         Attack attackData = SSRFDetector.run(
                 "localhost", 80,
                 List.of("127.0.0.1"),
@@ -130,8 +130,8 @@ public void testSsrfDetectorWithRedirectToLocalhostButIsRequestToItself() throws
                 "http://ssrf-redirects.testssandbox.com/examplesite")); // url
 
 
-        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), "test");
-        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://localhost"), "test");
+        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"));
+        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://localhost"));
         Attack attackData = SSRFDetector.run(
                 "localhost", 80,
                 List.of("127.0.0.1"),
@@ -147,8 +147,8 @@ public void testSsrfDetectorWithServiceHostnameInRedirect() throws MalformedURLE
         // Setup context :
         setContextAndLifecycle("http://mysql-database/ssrf-test");
 
-        URLCollector.report(new URL("http://mysql-database/ssrf-test"), "test");
-        RedirectCollector.report(new URL("http://mysql-database/ssrf-test"), new URL("http://127.0.0.1:8080"), "test");
+        URLCollector.report(new URL("http://mysql-database/ssrf-test"));
+        RedirectCollector.report(new URL("http://mysql-database/ssrf-test"), new URL("http://127.0.0.1:8080"));
         Attack attackData = SSRFDetector.run(
             "127.0.0.1", 8080,
             List.of("127.0.0.1"),
@@ -164,8 +164,8 @@ public void testSsrfDetectorForcedProtectionOff() throws MalformedURLException {
         // Setup context :
         setContextAndLifecycle("http://ssrf-redirects.testssandbox.com/", "/api2/forced-off-route");
 
-        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), "test");
-        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://localhost"), "test");
+        URLCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"));
+        RedirectCollector.report(new URL("http://ssrf-redirects.testssandbox.com/ssrf-test"), new URL("http://localhost"));
         Attack attackData = SSRFDetector.run(
             "localhost", 80,
             List.of("127.0.0.1"),