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

#2888: self.X -> self.config.X

Browse Source
This commit is contained in:
Nick Todd
2025-01-13 15:38:11 +00:00
parent 0203a8699a
commit ea9c13b5f4
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/primaite/simulator/system/applications/web_browser.py
View File

@@ -38,8 +38,6 @@ class WebBrowser(Application, identifier="WebBrowser"):
config: "WebBrowser.ConfigSchema" = Field(default_factory=lambda: WebBrowser.ConfigSchema()) config: "WebBrowser.ConfigSchema" = Field(default_factory=lambda: WebBrowser.ConfigSchema())
target_url: Optional[str] = None
domain_name_ip_address: Optional[IPv4Address] = None domain_name_ip_address: Optional[IPv4Address] = None
"The IP address of the domain name for the webpage." "The IP address of the domain name for the webpage."
@@ -57,7 +55,6 @@ class WebBrowser(Application, identifier="WebBrowser"):
kwargs["port"] = PORT_LOOKUP["HTTP"] kwargs["port"] = PORT_LOOKUP["HTTP"]
super().__init__(**kwargs) super().__init__(**kwargs)
self.target_url = self.config.target_url
self.run() self.run()
def _init_request_manager(self) -> RequestManager: def _init_request_manager(self) -> RequestManager:
@@ -95,7 +92,7 @@ class WebBrowser(Application, identifier="WebBrowser"):
:param: url: The address of the web page the browser requests :param: url: The address of the web page the browser requests
:type: url: str :type: url: str
""" """
url = url or self.target_url url = url or self.config.target_url
if not self._can_perform_action(): if not self._can_perform_action():
return False return False

2
tests/integration_tests/game_layer/observations/test_nic_observations.py
View File

@@ -191,7 +191,7 @@ def test_nic_monitored_traffic(simulation):
# send a database query # send a database query
browser: WebBrowser = pc.software_manager.software.get("WebBrowser") browser: WebBrowser = pc.software_manager.software.get("WebBrowser")
browser.target_url = f"http://arcd.com/" browser.config.target_url = f"http://arcd.com/"
browser.get_webpage() browser.get_webpage()
traffic_obs = nic_obs.observe(simulation.describe_state()).get("TRAFFIC") traffic_obs = nic_obs.observe(simulation.describe_state()).get("TRAFFIC")

8
tests/integration_tests/game_layer/test_actions.py
View File

@@ -181,7 +181,7 @@ def test_router_acl_removerule_integration(game_and_agent: Tuple[PrimaiteGame, P
browser: WebBrowser = client_1.software_manager.software.get("WebBrowser") browser: WebBrowser = client_1.software_manager.software.get("WebBrowser")
browser.run() browser.run()
browser.target_url = "http://www.example.com" browser.config.target_url = "http://www.example.com"
assert browser.get_webpage() # check that the browser can access example.com before we block it assert browser.get_webpage() # check that the browser can access example.com before we block it
# 2: Remove rule that allows HTTP traffic across the network # 2: Remove rule that allows HTTP traffic across the network
@@ -214,7 +214,7 @@ def test_host_nic_disable_integration(game_and_agent: Tuple[PrimaiteGame, ProxyA
browser: WebBrowser = client_1.software_manager.software.get("WebBrowser") browser: WebBrowser = client_1.software_manager.software.get("WebBrowser")
browser.run() browser.run()
browser.target_url = "http://www.example.com" browser.config.target_url = "http://www.example.com"
assert browser.get_webpage() # check that the browser can access example.com before we block it assert browser.get_webpage() # check that the browser can access example.com before we block it
# 2: Disable the NIC on client_1 # 2: Disable the NIC on client_1
@@ -413,7 +413,7 @@ def test_network_router_port_disable_integration(game_and_agent: Tuple[PrimaiteG
browser: WebBrowser = client_1.software_manager.software.get("WebBrowser") browser: WebBrowser = client_1.software_manager.software.get("WebBrowser")
browser.run() browser.run()
browser.target_url = "http://www.example.com" browser.config.target_url = "http://www.example.com"
assert browser.get_webpage() # check that the browser can access example.com before we block it assert browser.get_webpage() # check that the browser can access example.com before we block it
# 2: Disable the NIC on client_1 # 2: Disable the NIC on client_1
@@ -473,7 +473,7 @@ def test_node_application_scan_integration(game_and_agent: Tuple[PrimaiteGame, P
browser: WebBrowser = client_1.software_manager.software.get("WebBrowser") browser: WebBrowser = client_1.software_manager.software.get("WebBrowser")
browser.run() browser.run()
browser.target_url = "http://www.example.com" browser.config.target_url = "http://www.example.com"
assert browser.get_webpage() # check that the browser can access example.com assert browser.get_webpage() # check that the browser can access example.com
assert browser.health_state_actual == SoftwareHealthState.GOOD assert browser.health_state_actual == SoftwareHealthState.GOOD

2
tests/integration_tests/game_layer/test_rewards.py
View File

@@ -27,7 +27,7 @@ def test_WebpageUnavailablePenalty(game_and_agent):
client_1 = game.simulation.network.get_node_by_hostname("client_1") client_1 = game.simulation.network.get_node_by_hostname("client_1")
browser: WebBrowser = client_1.software_manager.software.get("WebBrowser") browser: WebBrowser = client_1.software_manager.software.get("WebBrowser")
browser.run() browser.run()
browser.target_url = "http://www.example.com" browser.config.target_url = "http://www.example.com"
agent.reward_function.register_component(comp, 0.7) agent.reward_function.register_component(comp, 0.7)
# Check that before trying to fetch the webpage, the reward is 0.0 # Check that before trying to fetch the webpage, the reward is 0.0

8
tests/integration_tests/system/test_web_client_server.py
View File

@@ -51,7 +51,7 @@ def test_web_page_get_users_page_request_with_domain_name(web_client_and_web_ser
web_browser_app, computer, web_server_service, server = web_client_and_web_server web_browser_app, computer, web_server_service, server = web_client_and_web_server
web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address
web_browser_app.target_url = f"http://arcd.com/" web_browser_app.config.target_url = f"http://arcd.com/"
assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING
assert web_browser_app.get_webpage() is True assert web_browser_app.get_webpage() is True
@@ -66,7 +66,7 @@ def test_web_page_get_users_page_request_with_ip_address(web_client_and_web_serv
web_browser_app, computer, web_server_service, server = web_client_and_web_server web_browser_app, computer, web_server_service, server = web_client_and_web_server
web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address
web_browser_app.target_url = f"http://{web_server_ip}/" web_browser_app.config.target_url = f"http://{web_server_ip}/"
assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING
assert web_browser_app.get_webpage() is True assert web_browser_app.get_webpage() is True
@@ -81,7 +81,7 @@ def test_web_page_request_from_shut_down_server(web_client_and_web_server):
web_browser_app, computer, web_server_service, server = web_client_and_web_server web_browser_app, computer, web_server_service, server = web_client_and_web_server
web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address
web_browser_app.target_url = f"http://arcd.com/" web_browser_app.config.target_url = f"http://arcd.com/"
assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING
assert web_browser_app.get_webpage() is True assert web_browser_app.get_webpage() is True
@@ -108,7 +108,7 @@ def test_web_page_request_from_closed_web_browser(web_client_and_web_server):
web_browser_app, computer, web_server_service, server = web_client_and_web_server web_browser_app, computer, web_server_service, server = web_client_and_web_server
assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING
web_browser_app.target_url = f"http://arcd.com/" web_browser_app.config.target_url = f"http://arcd.com/"
assert web_browser_app.get_webpage() is True assert web_browser_app.get_webpage() is True
# latest response should have status code 200 # latest response should have status code 200

2
tests/integration_tests/system/test_web_client_server_and_database.py
View File

@@ -74,7 +74,7 @@ def web_client_web_server_database(example_network) -> Tuple[Network, Computer,
# Install Web Browser on computer # Install Web Browser on computer
computer.software_manager.install(WebBrowser) computer.software_manager.install(WebBrowser)
web_browser: WebBrowser = computer.software_manager.software.get("WebBrowser") web_browser: WebBrowser = computer.software_manager.software.get("WebBrowser")
web_browser.target_url = "http://arcd.com/users/" web_browser.config.target_url = "http://arcd.com/users/"
web_browser.run() web_browser.run()
# Install DNS Client service on computer # Install DNS Client service on computer