Fix more test assertions: e.data -> e.url/e.pretty_string for URL events

Author: liquidsec

bbot/test/test_step_2/module_tests/test_module_excavate.py

@@ -127,7 +127,7 @@ def check(self, module_test, events):
         )
 
         assert any(
-            e.type == "URL_UNVERIFIED" and "miscellaneous.html" in e.data and "x50-uart-driver" not in e.data
+            e.type == "URL_UNVERIFIED" and "miscellaneous.html" in e.url and "x50-uart-driver" not in e.url
             for e in events
         )
 
@@ -1560,7 +1560,7 @@ async def setup_after_prep(self, module_test):
     def check(self, module_test, events):
         # excavate should skip PDF responses entirely, so no URLs or findings should be extracted from the body
         url_unverified_events = [
-            e for e in events if e.type == "URL_UNVERIFIED" and "pdf-extracted.test.notreal" in e.data
+            e for e in events if e.type == "URL_UNVERIFIED" and "pdf-extracted.test.notreal" in e.url
         ]
         assert len(url_unverified_events) == 0, (
             f"PDF body should not be processed by excavate, but got: {url_unverified_events}"

bbot/test/test_step_2/module_tests/test_module_ffuf.py

@@ -23,8 +23,8 @@ async def setup_before_prep(self, module_test):
         module_test.set_expect_requests(expect_args=expect_args, respond_args=respond_args)
 
     def check(self, module_test, events):
-        assert any(e.type == "URL_UNVERIFIED" and "admin" in e.data for e in events)
-        assert not any(e.type == "URL_UNVERIFIED" and "11111111" in e.data for e in events)
+        assert any(e.type == "URL_UNVERIFIED" and "admin" in e.url for e in events)
+        assert not any(e.type == "URL_UNVERIFIED" and "11111111" in e.url for e in events)
 
 
 class TestFFUF2(TestFFUF):
@@ -41,8 +41,8 @@ async def setup_before_prep(self, module_test):
         module_test.set_expect_requests(expect_args=expect_args, respond_args=respond_args)
 
     def check(self, module_test, events):
-        assert any(e.type == "URL_UNVERIFIED" and "console" in e.data for e in events)
-        assert not any(e.type == "URL_UNVERIFIED" and "11111111" in e.data for e in events)
+        assert any(e.type == "URL_UNVERIFIED" and "console" in e.url for e in events)
+        assert not any(e.type == "URL_UNVERIFIED" and "11111111" in e.url for e in events)
 
 
 class TestFFUF_ignorecase(TestFFUF):
@@ -65,8 +65,8 @@ async def setup_before_prep(self, module_test):
         module_test.set_expect_requests(expect_args=expect_args, respond_args=respond_args)
 
     def check(self, module_test, events):
-        assert any(e.type == "URL_UNVERIFIED" and "admin" in e.data for e in events)
-        assert not any(e.type == "URL_UNVERIFIED" and "Admin" in e.data for e in events)
+        assert any(e.type == "URL_UNVERIFIED" and "admin" in e.url for e in events)
+        assert not any(e.type == "URL_UNVERIFIED" and "Admin" in e.url for e in events)
 
 
 class TestFFUFHeaders(TestFFUF):
@@ -86,5 +86,5 @@ async def setup_before_prep(self, module_test):
         module_test.set_expect_requests(expect_args=expect_args, respond_args=respond_args)
 
     def check(self, module_test, events):
-        assert any(e.type == "URL_UNVERIFIED" and "console" in e.data for e in events)
-        assert not any(e.type == "URL_UNVERIFIED" and "11111111" in e.data for e in events)
+        assert any(e.type == "URL_UNVERIFIED" and "console" in e.url for e in events)
+        assert not any(e.type == "URL_UNVERIFIED" and "11111111" in e.url for e in events)

bbot/test/test_step_2/module_tests/test_module_httpx.py

@@ -124,8 +124,8 @@ def check(self, module_test, events):
         assert 1 == len([e for e in events if e.type == "URL" and e.url == "http://127.0.0.1:8888/"])
         assert 1 == len([e for e in events if e.type == "URL" and e.url == "http://127.0.0.1:8888/test.aspx"])
         assert 1 == len([e for e in events if e.type == "URL" and e.url == "http://127.0.0.1:8888/test.txt"])
-        assert not any(e for e in events if "URL" in e.type and ".svg" in e.data)
-        assert not any(e for e in events if "URL" in e.type and ".woff" in e.data)
+        assert not any(e for e in events if "URL" in e.type and ".svg" in e.url)
+        assert not any(e for e in events if "URL" in e.type and ".woff" in e.url)
 
 
 class TestHTTPX_querystring_removed(ModuleTestBase):