Fix downloaders order (#2511)

Author: enzok

lib/cuckoo/common/load_extra_modules.py

@@ -1,12 +1,15 @@
 import glob
 import importlib
 import inspect
+import logging
 import os
 import pkgutil
 from pathlib import Path
 
 from lib.cuckoo.common.config import Config
 
+log = logging.getLogger(__name__)
+
 integrations_conf = Config("integrations")
 
 
@@ -42,7 +45,7 @@ def ratdecodedr_load_decoders(path: str):
         try:
             module = importlib.import_module(module_name)
         except ImportError as e:
-            print(f"Unable to import Module {module_name}: {e}")
+            log.error("Unable to import Module %s - %s", module_name, e)
             continue
 
         for mod_name, mod_object in inspect.getmembers(module):
@@ -103,11 +106,11 @@ def cape_load_custom_decoders(CUCKOO_ROOT: str):
                 # For example, a cape_type of "Emotet Payload" would trigger a config parser named "Emotet.py".
                 cape_modules[name.replace("_", " ")] = importlib.import_module(f"{versions[version]}.{name}")
             except (ImportError, IndexError, AttributeError) as e:
-                print(f"CAPE parser: No module named {name} - {e}")
+                log.error("CAPE parser: No module named  %s - %s", name, e)
             except SyntaxError as e:
-                print(f"CAPE parser: Fix your code in {name} - {e}")
+                log.error("CAPE parser: Fix your code in %s - %s", name, e)
             except Exception as e:
-                print(f"CAPE parser: Fix your code in {name} - {e}")
+                log.error("CAPE parser: Fix your code in %s - %s", name, e)
 
     return cape_modules
 
@@ -135,7 +138,7 @@ def malduck_load_decoders(CUCKOO_ROOT: str):
         try:
             malduck_modules[name] = importlib.import_module(f"modules.processing.parsers.malduck.{name}")
         except (ImportError, IndexError) as e:
-            print(f"malduck parser: No module named {name} - {e}")
+            log.error("malduck parser: No module named %s - %s", name, e)
 
     return malduck_modules
 
@@ -174,7 +177,7 @@ def file_extra_info_load_modules(CUCKOO_ROOT: str):
                 continue
             file_extra_modules.append(module)
         except (ImportError, IndexError, AttributeError) as e:
-            print(f"file_extra_info module: No module named {name} - {e}")
+            log.error("file_extra_info module: No module named %s - %s", name, e)
 
     return file_extra_modules
 
@@ -218,13 +221,15 @@ def load_downloaders(CUCKOO_ROOT: str):
         for name in names:
             try:
                 module = importlib.import_module(f"{versions[version]}.{name}")
-                # config under [abusech]
-                if name == "malwarebazaar" and not getattr(module, "enabled", False) and not integrations_conf.__dict__.get("abusech", {}).get("malwarebazaar", False):
-                    continue
-                elif not getattr(module, "enabled", False) and not integrations_conf.__dict__.get(name, {}).get("enabled", False):
-                    continue
+                if name == "malwarebazaar":
+                    # config under [abusech]
+                    if not integrations_conf.__dict__.get("abusech", {}).get("malwarebazaar", False):
+                        continue
+                else:
+                    if not getattr(module, "enabled", False) and not integrations_conf.__dict__.get(name, {}).get("enabled", False):
+                        continue
                 downloaders[name] = module
             except (ImportError, IndexError, AttributeError) as e:
-                print(f"Downloader: No module named {name} - {e}")
+                log.error("Downloader: No module named %s - %s", name, e)
 
     return downloaders

lib/downloaders/__init__.py

@@ -32,7 +32,8 @@ class Downloaders(object):
     def __init__(self, destination_folder=None):
         self.downloaders = load_downloaders(CUCKOO_ROOT)
         if integrations_cfg.downloaders.order:
-            self.downloaders_order = [k.strip() for k in self.downloaders.keys() if k.strip() in integrations_cfg.downloaders.order]
+            order_list = [item.strip() for item in integrations_cfg.downloaders.order.split(',')]
+            self.downloaders_order = [k for k in order_list if k in self.downloaders.keys()]
         else:
             self.downloaders_order = list(self.downloaders.keys())