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

backport small fixes from dev version

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-12-21 14:28:54 +01:00
parent c1e4c5b81a
commit d462ecbb32
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tunnel-server/src/uds_tunnel/consts.py
View File

@ -54,6 +54,7 @@ BANDWIDTH_TIME: typing.Final[int] = 10
COMMAND_LENGTH: typing.Final[int] = 4
VERSION: typing.Final[str] = 'v2.0.0'
USER_AGENT: typing.Final[str] = f'UDSTunnel/{VERSION}'
# Valid commands
COMMAND_OPEN: typing.Final[bytes] = b'OPEN'

8
tunnel-server/src/uds_tunnel/tunnel.py
View File

@ -175,8 +175,8 @@ class TunnelProtocol(asyncio.Protocol):
self.transport.write(consts.RESPONSE_FORBIDDEN)
return
# Check password
passwd = self.cmd[consts.COMMAND_LENGTH :]
# Check password, max length is consts.PASSWORD_LENGTH
passwd = self.cmd[consts.COMMAND_LENGTH : consts.PASSWORD_LENGTH + consts.COMMAND_LENGTH]
# Clean up the command, only keep base part
self.cmd = self.cmd[:4]
@ -197,7 +197,7 @@ class TunnelProtocol(asyncio.Protocol):
self.close_connection()
async def timeout(self, wait: int) -> None:
"""Timeout can only occur while waiting for a command."""
"""Timeout can only occur while waiting for a command (or OPEN command ticket)."""
try:
await asyncio.sleep(wait)
logger.error('TIMEOUT FROM %s', self.pretty_source())
@ -349,7 +349,7 @@ class TunnelProtocol(asyncio.Protocol):
options['ssl'] = False
# Requests url with aiohttp
async with aiohttp.ClientSession() as session:
async with aiohttp.ClientSession(headers={'User-Agent': consts.USER_AGENT}) as session:
async with session.get(url, **options) as r:
if not r.ok:
raise Exception(await r.text())