From a302541df5c4e0856cff8f9c7f7904b24281f291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Mon, 21 Jun 2021 11:21:46 +0200 Subject: [PATCH] Fixed macos transports to search xfreerdp in path instead of using /usr/local/bin and added homebrew paths to default system ones --- client-py3/full/src/UDSClient.py | 2 +- server/src/uds/transports/RDP/scripts/macosx/direct.py | 2 +- .../src/uds/transports/RDP/scripts/macosx/direct.py.signature | 2 +- server/src/uds/transports/RDP/scripts/macosx/tunnel.py | 2 +- .../src/uds/transports/RDP/scripts/macosx/tunnel.py.signature | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client-py3/full/src/UDSClient.py b/client-py3/full/src/UDSClient.py index 4aa6d6c8..90ead3f6 100755 --- a/client-py3/full/src/UDSClient.py +++ b/client-py3/full/src/UDSClient.py @@ -322,7 +322,7 @@ if __name__ == "__main__": app.setStyle('plastique') # type: ignore else: logger.debug('Platform is Mac OS, adding homebrew possible paths') - os.environ['PATH'] += ''.join(os.pathsep + i for i in ('/opt/homebrew/bin',)) + os.environ['PATH'] += ''.join(os.pathsep + i for i in ('/usr/local/bin', '/opt/homebrew/bin',)) logger.debug('Now path is %s', os.environ['PATH']) # First parameter must be url diff --git a/server/src/uds/transports/RDP/scripts/macosx/direct.py b/server/src/uds/transports/RDP/scripts/macosx/direct.py index 009f0d9e..257fbd02 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/direct.py +++ b/server/src/uds/transports/RDP/scripts/macosx/direct.py @@ -14,7 +14,7 @@ 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' -xfreerdp = '/usr/local/bin/xfreerdp' +xfreerdp = tools.findApp('xfreerdp') executable = None def fixResolution(): 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 287a1cbe..31c4bbbc 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 @@ -ZXExDmT40GKafcLqJhNgy0IV7JB5qNdshRD5JOUdb9o5pzKn3MJ9kN4DRd6mt//oiaXBfzmChrWkgPReVcdEbG5Dqy1ULCevbXJBzulLIEptTlZtVfM0q85CmcbOEt+lNFtk3vlUp9P4ZwSKYYVsD/MzvziDlje00fXZKid/tkvE2UJ9ewjRYWrlOCBZt6rzXEuaGj26HkaTmGI74OY/IP1cPEP87O06rqsW4yGD77rayKDvdihGjQlHFGUwK8iVtV8ib7XwZdq25a8fpJxULg387hcliN9T/pPiiSIs4gxZ4dUo4AAGQjCMLMuIiTdgaT4TNUyAyYLkiXFJYDvK8x3gqBtyI1s6paZos9jlp4+NV5f2NnnAmvu1J7r6vu0Nvi2gplM997dePXsIchCJkGYhdouNDYF5w6jpNRfnd0Lfuhd6dNAprWxHc4jB4TS+UwqMdeJ5Nm+W1i9ipLZnNVZ1aSvKNYd1A4KNPFfjHZH0pKv56RVv9RZUgMFpY1VTZyxn9Q1n7Af9IW/btFoJkF37g1RflVhStRpftFX3RzObeUo1WR+O/8Kh68IBvbYjfOqv2E0lQdN7182uirM7qLmpsXckDmAKKIVUxINO8JFL5xGhgkaTP9BEDlYXTWFKDSPSUJkCuE6hn0QZeGysrg87u/mdQMOxtJGPLL+EGZM= \ No newline at end of file +PFhjbkT6+Xgiq/hHE10L5KdkDFhpp4wlRUBSEvUKO0Ral/+xB/La2AUUXVwyIZrIcy9oXZ3mzlOLfzCSa9jcqpR8X3twmtqSz7mDL166avrRGSWkRXS6VFSOt2mjeAPt/pCvB3IIz+KoluMJBtaYj4JTqGzu85t9REfHwv9BF7MarMStUcrXov8tL+04sH1Ge6/daey3Y3VkdLkel2VeMaQmfhwuIcHoNQhSXHKX6Jjdtv0Vzf9Pi3Va7CK+uR4rQK0etQTP6GVmX7veJdWbZM4x81136rD1yWIdFPTcy9NnhBbBtgZiIS8eKSXzDwC1ReJq++nclyxlbPD3JJPYZ8TNBfS0LStR8kpz4TTBj7uLJzXrBselIt4Io7w1QaLvOmDEEs1wcfvmSImvNHCFu1giPQRPrzaoeq9tJyin0xb2dZQNqDlptyCZZkEFOOfIhI3dYVeL38ljhpBo4wcQ2fI1kmhAuc2yZgNnhVRj2qJePCUTxmhQXuT9OKIF8YKlG0SaNIFszRG+qRxJ0G/S4MkPTjJsHXKq+qh2zilimJhJLherackXIG0aY5mkMFZ2zGrQgzy271zFNtOjUen8KTXkvrd2ZqxXYdJeu7PM3UxuLH5Cx3vnbf+/cXHXXqs5p5iBWqogsQZHkiKVod2S7FE+TmIQIaphwyd+lvy6iOE= \ 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 c9f2f0aa..74f8b3b4 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py +++ b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py @@ -25,7 +25,7 @@ def fixResolution(): msrdc = '/Applications/Microsoft Remote Desktop.app/Contents/MacOS/Microsoft Remote Desktop' -xfreerdp = '/usr/local/bin/xfreerdp' +xfreerdp = tools.findApp('xfreerdp') executable = None # Check first xfreerdp, allow password redir 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 97be19ae..b0903117 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 @@ -ITzSAyF88+9dvJjzGV5Mg2X+ZQHAJd/Hg19d2kOuoohECeIxrw2YE06wl1lkDGNldyosOm8w2wNjkl0JCnEF5d8B58d7NPAMLnZyJiNZOTJBOKNrQApZk7NZj9yOVM7+pCfKdrlBOs+a662jpkmzbE8I8//v/Uecd1FNtsuLta3oi9mwI4jBio7uDxiEW13WlAnuzrGfHCMFGTFGI0Cs8tC2T5MU2/noMsO7qLsKbCoX+mzBPpIzlDY2gO6/Wu3BA1vdqFDF28F/7Hxnqud9qKYlUp/8ntKJT8hNI04/S+/i3Vu2EgcH5z5YPaV0eEtiSvNul4yhUK+QjrqB25aeuBiW6dLCaBXVZkveI1So/e26PD5cUjwNOzzwlie3kXkVCHGfGgFOYKPyStILos0tVlpYb4hKEEnOJDbfQONQd0QZCo6CzuH068uqk6M5os5ENoewF9gC1qHBKLaTQR9tsghe5l3kWjccQf+ADTKUjYCmobZAVPf1+4oS8XUEY7Nomdbvwx+WJKXhZdycZjLz9/wqqkRGZGDT3YjYi2Lht7VW1PUV6Mm3gu1FIw5UO+dMxdEDQE21K7cLv+0QGW9vTEviMwu+bwqxxIfk6eyIIH5HRuf4UNzFarYer6Qn4sTaqdYbSl39tXJnf9MrEPCtjPbAdSjgBjNFrW4izSrcXe0= \ No newline at end of file +F5BEzwTWBoM12XfwvA70K8cgB8sxXrE9APZuvHhPTpJY9+TA3+Q4wnmC+yrbUW54wPS4HPSrDkERUVDHGmulIeLuOzXnmAA1C+L86FOkO5Pmiy/10utA44p8fja/3R6K5yGW2i9tDSg5CBalaVixw0YvxKZgDpLmdL7cd5h2aWliJc68nOoDMdduWz3Tt19tyMO7TRLfhCVJUP9ETStPIHoLLr/NiyeZ6y7/KvARoi5vEQ1XkRZhOoiZoSnOPCBihzXNIoVAPDFwcS2vW8j+u8TgdFeMgLz26ANs4VLslbhMqJfNTTueejGTma9POOXgDMcbAVbhBCk9xuZjieho/QdtaEQOgPnR45JfadUm0QvrNquVW6eKeE9K6VJ/o3EF5u4qSRoSTlDbxlBo5wblnrRj2IWScvSHGpzTto1o81zOMb8KLhK0iJggxWdK6IiRGmUMbiUKAjeXR3ufvoiQpU9gB54FbPWOThenKL3zUWamVTSx7HnleDSUn+Q9Xu1KWqCamagdgBG7MkEJFkd3dChzaxR2GNBRAijHhHF31AlFcdsIfPXsokqDbqtDu92oSj9MRfjDhp9Jwrw7De4CRXHbmaBYjXfcBTomQYjVymU+cyNjyfgt1NHHWkmVoYvHxod+cUAE5ORkrD9iwZsBbzwYMgcO0TPCqcmNMOS0Mto= \ No newline at end of file