From 2797068e9f6fb3e8ee6413236d1f355f7383ac84 Mon Sep 17 00:00:00 2001 From: Luiz Costa Date: Mon, 3 Jun 2024 15:02:00 +0100 Subject: [PATCH] change user/pass as parameters because special characters on uri --- msp_remoteadmin/tools.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/msp_remoteadmin/tools.py b/msp_remoteadmin/tools.py index 1f5591f..bd1c4db 100644 --- a/msp_remoteadmin/tools.py +++ b/msp_remoteadmin/tools.py @@ -40,8 +40,10 @@ def create_session(name, protocol): ip_doc = frappe.get_doc('IP Address', doc.get('main_ip')) ip_address = ip_doc.ip_address - uri = f"{protocol}://{username if username else ''}{':' + password if password else ''}@{ip_address}{':' + str(PROTOCOL_PORT[protocol])}" + uri = f"{protocol}://{ip_address}{':' + str(PROTOCOL_PORT[protocol])}" if protocol == 'RDP': - uri = f"{uri}/?ignore-cert=true&disable-audio=true{'&domain=' + domain if domain else ''}" + uri = f"{uri}/?ignore-cert=true&disable-audio=true{'&username=' + username if username else ''}{'&password=' + password if password else ''}{'&domain=' + domain if domain else ''}" + elif (protocol == 'SSH' and (username or password)): + uri = f"{uri}/?{'&username=' + username if username else ''}{'&password=' + password if password else ''}" url = f'{guaca_config.guacamole_server}/?#/?token={token}&quickconnect={urllib.parse.quote_plus(uri).lower()}' return url