From 99a96bf343d48457b138aaaf8d1ee63afeb3ed34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Fri, 5 Feb 2021 14:31:43 +0100 Subject: [PATCH] added environment variable expansion to rdp parameters --- server/src/uds/transports/RDP/scripts/linux/direct.py | 10 ++++++---- .../transports/RDP/scripts/linux/direct.py.signature | 2 +- server/src/uds/transports/RDP/scripts/linux/tunnel.py | 8 +++++--- .../transports/RDP/scripts/linux/tunnel.py.signature | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/server/src/uds/transports/RDP/scripts/linux/direct.py b/server/src/uds/transports/RDP/scripts/linux/direct.py index e1aa9a38..4b5c9b59 100644 --- a/server/src/uds/transports/RDP/scripts/linux/direct.py +++ b/server/src/uds/transports/RDP/scripts/linux/direct.py @@ -12,14 +12,16 @@ from uds import tools globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable def execUdsRdp(udsrdp): - import subprocess # @Reimport - params = [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable + import subprocess + import os.path + params = [os.path.expandvars(i) for i in [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])]] # type: ignore tools.addTaskToWait(subprocess.Popen(params)) def execNewXFreeRdp(xfreerdp): - import subprocess # @Reimport - params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable + import subprocess + import os.path + params = [os.path.expandvars(i) for i in [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])]] # type: ignore tools.addTaskToWait(subprocess.Popen(params)) # 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) diff --git a/server/src/uds/transports/RDP/scripts/linux/direct.py.signature b/server/src/uds/transports/RDP/scripts/linux/direct.py.signature index a334ae1a..6c22a33e 100644 --- a/server/src/uds/transports/RDP/scripts/linux/direct.py.signature +++ b/server/src/uds/transports/RDP/scripts/linux/direct.py.signature @@ -1 +1 @@ -m7XY+kUSxXSqD276bNG7ChwBU06IOR75uTw9eXdSdBYqbvG4FhrUmL1OXRjfNRUh5kzUqkIggcJ5mj3b5Ws76QMWUjqcKS+SM2V5CGOzzPW+lFDeMLEnLCtsrmxZcCPacLce/utMlNf/AqLnraWAUCj8s+5CR68FeHE9fH3CRUryjHhvUPf51GDpMMXq+jnLotWn34xgZ2DI62Kp39qTdFYhmnZ3cGI3cHSks5Jo+uqeD1n0J+pF7vPM22aRknxW8XcLj+tXeUSw1QZVD0tXOI8RaUeD1jAH3bn0tBwP2spUfBwLFsxbWDULkuN89klfe1C/rardNJgIog7pUyyUD4HmeYQqd31Z5kfno3KD9NeAkEe8EaW99PAj3maLPrl8wZB6myYJfiq5k0LV0tzt5JNy20p61JOXFl4F04Ndb0m+IlcvYcknfecsF5RA6ID9U/0vX84y0OHtrEut1G5OBck95X2l0ksKHYcCqxhSKAAds227aeHI3FcWNsIpGpvtnQDrCrxM/lHO5mXk9+t4OVCG8dxawNrSoRmx1gUN/QvRiZvRFJ3WFZgo4OLc6ls62YBxm8FhWn+19NyVzXKI5U+Q5wJFAUkZ7+XnnHrvz75zvt/Ym5SvgMHSBMe7L+4njcEFq5UMfiTCEATorJXk03YDUrQI7uKiE0UTVwIJlGc= \ No newline at end of file +Tsg/TJGSTLZyczlvCY6qTZSuExOSTjVlVKniD/1dzTZVHQ6cxVQJlNJK9ApbyIcsp20sdLZdDb+2i1IHX+jy/2lS/IsnCaONvy1tb5Aa3R09YRfl+cRDRwhjkR3eb7VuU81C3sFRgZ8jT5ugdCrkkR4CBiRa4H1CYRBQfX9xkzJmuNp4Tev88yj3U0H19MTv62eZQL/Sp2jMXV/waMR/XbgIIi0cEpLa5qDNQ8MKnAJQUNvx0IXwBpNY6JkMpoFEhXsx0dEGte4oAOns7t0vww8QZNs71rd6IN2vun7wtNOAuTVJM2tmqS9Orf7vtfxf10ejQ5xkLRLJ6E1hGWVs5ljDVxj1V1Yp68LfnH0dVIlvTxIAx1ksj4wSL2+ZMxYrnZmpzDiFRKqyNE6C6lkFPhoDgUu343tSgWtF0xz+Hl/Qgh5MUlLs+9kd0bA64Nb2BkQA8+n1godNNc8QM6JW5jZVroV8N48KkmxsYnpPIAONmiq370CqN44y3FlcGfrpf6REt1aqhcIaRG0JD+IRbB7aEEOuJdJUuriYgsubG8f7wfrDdXH7+qwsPobyVYalG+uBAJBCP1+zXEzxz3RhLZDCOVQa8hGQyu25eidlfp9nx+zgFtQ+91NRsmTdysQhFpQY8tvKYSPGVkA9CLRQgTkzSdfaGX7CKCcgwMP1CD8= \ No newline at end of file diff --git a/server/src/uds/transports/RDP/scripts/linux/tunnel.py b/server/src/uds/transports/RDP/scripts/linux/tunnel.py index 009e1ebf..e4049b84 100644 --- a/server/src/uds/transports/RDP/scripts/linux/tunnel.py +++ b/server/src/uds/transports/RDP/scripts/linux/tunnel.py @@ -14,13 +14,15 @@ globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable def execUdsRdp(udsrdp, port): import subprocess # @Reimport - params = [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable + import os.path + params = [os.path.expandvars(i) for i in [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)]] tools.addTaskToWait(subprocess.Popen(params)) def execNewXFreeRdp(xfreerdp, port): - import subprocess # @Reimport - params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable + import subprocess + import os.path + params = [os.path.expandvars(i) for i in [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)]] tools.addTaskToWait(subprocess.Popen(params)) # 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) diff --git a/server/src/uds/transports/RDP/scripts/linux/tunnel.py.signature b/server/src/uds/transports/RDP/scripts/linux/tunnel.py.signature index 4a9bb9bd..e0d7ff5f 100644 --- a/server/src/uds/transports/RDP/scripts/linux/tunnel.py.signature +++ b/server/src/uds/transports/RDP/scripts/linux/tunnel.py.signature @@ -1 +1 @@ -cL4uPkvN73tWpwdwNqedaOEHXLqmKlxKcg9iKW+QG3zCpPmbVn8nedzlumLfImLPQm+6ktpBscuIIsN5LyOZVuEnmoKWorLknlp5Jwzvp93gZEgGfCl8Y/YVaauvT4pPF5Pmczgsk/YykoAIHg5nllMHS0EdY0Pt/wAX7VgBN0RI1R4Ya5TeFC0b3NNZMg8kijmEYfSyNagPrzvM59SPOF93+iMMsZXaNiC7Lc0zbphS5QcjsMvALOHMyzl3omPVpIBFh/B8Wccx0svjfOp4Mdpt/tq0B9aGzhdEoaoqo3TNqINaPAVl90yPrfr/JrC7qEGNHaUWKgk5nImKJRyYBDiTFuv2TNMvJjrJ8JFgALsefdYhFM5EAo5i4G0bllEfn8g77NICnSlHGZal+x6oFORsmhRxJYXLDLDmeD/BJnHfhaNNSsy/dO/hBtAkkrIO3Qqot2MBo3ip6O/uOcCCdTNbwLCwlN90VahRzmf0j4irKNz5fdKT+Iox+1WT7980U9g3nyVCYz/Qw1b227WXJJ1NYSLGuVF1UU+8kIZPDxq+2FGmyvjTEKHw5RwMSA9Y5bRTDSZYhv9B0DGQ0NLfVJ9lCgQ9Zy99A6nTzIaqGi6FH7oxA5kMuGLAhfeT6sC3QSXfD9sfq2aKRsJgvqXrKiS79nZbkgijnj8nFSnTur8= \ No newline at end of file +qFmCTl0qAjPzl9cf0XZtBWDc8S3yJ977P4SuznFIrQIu5vg6wnCoAoVxr5RMqzYdmZRtd/QHiTVsV6sCiWUDlvn4tnMlHstiOZ9yIK/zBM/Q0EslR2Cy0+Wj4uNFJ2M+ENI1VbfdHaCNDny1eHzdloVBHhKigXXePI2J8X7G/tlQ5ixpfqi+ubj05EECEa2mPnTwUOV/DYCjDHfMYuH/xHm6t4GGQC5cu4o6AHU+wV0aK7olVJKmJB0RZoyfCYYXsihw8J4M6Fc84CZgtkwEYYL0RMyim5VbIOGG15us1GlnAHbbuLmU3cFp1YRb1Sl+8WErufpJYe9zkFIyOPWmkxJXvTJ3+nvI1GZS1AQawiyLyhTq0N2tm7Mxsh5ZotI2A2jMfmElFkqnqTXVPyotPWc33SjRRGiQvGNBaNXTiYkujNy1Ltoos3sw0Po8mg7gNRSDoWndwy9WZbAnTTKqdBkHFSeIU0y4MS93kE3/vwDwaekYr7xc2thq7pst0q9xe9GbeTiDKZ/BQNNtgCc3yyckSQ8WOG+AS1t76yneKqI1ebJHuT6IMgsX9ce3CQSCU/dreZ8nTvcu4eIPOGixLjLbHbeq5JwribxjI/JO2fJAWi21dgYpiIv9bHUK7PqSW9J/zU4NPk/JokLYFQuNrWIvwp0WUc0Eu8eTXmND7Qs= \ No newline at end of file