From eaef028486c0e11cab78a1c032d3ecd68109b455 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 21 Nov 2024 10:54:04 -0500 Subject: [PATCH] fix conflict --- bbot/core/helpers/depsinstaller/installer.py | 3 ++- bbot/defaults.yml | 15 +++++++-------- bbot/test/test.conf | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bbot/core/helpers/depsinstaller/installer.py b/bbot/core/helpers/depsinstaller/installer.py index 479c51c97..fce5f077d 100644 --- a/bbot/core/helpers/depsinstaller/installer.py +++ b/bbot/core/helpers/depsinstaller/installer.py @@ -49,7 +49,8 @@ def __init__(self, parent_helper): self.minimal_git_config.touch() os.environ["GIT_CONFIG_GLOBAL"] = str(self.minimal_git_config) - self.deps_behavior = self.parent_helper.config.get("deps_behavior", "abort_on_failure").lower() + self.deps_config = self.parent_helper.config.get("deps", {}) + self.deps_behavior = self.deps_config.get("behavior", "abort_on_failure").lower() self.ansible_debug = self.core.logger.log_level <= logging.DEBUG self.venv = "" if sys.prefix != sys.base_prefix: diff --git a/bbot/defaults.yml b/bbot/defaults.yml index e659a183b..63f5f7e68 100644 --- a/bbot/defaults.yml +++ b/bbot/defaults.yml @@ -112,6 +112,13 @@ engine: deps: ffuf: version: "2.1.0" + # How to handle installation of module dependencies + # Choices are: + # - abort_on_failure (default) - if a module dependency fails to install, abort the scan + # - retry_failed - try again to install failed dependencies + # - ignore_failed - run the scan regardless of what happens with dependency installation + # - disable - completely disable BBOT's dependency system (you are responsible for installing tools, pip packages, etc.) + behavior: abort_on_failure ### ADVANCED OPTIONS ### @@ -129,14 +136,6 @@ dnsresolve: True # Cloud provider tagging cloudcheck: True -# How to handle installation of module dependencies -# Choices are: -# - abort_on_failure (default) - if a module dependency fails to install, abort the scan -# - retry_failed - try again to install failed dependencies -# - ignore_failed - run the scan regardless of what happens with dependency installation -# - disable - completely disable BBOT's dependency system (you are responsible for installing tools, pip packages, etc.) -deps_behavior: abort_on_failure - # Strip querystring from URLs by default url_querystring_remove: True # When query string is retained, by default collapse parameter values down to a single value per parameter diff --git a/bbot/test/test.conf b/bbot/test/test.conf index 63914fe65..1c6a19dbf 100644 --- a/bbot/test/test.conf +++ b/bbot/test/test.conf @@ -36,6 +36,8 @@ dns: - example.com - evilcorp.com - one +deps: + behavior: retry_failed engine: debug: true agent_url: ws://127.0.0.1:8765