fix conflict

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:

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

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