ChaoticByte/ass.py
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Write server messages to stderr, ensure correct line endings are written to clients stdout and stderr

Browse source
This commit is contained in:
ChaoticByte 2024-06-16 07:41:36 +02:00
parent d63830423c
commit 3ffc8d01b1
No known key found for this signature in database
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
asserver.py
View file

@ -36,8 +36,15 @@ class SSHServer(asyncssh.SSHServer):
return False return False
def broadcast(msg: str): def broadcast(msg: str, use_stderr: bool = False):
assert type(msg) == str assert type(msg) == str
msg = msg.strip("\r\n")
if use_stderr:
msg += "\r\n"
for c in connected_clients:
c.stderr.write(msg)
else:
msg += "\n"
for c in connected_clients: for c in connected_clients:
c.stdout.write(msg) c.stdout.write(msg)
@ -46,13 +53,13 @@ async def handle_connection(process: asyncssh.SSHServerProcess):
username = process.get_extra_info("username") username = process.get_extra_info("username")
try: try:
connected_msg = f"[connected] {username}\n" connected_msg = f"[connected] {username}\n"
stdout.write(connected_msg) stderr.write(connected_msg)
broadcast(connected_msg) broadcast(connected_msg, True)
while True: while True:
try: try:
async for line in process.stdin: async for line in process.stdin:
if line == "": raise asyncssh.BreakReceived(0) if line == "": raise asyncssh.BreakReceived(0)
line = line.strip('\n\r') line = line.strip('\r\n')
msg = f"{username}: {line}\n" msg = f"{username}: {line}\n"
stdout.write(msg) stdout.write(msg)
broadcast(msg) broadcast(msg)
@ -69,8 +76,8 @@ async def handle_connection(process: asyncssh.SSHServerProcess):
process.exit(0) process.exit(0)
connected_clients.remove(process) connected_clients.remove(process)
disconnected_msg = f"[disconnected] {username}\n" disconnected_msg = f"[disconnected] {username}\n"
stdout.write(disconnected_msg) stderr.write(disconnected_msg)
broadcast(disconnected_msg) broadcast(disconnected_msg, True)
if __name__ == "__main__": if __name__ == "__main__":