shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-03-13 08:58:35 +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-01-31 14:18:40 +01:00
commit 1801feec6c
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,6 @@ class RemoteViewerFile:
delete_file = '01'[self.delete_file] delete_file = '01'[self.delete_file]
usb_auto_share = '01'[self.usb_auto_share] usb_auto_share = '01'[self.usb_auto_share]
new_usb_auto_share = '01'[self.new_usb_auto_share] new_usb_auto_share = '01'[self.new_usb_auto_share]
ssl_connection = '01'[self.ssl_connection]
ca = self.ca.strip().replace( ca = self.ca.strip().replace(
'\n', '\\n' '\n', '\\n'
@ -127,7 +126,7 @@ class RemoteViewerFile:
host_subject=self.host_subject if tls_port != '-1' else '', host_subject=self.host_subject if tls_port != '-1' else '',
ca=ca if tls_port != '-1' else '', ca=ca if tls_port != '-1' else '',
secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard' secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard'
if ssl_connection and tls_port != '-1' if self.ssl_connection and tls_port != '-1'
else '', else '',
proxy=self.proxy, proxy=self.proxy,
) )

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

@ -104,7 +104,7 @@ class SPICETransport(BaseSpiceTransport):
r.usb_auto_share = self.usbShare.isTrue() r.usb_auto_share = self.usbShare.isTrue()
r.new_usb_auto_share = self.autoNewUsbShare.isTrue() r.new_usb_auto_share = self.autoNewUsbShare.isTrue()
r.smartcard = self.smartCardRedirect.isTrue() r.smartcard = self.smartCardRedirect.isTrue()
r.ssl = self.sslConnection.isTrue() r.ssl_connection = self.sslConnection.isTrue()
osName = { osName = {
OsDetector.KnownOS.Windows: 'windows', OsDetector.KnownOS.Windows: 'windows',

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

@ -117,8 +117,9 @@ class BaseSpiceTransport(transports.Transport):
SSLConnection = gui.CheckBoxField( SSLConnection = gui.CheckBoxField(
order=9, order=9,
label=_('SSL Connection'), label=_('SSL Connection'),
tooltip=_('If checked, SPICE protocol will required SSL connection.'), tooltip=_('If checked, SPICE protocol will allow SSL connections.'),
defvalue=gui.FALSE, defvalue=gui.TRUE,
tab=gui.ADVANCED_TAB,
) )
def isAvailableFor(self, userService: 'models.UserService', ip: str) -> bool: def isAvailableFor(self, userService: 'models.UserService', ip: str) -> bool:

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

@ -102,6 +102,7 @@ class TSPICETransport(BaseSpiceTransport):
usbShare = BaseSpiceTransport.usbShare usbShare = BaseSpiceTransport.usbShare
autoNewUsbShare = BaseSpiceTransport.autoNewUsbShare autoNewUsbShare = BaseSpiceTransport.autoNewUsbShare
smartCardRedirect = BaseSpiceTransport.smartCardRedirect smartCardRedirect = BaseSpiceTransport.smartCardRedirect
sslConnection = BaseSpiceTransport.SSLConnection
def initialize(self, values: 'Module.ValuesType'): def initialize(self, values: 'Module.ValuesType'):
if values: if values:
@ -176,6 +177,7 @@ class TSPICETransport(BaseSpiceTransport):
r.usb_auto_share = self.usbShare.isTrue() r.usb_auto_share = self.usbShare.isTrue()
r.new_usb_auto_share = self.autoNewUsbShare.isTrue() r.new_usb_auto_share = self.autoNewUsbShare.isTrue()
r.smartcard = self.smartCardRedirect.isTrue() r.smartcard = self.smartCardRedirect.isTrue()
r.ssl_connection = self.sslConnection.isTrue()
osName = { osName = {
OsDetector.KnownOS.Windows: 'windows', OsDetector.KnownOS.Windows: 'windows',