From cd49f1eb85c49c43af1c9521df8e0af85705f113 Mon Sep 17 00:00:00 2001 From: Czar Echavez Date: Sat, 25 Nov 2023 13:19:32 +0000 Subject: [PATCH] #2064: Apply PR suggestions --- .../system/services/dns/dns_client.py | 1 + .../red_services/data_manipulation_bot.py | 2 +- .../system/test_ftp_client_server.py | 20 +++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/primaite/simulator/system/services/dns/dns_client.py b/src/primaite/simulator/system/services/dns/dns_client.py index a0965009..2c3716e9 100644 --- a/src/primaite/simulator/system/services/dns/dns_client.py +++ b/src/primaite/simulator/system/services/dns/dns_client.py @@ -62,6 +62,7 @@ class DNSClient(Service): return False self.dns_cache[domain_name] = ip_address + return True def check_domain_exists( self, diff --git a/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py b/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py index f6662762..8dc2eeab 100644 --- a/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py +++ b/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py @@ -46,7 +46,7 @@ class DataManipulationBot(DatabaseClient): self.sys_log.error(f"Failed to start the {self.name} as it requires both a target_ip_address and payload.") def attack(self): - """Run the datab manipulation attack.""" + """Run the data manipulation attack.""" if not self.connected: self.connect() if self.connected: diff --git a/tests/integration_tests/system/test_ftp_client_server.py b/tests/integration_tests/system/test_ftp_client_server.py index d8968b2d..b2cdbc06 100644 --- a/tests/integration_tests/system/test_ftp_client_server.py +++ b/tests/integration_tests/system/test_ftp_client_server.py @@ -15,10 +15,10 @@ def test_ftp_client_store_file_in_server(uc2_network): backup_server: Server = uc2_network.get_node_by_hostname("backup_server") ftp_client: FTPClient = client_1.software_manager.software["FTPClient"] - ftp_server: FTPServer = backup_server.software_manager.software["FTPServer"] + ftp_server_service: FTPServer = backup_server.software_manager.software["FTPServer"] assert ftp_client.operating_state == ServiceOperatingState.RUNNING - assert ftp_server.operating_state == ServiceOperatingState.RUNNING + assert ftp_server_service.operating_state == ServiceOperatingState.RUNNING # create file on ftp client ftp_client.file_system.create_file(file_name="test_file.txt") @@ -31,7 +31,7 @@ def test_ftp_client_store_file_in_server(uc2_network): dest_ip_address=backup_server.nics.get(next(iter(backup_server.nics))).ip_address, ) - assert ftp_server.file_system.get_file(folder_name="client_1_backup", file_name="test_file.txt") + assert ftp_server_service.file_system.get_file(folder_name="client_1_backup", file_name="test_file.txt") def test_ftp_client_retrieve_file_from_server(uc2_network): @@ -42,13 +42,13 @@ def test_ftp_client_retrieve_file_from_server(uc2_network): backup_server: Server = uc2_network.get_node_by_hostname("backup_server") ftp_client: FTPClient = client_1.software_manager.software["FTPClient"] - ftp_server: FTPServer = backup_server.software_manager.software["FTPServer"] + ftp_server_service: FTPServer = backup_server.software_manager.software["FTPServer"] assert ftp_client.operating_state == ServiceOperatingState.RUNNING - assert ftp_server.operating_state == ServiceOperatingState.RUNNING + assert ftp_server_service.operating_state == ServiceOperatingState.RUNNING # create file on ftp server - ftp_server.file_system.create_file(file_name="test_file.txt", folder_name="file_share") + ftp_server_service.file_system.create_file(file_name="test_file.txt", folder_name="file_share") assert ftp_client.request_file( src_folder_name="file_share", @@ -68,13 +68,13 @@ def test_ftp_client_tries_to_connect_to_offline_server(uc2_network): backup_server: Server = uc2_network.get_node_by_hostname("backup_server") ftp_client: FTPClient = client_1.software_manager.software["FTPClient"] - ftp_server: FTPServer = backup_server.software_manager.software["FTPServer"] + ftp_server_service: FTPServer = backup_server.software_manager.software["FTPServer"] assert ftp_client.operating_state == ServiceOperatingState.RUNNING - assert ftp_server.operating_state == ServiceOperatingState.RUNNING + assert ftp_server_service.operating_state == ServiceOperatingState.RUNNING # create file on ftp server - ftp_server.file_system.create_file(file_name="test_file.txt", folder_name="file_share") + ftp_server_service.file_system.create_file(file_name="test_file.txt", folder_name="file_share") backup_server.power_off() @@ -82,7 +82,7 @@ def test_ftp_client_tries_to_connect_to_offline_server(uc2_network): uc2_network.apply_timestep(timestep=i) assert ftp_client.operating_state == ServiceOperatingState.RUNNING - assert ftp_server.operating_state == ServiceOperatingState.STOPPED + assert ftp_server_service.operating_state == ServiceOperatingState.STOPPED assert ( ftp_client.request_file(