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

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

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

2
server/src/uds/transports/SPICE/remote_viewer_file.py
View File

@ -128,5 +128,5 @@ class RemoteViewerFile:
secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard'
if self.ssl_connection and tls_port != '-1'
else '',
proxy=self.proxy,
proxy=f'proxy={self.proxy}' if self.proxy else '',
)

3
server/src/uds/transports/SPICE/spice_base.py
View File

@ -137,6 +137,9 @@ class BaseSpiceTransport(transports.Transport):
if con is None:
return False
if 'proxy' in con: # If we have a proxy, we can't check if it is available, return True
return True
port, secure_port = con['port'] or -1, con['secure_port'] or -1