Refactors RDP tunnel logic to streamline and unify handling

src/uds/transports/RDP/scripts/linux/tunnel.js

@@ -15,7 +15,7 @@ const executablePath =
     Process.findExecutable('thincast-client') ||
     Process.findExecutable('thincast') ||
     Process.findExecutable('xfreerdp3') ||
-    Process.findExecutable('xfreerdp') ||
+    Process.findExecutable('xfreerdp2') ||
     Process.findExecutable('xfreerdp');
 
 if (!executablePath) {
@@ -27,13 +27,14 @@ if (!executablePath) {
 let parameters = data.freerdp_params.map((param) => Utils.expandVars(param));
 
 // Raises an exception if tunnel cannot be started
-let tunnel = await Tasks.startTunnel(
-    data.tunnel.host,
-    data.tunnel.port,
-    data.tunnel.ticket,
-    data.tunnel.startup_time,
-    data.tunnel.verify_ssl,
-);
+const tunnel = await Tasks.startTunnel({
+    addr: data.tunnel.host,
+    port: data.tunnel.port,
+    ticket: data.tunnel.ticket,
+    startup_time_ms: data.tunnel.startup_time,
+    check_certificate: data.tunnel.verify_ssl,
+    shared_secret: data.shared_secret
+});
 
 let process = null;
 

src/uds/transports/RDP/scripts/linux/tunnel.js.mldsa65.sig

@@ -1 +1 @@
-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
+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

src/uds/transports/RDPEmbedded/scripts/linux/tunnel.js

@@ -1,59 +1,19 @@
 'use strict';
-import { Process, Tasks, Logger, File, Utils} from 'runtime';  
+import { Tasks, Logger, RDP } from 'runtime';
 
-// We receive data in "data" variable, which is an object from json readonly
+Logger.info(`Tunnel data: host=${data.tunnel.host}, port=${data.tunnel.port}, ticket=${data.tunnel.ticket}, timeout=${data.tunnel.timeout}`);
 
-const errorString = `You need to have xfreerdp or Thincast installed and in path for this to work.
-Please, install the proper package for your system.
-https://github.com/FreeRDP/FreeRDP|* xfreerdp
-https://thincast.com/en/products/client|* Thincast`;
 
-// Try, in order of preference, to find other RDP clients
-const executablePath =
-    Process.findExecutable('udsrdp') ||
-    Process.findExecutable('thincast-remote-desktop-client') ||
-    Process.findExecutable('thincast-client') ||
-    Process.findExecutable('thincast') ||
-    Process.findExecutable('xfreerdp3') ||
-    Process.findExecutable('xfreerdp') ||
-    Process.findExecutable('xfreerdp');
+const tunnel = await Tasks.startTunnel({
+    addr: data.tunnel.host,
+    port: data.tunnel.port,
+    ticket: data.tunnel.ticket,
+    startup_time_ms: data.tunnel.startup_time,
+    shared_secret: data.shared_secret,
+});
 
-if (!executablePath) {
-    Logger.error('No RDP client found on system');
-    throw new Error('No RDP client found on system');
-}
+data.port = tunnel.port;
+data.server = '127.0.0.1';
+Logger.info(`Tunnel established on port ${data.port}`);
 
-// using Utils.expandVars, expand variables of data.freerdp_params (that is an array of strings)
-let parameters = data.freerdp_params.map((param) => Utils.expandVars(param));
-
-// Raises an exception if tunnel cannot be started
-let tunnel = await Tasks.startTunnel(
-    data.tunnel.host,
-    data.tunnel.port,
-    data.tunnel.ticket,
-    data.tunnel.startup_time,
-    data.tunnel.verify_ssl,
-);
-
-let process = null;
-
-// If has the as_file property, create the temp file on home folder and use it
-if (data.as_file) {
-    Logger.debug('Has as_file property, creating temp RDP file');
-    // Replace "{address}" with data.address in the as_file content
-    let content = data.as_file.replace(/\{address\}/g, `127.0.0.1:${tunnel.port}`);
-    // Create and save the temp file
-    let rdpFilePath = File.createTempFile(File.getHomeDirectory(), content, '.rdp');
-    Logger.debug(`RDP temp file created at ${rdpFilePath}`);
-
-    // Append to removable task to delete the file later
-    Tasks.addEarlyUnlinkableFile(rdpFilePath);
-    let password = data.password ? `/p:${data.password}` : '';
-    // Launch the RDP client with the temp file, the addres in INSIDE the file is already set to
-    process = Process.launch(executablePath, [rdpFilePath, password]);
-} else {
-    // Launch the RDP client with the parameters
-    process = Process.launch(executablePath, [...parameters, `/v:127.0.0.1:${tunnel.port}`]);
-}
-
-Tasks.addWaitableApp(process);
+RDP.start(data);