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

#2712 - Prepping ahead of raising PR.

Browse Source
This commit is contained in:
Charlie Crane
2024-07-24 08:31:24 +01:00
parent 9d5b58ce44
commit a36e34ee1d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/simulation_components/system/services/terminal.rst
View File

@@ -21,7 +21,7 @@ Key capabilities
- Authenticates User connection by maintaining an active User account. - Authenticates User connection by maintaining an active User account.
- Ensures packets are matched to an existing session - Ensures packets are matched to an existing session
- Simulates common Terminal commands - Simulates common Terminal processes/commands.
- Leverages the Service base class for install/uninstall, status tracking etc. - Leverages the Service base class for install/uninstall, status tracking etc.
Usage Usage

8
src/primaite/simulator/system/services/terminal/terminal.py
View File

@@ -71,9 +71,6 @@ class Terminal(Service):
remote_connection: TerminalClientConnection = None remote_connection: TerminalClientConnection = None
parent: Node
"""Parent component the terminal service is installed on."""
def __init__(self, **kwargs): def __init__(self, **kwargs):
kwargs["name"] = "Terminal" kwargs["name"] = "Terminal"
kwargs["port"] = Port.SSH kwargs["port"] = Port.SSH
@@ -196,14 +193,14 @@ class Terminal(Service):
) )
transport_message: SSHTransportMessage = SSHTransportMessage.SSH_MSG_USERAUTH_SUCCESS transport_message: SSHTransportMessage = SSHTransportMessage.SSH_MSG_USERAUTH_SUCCESS
connection_message: SSHConnectionMessage = SSHConnectionMessage.SSH_MSG_CHANNEL_DATA connection_message: SSHConnectionMessage = SSHConnectionMessage.SSH_MSG_CHANNEL_DATA
payload = SSHPacket( return_payload = SSHPacket(
transport_message=transport_message, transport_message=transport_message,
connection_message=connection_message, connection_message=connection_message,
connection_uuid=self.connection_uuid, connection_uuid=self.connection_uuid,
sender_ip_address=self.parent.network_interface[1].ip_address, sender_ip_address=self.parent.network_interface[1].ip_address,
target_ip_address=payload.sender_ip_address, target_ip_address=payload.sender_ip_address,
) )
self.send(payload=payload, dest_ip_address=payload.target_ip_address) self.send(payload=return_payload, dest_ip_address=return_payload.target_ip_address)
return True return True
else: else:
# UserSessionManager has returned None # UserSessionManager has returned None
@@ -232,7 +229,6 @@ class Terminal(Service):
elif payload.transport_message == SSHTransportMessage.SSH_MSG_USERAUTH_REQUEST: elif payload.transport_message == SSHTransportMessage.SSH_MSG_USERAUTH_REQUEST:
"""Login Request Received.""" """Login Request Received."""
self._process_remote_login(payload=payload) self._process_remote_login(payload=payload)
self.sys_log.info("User Auth Success!")
elif payload.transport_message == SSHTransportMessage.SSH_MSG_USERAUTH_SUCCESS: elif payload.transport_message == SSHTransportMessage.SSH_MSG_USERAUTH_SUCCESS:
self.sys_log.info(f"Login Successful, connection ID is {payload.connection_uuid}") self.sys_log.info(f"Login Successful, connection ID is {payload.connection_uuid}")