From 917a201483e06f77eed2b8d9f76c9e86e5252827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Mon, 3 Jan 2022 14:23:52 +0100 Subject: [PATCH] Added localized MSRDP as possible path --- server/src/uds/transports/RDP/scripts/macosx/direct.py | 7 ++++++- .../uds/transports/RDP/scripts/macosx/direct.py.signature | 2 +- server/src/uds/transports/RDP/scripts/macosx/tunnel.py | 8 +++++++- .../uds/transports/RDP/scripts/macosx/tunnel.py.signature | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/server/src/uds/transports/RDP/scripts/macosx/direct.py b/server/src/uds/transports/RDP/scripts/macosx/direct.py index 5c5c4e1b..e0e6ee0f 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/direct.py +++ b/server/src/uds/transports/RDP/scripts/macosx/direct.py @@ -11,6 +11,9 @@ globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable msrdc = ( '/Applications/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop' ) +msrdc_localized = ( + '/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop' +) xfreerdp = tools.findApp('xfreerdp') executable = None @@ -37,8 +40,10 @@ def fixResolution(): # Check first xfreerdp, allow password redir if xfreerdp and os.path.isfile(xfreerdp): executable = xfreerdp -elif msrdc and os.path.isfile(msrdc) and sp['as_file']: # type: ignore +elif os.path.isfile(msrdc) and sp['as_file']: # type: ignore executable = msrdc +elif os.path.isfile(msrdc_localized) and sp['as_file']: # type: ignore + executable = msrdc_localized if executable is None: if sp['as_file']: # type: ignore diff --git a/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature b/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature index f1d92bd1..1ac4e5fc 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature +++ b/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature @@ -1 +1 @@ -hWCOxfB6KhYm93AeRp3dBe0LOYNjRdlBMzgTYlRlIe89Kiq2YyO9ap/cYG9xT8+oClWTQwhL7esSrE/7sH0bo7OSy5X2EwjNreP2hET+F+1oDEKMlJiYh3ZkN+TWQXf6kuylnp1LMsVSpMIGEJ9qZ2xgdsngyxJTh1LIPHdX2hBi4JgjUSz37PNiGXTbtUS89QvY4yrBT1Vajai28RlsnUMnwW4X9YPfk1s7++GY//wjdpd2vPwwQvfLs+70KwpWYKo3UkLdRW6Tpkhbw8IbM9wF1MrT1ID1k6//hBJ5pFa7m2vacsx7zIviETsUMIs9Zol3YNBetFsllNX+mlPNxEQv/s23DMt41ibHsiTk8+FMHphmPidlAwQNhNTfb+FIIRRa9MFb88lm/5l8NYqx5Vb48KiD8K6xE6+HOrFm0wU3MkeA1nfDlO1xotp/ze8Ur2iVA50QebrgUkDkEGO1GybU5IUSo1k/DesNHspIv8nej5BsLrbMPxDApCsUki7d2Ufr4aHgcc2CNLJrVT71yXcCW7ngLUIz4wnjBxCnQwP1AsIA4uXOHbqs0lXZ3yde2wCqQUsHpR1R1BtVOxQzbwezsAbYHNJROQlqpDltwSg8Fy0enFuYy4znVAN/5VxUARCWSN77/O3VniW3ll365eoHDI5Zh4UrKOgqFxTrr28= \ No newline at end of file +AI1DH0mP1dtmxnnjYOj2p+x1sNzGU0PIXFgn+0Y6sXSJvikFTX0WsCWEtloVO4X6x26bVqot0cFDmfiS1EdnnbPhnCmSKXUbVleqZ+wcUYRKXx5hP2Q6otP8bCGqJOpTA5/rC0Vb4gGlBw00iVbZtxyW+GazL6eTAlhUQlx3qEdbiFWpV8siG5qusWkMg+pJXnaYt6b1GDIXwNhqTZUxs1lBWWYDL1k2xXQn2LQ80UK+7ng6v/Z5pEQYQNrrshYPjSCysaQpHNdS2i3yi2uv6afq8IPENDxtXozcYLwHcN6lnfvihWKIttTa76fx5qdRNMMPAPDbsbVqfKehY/36y1Av95DBN1B65nAWTq54bqLD0Lf6xPGrerga21VsUA4WPfHCslvDhi52+nVIDtawZsm08nT6g3uSgW8jsrC3Xc2GIev/clhlsm99maSo2lNAVFRB637W1IGSo0nIuQj/0q+LGKScEOiAFBrYr7DgDI0gQV9hyn1TKDqNLXjZg76FXgCStaTV8B1BdVcoyWSSWxbzomnLyIpOZLB2Gqvc+/QOLa1lPcHi8M7Q+/VZELxIQm8O7QQAhl91P/yek08cLrvJPAvyeBlmNeKP1jOOM+0Yzs87HmGiWCDwxSiHb12lmcWFHVUydduKYiTicr4xz1uEV7OCiJXbWOLGv/Ag7EM= \ No newline at end of file diff --git a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py index 066277da..52bf7d77 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py +++ b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py @@ -34,14 +34,20 @@ def fixResolution(): msrdc = ( '/Applications/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop' ) +msrdc_localized = ( + '/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop' +) + xfreerdp = tools.findApp('xfreerdp') executable = None # Check first xfreerdp, allow password redir if xfreerdp and os.path.isfile(xfreerdp): executable = xfreerdp -elif msrdc and os.path.isfile(msrdc) and sp['as_file']: # type: ignore +elif os.path.isfile(msrdc) and sp['as_file']: # type: ignore executable = msrdc +elif os.path.isfile(msrdc_localized) and sp['as_file']: # type: ignore + executable = msrdc_localized if executable is None: if sp['as_rdp_url']: # type: ignore diff --git a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature index 8309a58a..455fae0e 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature +++ b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature @@ -1 +1 @@ -XNJEeqnpcluSTlnHvn1UOM88MeWKB5wX3vCKOQAEdh4I9tVlTVvPT3EHwj/3CgqEFGeM+2d8iC3T6w19hrD+CZGC2Vr2UckOEjM4EXYcF0Bd5ehYdGsdzkUg9CpgHZTs0GlErG96lVid3aXP+fh16k3IVOaKu5N30APtSN4BBcAeHLdWK1i8aV6rSJ6TKkdKNVV8waklTWXvDrSfexZIUPXX66znApww0DpQkRmIdqZQjk7Eb2unuTkZnFL7F3S3Czd+KyvMPraiYbHmql9ldYpB+qx0mFhliLUQJILWoYrtuAa3ovSuBJAAxrtWLdX/LX5HV8YVrnEGpMitwTMNivXGprv/2LI1UOh3pBmocSL9ka465rfP2DoIoDBRGXcFnTtmzl9M7O/HlHkqzKeH8xzZWOcAhAeqXQTZxM6ElpHbcksDS1tU7YGrxN1SW40+iIkNxEHAL0yQNrhR7O+U09E7i3DQEL9vbLve0ooVN1VAfEenpU/sowUxb2pdzkRrY7PUubujKmtWbU7IOzmB2B2mDjJXoJwuuLOCVTEN8sg30nduCFUtpoR3XwYbgw4W+e0SR+kMi2CBXs42GEuPCP6MtIekZtX4zU5zMVwnO/i26vC9OdUIz1+4JEa7eRdP+AW7J1pgNMRV7tX9btjYe3iZJDw18W3U3NhmM74yA4w= \ No newline at end of file +fkKzJw/oa9B1ONrgWKjBhItsNlHiAyPZ/7myNUgRIEYSczvAgTjS3rZk0EJlDx5zcmmAOz38GnFeZrYqnvyR5RZfhvN9C2kOCjOo7i9GcufOWdsRB3poWLeQAAfxywq+gcKNev+R1ucsom+QWkkXiPgmfm7KxxViOx/yqdIDUaIxamrfBprDl5HlGnB6wLoUypfiGOthERbAy+eu9MuP7F+hiCtyHEV9JhEhgfUhEmSJCBMbs15AbyAnWU8N1INk5kK+TtfsNxp4cFHSSg2sqvecEbchrietVX/JtKJFU9+yYwIdErTtdt9EWQv6F1Xe7dtpbJnQ4+doLRxxhYkk/CLNoUCsgv6R+R00+Os5SyCLfY0TSAiakZ5aLnGFQDJSOePowIu8sMtREfQK9fyGjc4vs1jdvNcnJ1/5VfhKsN8Iqi2lmwEYx++Z6LA7FldBa1uq+efo7M/wvwmoYjzXM5E6onSqD7c4s6aDKt5tR4L+427/W9FtoGJAAN0Nt0Qg/RhHj0ciNWigurytizaSumiB/o9nlqWui8nLGkNDt/ojV2ChowWNUAsWG9KmTauxFnhXN9WSwLKPAZdVTgdzVlCH/SjOG2eU2PPA3xGjDJOpRfFrGxSSpPJFCiZN14PVWY1ImuJXHMpvUh6GYQck9lHHUBsAmnlLasf1DMkc5EA= \ No newline at end of file