bbot 2.3.0.5515rc0__tar.gz → 2.3.0.5520rc0__tar.gz

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/PKG-INFO

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

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/bbot/__init__.py

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

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/bbot/core/event/base.py

@@ -1578,19 +1578,22 @@ class FILESYSTEM(DictPathEvent):
             # detect type of file content using magic
             from bbot.core.helpers.libmagic import get_magic_info, get_compression
 
-            extension, mime_type, description, confidence = get_magic_info(self.data["path"])
-            self.data["magic_extension"] = extension
-            self.data["magic_mime_type"] = mime_type
-            self.data["magic_description"] = description
-            self.data["magic_confidence"] = confidence
-            # detection compression
-            compression = get_compression(mime_type)
-            if compression:
-                self.add_tag("compressed")
-                self.add_tag(f"{compression}-archive")
-                self.data["compression"] = compression
-            # refresh hash
-            self.data = self.data
+            try:
+                extension, mime_type, description, confidence = get_magic_info(self.data["path"])
+                self.data["magic_extension"] = extension
+                self.data["magic_mime_type"] = mime_type
+                self.data["magic_description"] = description
+                self.data["magic_confidence"] = confidence
+                # detection compression
+                compression = get_compression(mime_type)
+                if compression:
+                    self.add_tag("compressed")
+                    self.add_tag(f"{compression}-archive")
+                    self.data["compression"] = compression
+                # refresh hash
+                self.data = self.data
+            except Exception as e:
+                log.debug(f"Error detecting file type: {type(e).__name__}: {e}")
 
 
 class RAW_DNS_RECORD(DictHostEvent, DnsEvent):
@@ -1683,6 +1686,8 @@ def make_event(
         When working within a module's `handle_event()`, use the instance method
         `self.make_event()` instead of calling this function directly.
     """
+    if not data:
+        raise ValidationError("No data provided")
 
     # allow tags to be either a string or an array
     if not tags:

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/bbot/modules/filedownload.py

@@ -148,7 +148,8 @@ class filedownload(BaseModule):
                 file_event = self.make_event(
                     {"path": str(file_destination)}, "FILESYSTEM", tags=["filedownload", "file"], parent=source_event
                 )
-                await self.emit_event(file_event)
+                if file_event is not None:
+                    await self.emit_event(file_event)
         self.urls_downloaded.add(hash(url))
 
     def make_filename(self, url, content_type=None):

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/bbot/modules/internal/cloudcheck.py

@@ -41,7 +41,12 @@ class CloudCheck(BaseInterceptModule):
 
         for i, host in enumerate(hosts_to_check):
             host_is_ip = self.helpers.is_ip(host)
-            for provider, provider_type, subnet in self.helpers.cloudcheck(host):
+            try:
+                cloudcheck_results = self.helpers.cloudcheck(host)
+            except Exception as e:
+                self.trace(f"Error running cloudcheck against {event} (host: {host}): {e}")
+                continue
+            for provider, provider_type, subnet in cloudcheck_results:
                 if provider:
                     event.add_tag(f"{provider_type}-{provider}")
                     if host_is_ip:

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/bbot/modules/wpscan.py

@@ -141,10 +141,10 @@ class wpscan(BaseModule):
 
     def parse_wpscan_output(self, output, base_url, source_event):
         json_output = json.loads(output)
-        interesting_json = json_output.get("interesting_findings", {})
-        version_json = json_output.get("version", {})
-        theme_json = json_output.get("main_theme", {})
-        plugins_json = json_output.get("plugins", {})
+        interesting_json = json_output.get("interesting_findings", {}) or {}
+        version_json = json_output.get("version", {}) or {}
+        theme_json = json_output.get("main_theme", {}) or {}
+        plugins_json = json_output.get("plugins", {}) or {}
         if interesting_json:
             yield from self.parse_wp_misc(interesting_json, base_url, source_event)
         if version_json:

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/bbot/test/test_step_1/test_events.py

@@ -622,6 +622,10 @@ async def test_events(events, helpers):
     assert str(parent_event_3.module) == "mymodule"
     assert str(parent_event_3.module_sequence) == "mymodule->mymodule->mymodule"
 
+    # event with no data
+    with pytest.raises(ValidationError):
+        event = scan.make_event(None, "DNS_NAME", parent=scan.root_event)
+
     await scan._cleanup()
 
 

{bbot-2.3.0.5515rc0 → bbot-2.3.0.5520rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bbot"
-version = "v2.3.0.5515rc"
+version = "v2.3.0.5520rc"
 description = "OSINT automation for hackers."
 authors = [
     "TheTechromancer",