fix conflicts

Author: github-actions

bbot/core/helpers/async_helpers.py

@@ -1,10 +1,10 @@
+import time
 import uuid
 import random
 import asyncio
 import logging
 import functools
-from datetime import datetime
-from .misc import human_timedelta
+from contextlib import suppress
 from cachetools import keys, LRUCache
 from contextlib import asynccontextmanager
 
@@ -63,26 +63,27 @@ def lock(self):
             self._lock = asyncio.Lock()
         return self._lock
 
-    def count(self, task_name, n=1, _log=True):
+    def count(self, task_name, n=1, asyncio_task=None, _log=True):
         if callable(task_name):
             task_name = f"{task_name.__qualname__}()"
-        return self.Task(self, task_name, n=n, _log=_log)
+        return self.Task(self, task_name, n=n, _log=_log, asyncio_task=asyncio_task)
 
     class Task:
-        def __init__(self, manager, task_name, n=1, _log=True):
+        def __init__(self, manager, task_name, n=1, _log=True, asyncio_task=None):
             self.manager = manager
             self.task_name = task_name
             self.task_id = None
             self.start_time = None
             self.log = _log
             self.n = n
+            self._asyncio_task = asyncio_task
 
         async def __aenter__(self):
             self.task_id = uuid.uuid4()
             # if self.log:
             #     log.trace(f"Starting task {self.task_name} ({self.task_id})")
             async with self.manager.lock:
-                self.start_time = datetime.now()
+                self.start_time = time.time()
                 self.manager.tasks[self.task_id] = self
             return self
 
@@ -92,9 +93,29 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
             # if self.log:
             #     log.trace(f"Finished task {self.task_name} ({self.task_id})")
 
+        @property
+        def asyncio_task(self):
+            if self._asyncio_task is None:
+                raise AttributeError("No asyncio task associated with this task")
+            return self._asyncio_task
+
+        @property
+        def function_name(self):
+            with suppress(AttributeError):
+                return self.asyncio_task.get_coro().__name__
+            return ""
+
+        async def cancel(self):
+            self.asyncio_task.cancel()
+            with suppress(asyncio.CancelledError):
+                await self.asyncio_task
+
+        @property
+        def running_for(self):
+            return time.time() - self.start_time
+
         def __str__(self):
-            running_for = human_timedelta(datetime.now() - self.start_time)
-            return f"{self.task_name} running for {running_for}"
+            return f"{self.task_name} running for {self.running_for:.1f}s"
 
 
 def get_event_loop():

bbot/core/helpers/depsinstaller/installer.py

@@ -196,7 +196,7 @@ async def install_module(self, module):
         deps_common = preloaded["deps"]["common"]
         if deps_common:
             for dep_common in deps_common:
-                if self.setup_status.get(dep_common, False) is True:
+                if self.setup_status.get(dep_common, False) is True and self.deps_behavior != "force_install":
                     log.debug(
                         f'Skipping installation of dependency "{dep_common}" for module "{module}" since it is already installed'
                     )

bbot/core/helpers/misc.py

@@ -1309,7 +1309,7 @@ def make_netloc(host, port=None):
     return f"{host}:{port}"
 
 
-def which(*executables):
+def which(*executables, path=None):
     """Finds the full path of the first available executable from a list of executables.
 
     Args:
@@ -1325,7 +1325,7 @@ def which(*executables):
     import shutil
 
     for e in executables:
-        location = shutil.which(e)
+        location = shutil.which(e, path=path)
         if location:
             return location
 

bbot/core/helpers/names_generator.py

@@ -50,6 +50,7 @@
     "delicious",
     "demented",
     "demonic",
+    "demonstrative",
     "depraved",
     "depressed",
     "deranged",
@@ -201,8 +202,10 @@
     "reckless",
     "reductive",
     "ripped",
+    "ruthless",
     "sadistic",
     "satanic",
+    "saucy",
     "savvy",
     "scheming",
     "schizophrenic",

bbot/core/shared_deps.py

@@ -108,6 +108,24 @@
         "when": "ansible_facts['os_family'] == 'Debian'",
         "ignore_errors": True,
     },
+    {
+        "name": "Get latest Chromium version (Darwin x86_64)",
+        "uri": {
+            "url": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac%2FLAST_CHANGE?alt=media",
+            "return_content": True,
+        },
+        "register": "chromium_version_darwin_x86_64",
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'x86_64'",
+    },
+    {
+        "name": "Get latest Chromium version (Darwin arm64)",
+        "uri": {
+            "url": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac_Arm%2FLAST_CHANGE?alt=media",
+            "return_content": True,
+        },
+        "register": "chromium_version_darwin_arm64",
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'arm64'",
+    },
     {
         "name": "Download Chromium (Debian)",
         "unarchive": {
@@ -119,6 +137,26 @@
         "when": "ansible_facts['os_family'] == 'Debian'",
         "ignore_errors": True,
     },
+    {
+        "name": "Download Chromium (Darwin x86_64)",
+        "unarchive": {
+            "src": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac%2F{{ chromium_version_darwin_x86_64.content }}%2Fchrome-mac.zip?alt=media",
+            "remote_src": True,
+            "dest": "#{BBOT_TOOLS}",
+            "creates": "#{BBOT_TOOLS}/chrome-mac",
+        },
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'x86_64'",
+    },
+    {
+        "name": "Download Chromium (Darwin arm64)",
+        "unarchive": {
+            "src": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac_Arm%2F{{ chromium_version_darwin_arm64.content }}%2Fchrome-mac.zip?alt=media",
+            "remote_src": True,
+            "dest": "#{BBOT_TOOLS}",
+            "creates": "#{BBOT_TOOLS}/chrome-mac",
+        },
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'arm64'",
+    },
     # Because Ubuntu is a special snowflake, we have to bend over backwards to fix the chrome sandbox
     # see https://chromium.googlesource.com/chromium/src/+/main/docs/security/apparmor-userns-restrictions.md
     {

bbot/defaults.yml

@@ -142,6 +142,12 @@ deps:
 # Load BBOT modules from these custom paths
 module_dirs: []
 
+# maximum runtime in seconds for each module's handle_event() is 60 minutes
+# when the timeout is reached, the offending handle_event() will be cancelled and the module will move on to the next event
+module_handle_event_timeout: 3600
+# handle_batch() default timeout is 2 hours
+module_handle_batch_timeout: 7200
+
 # Infer certain events from others, e.g. IPs from IP ranges, DNS_NAMEs from URLs, etc.
 speculate: True
 # Passively search event data for URLs, hostnames, emails, etc.

bbot/modules/apkpure.py

@@ -13,14 +13,16 @@ class apkpure(BaseModule):
         "author": "@domwhewell-sage",
     }
     options = {"output_folder": ""}
-    options_desc = {"output_folder": "Folder to download apk's to"}
+    options_desc = {
+        "output_folder": "Folder to download APKs to. If not specified, downloaded APKs will be deleted when the scan completes, to minimize disk usage."
+    }
 
     async def setup(self):
-        output_folder = self.config.get("output_folder")
+        output_folder = self.config.get("output_folder", "")
         if output_folder:
             self.output_dir = Path(output_folder) / "apk_files"
         else:
-            self.output_dir = self.scan.home / "apk_files"
+            self.output_dir = self.helpers.temp_dir / "apk_files"
         self.helpers.mkdir(self.output_dir)
         return await super().setup()