bbot 2.3.2.5927rc0__tar.gz → 2.3.2.5938rc0__tar.gz

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bbot
-Version: 2.3.2.5927rc0
+Version: 2.3.2.5938rc0
 Summary: OSINT automation for hackers.
 License: GPL-3.0
 Keywords: python,cli,automation,osint,threat-intel,intelligence,neo4j,scanner,python-library,hacking,recursion,pentesting,recon,command-line-tool,bugbounty,subdomains,security-tools,subdomain-scanner,osint-framework,attack-surface,subdomain-enumeration,osint-tool
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Security
-Requires-Dist: ansible (>=7.3,<9.0)
+Requires-Dist: ansible-core (>=2.15.13,<3.0.0)
 Requires-Dist: ansible-runner (>=2.3.2,<3.0.0)
 Requires-Dist: beautifulsoup4 (>=4.12.2,<5.0.0)
 Requires-Dist: cachetools (>=5.3.2,<6.0.0)
@@ -367,16 +367,16 @@ bbot -t evilcorp.com evilcorp.org 1.2.3.0/24 -p subdomain-enum
 
 Targets can be any of the following:
 
-- `DNS_NAME` (`evilcorp.com`)
-- `IP_ADDRESS` (`1.2.3.4`)
-- `IP_RANGE` (`1.2.3.0/24`)
-- `OPEN_TCP_PORT` (`192.168.0.1:80`)
-- `URL` (`https://www.evilcorp.com`)
-- `EMAIL_ADDRESS` (`bob@evilcorp.com`)
-- `ORG_STUB` (`ORG:evilcorp`)
-- `USER_STUB` (`USER:bobsmith`)
-- `FILESYSTEM` (`FILESYSTEM:/tmp/asdf`)
-- `MOBILE_APP` (`MOBILE_APP:https://play.google.com/store/apps/details?id=com.evilcorp.app`)
+- DNS Name (`evilcorp.com`)
+- IP Address (`1.2.3.4`)
+- IP Range (`1.2.3.0/24`)
+- Open TCP Port (`192.168.0.1:80`)
+- URL (`https://www.evilcorp.com`)
+- Email Address (`bob@evilcorp.com`)
+- Organization (`ORG:evilcorp`)
+- Username (`USER:bobsmith`)
+- Filesystem (`FILESYSTEM:/tmp/asdf`)
+- Mobile App (`MOBILE_APP:https://play.google.com/store/apps/details?id=com.evilcorp.app`)
 
 For more information, see [Targets](https://www.blacklanternsecurity.com/bbot/Stable/scanning/#targets-t). To learn how BBOT handles scope, see [Scope](https://www.blacklanternsecurity.com/bbot/Stable/scanning/#scope).
 

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/README.md

@@ -312,16 +312,16 @@ bbot -t evilcorp.com evilcorp.org 1.2.3.0/24 -p subdomain-enum
 
 Targets can be any of the following:
 
-- `DNS_NAME` (`evilcorp.com`)
-- `IP_ADDRESS` (`1.2.3.4`)
-- `IP_RANGE` (`1.2.3.0/24`)
-- `OPEN_TCP_PORT` (`192.168.0.1:80`)
-- `URL` (`https://www.evilcorp.com`)
-- `EMAIL_ADDRESS` (`bob@evilcorp.com`)
-- `ORG_STUB` (`ORG:evilcorp`)
-- `USER_STUB` (`USER:bobsmith`)
-- `FILESYSTEM` (`FILESYSTEM:/tmp/asdf`)
-- `MOBILE_APP` (`MOBILE_APP:https://play.google.com/store/apps/details?id=com.evilcorp.app`)
+- DNS Name (`evilcorp.com`)
+- IP Address (`1.2.3.4`)
+- IP Range (`1.2.3.0/24`)
+- Open TCP Port (`192.168.0.1:80`)
+- URL (`https://www.evilcorp.com`)
+- Email Address (`bob@evilcorp.com`)
+- Organization (`ORG:evilcorp`)
+- Username (`USER:bobsmith`)
+- Filesystem (`FILESYSTEM:/tmp/asdf`)
+- Mobile App (`MOBILE_APP:https://play.google.com/store/apps/details?id=com.evilcorp.app`)
 
 For more information, see [Targets](https://www.blacklanternsecurity.com/bbot/Stable/scanning/#targets-t). To learn how BBOT handles scope, see [Scope](https://www.blacklanternsecurity.com/bbot/Stable/scanning/#scope).
 

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/bbot/__init__.py

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

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/bbot/cli.py

@@ -161,8 +161,11 @@ async def _main():
             all_modules = list(preset.module_loader.preloaded())
             scan.helpers.depsinstaller.force_deps = True
             succeeded, failed = await scan.helpers.depsinstaller.install(*all_modules)
-            log.info("Finished installing module dependencies")
-            return False if failed else True
+            if failed:
+                log.hugewarning(f"Failed to install dependencies for the following modules: {', '.join(failed)}")
+                return False
+            log.hugesuccess(f"Successfully installed dependencies for the following modules: {', '.join(succeeded)}")
+            return True
 
         scan_name = str(scan.name)
 

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/bbot/core/helpers/depsinstaller/installer.py

@@ -96,7 +96,7 @@ class DepsInstaller:
         self.ensure_root_lock = Lock()
 
     async def install(self, *modules):
-        self.install_core_deps()
+        await self.install_core_deps()
         succeeded = []
         failed = []
         try:
@@ -386,13 +386,14 @@ class DepsInstaller:
                 else:
                     log.warning("Incorrect password")
 
-    def install_core_deps(self):
+    async def install_core_deps(self):
         to_install = set()
         to_install_friendly = set()
         playbook = []
         self._install_sudo_askpass()
         # ensure tldextract data is cached
         self.parent_helper.tldextract("evilcorp.co.uk")
+        # install any missing commands
         for command, package_name_or_playbook in self.CORE_DEPS.items():
             if not self.parent_helper.which(command):
                 to_install_friendly.add(command)
@@ -400,6 +401,19 @@ class DepsInstaller:
                     to_install.add(package_name_or_playbook)
                 else:
                     playbook.extend(package_name_or_playbook)
+        # install ansible community.general collection
+        if not self.setup_status.get("ansible:community.general", False):
+            log.info("Installing Ansible Community General Collection")
+            try:
+                command = ["ansible-galaxy", "collection", "install", "community.general"]
+                await self.parent_helper.run(command, check=True)
+                self.setup_status["ansible:community.general"] = True
+                log.info("Successfully installed Ansible Community General Collection")
+            except CalledProcessError as err:
+                log.warning(
+                    f"Failed to install Ansible Community.General Collection (return code {err.returncode}): {err.stderr}"
+                )
+        # construct ansible playbook
         if to_install:
             playbook.append(
                 {
@@ -408,6 +422,7 @@ class DepsInstaller:
                     "become": True,
                 }
             )
+        # run playbook
         if playbook:
             log.info(f"Installing core BBOT dependencies: {','.join(sorted(to_install_friendly))}")
             self.ensure_root()

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/bbot/core/helpers/names_generator.py

@@ -594,7 +594,6 @@ names = [
     "rachel",
     "radagast",
     "ralph",
-    "rambunctious",
     "randy",
     "raymond",
     "rebecca",

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/bbot/modules/portfilter.py

@@ -2,7 +2,7 @@ from bbot.modules.base import BaseInterceptModule
 
 
 class portfilter(BaseInterceptModule):
-    watched_events = ["OPEN_TCP_PORT"]
+    watched_events = ["OPEN_TCP_PORT", "URL_UNVERIFIED", "URL"]
     flags = ["passive", "safe"]
     meta = {
         "description": "Filter out unwanted open ports from cloud/CDN targets",

{bbot-2.3.2.5927rc0 → bbot-2.3.2.5938rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bbot"
-version = "v2.3.2.5927rc"
+version = "v2.3.2.5938rc"
 description = "OSINT automation for hackers."
 authors = [
     "TheTechromancer",
@@ -34,7 +34,6 @@ deepdiff = "^8.0.0"
 xmltojson = "^2.0.2"
 pycryptodome = "^3.17"
 idna = "^3.4"
-ansible = ">=7.3,<9.0"
 tabulate = "0.8.10"
 websockets = ">=11.0.2,<16.0.0"
 pyjwt = "^2.7.0"
@@ -57,6 +56,7 @@ pydantic = "^2.9.2"
 radixtarget = "^3.0.13"
 cloudcheck = "^7.0.12"
 orjson = "^3.10.12"
+ansible-core = "^2.15.13"
 
 [tool.poetry.group.dev.dependencies]
 poetry-dynamic-versioning = ">=0.21.4,<1.8.0"