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

Fixed linux rdp scripts

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-05-29 14:10:01 +02:00
parent b48bea14d2
commit 9454b9f63f
2 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/src/uds/transports/RDP/scripts/linux/direct.py
View File

@ -22,42 +22,13 @@ def execNewXFreeRdp(xfreerdp):
params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable
tools.addTaskToWait(subprocess.Popen(params))
def execRdesktop(rdesktop):
import subprocess # @Reimport
params = [rdesktop] + sp['as_rdesktop_params'] + [sp['address']] # @UndefinedVariable
p = subprocess.Popen(params, stdin=subprocess.PIPE)
if sp['password'] != '': # @UndefinedVariable
p.stdin.write(sp['password'].encode()) # @UndefinedVariable
p.stdin.close()
tools.addTaskToWait(p)
# Try to locate a "valid" version of xfreerdp as first option (<1.1 does not allows drive redirections, so it will not be used if found)
xfreerdp = tools.findApp('xfreerdp')
rdesktop = tools.findApp('rdesktop')
udsrdp = tools.findApp('udsrdp')
fnc, app = None, None
if rdesktop is not None:
fnc, app = execRdesktop, rdesktop
if xfreerdp is not None:
# Check for nice version
try:
try:
version = subprocess.check_output([xfreerdp, '--version'])
except subprocess.CalledProcessError as e:
version = e.output
version = float(re.search(r'version ([0-9]*\.[0-9]*)', version).groups()[0]) # type: ignore
if version < 1.1: # type: ignore
raise Exception()
else:
fnc, app = execNewXFreeRdp, xfreerdp
except Exception as e: # Valid version not found, pass to check rdesktop
pass
if xfreerdp:
fnc, app = execNewXFreeRdp, xfreerdp
if udsrdp is not None:
fnc, app = execUdsRdp, udsrdp

32
server/src/uds/transports/RDP/scripts/linux/tunnel.py
View File

@ -23,43 +23,13 @@ def execNewXFreeRdp(xfreerdp, port):
params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable
tools.addTaskToWait(subprocess.Popen(params))
def execRdesktop(rdesktop, port):
import subprocess # @Reimport
params = [rdesktop] + sp['as_rdesktop_params'] + ['127.0.0.1:{}'.format(port)] # @UndefinedVariable
p = subprocess.Popen(params, stdin=subprocess.PIPE)
if sp['password'] != '':
p.stdin.write(sp['password'].encode())
p.stdin.close()
tools.addTaskToWait(p)
# Try to locate a "valid" version of xfreerdp as first option (<1.1 does not allows drive redirections, so it will not be used if found)
xfreerdp = tools.findApp('xfreerdp')
rdesktop = tools.findApp('rdesktop')
udsrdp = tools.findApp('udsrdp')
fnc, app = None, None
if rdesktop is not None:
fnc, app = execRdesktop, rdesktop
if xfreerdp is not None:
# Check for nice version
try:
try:
version = subprocess.check_output([xfreerdp, '--version'])
except subprocess.CalledProcessError as e:
version = e.output
version = float(re.search(r'version ([0-9]*\.[0-9]*)', version).groups()[0])
if version < 1.1:
raise Exception()
else:
fnc, app = execNewXFreeRdp, xfreerdp
except Exception as e: # Valid version not found, pass to check rdesktop
# QtGui.QMessageBox.critical(parent, 'Notice', six.text_type(e), QtGui.QMessageBox.Ok)
pass
fnc, app = execNewXFreeRdp, xfreerdp
if udsrdp is not None:
fnc, app = execUdsRdp, udsrdp