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-01-04 10:39:12 +01:00
commit e41c0f32bb
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/uds/transports/RDP/scripts/macosx/direct.py
View File

@ -9,11 +9,13 @@ from uds import tools # type: ignore
globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable
msrdc = (
'/Applications/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop'
'/Applications/Microsoft Remote Desktop.app'
)
msrdc_localized = (
'/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop'
'/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app'
)
# msrdc_app = '/Contents/MacOS/Microsoft Remote Desktop'
xfreerdp = tools.findApp('xfreerdp')
executable = None
@ -40,9 +42,9 @@ def fixResolution():
# Check first xfreerdp, allow password redir
if xfreerdp and os.path.isfile(xfreerdp):
executable = xfreerdp
elif os.path.isfile(msrdc) and sp['as_file']: # type: ignore
elif os.path.isdir(msrdc) and sp['as_file']: # type: ignore
executable = msrdc
elif os.path.isfile(msrdc_localized) and sp['as_file']: # type: ignore
elif os.path.isdir(msrdc_localized) and sp['as_file']: # type: ignore
executable = msrdc_localized
if executable is None:
@ -81,7 +83,7 @@ if executable is None:
</ul>
'''
)
elif executable == msrdc or executable == msrdc_localized:
if executable in (msrdc, msrdc_localized):
theFile = sp['as_file'] # type: ignore
filename = tools.saveTempFile(theFile)
# Rename as .rdp, so open recognizes it
@ -94,7 +96,7 @@ elif executable == msrdc or executable == msrdc_localized:
[
'open',
'-a',
'/Applications/Microsoft Remote Desktop.app',
executable,
filename + '.rdp',
]
)

2
server/src/uds/transports/RDP/scripts/macosx/direct.py.signature
View File

@ -1 +1 @@
Zynr5gg1ODuB1OTbsSd8FArXG/Z+1QQpbgdd1HNNQim8iFziDMRTyONLHB/IM/sblYis2rXOkIDfHyJKf3vqefw9XHKCFSkLJ5zrzmIjDJItBuepQuWy3dGRxym7WPjKYmQYYt3G7E6ypqiXvcRaFqUhjpjhkxfczxOQ3JIg7f6rHzrFxpMmcXB3+NG2gIFxN5/Rom2dwb2vuBhsImAIsx4of5VbNQ015wU6calXaxLTqqqlIfhcLrbod/AG/jvegoZTL2B4RHJkJYv7S1vVjzRlfmhOxinqUoh41dRYLCZET5KKufHyLDD/LVJlI7ToALHRXNX1dluBeDOBx1Dan2aTKZS/rz46sj2qld4zLDgmryb0rHX0fF9gj/WLT0RbiFJfvH0mA1hdgp5mYjp+eZZ5R5uVNhI87VJHs9uopAE8RBn3ecibk0Id9qRuumUSPgWkt2/hXOfdomeRJqH2YUcPhSDn7ZzH2/1E54IHlgf25EVCXEofilpAtmZfpg1NdzK5QUrOwNKXb24dicE20iIveKD/5gswovhLsNDijJSFEUE/uRAW0eQBy/jKpb3RiHiYOo+0IPDSd1yrstxwCSJubKhB3JqHjRg+b+mmu3IuU94bpcOk4eawJajNCrR0qYuegC581pxe4UmLBaz3gO80V7JGSYMSMT0ofnz1ViQ=
SijMzRukH+xARWhBXzy3Xu0fCA35ToaOZbn7LhYGxpYAGwMYGz2o6AfproZSSg/PtTwJjurqwGvTGkcS80ZvMMx/xNiHUJw1dUygcKKWBbsra/uEdMTTnkXiZZo61VJAl/Xk74hTbU8f6QEmoZwxXVr+DcrX7kqXhr/YuRxRS16rmWu0mYwu45p45X6tOB5z7ySDXJvjWg8uzdXZwKuUSh0TZi5PKCzzP/u8yVou8t6TkNk4Szh6KA7RcnEzrPzIYnNesfBH0GiFUTo8FYavN4rsTMU3FcYN9dfEy3eqwGsfizJ9c8fXlsYYAS5lO2TyNHq8HwL3uEl1uzihu0Z64pLX5xDC+oSRxMPuFR88XyfzM58bUPbGa/DVnSwKRHJO16tDh4pZ133wO7alSi80VYrgR2OB61LA7NcQlO0iQGjXFSqRoYVXL9mU3yHWngm8jb8UIrXYyyZfKTS46dbqko0BQ2h2n/JPIFS1D0x//rePc5R9Mp/oDrZk1+9JhZ+fPULX/X0jLxxVG9xHhSQ2IscLqswOBbgvqcjsz44+hmdzWwXMABizxMiMk1DOh0caMAKQPvncqCcMwZNsUygLh4GQxxcfLSTFSuEtGgw26sQctmIIhXtcMl0gy/nFY8uvlhwwzVbdbFFumRmB0xyuhYvDOfdFaQrz3i6utuFFaAk=

13
server/src/uds/transports/RDP/scripts/macosx/tunnel.py
View File

@ -31,11 +31,12 @@ def fixResolution():
return list(map(lambda x: x.replace('#WIDTH#', width).replace('#HEIGHT#', height), sp['as_new_xfreerdp_params'])) # type: ignore
msrdc = (
'/Applications/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop'
'/Applications/Microsoft Remote Desktop.app'
)
msrdc_localized = (
'/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop'
'/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app'
)
xfreerdp = tools.findApp('xfreerdp')
@ -44,9 +45,9 @@ executable = None
# Check first xfreerdp, allow password redir
if xfreerdp and os.path.isfile(xfreerdp):
executable = xfreerdp
elif os.path.isfile(msrdc) and sp['as_file']: # type: ignore
elif os.path.isdir(msrdc) and sp['as_file']: # type: ignore
executable = msrdc
elif os.path.isfile(msrdc_localized) and sp['as_file']: # type: ignore
elif os.path.isdir(msrdc_localized) and sp['as_file']: # type: ignore
executable = msrdc_localized
if executable is None:
@ -96,7 +97,7 @@ if fs.check() is False:
'<p>Could not connect to tunnel server.</p><p>Please, check your network settings.</p>'
)
if executable == msrdc or executable == msrdc_localized:
if executable in (msrdc, msrdc_localized):
theFile = theFile = sp['as_file'].format(address=address) # type: ignore
filename = tools.saveTempFile(theFile)
@ -110,7 +111,7 @@ if executable == msrdc or executable == msrdc_localized:
[
'open',
'-a',
'/Applications/Microsoft Remote Desktop.app',
executable,
filename + '.rdp',
]
)

2
server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature
View File

@ -1 +1 @@
EE3eFjtFJijhoTj6QI1P1DbSfY/pxmb8A2GNP7drfyvmbdK4MagMRJdcKvP9MgRZONAfmj1/xGuzRgTwY6fheeQTAQZhGhzrm5mbraI15eo5PhlSPWKuLFCYUEYatY4Go7clTMA4OWJLG2ApAU+XryM8kTZ4IHpu7Hf//pVIOLPkL4yOsVt7hBTb7VybLyc21UiHY9+w6paiTpiJ0GFQ0jvJBaPUk88gzeyzXxlg6bVGSgDfjCSDd1kKt6CwVzDq4La9xHNIdV6o8iN/kMRFsNE3m9Axr4vSs6GIMHru+DsZZYAeQKIzhgk3jtPUnPEJsWKL35kfWcdH8mqoLVscoZzfPlRHnX1TVwsy/rgUST8osNhRKdZfbP+47iyWpuTPL59HZINbmY87vfut2TpLzTA2t+HC2Yg59gP2SiMRnzwgga58nl6Sv+jDOeSiNpJRqwVyngIYoZIk1vJm23WrtbOa9VxiSmF8joM1VNgxPcx40xmHMS0BJ0PfdxUauZTUvuuYPh/6WJc40eoGFlRKTVO6f6Msx91iEA5Wg5RBPa59dLLhogyDWIgdhWINn3UiAT7iuDsZkYULn96R0iipc6Dxv5Thgm3KAvCy2B9yALEjdmWE6ZoP9OMHQ4u8cR8GqfiLfeR0XPZRozG4mo31nFfsnjTZtmadL06byxE/aWw=
lr9WxhxFvFzpPIWqffvflnfr6E+Vif26jUQXaIKjStnA2ypDSGuWorP9AaAVIZhs0Dx/rYLPw1J2kp0HnvCdBoTQwWj7yO/96EJ4NbuSHH78IwHlERgK2jT2IhSmU0J8fQV5xZy6e6hgRgmoRmeA+MA8NLw8vfGBw9oJRAZG0uYmr+vCQpk8xVSnOK+joR7v5WNer7vlcT6izObAFW2EYpfvC91wY1/eUcpp9eyUxZcG4OeBu/gubCU4gm7i9JVojEh4zdU7SOaHX/RyvT7I3Y3krOV/fjCrIKIFkgvN3E45udpcl786z96pt3qDZ8X8jmxJZ641mzHE+nFKmUITKVUiXEX1+lifRWgl+x1YfatYrfSbVzSmMd+cMtXg54QVnmOzsUqPFQDB1b0IPXWI3ybQyVbkwbAFT2U86AZVoUDA0Kq4ZO7cyTDGwNVqbU2VERYMoSEphutSrZ+vEMxkTdmkM1LrJDm/fWV04jbW3MjPgOSyyul/xjQtYChBaTVFmQXbCH/BQsqMtjBjubixmK/jM7hP28FdJMtad+BxWSZsvQIaDjc80S+NgE2Yavu161SPu4fA34kQhZH4DkzkgS8xLCe2L9hrIrhWVrMhGxCl/9IhvKy4xDfbelxMcgr8X9m8NqwI6yn+qK96/6+NqfqUJ01h2/A7jta+7dze7c8=