tabby-rdp 0.5.2 → 0.5.3

package/dist/rdpFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MICROPHONE_NOTE = void 0;
+exports.MAX_RDP_FILE = exports.MICROPHONE_NOTE = void 0;
 exports.parseRdpFile = parseRdpFile;
 /**
  * The note for a file that asks for the microphone: not applied while the setting is off. With it on, every desktop
@@ -53,6 +53,11 @@ function decode(data) {
     }
     return b.toString('utf8');
 }
+/**
+ * The most an .rdp file may be: one Remote Desktop Connection saves is a few KB, a signed one a few more. A larger one is
+ * refused before it is read: what it holds would be parsed on the thread that runs Tabby's window.
+ */
+exports.MAX_RDP_FILE = 1024 * 1024;
 /** The connection a .rdp file describes, or null without a usable `full address`. */
 function parseRdpFile(data) {
     const settings = new Map();
@@ -60,9 +65,13 @@ function parseRdpFile(data) {
     // twice, differently, gets the narrower of the two rather than whichever line comes last.
     let clipboardOff = false;
     for (const line of decode(data).split(/\r?\n/)) {
-        const m = /^\s*([^:]+?)\s*:\s*([sib])\s*:(.*)$/i.exec(line);
-        if (m) {
-            const key = m[1].toLowerCase();
+        // The name up to the first colon, trimmed after: a pattern with room for spaces on both sides of the name (as
+        // `\s*([^:]+?)\s*:` had) tries every way of splitting a line of spaces without a colon before it fails, in time
+        // that grows with the cube of its length, and a line of a few thousand spaces held up Tabby's window for seconds
+        // (security review, finding 2). This one takes a line's length, whatever it holds.
+        const m = /^([^:]*):\s*([sib])\s*:(.*)$/i.exec(line);
+        const key = m?.[1].trim().toLowerCase();
+        if (m && key) {
             const value = m[3].trim();
             settings.set(key, value);
             clipboardOff ||= key === 'redirectclipboard' && /^[+-]?\d+$/.test(value) && Number(value) === 0;

package/dist/rdpProfile.js

@@ -124,7 +124,7 @@ exports.RDPTabRecovery = RDPTabRecovery = __decorate([
 // ---- profile settings --------------------------------------------------------------------------
 /**
  * The profile's own fields in Tabby's profile editor (name, group, icon and color are Tabby's). Plain DOM like the
- * rest of the plugin, writing to the profile as you type.
+ * rest of the plugin. Address and gateway edits stay in the form until Save validates both of them.
  */
 let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
     constructor(element, injector) {
@@ -188,6 +188,7 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
                     Applies on the next connection.</div>
             </div>`;
         const field = (name) => root.querySelector(`[name="${name}"]`);
+        this.connectionInputs = { address: field('address'), gateway: field('gateway') };
         field('address').value = o.host ? (0, desktopForm_1.formatAddress)(o.host, o.port || 3389) : '';
         field('kind').value = o.kind === 'gnome' || o.kind === 'xrdp' ? o.kind : 'windows';
         field('username').value = o.username ?? '';
@@ -196,10 +197,6 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
             const text = field('address').value;
             const address = (0, desktopForm_1.parseAddress)(text);
             root.querySelector('[data-for=address]').textContent = text.trim() && !address ? 'This doesn\'t look like an address.' : '';
-            if (address) {
-                o.host = address.host;
-                o.port = address.port;
-            }
         });
         field('kind').addEventListener('change', () => {
             const kind = field('kind').value;
@@ -227,12 +224,12 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
         ownAccount();
         field('username').addEventListener('input', () => { o.username = field('username').value.trim(); });
         field('domain').addEventListener('input', () => { o.domain = field('domain').value.trim(); });
-        // The gateway, and its account where that isn't the desktop's (offered once there is a gateway and a saved account).
+        // The gateway, and its separate account or sign-in prompt.
         const gateway = field('gateway');
         const gatewayAccount = field('gatewayAccount');
         gateway.value = o.gateway ?? '';
-        gatewayAccount.append(new Option('The same as the desktop\'s', ''), ...accounts.map(a => new Option(label(a), a.id)));
-        if (o.gatewayAccount && !accounts.some(a => a.id === o.gatewayAccount)) {
+        gatewayAccount.append(new Option('The same as the desktop\'s', ''), new Option('Ask for a gateway account when connecting', accounts_1.ASK_GATEWAY_ACCOUNT), ...accounts.map(a => new Option(label(a), a.id)));
+        if (o.gatewayAccount && o.gatewayAccount !== accounts_1.ASK_GATEWAY_ACCOUNT && !accounts.some(a => a.id === o.gatewayAccount)) {
             gatewayAccount.append(new Option('(a saved account that no longer exists)', o.gatewayAccount));
         }
         gatewayAccount.value = o.gatewayAccount ?? '';
@@ -241,10 +238,7 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
             root.querySelector('[data-for=gateway]').textContent = text && !(0, gateway_1.parseGateway)(text) ? 'A name or address, with :port if it isn\'t 443.' : '';
             root.querySelector('[data-gateway-account]').hidden = !text || gatewayAccount.options.length < 2;
         };
-        gateway.addEventListener('input', () => {
-            o.gateway = gateway.value.trim();
-            gatewayChanged();
-        });
+        gateway.addEventListener('input', gatewayChanged);
         gatewayAccount.addEventListener('change', () => { o.gatewayAccount = gatewayAccount.value; });
         gatewayChanged();
         // Its own clipboard sharing, or the setting's (named, as it is now).
@@ -265,10 +259,45 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
     }
     save() {
         const o = this.profile.options;
+        if (this.connectionInputs) {
+            const { address: addressInput, gateway: gatewayInput } = this.connectionInputs;
+            const addressText = addressInput.value.trim();
+            const address = (0, desktopForm_1.parseAddress)(addressText);
+            const gatewayText = gatewayInput.value.trim();
+            // Empty addresses are useful in group/type defaults. They clear the destination instead of retaining it.
+            const addressError = addressText && !address ? 'This doesn\'t look like an address.' : '';
+            const gatewayError = gatewayText && !(0, gateway_1.parseGateway)(gatewayText) ? 'A name or address, with :port if it isn\'t 443.' : '';
+            const root = this.element.nativeElement;
+            root.querySelector('[data-for=address]').textContent = addressError;
+            root.querySelector('[data-for=gateway]').textContent = gatewayError;
+            if (addressError || gatewayError) {
+                ;
+                (addressError ? addressInput : gatewayInput).focus();
+                // Tabby invokes this synchronous hook before cleaning the proxy and closing the modal. Throwing
+                // stops that Save operation; a return value would be ignored by the host.
+                throw new Error(`Cannot save this RDP profile: ${addressError || gatewayError}`);
+            }
+            // Commit the two connection fields together only after both drafts pass validation.
+            o.host = address?.host ?? '';
+            // A blank destination carries no port edit: keep custom/inherited ports in group and type defaults.
+            if (address) {
+                o.port = address.port;
+            }
+            o.gateway = gatewayText;
+        }
         const { id, account, via, gateway } = this.before;
         if (!id) {
             return;
         }
+        if (!o.host) {
+            // A saved profile's address cleared: the desktop it led to is gone from it, as when the profile is removed
+            // (see RDPProfilesService.deleteProfile). Not for the type's or a group's defaults, which have no id of
+            // their own (an empty address is useful there): profiles that name that address keep what is saved for it.
+            if (!via && this.profile.id) {
+                this.injector.get(desktop_service_1.RemoteDesktopService).forgetDesktop(id, true, `"${this.profile.name}"`).catch(() => null);
+            }
+            return;
+        }
         if ((o.via ?? '') !== via) {
             // Reached another way, it is another desktop. A direct one's saved passwords (through any gateway, the ones
             // it had before included) and certificate were its own; one behind a host shares them with that host's
@@ -374,8 +403,9 @@ let RDPProfilesService = class RDPProfilesService extends tabby_core_1.QuickConn
     }
     deleteProfile(profile) {
         // A direct desktop's saved passwords (through any gateway: one it went through before too) and certificate are
-        // its own; one behind a host shares them with that host's desktop at the same address.
-        if (!profile.options.via) {
+        // its own; one behind a host shares them with that host's desktop at the same address. A profile without an
+        // address of its own leads to no desktop of its own: desktopIdOf would name 127.0.0.1:3389 for it.
+        if (!profile.options.via && (0, desktops_1.configText)(profile.options.host)) {
             this.injector.get(desktop_service_1.RemoteDesktopService).forgetDesktop((0, desktops_1.desktopIdOf)(profile.options), true, `"${profile.name}"`).catch(() => null);
         }
     }

package/dist/releases.js

@@ -310,6 +310,7 @@ class ReleaseManager {
                 if (reason) {
                     throw new Error(reason);
                 }
+                const targetFloor = this.catalog.versions.find(p => p.version === version).policy.rollbackFloor;
                 if (version === this.running) {
                     progress('success', `tabby-rdp ${version} is already running.`);
                     return;
@@ -339,6 +340,8 @@ class ReleaseManager {
                 this.state.previous = this.running;
                 this.state.pending = version;
                 this.state.removed = false;
+                // Record the target's data boundary before restart, while older windows may still be running.
+                this.state.rollbackFloor = greatest(this.state.rollbackFloor, targetFloor);
                 if (returnToStable) {
                     this.state.channel = 'stable';
                 }

package/dist/settingsPage.js

@@ -597,29 +597,34 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
         const accounts = this.desktop.accounts();
         const accountOf = (id) => id ? accounts.find(a => a.id === id) : undefined;
         // Remote desktop profiles first (Tabby's editor), then the desktops added from SSH tabs (the plugin's form).
-        const profiles = (this.config.store.profiles ?? []).filter((p) => p?.type === targets_1.RDP_PROFILE_TYPE && p.options?.host);
-        const groups = this.config.store.groups ?? [];
+        const profiles = (this.config.store.profiles ?? []).filter((p) => p?.type === targets_1.RDP_PROFILE_TYPE);
+        const gatewaySignIn = (id) => {
+            const account = accountOf(id);
+            return account ? `, as ${(0, help_1.esc)(account.name)}` : id === accounts_1.ASK_GATEWAY_ACCOUNT ? ', asks for a gateway account'
+                : id ? ', saved gateway account missing (asks when connecting)' : '';
+        };
         // Every field as text whatever the config holds (see configText): one that can't be shown would leave this list,
         // and the lists after it on the page, unbuilt.
-        const profileRows = profiles.map(p => {
-            const o = p.options;
+        const profileRows = profiles.flatMap(p => {
+            const o = this.injector.get(tabby_core_1.ProfilesService).getConfigProxyForProfile(p).options;
+            if (!o?.host) {
+                return [];
+            }
             const address = `${(0, desktops_1.configText)(o.host)}:${(0, desktops_1.configText)(o.port || 3389)}`;
             const via = o.via ? (0, desktops_1.configText)((this.config.store.profiles ?? []).find((x) => x.id === o.via)?.name) || 'an SSH profile' : null;
-            const inherited = o.account === undefined ? groups.find(g => g.id === p.group)?.defaults?.[targets_1.RDP_PROFILE_TYPE]?.options?.account : undefined;
-            const account = accountOf(o.account || inherited);
-            // Its own clipboard, or its group's or the type's default: what it connects with, as Tabby resolves the profile.
-            const clipboard = (0, clipboard_1.ownClipboard)(this.injector.get(tabby_core_1.ProfilesService).getConfigProxyForProfile(p).options?.clipboard);
+            const account = accountOf(o.account);
+            const clipboard = (0, clipboard_1.ownClipboard)(o.clipboard);
             const [username, kind, gateway] = [(0, desktops_1.configText)(o.username), (0, desktops_1.configText)(o.kind), (0, desktops_1.configText)(o.gateway)];
             const details = [
                 account ? `Signs in as ${(0, help_1.esc)(account.name)}` : username ? `Signs in as ${(0, help_1.esc)(username)}` : '',
                 kind && kind !== 'windows' ? (0, help_1.esc)(kind) : '',
-                gateway ? `Through the gateway ${(0, help_1.esc)(gateway)}${accountOf(o.gatewayAccount) ? `, as ${(0, help_1.esc)(accountOf(o.gatewayAccount).name)}` : ''}` : '',
+                gateway ? `Through the gateway ${(0, help_1.esc)(gateway)}${gatewaySignIn(o.gatewayAccount)}` : '',
                 clipboard ? `Clipboard: ${(0, help_1.esc)(clipboard_1.CLIPBOARD_LABELS[clipboard].toLowerCase())}` : '',
             ].filter(Boolean).join('<br>');
-            return this.row((0, help_1.esc)((0, desktops_1.configText)(p.name) || address), `${(0, help_1.esc)(address)}${via ? ` via ${(0, help_1.esc)(via)}` : ''}${details ? `<br>${details}` : ''}`, [
-                { label: 'Edit…', run: () => { this.editProfile(p.id); } },
-                { label: 'Remove…', danger: true, run: () => { this.removeProfile(p.id); } },
-            ]);
+            return [this.row((0, help_1.esc)((0, desktops_1.configText)(p.name) || address), `${(0, help_1.esc)(address)}${via ? ` via ${(0, help_1.esc)(via)}` : ''}${details ? `<br>${details}` : ''}`, [
+                    { label: 'Edit…', run: () => { this.editProfile(p.id); } },
+                    { label: 'Remove…', danger: true, run: () => { this.removeProfile(p.id); } },
+                ])];
         });
         const desktops = this.desktop.configuredDesktops();
         // An item that is no entry describes no desktop, and isn't listed (see isDesktopEntry).
@@ -634,7 +639,7 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
             const details = [
                 account ? `Signs in as ${(0, help_1.esc)(account.name)}` : username ? `Signs in as ${(0, help_1.esc)(username)}` : '',
                 kind && kind !== 'windows' ? (0, help_1.esc)(kind) : '',
-                gateway && !hyperv ? `Through the gateway ${(0, help_1.esc)(gateway)}${accountOf(d.gatewayAccount) ? `, as ${(0, help_1.esc)(accountOf(d.gatewayAccount).name)}` : ''}` : '',
+                gateway && !hyperv ? `Through the gateway ${(0, help_1.esc)(gateway)}${gatewaySignIn(d.gatewayAccount)}` : '',
                 vm ? `Starts VM ${(0, help_1.esc)(vm)} when off` : mac ? `Wakes ${(0, help_1.esc)(mac)} when off` : '',
                 (0, clipboard_1.ownClipboard)(d.clipboard) ? `Clipboard: ${(0, help_1.esc)(clipboard_1.CLIPBOARD_LABELS[(0, clipboard_1.ownClipboard)(d.clipboard)].toLowerCase())}` : '',
             ].filter(Boolean).join('<br>');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-rdp",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Remote desktops in Tabby's SSH tabs: Linux (GNOME) and Windows, through the SSH connection, with clipboard, files and sound. Built on IronRDP.",
   "keywords": [
     "tabby-plugin",
@@ -43,7 +43,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit && npm run typecheck:test",
     "typecheck:test": "tsc -p tsconfig.test.json",
     "test": "tsx test/run.ts",
-    "test:smoke": "tsx test/run.ts --packed --hidden smoke-host smoke-rdp",
+    "test:smoke": "tsx test/run.ts --packed --hidden smoke-host smoke-rdp direct",
     "test:unit": "tsx --test test/unit/*.ts",
     "build:ironrdp": "scripts/build-ironrdp.sh",
     "prepublishOnly": "npm run build"
@@ -65,6 +65,6 @@
   },
   "tabbyRdp": {
     "minimumTabbyVersion": "1.0.236",
-    "rollbackFloor": "0.5.1"
+    "rollbackFloor": "0.5.3"
   }
 }

package/vendor/SHA256SUMS

@@ -24,3 +24,4 @@ d67aa6029edb142daa1e5069fa79ab1917687474a89a61bd221081f204ba8e12  ironrdp/patche
 538641d863e52972074b032c111a67cfa02d06290bff0601423f3dfd25ad563b  vendor/iron-remote-desktop-rdp.js
 5a6363b9140a5a2abf0218aa39edb38f10445e8d7e9c5a798c321772e1f07c11  vendor/iron-remote-desktop.js
 31f961cc5fc60f6a3dc580333f871bf9b380950dc849395465844dcc90f871f3  vendor/ironrdp_web_bg.wasm
+82470ad2980db3fe48787cb821e231fc44811b046f7820555f6e25f2b4ccce28  vendor/ironrdp-factory.js