Create concept of Plugin and have all current plugins (fingerprinters/PBAs) inherit from it.

Move plugin manager to their own package. (prep for tests)

monkey/infection_monkey/network/HostFinger.py

@@ -1,9 +1,10 @@
 from abc import ABCMeta, abstractproperty, abstractmethod
 
 from infection_monkey.config import WormConfiguration
+from infection_monkey.utils.plugins.plugin import Plugin
 
 
-class HostFinger(metaclass=ABCMeta):
+class HostFinger(Plugin, metaclass=ABCMeta):
     @property
     @abstractmethod
     def _SCANNED_SERVICE(self):

monkey/infection_monkey/network/fingerprinters_collector.py

@@ -1,6 +1,6 @@
 import logging
 from typing import Sequence
-from infection_monkey.utils.load_plugins import get_instances
+from infection_monkey.utils.plugins.load_plugins import get_instances
 from infection_monkey.network.HostFinger import HostFinger
 
 LOG = logging.getLogger(__name__)

monkey/infection_monkey/post_breach/pba.py

@@ -6,6 +6,7 @@ from infection_monkey.telemetry.post_breach_telem import PostBreachTelem
 from infection_monkey.utils.environment import is_windows_os
 from infection_monkey.config import WormConfiguration
 from infection_monkey.telemetry.attack.t1064_telem import T1064Telem
+from infection_monkey.utils.plugins.plugin import Plugin
 
 LOG = logging.getLogger(__name__)
 
@@ -14,7 +15,7 @@ __author__ = 'VakarisZ'
 EXECUTION_WITHOUT_OUTPUT = "(PBA execution produced no output)"
 
 
-class PBA(object):
+class PBA(Plugin):
     """
     Post breach action object. Can be extended to support more than command execution on target machine.
     """

monkey/infection_monkey/post_breach/post_breach_handler.py

@@ -1,6 +1,6 @@
 import logging
 from infection_monkey.utils.environment import is_windows_os
-from infection_monkey.utils.load_plugins import get_instances
+from infection_monkey.utils.plugins.load_plugins import get_instances
 from infection_monkey.post_breach.pba import PBA
 import infection_monkey.post_breach.actions
 

monkey/infection_monkey/utils/plugins/load_plugins.py

@@ -4,6 +4,8 @@ import logging
 from os.path import dirname, basename, isfile, join
 import glob
 
+from infection_monkey.utils.plugins.plugin import Plugin
+
 LOG = logging.getLogger(__name__)
 
 
@@ -12,9 +14,11 @@ def _get_candidate_files(base_package_file):
     return [basename(f)[:-3] for f in files if isfile(f) and not f.endswith('__init__.py')]
 
 
-def get_instances(base_package_name, base_package_file, parent_class):
+def get_instances(base_package_name, base_package_file, parent_class: Plugin):
     """
-    Returns the parent_class type objects from base_package_spec according to configuration
+    Returns the parent_class type objects from base_package_spec.
+    parent_class must be a class object that inherits from Plugin
+    base_package name and file must refer to the same package otherwise bad results
     :return: A list of parent_class objects.
     """
     objects = []

monkey/infection_monkey/utils/plugins/plugin.py

@@ -0,0 +1,9 @@
+from abc import ABCMeta, abstractmethod
+
+
+class Plugin(metaclass=ABCMeta):
+
+    @staticmethod
+    @abstractmethod
+    def should_run(class_name: str) -> bool:
+        raise NotImplementedError()