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

#2712 - Commit before merging in changes on dev

Browse Source
This commit is contained in:
Charlie Crane
2024-07-19 11:18:17 +01:00
parent 2104a7ec7d
commit 155562cb68
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/primaite/simulator/network/protocols/ssh.py
View File

@@ -56,6 +56,7 @@ class SSHConnectionMessage(IntEnum):
SSH_MSG_CHANNEL_CLOSE = 87 SSH_MSG_CHANNEL_CLOSE = 87
"""Closes the channel.""" """Closes the channel."""
class SSHUserCredentials(DataPacket): class SSHUserCredentials(DataPacket):
"""Hold Username and Password in SSH Packets""" """Hold Username and Password in SSH Packets"""

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

@@ -100,7 +100,12 @@ class Terminal(Service):
_login_valid = Terminal._LoginValidator(terminal=self) _login_valid = Terminal._LoginValidator(terminal=self)
rm = super()._init_request_manager() rm = super()._init_request_manager()
rm.add_request("login", request_type=RequestType(func=lambda request, context: RequestResponse.from_bool(self._validate_login()), validator=_login_valid)) rm.add_request(
"login",
request_type=RequestType(
func=lambda request, context: RequestResponse.from_bool(self._validate_login()), validator=_login_valid
),
)
return rm return rm
def _validate_login(self, user_account: Optional[str]) -> bool: def _validate_login(self, user_account: Optional[str]) -> bool:
@@ -131,8 +136,7 @@ class Terminal(Service):
@property @property
def fail_message(self) -> str: def fail_message(self) -> str:
"""Message that is reported when a request is rejected by this validator""" """Message that is reported when a request is rejected by this validator"""
return ("Cannot perform request on terminal as not logged in.") return "Cannot perform request on terminal as not logged in."
# %% Inbound # %% Inbound