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

added support for "legacy" window override on html5 for UDS

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-02-17 15:33:56 +01:00
parent 041ff932e4
commit d474f02baf
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/static/modern/main-es2015.js
View File

File diff suppressed because one or more lines are too long

2
server/src/uds/static/modern/main-es5.js
View File

File diff suppressed because one or more lines are too long

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

@ -131,10 +131,17 @@ class HTML5RDPTransport(transports.Transport):
minValue=60,
tab=gui.ADVANCED_TAB
)
forceNewWindow = gui.CheckBoxField(
label=_('Force new HTML Window'),
forceNewWindow = gui.ChoiceField(
order=91,
tooltip=_('If checked, every connection will try to open its own window instead of reusing the "global" one.'),
label=_('Force new HTML Window'),
tooltip=_('Select windows behavior for new connections on HTML5'),
required=True,
values=[
gui.choiceItem(gui.FALSE, _('Open every connection on the same window, but keeps UDS window.')),
gui.choiceItem(gui.TRUE, _('Force every connection to be opened on a new window.')),
gui.choiceItem('overwrite', _('Override UDS window and replace it with the connection.')),
],
defvalue=gui.FALSE,
tab=gui.ADVANCED_TAB
)
@ -258,7 +265,13 @@ class HTML5RDPTransport(transports.Transport):
ticket = models.TicketStore.create(params, validity=self.ticketValidity.num())
onw = 'o_n_w={};'.format(hash(transport.name)) if self.forceNewWindow.isTrue() else ''
onw = ''
if self.forceNewWindow.value == gui.TRUE:
onw = 'o_n_w={}'
elif self.forceNewWindow.value == 'overwrite':
onw = 'o_s_w=yes'
onw = onw.format(hash(transport.name))
return str(
"{}/transport/?{}.{}&{}".format(
self.guacamoleServer.value,

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

@ -114,10 +114,16 @@ class HTML5VNCTransport(transports.Transport):
minValue=60,
tab=gui.ADVANCED_TAB
)
forceNewWindow = gui.CheckBoxField(
label=_('Force new HTML Window'),
forceNewWindow = gui.ChoiceField(
order=91,
tooltip=_('If checked, every connection will try to open its own window instead of reusing the "global" one.'),
label=_('Force new HTML Window'),
tooltip=_('Select windows behavior for new connections on HTML5'),
required=True,
values=[
gui.choiceItem(gui.FALSE, _('Open every connection on the same window, but keeps UDS window.')),
gui.choiceItem(gui.TRUE, _('Force every connection to be opened on a new window.')),
gui.choiceItem('overwrite', _('Override UDS window and replace it with the connection.')),
],
defvalue=gui.FALSE,
tab=gui.ADVANCED_TAB
)