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

Fixed proxy sent stats to UDS

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-07-03 21:16:17 +02:00
parent 1736cae1c1
commit 9ca3a7cdeb
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tunnel-server/src/uds_tunnel/proxy.py
View File

@ -53,9 +53,11 @@ class Proxy:
self.ns = ns
@staticmethod
def _getUdsUrl(cfg: config.ConfigurationType, ticket: bytes, msg: str) -> typing.MutableMapping[str, typing.Any]:
def _getUdsUrl(cfg: config.ConfigurationType, ticket: bytes, msg: str, queryParams: typing.Mapping[str, str] = None) -> typing.MutableMapping[str, typing.Any]:
try:
url = cfg.uds_server + '/' + ticket.decode() + '/' + msg + '/' + cfg.uds_token
if queryParams:
url += '?' + '&'. join([f'{key}={value}' for key, value in queryParams.items()])
r = requests.get(url, headers={'content-type': 'application/json', 'User-Agent': f'UDSTunnel-{consts.VERSION}'})
if not r.ok:
raise Exception(r.content)
@ -87,17 +89,21 @@ class Proxy:
@staticmethod
def notifyEndToUds(cfg: config.ConfigurationType, ticket: bytes, counter: stats.Stats) -> None:
msg = f'stop?sent={counter.sent}&recv={counter.recv}'
Proxy._getUdsUrl(cfg, ticket, msg) # Ignore results
Proxy._getUdsUrl(cfg, ticket, 'stop', {'sent': str(counter.sent), 'recv': str(counter.recv)}) # Ignore results
@staticmethod
async def doProxy(source, destination, counter: stats.StatsSingleCounter) -> None:
while True:
data = await source.recv(consts.BUFFER_SIZE)
if not data:
break
await destination.sendall(data)
counter.add(len(data))
try:
while True:
data = await source.recv(consts.BUFFER_SIZE)
if not data:
break
await destination.sendall(data)
counter.add(len(data))
except Exception:
# Connection broken
logger.info('CONNECTION LOST FROM %s to %s', source, destination)
# Method responsible of proxying requests
async def __call__(self, source, address: typing.Tuple[str, int]) -> None: