burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-02-10 13:33:50 +01:00
commit a2e5e00aa6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/REST/methods/transports.py
View File

@ -138,7 +138,7 @@ class Transports(ModelHandler):
),
'type': 'text',
'order': 201,
'tab': gui.ADVANCED_TAB,
'tab': ugettext(gui.ADVANCED_TAB),
},
)

4
server/src/uds/transports/HTML5RDP/html5rdp.py
View File

@ -319,8 +319,8 @@ class HTML5RDPTransport(transports.Transport):
def initialize(self, values: 'Module.ValuesType'):
if not values:
return
# Strip spaces
self.guacamoleServer.value = self.guacamoleServer.value.strip()
# Strip spaces and all trailing '/'
self.guacamoleServer.value = self.guacamoleServer.value.strip().rstrip('/')
if self.guacamoleServer.value[0:4] != 'http':
raise transports.Transport.ValidationException(
_('The server must be http or https')

3
server/src/uds/transports/HTML5VNC/html5vnc.py
View File

@ -179,7 +179,8 @@ class HTML5VNCTransport(transports.Transport):
if not values:
return
# Strip spaces
self.guacamoleServer.value = self.guacamoleServer.value.strip()
# Remove trailing / (one or more) from url if it exists from "guacamoleServer" field
self.guacamoleServer.value = self.guacamoleServer.value.strip().rstrip('/')
if self.guacamoleServer.value[0:4] != 'http':
raise transports.Transport.ValidationException(
_('The server must be http or https')