Remove another place where we check for the existence of the config f…

…ile.

Let the Config class handle raising those types of errors.

lib/cuckoo/common/config.py

@@ -10,7 +10,7 @@
 from lib.cuckoo.common.colors import bold, red
 from lib.cuckoo.common.constants import CUCKOO_ROOT, CUSTOM_CONF_DIR
 from lib.cuckoo.common.dictionary import Dictionary
-from lib.cuckoo.common.exceptions import CuckooOperationalError
+from lib.cuckoo.common.exceptions import CuckooCriticalError, CuckooOperationalError
 
 
 def parse_options(options: str) -> Dict[str, str]:
@@ -115,6 +115,8 @@ def _get_files_to_read(self, fname_base):
  files.extend(sorted(glob.glob(os.path.join(CUCKOO_ROOT, "conf", f"{fname_base}.conf.d", "*.conf"))))
  files.append(os.path.join(CUSTOM_CONF_DIR, f"{fname_base}.conf"))
  files.extend(sorted(glob.glob(os.path.join(CUSTOM_CONF_DIR, f"{fname_base}.conf.d", "*.conf"))))
+ if not files:
+ raise CuckooCriticalError(f"No {fname_base} config files could be found!")
  return files
 
 

lib/cuckoo/core/scheduler.py

@@ -878,14 +878,6 @@ def initialize(self):
  # Initialize the machine manager.
  machinery = plugin()
 
- # Find its configuration file.
- conf = os.path.join(CUCKOO_ROOT, "conf", f"{machinery_name}.conf")
-
- if not path_exists(conf):
- raise CuckooCriticalError(
- f'The configuration file for machine manager "{machinery_name}" does not exist at path: {conf}'
- )
-
  # Provide a dictionary with the configuration options to the
  # machine manager instance.
  machinery.set_options(Config(machinery_name))