bbot 2.1.0.5021rc0__tar.gz → 2.1.0.5036rc0__tar.gz

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bbot
-Version: 2.1.0.5021rc0
+Version: 2.1.0.5036rc0
 Summary: OSINT automation for hackers.
 Home-page: https://github.com/blacklanternsecurity/bbot
 License: GPL-3.0

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/__init__.py

@@ -1,4 +1,4 @@
 # version placeholder (replaced by poetry-dynamic-versioning)
-__version__ = "v2.1.0.5021rc"
+__version__ = "v2.1.0.5036rc"
 
 from .scanner import Scanner, Preset

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/core/event/base.py

@@ -158,7 +158,7 @@ class BaseEvent:
         Raises:
             ValidationError: If either `scan` or `parent` are not specified and `_dummy` is False.
         """
-        self.uuid = uuid.uuid4()
+        self._uuid = uuid.uuid4()
         self._id = None
         self._hash = None
         self._data = None
@@ -456,6 +456,13 @@ class BaseEvent:
             self._id = f"{self.type}:{self.data_hash.hex()}"
         return self._id
 
+    @property
+    def uuid(self):
+        """
+        A universally unique identifier for the event
+        """
+        return f"{self.type}:{self._uuid}"
+
     @property
     def data_hash(self):
         """
@@ -1718,7 +1725,7 @@ def event_from_json(j, siem_friendly=False):
         event = make_event(**kwargs)
         event_uuid = j.get("uuid", None)
         if event_uuid is not None:
-            event.uuid = uuid.UUID(event_uuid)
+            event._uuid = uuid.UUID(event_uuid.split(":")[-1])
 
         resolved_hosts = j.get("resolved_hosts", [])
         event._resolved_hosts = set(resolved_hosts)
@@ -1730,7 +1737,8 @@ def event_from_json(j, siem_friendly=False):
             event._parent_id = parent_id
         parent_uuid = j.get("parent_uuid", None)
         if parent_uuid is not None:
-            event._parent_uuid = uuid.UUID(parent_uuid)
+            parent_type, parent_uuid = parent_uuid.split(":", 1)
+            event._parent_uuid = parent_type + ":" + str(uuid.UUID(parent_uuid))
         return event
     except KeyError as e:
         raise ValidationError(f"Event missing required field: {e}")

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/core/helpers/regexes.py

@@ -54,6 +54,9 @@ ptr_regex = re.compile(_ptr_regex)
 # uuid regex
 _uuid_regex = r"[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}"
 uuid_regex = re.compile(_uuid_regex, re.I)
+# event uuid regex
+_event_uuid_regex = r"[0-9A-Z_]+:[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}"
+event_uuid_regex = re.compile(_event_uuid_regex, re.I)
 
 _open_port_regexes = (
     _dns_name_regex + r":[0-9]{1,5}",

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/scanner/preset/preset.py

@@ -844,8 +844,6 @@ class Preset:
 
         if module in self.exclude_modules:
             reason = "the module has been excluded"
-            if raise_error:
-                raise ValidationError(f'Unable to add {module_type} module "{module}" because {reason}')
             return False, reason, {}
 
         module_flags = preloaded.get("flags", [])

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/test/test_step_1/test_cli.py

@@ -351,14 +351,6 @@ async def test_cli_args(monkeypatch, caplog, capsys, clean_default_config):
     result = await cli._main()
     assert result == True
 
-    # enable and exclude the same module
-    caplog.clear()
-    assert not caplog.text
-    monkeypatch.setattr("sys.argv", ["bbot", "-m", "ffuf_shortnames", "-em", "ffuf_shortnames"])
-    result = await cli._main()
-    assert result == None
-    assert 'Unable to add scan module "ffuf_shortnames" because the module has been excluded' in caplog.text
-
     # require flags
     monkeypatch.setattr("sys.argv", ["bbot", "-f", "active", "-rf", "passive"])
     result = await cli._main()

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/test/test_step_1/test_events.py

@@ -4,7 +4,7 @@ import ipaddress
 
 from ..bbot_fixtures import *
 from bbot.scanner import Scanner
-from bbot.core.helpers.regexes import uuid_regex
+from bbot.core.helpers.regexes import event_uuid_regex
 
 
 @pytest.mark.asyncio
@@ -443,11 +443,17 @@ async def test_events(events, helpers):
     parent_event2 = scan.make_event("evilcorp.com", parent=scan.root_event, context="test context")
 
     event1 = scan.make_event("evilcorp.com:80", parent=parent_event1, context="test context")
+    assert hasattr(event1, "_uuid")
     assert hasattr(event1, "uuid")
-    assert isinstance(event1.uuid, uuid.UUID)
+    assert isinstance(event1._uuid, uuid.UUID)
+    assert isinstance(event1.uuid, str)
+    assert event1.uuid == f"{event1.type}:{event1._uuid}"
     event2 = scan.make_event("evilcorp.com:80", parent=parent_event2, context="test context")
+    assert hasattr(event2, "_uuid")
     assert hasattr(event2, "uuid")
-    assert isinstance(event2.uuid, uuid.UUID)
+    assert isinstance(event2._uuid, uuid.UUID)
+    assert isinstance(event2.uuid, str)
+    assert event2.uuid == f"{event2.type}:{event2._uuid}"
     # ids should match because the event type + data is the same
     assert event1.id == event2.id
     # but uuids should be unique!
@@ -470,7 +476,7 @@ async def test_events(events, helpers):
     assert db_event.discovery_context == "test context"
     assert db_event.discovery_path == ["test context"]
     assert len(db_event.parent_chain) == 1
-    assert all([uuid_regex.match(u) for u in db_event.parent_chain])
+    assert all([event_uuid_regex.match(u) for u in db_event.parent_chain])
     assert db_event.parent_chain[0] == str(db_event.uuid)
     assert db_event.parent.uuid == scan.root_event.uuid
     assert db_event.parent_uuid == scan.root_event.uuid
@@ -490,7 +496,7 @@ async def test_events(events, helpers):
     assert json_event["parent_chain"] == db_event.parent_chain
     assert json_event["parent_chain"][0] == str(db_event.uuid)
     reconstituted_event = event_from_json(json_event)
-    assert isinstance(reconstituted_event.uuid, uuid.UUID)
+    assert isinstance(reconstituted_event._uuid, uuid.UUID)
     assert str(reconstituted_event.uuid) == json_event["uuid"]
     assert str(reconstituted_event.parent_uuid) == json_event["parent_uuid"]
     assert reconstituted_event.uuid == db_event.uuid

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/bbot/test/test_step_1/test_presets.py

@@ -532,9 +532,22 @@ def test_preset_module_resolution(clean_default_config):
     assert set(preset.scan_modules) == {"wayback"}
 
     # modules + module exclusions
-    with pytest.raises(ValidationError) as error:
-        preset = Preset(exclude_modules=["sslcert"], modules=["sslcert", "wappalyzer", "wayback"]).bake()
-    assert str(error.value) == 'Unable to add scan module "sslcert" because the module has been excluded'
+    preset = Preset(exclude_modules=["sslcert"], modules=["sslcert", "wappalyzer", "wayback"]).bake()
+    baked_preset = preset.bake()
+    assert baked_preset.modules == {
+        "wayback",
+        "cloudcheck",
+        "python",
+        "json",
+        "speculate",
+        "dnsresolve",
+        "aggregate",
+        "excavate",
+        "txt",
+        "httpx",
+        "csv",
+        "wappalyzer",
+    }
 
 
 @pytest.mark.asyncio

{bbot-2.1.0.5021rc0 → bbot-2.1.0.5036rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bbot"
-version = "v2.1.0.5021rc"
+version = "v2.1.0.5036rc"
 description = "OSINT automation for hackers."
 authors = [
     "TheTechromancer",
@@ -70,7 +70,7 @@ pytest-timeout = "^2.3.1"
 pytest-httpx = "^0.30.0"
 pytest-httpserver = "^1.0.11"
 pytest = "^8.3.1"
-pytest-asyncio = "=0.23.8"
+pytest-asyncio = "0.24.0"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "^1.5.2"