oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#3062 - First pass at unifying naming convention for discriminators (still errors) [skip ci]

Browse Source
This commit is contained in:
Marek Wolan
2025-02-03 16:24:03 +00:00
parent 055c853b0f
commit abccf4afc5
195 changed files with 2824 additions and 2802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration_tests/network/test_bandwidth_load_checks_before_transmission.py
View File

@@ -19,11 +19,11 @@ def test_wireless_link_loading(wireless_wan_network):
airspace = router_1.airspace
client.software_manager.install(FTPClient)
ftp_client: FTPClient = client.software_manager.software.get("FTPClient")
ftp_client: FTPClient = client.software_manager.software.get("ftp-client")
ftp_client.start()
server.software_manager.install(FTPServer)
ftp_server: FTPServer = server.software_manager.software.get("FTPServer")
ftp_server: FTPServer = server.software_manager.software.get("ftp-server")
ftp_server.start()
client.file_system.create_file(file_name="mixtape", size=10 * 10**6, file_type=FileType.MP3, folder_name="music")

20
tests/integration_tests/network/test_broadcast.py
View File

@@ -15,13 +15,13 @@ from primaite.utils.validation.ip_protocol import PROTOCOL_LOOKUP
from primaite.utils.validation.port import PORT_LOOKUP
class BroadcastTestService(Service, discriminator="BroadcastTestService"):
class BroadcastTestService(Service, discriminator="broadcast-test-service"):
"""A service for sending broadcast and unicast messages over a network."""
class ConfigSchema(Service.ConfigSchema):
"""ConfigSchema for BroadcastTestService."""
type: str = "BroadcastTestService"
type: str = "broadcast-test-service"
config: "BroadcastTestService.ConfigSchema" = Field(default_factory=lambda: BroadcastTestService.ConfigSchema())
@@ -51,13 +51,13 @@ class BroadcastTestService(Service, discriminator="BroadcastTestService"):
)
class BroadcastTestClient(Application, discriminator="BroadcastTestClient"):
class BroadcastTestClient(Application, discriminator="broadcast-test-client"):
"""A client application to receive broadcast and unicast messages."""
class ConfigSchema(Service.ConfigSchema):
"""ConfigSchema for BroadcastTestClient."""
type: str = "BroadcastTestClient"
type: str = "broadcast-test-client"
config: ConfigSchema = Field(default_factory=lambda: BroadcastTestClient.ConfigSchema())
@@ -65,7 +65,7 @@ class BroadcastTestClient(Application, discriminator="BroadcastTestClient"):
def __init__(self, **kwargs):
# Set default client properties
kwargs["name"] = "BroadcastTestClient"
kwargs["name"] = "broadcast-test-client"
kwargs["port"] = PORT_LOOKUP["HTTP"]
kwargs["protocol"] = PROTOCOL_LOOKUP["TCP"]
super().__init__(**kwargs)
@@ -93,7 +93,7 @@ def broadcast_network() -> Network:
)
client_1.power_on()
client_1.software_manager.install(BroadcastTestClient)
application_1 = client_1.software_manager.software["BroadcastTestClient"]
application_1 = client_1.software_manager.software["broadcast-test-client"]
application_1.run()
client_2 = Computer(
@@ -105,7 +105,7 @@ def broadcast_network() -> Network:
)
client_2.power_on()
client_2.software_manager.install(BroadcastTestClient)
application_2 = client_2.software_manager.software["BroadcastTestClient"]
application_2 = client_2.software_manager.software["broadcast-test-client"]
application_2.run()
server_1 = Server(
@@ -136,13 +136,13 @@ def broadcast_service_and_clients(
broadcast_network,
) -> Tuple[BroadcastTestService, BroadcastTestClient, BroadcastTestClient]:
client_1: BroadcastTestClient = broadcast_network.get_node_by_hostname("client_1").software_manager.software[
"BroadcastTestClient"
"broadcast-test-client"
]
client_2: BroadcastTestClient = broadcast_network.get_node_by_hostname("client_2").software_manager.software[
"BroadcastTestClient"
"broadcast-test-client"
]
service: BroadcastTestService = broadcast_network.get_node_by_hostname("server_1").software_manager.software[
"BroadcastService"
"broadcast-service"
]
return service, client_1, client_2

6
tests/integration_tests/network/test_capture_nmne.py
View File

@@ -17,7 +17,7 @@ def test_capture_nmne(uc2_network: Network):
of the "DELETE" SQL command as a malicious network event.
"""
web_server: Server = uc2_network.get_node_by_hostname("web_server") # noqa
db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"] # noqa
db_client: DatabaseClient = web_server.software_manager.software["database-client"] # noqa
db_client_connection: DatabaseClientConnection = db_client.get_new_connection()
db_server: Server = uc2_network.get_node_by_hostname("database_server") # noqa
@@ -94,7 +94,7 @@ def test_describe_state_nmne(uc2_network: Network):
only shows MNEs since the last time describe_state was called.
"""
web_server: Server = uc2_network.get_node_by_hostname("web_server") # noqa
db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"] # noqa
db_client: DatabaseClient = web_server.software_manager.software["database-client"] # noqa
db_client_connection: DatabaseClientConnection = db_client.get_new_connection()
db_server: Server = uc2_network.get_node_by_hostname("database_server") # noqa
@@ -208,7 +208,7 @@ def test_capture_nmne_observations(uc2_network: Network):
sim.network = uc2_network
web_server: Server = uc2_network.get_node_by_hostname("web_server")
db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"]
db_client: DatabaseClient = web_server.software_manager.software["database-client"]
db_client_connection: DatabaseClientConnection = db_client.get_new_connection()
# Set the NMNE configuration to capture DELETE/ENCRYPT queries as MNEs

14
tests/integration_tests/network/test_firewall.py
View File

@@ -90,7 +90,7 @@ def dmz_external_internal_network() -> Network:
)
external_node.power_on()
external_node.software_manager.install(NTPServer)
ntp_service: NTPServer = external_node.software_manager.software["NTPServer"]
ntp_service: NTPServer = external_node.software_manager.software["ntp-server"]
ntp_service.start()
# connect external node to firewall node
network.connect(endpoint_b=external_node.network_interface[1], endpoint_a=firewall_node.external_port)
@@ -105,7 +105,7 @@ def dmz_external_internal_network() -> Network:
)
internal_node.power_on()
internal_node.software_manager.install(NTPClient)
internal_ntp_client: NTPClient = internal_node.software_manager.software["NTPClient"]
internal_ntp_client: NTPClient = internal_node.software_manager.software["ntp-client"]
internal_ntp_client.configure(external_node.network_interface[1].ip_address)
internal_ntp_client.start()
# connect external node to firewall node
@@ -120,7 +120,7 @@ def dmz_external_internal_network() -> Network:
start_up_duration=0,
)
dmz_node.power_on()
dmz_ntp_client: NTPClient = dmz_node.software_manager.software["NTPClient"]
dmz_ntp_client: NTPClient = dmz_node.software_manager.software["ntp-client"]
dmz_ntp_client.configure(external_node.network_interface[1].ip_address)
dmz_ntp_client.start()
# connect external node to firewall node
@@ -214,8 +214,8 @@ def test_service_blocked(dmz_external_internal_network):
firewall = dmz_external_internal_network.get_node_by_hostname("firewall_1")
internal_node = dmz_external_internal_network.get_node_by_hostname("internal_node")
dmz_node = dmz_external_internal_network.get_node_by_hostname("dmz_node")
internal_ntp_client: NTPClient = internal_node.software_manager.software["NTPClient"]
dmz_ntp_client: NTPClient = dmz_node.software_manager.software["NTPClient"]
internal_ntp_client: NTPClient = internal_node.software_manager.software["ntp-client"]
dmz_ntp_client: NTPClient = dmz_node.software_manager.software["ntp-client"]
assert not internal_ntp_client.time
@@ -261,8 +261,8 @@ def test_service_allowed_with_rule(dmz_external_internal_network):
firewall = dmz_external_internal_network.get_node_by_hostname("firewall_1")
internal_node = dmz_external_internal_network.get_node_by_hostname("internal_node")
dmz_node = dmz_external_internal_network.get_node_by_hostname("dmz_node")
internal_ntp_client: NTPClient = internal_node.software_manager.software["NTPClient"]
dmz_ntp_client: NTPClient = dmz_node.software_manager.software["NTPClient"]
internal_ntp_client: NTPClient = internal_node.software_manager.software["ntp-client"]
dmz_ntp_client: NTPClient = dmz_node.software_manager.software["ntp-client"]
assert not internal_ntp_client.time

36
tests/integration_tests/network/test_multi_lan_internet_example_network.py
View File

@@ -12,7 +12,7 @@ def test_all_with_configured_dns_server_ip_can_resolve_url():
network = multi_lan_internet_network_example()
for node in network.nodes.values():
dns_client: DNSClient = node.software_manager.software.get("DNSClient")
dns_client: DNSClient = node.software_manager.software.get("dns-client")
if not dns_client:
continue
@@ -24,8 +24,8 @@ def test_all_with_configured_dns_server_ip_can_resolve_url():
def test_external_pcs_can_access_sometech_website():
network = multi_lan_internet_network_example()
pc_1_browser: WebBrowser = network.get_node_by_hostname("pc_1").software_manager.software["WebBrowser"]
pc_2_browser: WebBrowser = network.get_node_by_hostname("pc_2").software_manager.software["WebBrowser"]
pc_1_browser: WebBrowser = network.get_node_by_hostname("pc_1").software_manager.software["web-browser"]
pc_2_browser: WebBrowser = network.get_node_by_hostname("pc_2").software_manager.software["web-browser"]
assert pc_1_browser.get_webpage()
assert pc_2_browser.get_webpage()
@@ -34,8 +34,8 @@ def test_external_pcs_can_access_sometech_website():
def test_external_pcs_cannot_access_sometech_db():
network = multi_lan_internet_network_example()
pc_1_db_client: DatabaseClient = network.get_node_by_hostname("pc_1").software_manager.software["DatabaseClient"]
pc_2_db_client: DatabaseClient = network.get_node_by_hostname("pc_2").software_manager.software["DatabaseClient"]
pc_1_db_client: DatabaseClient = network.get_node_by_hostname("pc_1").software_manager.software["database-client"]
pc_2_db_client: DatabaseClient = network.get_node_by_hostname("pc_2").software_manager.software["database-client"]
assert not pc_1_db_client.get_new_connection()
assert not pc_2_db_client.get_new_connection()
@@ -47,8 +47,8 @@ def test_external_pcs_cannot_access_ftp_on_sometech_storage_server():
some_tech_storage_srv = network.get_node_by_hostname("some_tech_storage_srv")
some_tech_storage_srv.file_system.create_file(file_name="test.png")
pc_1_ftp_client: FTPClient = network.get_node_by_hostname("pc_1").software_manager.software["FTPClient"]
pc_2_ftp_client: FTPClient = network.get_node_by_hostname("pc_2").software_manager.software["FTPClient"]
pc_1_ftp_client: FTPClient = network.get_node_by_hostname("pc_1").software_manager.software["ftp-client"]
pc_2_ftp_client: FTPClient = network.get_node_by_hostname("pc_2").software_manager.software["ftp-client"]
assert not pc_1_ftp_client.request_file(
dest_ip_address=some_tech_storage_srv.network_interface[1].ip_address,
@@ -71,7 +71,7 @@ def test_sometech_webserver_can_access_sometech_db_server():
network = multi_lan_internet_network_example()
web_db_client: DatabaseClient = network.get_node_by_hostname("some_tech_web_srv").software_manager.software[
"DatabaseClient"
"database-client"
]
assert web_db_client.get_new_connection()
@@ -85,7 +85,7 @@ def test_sometech_webserver_cannot_access_ftp_on_sometech_storage_server():
web_server: Server = network.get_node_by_hostname("some_tech_web_srv")
web_server.software_manager.install(FTPClient)
web_ftp_client: FTPClient = web_server.software_manager.software["FTPClient"]
web_ftp_client: FTPClient = web_server.software_manager.software["ftp-client"]
assert not web_ftp_client.request_file(
dest_ip_address=some_tech_storage_srv.network_interface[1].ip_address,
@@ -101,13 +101,13 @@ def test_sometech_dev_pcs_can_access_sometech_website():
some_tech_snr_dev_pc: Computer = network.get_node_by_hostname("some_tech_snr_dev_pc")
snr_dev_browser: WebBrowser = some_tech_snr_dev_pc.software_manager.software["WebBrowser"]
snr_dev_browser: WebBrowser = some_tech_snr_dev_pc.software_manager.software["web-browser"]
assert snr_dev_browser.get_webpage()
some_tech_jnr_dev_pc: Computer = network.get_node_by_hostname("some_tech_jnr_dev_pc")
jnr_dev_browser: WebBrowser = some_tech_jnr_dev_pc.software_manager.software["WebBrowser"]
jnr_dev_browser: WebBrowser = some_tech_jnr_dev_pc.software_manager.software["web-browser"]
assert jnr_dev_browser.get_webpage()
@@ -116,12 +116,12 @@ def test_sometech_dev_pcs_can_connect_to_sometech_db_server():
network = multi_lan_internet_network_example()
some_tech_snr_dev_pc: Computer = network.get_node_by_hostname("some_tech_snr_dev_pc")
snr_dev_db_client: DatabaseClient = some_tech_snr_dev_pc.software_manager.software["DatabaseClient"]
snr_dev_db_client: DatabaseClient = some_tech_snr_dev_pc.software_manager.software["database-client"]
assert snr_dev_db_client.get_new_connection()
some_tech_jnr_dev_pc: Computer = network.get_node_by_hostname("some_tech_jnr_dev_pc")
jnr_dev_db_client: DatabaseClient = some_tech_jnr_dev_pc.software_manager.software["DatabaseClient"]
jnr_dev_db_client: DatabaseClient = some_tech_jnr_dev_pc.software_manager.software["database-client"]
assert jnr_dev_db_client.get_new_connection()
@@ -133,7 +133,7 @@ def test_sometech_snr_dev_can_access_ftp_on_sometech_storage_server():
some_tech_storage_srv.file_system.create_file(file_name="test.png")
some_tech_snr_dev_pc: Computer = network.get_node_by_hostname("some_tech_snr_dev_pc")
snr_dev_ftp_client: FTPClient = some_tech_snr_dev_pc.software_manager.software["FTPClient"]
snr_dev_ftp_client: FTPClient = some_tech_snr_dev_pc.software_manager.software["ftp-client"]
assert snr_dev_ftp_client.request_file(
dest_ip_address=some_tech_storage_srv.network_interface[1].ip_address,
@@ -151,7 +151,7 @@ def test_sometech_jnr_dev_cannot_access_ftp_on_sometech_storage_server():
some_tech_storage_srv.file_system.create_file(file_name="test.png")
some_tech_jnr_dev_pc: Computer = network.get_node_by_hostname("some_tech_jnr_dev_pc")
jnr_dev_ftp_client: FTPClient = some_tech_jnr_dev_pc.software_manager.software["FTPClient"]
jnr_dev_ftp_client: FTPClient = some_tech_jnr_dev_pc.software_manager.software["ftp-client"]
assert not jnr_dev_ftp_client.request_file(
dest_ip_address=some_tech_storage_srv.network_interface[1].ip_address,
@@ -167,7 +167,7 @@ def test_sometech_hr_pc_can_access_sometech_website():
some_tech_hr_pc: Computer = network.get_node_by_hostname("some_tech_hr_1")
hr_browser: WebBrowser = some_tech_hr_pc.software_manager.software["WebBrowser"]
hr_browser: WebBrowser = some_tech_hr_pc.software_manager.software["web-browser"]
assert hr_browser.get_webpage()
@@ -177,7 +177,7 @@ def test_sometech_hr_pc_cannot_access_sometech_db():
some_tech_hr_pc: Computer = network.get_node_by_hostname("some_tech_hr_1")
hr_db_client: DatabaseClient = some_tech_hr_pc.software_manager.software["DatabaseClient"]
hr_db_client: DatabaseClient = some_tech_hr_pc.software_manager.software["database-client"]
assert not hr_db_client.get_new_connection()
@@ -189,7 +189,7 @@ def test_sometech_hr_pc_cannot_access_ftp_on_sometech_storage_server():
some_tech_storage_srv.file_system.create_file(file_name="test.png")
some_tech_hr_pc: Computer = network.get_node_by_hostname("some_tech_hr_1")
hr_ftp_client: FTPClient = some_tech_hr_pc.software_manager.software["FTPClient"]
hr_ftp_client: FTPClient = some_tech_hr_pc.software_manager.software["ftp-client"]
assert not hr_ftp_client.request_file(
dest_ip_address=some_tech_storage_srv.network_interface[1].ip_address,

4
tests/integration_tests/network/test_routing.py
View File

@@ -188,11 +188,11 @@ def test_routing_services(multi_hop_network):
pc_b = multi_hop_network.get_node_by_hostname("pc_b")
pc_a.software_manager.install(NTPClient)
ntp_client = pc_a.software_manager.software["NTPClient"]
ntp_client = pc_a.software_manager.software["ntp-client"]
ntp_client.start()
pc_b.software_manager.install(NTPServer)
pc_b.software_manager.software["NTPServer"].start()
pc_b.software_manager.software["ntp-server"].start()
ntp_client.configure(ntp_server_ip_address=pc_b.network_interface[1].ip_address)

2
tests/integration_tests/network/test_users_creation_from_config.py
View File

@@ -15,7 +15,7 @@ def test_users_from_config():
client_1 = network.get_node_by_hostname("client_1")
user_manager: UserManager = client_1.software_manager.software["UserManager"]
user_manager: UserManager = client_1.software_manager.software["user-manager"]
assert len(user_manager.users) == 3