Merge remote-tracking branch 'origin/dev' into 4.0.0-dev

tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp_client.py

@@ -73,7 +73,7 @@ def test_ftp_should_not_process_commands_if_service_not_running(ftp_client):
     assert ftp_client_service._process_ftp_command(payload=payload).status_code is FTPStatusCode.ERROR
 
 
-def test_ftp_tries_to_senf_file__that_does_not_exist(ftp_client):
+def test_ftp_tries_to_send_file__that_does_not_exist(ftp_client):
     """Method send_file should return false if no file to send."""
     assert ftp_client.file_system.get_file(folder_name="root", file_name="test.txt") is None
 

tests/unit_tests/_primaite/_simulator/_system/_services/test_terminal.py

@@ -6,6 +6,7 @@ import pytest
 
 from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
+from primaite.interface.request import RequestResponse
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.server import Server
@@ -442,3 +443,59 @@ def test_terminal_connection_timeout(basic_network):
     assert len(computer_b.user_session_manager.remote_sessions) == 0
 
     assert not remote_connection.is_active
+
+
+def test_terminal_last_response_updates(basic_network):
+    """Test that the _last_response within Terminal correctly updates."""
+    network: Network = basic_network
+    computer_a: Computer = network.get_node_by_hostname("node_a")
+    terminal_a: Terminal = computer_a.software_manager.software.get("terminal")
+    computer_b: Computer = network.get_node_by_hostname("node_b")
+
+    assert terminal_a.last_response is None
+
+    remote_connection = terminal_a.login(username="admin", password="admin", ip_address="192.168.0.11")
+
+    # Last response should be a successful logon
+    assert terminal_a.last_response == RequestResponse(status="success", data={"reason": "Login Successful"})
+
+    remote_connection.execute(command=["software_manager", "application", "install", "ransomware-script"])
+
+    # Last response should now update following successful install
+    assert terminal_a.last_response == RequestResponse(status="success", data={})
+
+    remote_connection.execute(command=["software_manager", "application", "install", "ransomware-script"])
+
+    # Last response should now update to success, but with supplied reason.
+    assert terminal_a.last_response == RequestResponse(status="success", data={"reason": "already installed"})
+
+    remote_connection.execute(command=["file_system", "create", "file", "folder123", "doggo.pdf", False])
+
+    # Check file was created.
+    assert computer_b.file_system.access_file(folder_name="folder123", file_name="doggo.pdf")
+
+    # Last response should be confirmation of file creation.
+    assert terminal_a.last_response == RequestResponse(
+        status="success",
+        data={"file_name": "doggo.pdf", "folder_name": "folder123", "file_type": "PDF", "file_size": 102400},
+    )
+
+    remote_connection.execute(
+        command=[
+            "service",
+            "ftp-client",
+            "send",
+            {
+                "dest_ip_address": "192.168.0.2",
+                "src_folder": "folder123",
+                "src_file_name": "cat.pdf",
+                "dest_folder": "root",
+                "dest_file_name": "cat.pdf",
+            },
+        ]
+    )
+
+    assert terminal_a.last_response == RequestResponse(
+        status="failure",
+        data={"reason": "Unable to locate given file on local file system. Perhaps given options are invalid?"},
+    )