Merge branch 'feature/1816_Database-Service-(Network-and-User-Interaction)' into feature/1752-dns-server-and-client

tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py

@@ -0,0 +1,25 @@
+from primaite.simulator.network.hardware.nodes.computer import Computer
+from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.system.applications.database_client import DatabaseClient
+from primaite.simulator.system.services.database_service import DatabaseService
+from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot
+
+
+def test_data_manipulation(uc2_network):
+    client_1: Computer = uc2_network.get_node_by_hostname("client_1")
+    db_manipulation_bot: DataManipulationBot = client_1.software_manager.software["DataManipulationBot"]
+
+    database_server: Server = uc2_network.get_node_by_hostname("database_server")
+    db_service: DatabaseService = database_server.software_manager.software["DatabaseService"]
+
+    web_server: Server = uc2_network.get_node_by_hostname("web_server")
+    db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"]
+
+    # First check that the DB client on the web_server can successfully query the users table on the database
+    assert db_client.query("SELECT * FROM user;")
+
+    # Now we run the DataManipulationBot
+    db_manipulation_bot.run()
+
+    # Now check that the DB client on the web_server cannot query the users table on the database
+    assert not db_client.query("SELECT * FROM user;")

tests/integration_tests/system/test_database_on_node.py

@@ -12,9 +12,6 @@ def test_database_client_server_connection(uc2_network):
     db_server: Server = uc2_network.get_node_by_hostname("database_server")
     db_service: DatabaseService = db_server.software_manager.software["DatabaseService"]
 
-    assert len(db_service.connections) == 0
-
-    assert db_client.connect(server_ip_address=IPv4Address("192.168.1.14"))
     assert len(db_service.connections) == 1
 
     db_client.disconnect()
@@ -27,11 +24,14 @@ def test_database_client_server_correct_password(uc2_network):
 
     db_server: Server = uc2_network.get_node_by_hostname("database_server")
     db_service: DatabaseService = db_server.software_manager.software["DatabaseService"]
+
+    db_client.disconnect()
+
+    db_client.configure(server_ip_address=IPv4Address("192.168.1.14"), server_password="12345")
     db_service.password = "12345"
 
-    assert len(db_service.connections) == 0
+    assert db_client.connect()
 
-    assert db_client.connect(server_ip_address=IPv4Address("192.168.1.14"), password="12345")
     assert len(db_service.connections) == 1
 
 
@@ -41,11 +41,12 @@ def test_database_client_server_incorrect_password(uc2_network):
 
     db_server: Server = uc2_network.get_node_by_hostname("database_server")
     db_service: DatabaseService = db_server.software_manager.software["DatabaseService"]
+
+    db_client.disconnect()
+    db_client.configure(server_ip_address=IPv4Address("192.168.1.14"), server_password="54321")
     db_service.password = "12345"
 
-    assert len(db_service.connections) == 0
-
-    assert not db_client.connect(server_ip_address=IPv4Address("192.168.1.14"), password="54321")
+    assert not db_client.connect()
     assert len(db_service.connections) == 0
 
 
@@ -53,14 +54,6 @@ def test_database_client_query(uc2_network):
     """Tests DB query across the network returns HTTP status 200 and date."""
     web_server: Server = uc2_network.get_node_by_hostname("web_server")
     db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"]
+    db_client.connect()
 
-    db_client.connect(server_ip_address=IPv4Address("192.168.1.14"))
-
-    db_client.query("SELECT * FROM user;")
-
-    web_server_nic = web_server.ethernet_port[1]
-
-    web_server_last_payload = web_server_nic.pcap.read()[-1]["payload"]
-
-    assert web_server_last_payload["status_code"] == 200
-    assert web_server_last_payload["data"]
+    assert db_client.query("SELECT * FROM user;")

tests/unit_tests/_primaite/_simulator/_network/test_container.py

@@ -1,5 +1,7 @@
 import json
 
+import pytest
+
 from primaite.simulator.network.container import Network
 
 
@@ -10,6 +12,7 @@ def test_creating_container():
     assert net.links == {}
 
 
+@pytest.mark.skip(reason="Skipping until we tackle serialisation")
 def test_describe_state():
     """Check that we can describe network state without raising errors, and that the result is JSON serialisable."""
     net = Network()

tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulation_bot.py

@@ -0,0 +1,20 @@
+from ipaddress import IPv4Address
+
+from primaite.simulator.network.hardware.base import Node
+from primaite.simulator.network.networks import arcd_uc2_network
+from primaite.simulator.network.transmission.network_layer import IPProtocol
+from primaite.simulator.network.transmission.transport_layer import Port
+from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot
+
+
+def test_creation():
+    network = arcd_uc2_network()
+
+    client_1: Node = network.get_node_by_hostname("client_1")
+
+    data_manipulation_bot: DataManipulationBot = client_1.software_manager.software["DataManipulationBot"]
+
+    assert data_manipulation_bot.name == "DataManipulationBot"
+    assert data_manipulation_bot.port == Port.POSTGRES_SERVER
+    assert data_manipulation_bot.protocol == IPProtocol.TCP
+    assert data_manipulation_bot.payload == "DROP TABLE IF EXISTS user;"

tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulator_service.py

@@ -1,32 +0,0 @@
-from ipaddress import IPv4Address
-
-from primaite.simulator.network.hardware.base import Node
-from primaite.simulator.network.networks import arcd_uc2_network
-from primaite.simulator.network.transmission.network_layer import IPProtocol
-from primaite.simulator.network.transmission.transport_layer import Port
-from primaite.simulator.system.services.red_services.data_manipulator_service import DataManipulatorService
-
-
-def test_creation():
-    network = arcd_uc2_network()
-
-    client_1: Node = network.get_node_by_hostname("client_1")
-
-    client_1.software_manager.install(service_class=DataManipulatorService)
-
-    data_manipulator_service: DataManipulatorService = client_1.software_manager.software["DataManipulatorBot"]
-
-    assert data_manipulator_service.name == "DataManipulatorBot"
-    assert data_manipulator_service.port == Port.POSTGRES_SERVER
-    assert data_manipulator_service.protocol == IPProtocol.TCP
-
-    # should have no session yet
-    assert len(client_1.session_manager.sessions_by_uuid) == 0
-
-    try:
-        data_manipulator_service.start(target_ip_address=IPv4Address("192.168.1.14"))
-    except Exception as e:
-        assert False, f"Test was not supposed to throw exception: {e}"
-
-    # there should be a session after the service is started
-    assert len(client_1.session_manager.sessions_by_uuid) == 1