shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v3.6'

Browse Source
This commit is contained in:
Adolfo Gómez García 2023-05-10 23:27:53 +02:00
commit d25f278230
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client-py3/full/src/uds/tunnel.py
View File

@ -64,8 +64,10 @@ CMD_OPEN: typing.Final[bytes] = b'OPEN'
RESPONSE_OK: typing.Final[bytes] = b'OK'
logger = logging.getLogger(__name__)
PayLoadType = typing.Optional[typing.Tuple[typing.Optional[bytes], typing.Optional[bytes]]]
class ForwardServer(socketserver.ThreadingTCPServer):
daemon_threads = True
@ -229,7 +231,13 @@ class Handler(socketserver.BaseRequestHandler):
# If we have a payload, send it
if self.server.initial_payload:
ssl_socket.sendall(self.server.initial_payload)
to_send, to_receive = self.server.initial_payload
if to_send: # To send
ssl_socket.sendall(to_send)
if to_receive:
temp = ssl_socket.recv(len(to_receive))
if temp != to_receive:
raise Exception(f'Invalid response: {temp!s} != {to_receive!s}')
self.process(remote=ssl_socket)
except Exception as e:
@ -283,7 +291,7 @@ def forward(
local_port: int = 0,
check_certificate=True,
keep_listening=True,
initial_payload: typing.Optional[bytes] = None,
initial_payload: PayLoadType = None,
) -> ForwardServer:
fs = ForwardServer(
remote=remote,