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

Merge remote-tracking branch 'origin/dev' into feature/2470-refactor-syslog-to-be-able-to-leverage-a-configured-log-level

Browse Source
This commit is contained in:
Czar Echavez
2024-04-24 09:17:28 +01:00
parent 16fc6f4fd0 32cd7dba04
commit 23231e432e
5 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/primaite/simulator/network/hardware/base.py
View File

@@ -1360,7 +1360,6 @@ class Node(SimComponent):
self.software_manager.install(application) self.software_manager.install(application)
application_instance = self.software_manager.software.get(str(application.__name__)) application_instance = self.software_manager.software.get(str(application.__name__))
self.applications[application_instance.uuid] = application_instance self.applications[application_instance.uuid] = application_instance
self.sys_log.info(f"Installed application {application_instance.name}")
_LOGGER.debug(f"Added application {application_instance.name} to node {self.hostname}") _LOGGER.debug(f"Added application {application_instance.name} to node {self.hostname}")
self._application_request_manager.add_request( self._application_request_manager.add_request(
application_instance.name, RequestType(func=application_instance._request_manager) application_instance.name, RequestType(func=application_instance._request_manager)

1
src/primaite/simulator/system/applications/application.py
View File

@@ -128,7 +128,6 @@ class Application(IOSoftware):
"""Install Application.""" """Install Application."""
super().install() super().install()
if self.operating_state == ApplicationOperatingState.CLOSED: if self.operating_state == ApplicationOperatingState.CLOSED:
self.sys_log.info(f"Installing Application {self.name}")
self.operating_state = ApplicationOperatingState.INSTALLING self.operating_state = ApplicationOperatingState.INSTALLING
def receive(self, payload: Any, session_id: str, **kwargs) -> bool: def receive(self, payload: Any, session_id: str, **kwargs) -> bool:

1
src/primaite/simulator/system/core/software_manager.py
View File

@@ -97,7 +97,6 @@ class SoftwareManager:
software.software_manager = self software.software_manager = self
self.software[software.name] = software self.software[software.name] = software
self.port_protocol_mapping[(software.port, software.protocol)] = software self.port_protocol_mapping[(software.port, software.protocol)] = software
self.sys_log.info(f"Installed {software.name}")
if isinstance(software, Application): if isinstance(software, Application):
software.operating_state = ApplicationOperatingState.CLOSED software.operating_state = ApplicationOperatingState.CLOSED

1
src/primaite/simulator/system/core/sys_log.py
View File

@@ -52,6 +52,7 @@ class SysLog:
file_handler.setFormatter(logging.Formatter(log_format)) file_handler.setFormatter(logging.Formatter(log_format))
self.logger = logging.getLogger(f"{self.hostname}_sys_log") self.logger = logging.getLogger(f"{self.hostname}_sys_log")
self.logger.handlers.clear() # clear handlers
self.logger.setLevel(logging.DEBUG) self.logger.setLevel(logging.DEBUG)
self.logger.addHandler(file_handler) self.logger.addHandler(file_handler)

1
tests/assets/configs/basic_switched_network.yaml
View File

@@ -172,6 +172,7 @@ simulation:
default_gateway: 192.168.10.1 default_gateway: 192.168.10.1
dns_server: 192.168.1.10 dns_server: 192.168.1.10
applications: applications:
- type: RansomwareScript
- type: WebBrowser - type: WebBrowser
options: options:
target_url: http://arcd.com/users/ target_url: http://arcd.com/users/