diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py index 8fb4b2cb9..2c6e4b678 100644 --- a/monkey/infection_monkey/config.py +++ b/monkey/infection_monkey/config.py @@ -86,7 +86,6 @@ class Configuration(object): # dropper config ########################### - dropper_try_move_first = True dropper_set_date = True dropper_date_reference_path_windows = r"%windir%\system32\kernel32.dll" dropper_date_reference_path_linux = "/bin/sh" diff --git a/monkey/infection_monkey/dropper.py b/monkey/infection_monkey/dropper.py index 67ceaa708..6919acc8e 100644 --- a/monkey/infection_monkey/dropper.py +++ b/monkey/infection_monkey/dropper.py @@ -72,8 +72,8 @@ class MonkeyDrops(object): if not file_moved and os.path.exists(self._config["destination_path"]): os.remove(self._config["destination_path"]) - # first try to move the file - if not file_moved and WormConfiguration.dropper_try_move_first: + # always try to move the file first + if not file_moved: try: shutil.move(self._config["source_path"], self._config["destination_path"]) @@ -187,11 +187,8 @@ class MonkeyDrops(object): logger.info("Cleaning up the dropper") try: - if ( - (self._config["source_path"].lower() != self._config["destination_path"].lower()) - and os.path.exists(self._config["source_path"]) - and WormConfiguration.dropper_try_move_first - ): + if self._config["source_path"].lower() != self._config["destination_path"].lower() \ + and os.path.exists(self._config["source_path"]): # try removing the file first try: diff --git a/monkey/infection_monkey/example.conf b/monkey/infection_monkey/example.conf index 5fce5aca5..de6965a6e 100644 --- a/monkey/infection_monkey/example.conf +++ b/monkey/infection_monkey/example.conf @@ -26,7 +26,6 @@ "monkey_dir_name": "monkey_dir", - "dropper_try_move_first": true, "exploiter_classes": [ "SSHExploiter", "SmbExploiter",