tabby-rdp 0.5.0 → 0.5.1

package/dist/rdpProfile.js

@@ -18,9 +18,10 @@ const desktopForm_1 = require("./desktopForm");
 const help_1 = require("./help");
 const accounts_1 = require("./accounts");
 const accountForm_1 = require("./accountForm");
+const clipboard_1 = require("./clipboard");
 const desktops_1 = require("./desktops");
 const gateway_1 = require("./gateway");
-const signin_1 = require("./signin");
+const osd_1 = require("./osd");
 const ssh_1 = require("./ssh");
 const targets_1 = require("./targets");
 /** Input of an SSH tab opened for an RDP profile with `via`: the desktop to show once SSH is connected. */
@@ -134,7 +135,7 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
         const o = this.profile.options;
         const account = () => `${o.username ?? ''}\n${o.domain ?? ''}\n${o.account ?? ''}`;
         // No id for a new profile (no address yet): it has nothing saved to take along.
-        this.before = { id: o.host ? (0, desktops_1.desktopIdOf)(o) : '', account: account(), via: o.via ?? '' };
+        this.before = { id: o.host ? (0, desktops_1.desktopIdOf)(o) : '', account: account(), via: o.via ?? '', gateway: o.gateway ?? '' };
         const root = this.element.nativeElement;
         root.innerHTML = `
             <div class="mb-3">
@@ -179,6 +180,12 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
                 <label>Gateway account</label>
                 <select class="form-control" name="gatewayAccount"></select>
                 <div class="text-muted small">A gateway that takes another account than the desktop: a saved account for it.</div>
+            </div>
+            <div class="mb-3">
+                <label>Clipboard</label>
+                <select class="form-control" name="clipboard"></select>
+                <div class="text-muted small">Which ways text, pictures and files copied on either side go between this computer and the desktop.
+                    Applies on the next connection.</div>
             </div>`;
         const field = (name) => root.querySelector(`[name="${name}"]`);
         field('address').value = o.host ? (0, desktopForm_1.formatAddress)(o.host, o.port || 3389) : '';
@@ -240,6 +247,11 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
         });
         gatewayAccount.addEventListener('change', () => { o.gatewayAccount = gatewayAccount.value; });
         gatewayChanged();
+        // Its own clipboard sharing, or the setting's (named, as it is now).
+        const clipboard = field('clipboard');
+        clipboard.append(new Option(`As in Settings › Remote Desktop (${clipboard_1.CLIPBOARD_LABELS[desktop.settings().clipboard].toLowerCase()})`, ''), ...Object.entries(clipboard_1.CLIPBOARD_LABELS).map(([mode, text]) => new Option(text, mode)));
+        clipboard.value = (0, clipboard_1.ownClipboard)(o.clipboard) ?? '';
+        clipboard.addEventListener('change', () => { o.clipboard = clipboard.value; });
         const via = field('via');
         via.addEventListener('change', () => { o.via = via.value; });
         this.injector.get(tabby_core_1.ProfilesService).getProfiles().then(profiles => {
@@ -253,21 +265,22 @@ let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
     }
     save() {
         const o = this.profile.options;
-        const { id, account, via } = this.before;
+        const { id, account, via, gateway } = this.before;
         if (!id) {
             return;
         }
         if ((o.via ?? '') !== via) {
-            // Reached another way, it is another desktop. A direct one's saved account and certificate were its own; one
-            // behind a host shares them with that host's desktop at the same address, so they stay.
+            // 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
+            // desktop at the same address, so they stay.
             if (!via) {
-                (0, signin_1.forgetCredentials)(`${desktops_1.DIRECT_KEY}#${id}`);
-                this.injector.get(desktop_service_1.RemoteDesktopService).forgetCertificatesFor(id, true);
+                this.injector.get(desktop_service_1.RemoteDesktopService).forgetDesktop(id, true, `"${this.profile.name}"`).catch(() => null);
             }
             return;
         }
+        // Its saved password goes with its way there (see desktopEdited): another gateway is asked for again.
         const accountChanged = `${o.username ?? ''}\n${o.domain ?? ''}\n${o.account ?? ''}` !== account;
-        this.injector.get(desktop_service_1.RemoteDesktopService).desktopEdited(id, (0, desktops_1.desktopIdOf)(o), accountChanged, !via).catch(() => null);
+        this.injector.get(desktop_service_1.RemoteDesktopService).desktopEdited(id, (0, desktops_1.desktopIdOf)(o), accountChanged, !via, { from: gateway, to: o.gateway }).catch(() => null);
     }
 };
 exports.RDPProfileSettingsComponent = RDPProfileSettingsComponent;
@@ -289,11 +302,14 @@ let RDPProfilesService = class RDPProfilesService extends tabby_core_1.QuickConn
         this.name = 'Remote desktop (RDP)';
         this.settingsComponent = RDPProfileSettingsComponent;
         this.configDefaults = {
-            options: { host: '', port: 3389, kind: 'windows', username: '', domain: '', account: '', via: '', gateway: '', gatewayAccount: '' },
+            options: { host: '', port: 3389, kind: 'windows', username: '', domain: '', account: '', via: '', gateway: '', gatewayAccount: '', clipboard: '' },
             clearServiceMessagesOnConnect: false,
         };
     }
     async getBuiltinProfiles() {
+        // No clipboard here: a new profile is made from a copy of this, and a value saved with it (even '', the
+        // setting's) would hide the clipboard its group's or the type's defaults give it, which may well be narrower.
+        // Left out, the profile follows those defaults (configDefaults has the key) until it is given one of its own.
         return [{
                 id: `${targets_1.RDP_PROFILE_TYPE}:template`,
                 type: targets_1.RDP_PROFILE_TYPE,
@@ -323,13 +339,17 @@ let RDPProfilesService = class RDPProfilesService extends tabby_core_1.QuickConn
     }
     getDescription(profile) {
         const o = profile.options ?? {};
-        if (!o.host) {
+        // Each field as text whatever the config holds (see configText): Tabby asks this of every profile as it lists
+        // them in its profile selector, and one that throws keeps the selector from opening at all.
+        const host = (0, desktops_1.configText)(o.host);
+        if (!host) {
             return '';
         }
-        const address = (0, desktopForm_1.formatAddress)(o.host, o.port || 3389);
+        const address = (0, desktopForm_1.formatAddress)(host, (0, osd_1.configNumber)(o.port || 3389));
+        const gateway = (0, desktops_1.configText)(o.gateway);
         const via = [
-            ...o.gateway ? [`the gateway ${o.gateway}`] : [],
-            ...o.via ? [(this.config.store.profiles ?? []).find((p) => p.id === o.via)?.name ?? 'an SSH profile'] : [],
+            ...gateway ? [`the gateway ${gateway}`] : [],
+            ...o.via ? [(0, desktops_1.configText)((this.config.store.profiles ?? []).find((p) => p.id === o.via)?.name) || 'an SSH profile'] : [],
         ];
         return via.length ? `${address} via ${via.join(', via ')}` : address;
     }
@@ -348,16 +368,15 @@ let RDPProfilesService = class RDPProfilesService extends tabby_core_1.QuickConn
     }
     intoQuickConnectString(profile) {
         const o = profile.options;
-        return o.via ? null : `${o.username ? `${o.username}@` : ''}${(0, desktopForm_1.formatAddress)(o.host, o.port || 3389)}`;
+        // As text, as getDescription reads them: the profile selector asks this of every profile too.
+        const username = (0, desktops_1.configText)(o.username);
+        return o.via ? null : `${username ? `${username}@` : ''}${(0, desktopForm_1.formatAddress)((0, desktops_1.configText)(o.host), (0, osd_1.configNumber)(o.port || 3389))}`;
     }
     deleteProfile(profile) {
-        // A direct desktop's saved account and certificate are its own; one behind a host shares them with that host's
-        // desktop at the same address.
+        // 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) {
-            const id = (0, desktops_1.desktopIdOf)(profile.options);
-            (0, signin_1.forgetCredentials)(`${desktops_1.DIRECT_KEY}#${id}`);
-            this.injector.get(desktop_service_1.RemoteDesktopService).forgetCertificatesFor(id, true);
-            this.config.save();
+            this.injector.get(desktop_service_1.RemoteDesktopService).forgetDesktop((0, desktops_1.desktopIdOf)(profile.options), true, `"${profile.name}"`).catch(() => null);
         }
     }
 };
@@ -427,4 +446,3 @@ exports.RDPProfileOpener = RDPProfileOpener = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [desktop_service_1.RemoteDesktopService, core_1.NgZone])
 ], RDPProfileOpener);
-//# sourceMappingURL=rdpProfile.js.map

package/dist/remoteSetup.js

@@ -3,14 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareRemoteDesktop = prepareRemoteDesktop;
 const fs = require("fs");
 const path = require("path");
+const desktops_1 = require("./desktops");
 const rdcleanpath_1 = require("./rdcleanpath");
 // Runs as the SSH user; needs no root. Prints exactly one `RD_OK port=N user=U pass=P cert=SHA256`,
 // `RD_XRDP port=N user=U` (no GNOME, but xrdp), `RD_WINDOWS` (a Windows host's POSIX sh) or `RD_ERR <reason>` line;
-// with RD_OK, also an RD_XRDP line when xrdp runs besides GNOME, `RD_CLIENTS N`, the clients connected already, and
-// `RD_TAKEN_OVER <client> <seconds ago>` after a recent take-over.
+// with RD_OK, also an RD_XRDP line when xrdp runs besides GNOME, `RD_CLIENTS N`, the clients connected already,
+// `RD_TAKEN_OVER <client> <seconds ago>` after a recent take-over, `RD_DESK <key>` with 'desk' on, and an `RD_NOTE <text>`
+// for each rc file it couldn't change.
 // The RDP password is generated once per remote user and kept in a 0600 file; grd reads credentials only
 // at startup, so grd is restarted only when its configuration actually changes (that drops live sessions).
-// (grdctl takes the credentials as arguments, so they are briefly visible in the remote's process list.)
+// Secrets never go on a command line, which any user there can see in the process list, except where grdctl can't
+// read the password from its input: then it is an argument once, when the credentials are set.
 const SETUP_SCRIPT = String.raw `
 say () { printf '%s\n' "$*"; }
 fail () { say "RD_ERR $*"; exit 0; }
@@ -59,12 +62,49 @@ OLD="$HOME/.local/share/tabby-remote-desktop"
 if [ -d "$OLD" ] && [ ! -e "$D" ]; then
     mv "$OLD" "$D" || fail "could not move $OLD to $D"
 fi
-for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
-    if [ -f "$rc" ] && grep -qF '# tabby-remote-desktop' "$rc"; then
-        sed -i.trd-bak '/# tabby-remote-desktop$/d' "$rc" && rm -f "$rc.trd-bak"
+mkdir -p "$D" && chmod 700 "$D" || fail "could not create $D"
+# The login hook ('desk'): this one line in ~/.bashrc and ~/.zshrc, added and removed exactly, so that a line of the
+# user's own that only looks like it stays.
+HOOK='[ -f "$HOME/.local/share/tabby-rdp/login.sh" ] && . "$HOME/.local/share/tabby-rdp/login.sh"  # tabby-rdp'
+# Takes the lines that are exactly $2 out of rc file $1 and changes nothing else. grep reads it byte by byte, as text
+# (LC_ALL=C, -a): otherwise a NUL byte, or a byte the host's locale can't read, has it leave lines out or print "Binary
+# file … matches" in their place. What it leaves must be the file less those lines, to the byte, and is written into
+# the file itself, so that a symbolic link to it, another name for it (a hard link), its mode and its owner all stay.
+# A file that can't be written (read-only) or doesn't add up is left as it is, and the setup says so (RD_NOTE).
+unhook () {
+    [ -f "$1" ] || return 0
+    LC_ALL=C grep -a -q -xF -- "$2" "$1" 2>/dev/null
+    case $? in 0) ;; 1) return 0 ;; *) say "RD_NOTE desk's line may be in $1, which can't be read"; return 0 ;; esac
+    uh_tmp=$(mktemp "$D/rc.XXXXXX") || { say "RD_NOTE desk's line stays in $1: no temporary file could be made in $D"; return 0; }
+    LC_ALL=C grep -a -v -xF -- "$2" "$1" > "$uh_tmp"
+    # 1: no line left, the file held only the hook. Each line taken out goes with its newline, and grep ends a last line
+    # that has none with one: so what is left is shorter by exactly that, or one byte longer than that. A step that fails
+    # counts as a mismatch (rather than ending the script, as a failed sum would).
+    if [ $? -le 1 ] && uh_was=$(wc -c < "$1") && uh_lines=$(LC_ALL=C grep -a -c -xF -- "$2" "$1") && uh_now=$(wc -c < "$uh_tmp"); then
+        uh_more=$(( $uh_now - ($uh_was - $uh_lines * (${"$"}{#2} + 1)) ))
+    else
+        uh_more=-1
     fi
+    if [ "$uh_more" != 0 ] && [ "$uh_more" != 1 ]; then
+        say "RD_NOTE desk's line stays in $1: the rest of it didn't copy exactly"
+    elif ! cat "$uh_tmp" 2>/dev/null > "$1"; then
+        # Not opened (read-only), the file is as it was, its line in it. Otherwise writing it failed on the way (a full
+        # disk): what it is to hold stays where the user can find it.
+        if ! LC_ALL=C grep -a -q -xF -- "$2" "$1" 2>/dev/null; then
+            say "RD_NOTE writing $1 failed; what it should hold (without desk's line) is in $uh_tmp"
+            return 0
+        fi
+        say "RD_NOTE desk's line stays in $1: it can't be written (read-only?)"
+    fi
+    rm -f "$uh_tmp"
+}
+# The hook from before 0.2, as those versions wrote it, and what it sources, where the old folder is still there (it
+# couldn't be moved over): so that a copy of the line that was changed since, and stays, does nothing either.
+OLD_HOOK='[ -f "$HOME/.local/share/tabby-remote-desktop/login.sh" ] && . "$HOME/.local/share/tabby-remote-desktop/login.sh"  # tabby-remote-desktop'
+for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
+    unhook "$rc" "$OLD_HOOK"
 done
-mkdir -p "$D" && chmod 700 "$D" || fail "could not create $D"
+rm -f "$OLD/login.sh"
 NEW_CERT=0
 if [ ! -s "$D/tls.key" ]; then
     openssl req -new -newkey rsa:3072 -days 3650 -nodes -x509 -subj "/CN=$(hostname)" \
@@ -77,8 +117,29 @@ CERT=$(openssl x509 -in "$D/tls.crt" -noout -fingerprint -sha256 2>/dev/null | s
 # 'desk' support (setting, off by default): interactive SSH logins start inside a shareable session (trd-pty,
 # or tmux), so 'desk' can attach this exact console to a terminal on the desktop. Rewritten on every connect;
 # opt out per login with TABBY_NO_SESSION=1. When the setting is off, the hook and helpers are removed.
+DESK_KEY=
 if [ "${"$"}{TRD_DESK:-0}" = 1 ]; then
 mkdir -p "$D/bin"
+# 'desk' sends this key with each request, and the plugin (told it below) ignores requests without it: anything shown
+# in a terminal could print the rest. Only this user can read it. Made once, like the RDP password: a key is a file of
+# this user's own (not a link), private, holding 128 bits in hex.
+desk_key () {
+    DESK_KEY=
+    [ -f "$D/desk-key" ] && [ ! -L "$D/desk-key" ] && [ -O "$D/desk-key" ] || return 1
+    DESK_KEY=$(cat "$D/desk-key")
+    case $DESK_KEY in *[!0-9a-f]*) DESK_KEY= ;; esac
+    [ ${"$"}{#DESK_KEY} = 32 ] || { DESK_KEY=; return 1; }
+    chmod 600 "$D/desk-key"
+}
+if ! desk_key; then
+    # Put in place in one step, where there is none: of two setups making one at once (two panes, or two computers),
+    # the first one's stays, and both report it.
+    T=$(mktemp "$D/desk-key.XXXXXX") && od -An -N16 -tx1 /dev/urandom | tr -d ' \n' > "$T" || fail "could not create a key for desk"
+    { [ -e "$D/desk-key" ] || [ -L "$D/desk-key" ]; } && ! desk_key && rm -f "$D/desk-key"
+    ln "$T" "$D/desk-key" 2>/dev/null || desk_key || mv -f "$T" "$D/desk-key"
+    rm -f "$T"
+    desk_key || fail "could not create a key for desk"
+fi
 cat > "$D/login.sh" <<'TRD_EOF'
 # tabby-rdp ('desk' setting): interactive SSH logins run inside a shareable session, so 'desk' in Tabby can
 # bring this console to the remote desktop. Backend ("native" trd-pty or "tmux") is in $TRD_HOME/backend.
@@ -128,7 +189,9 @@ fi
 # Which machine this is: a shared home folder puts this script on others too, and the tab may be connected to another
 # machine than the one this runs on (ssh typed in its console).
 MACHINE=$(cat /etc/machine-id 2>/dev/null || hostname)
-SEQ=$(printf '\033]7777;desk;%s;%s;%s;%s;%s;%s\007' "$(b64 "$SESSION")" "$(b64 "$SOCKET")" "$(b64 "$PWD")" "$(b64 "$KIND")" "$(b64 "$MACHINE")" "$(b64 "$(hostname)")")
+# What Tabby knows a real request by: other output can't read this.
+KEY=$(cat "$HOME/.local/share/tabby-rdp/desk-key" 2>/dev/null)
+SEQ=$(printf '\033]7777;desk;%s;%s;%s;%s;%s;%s;%s\007' "$(b64 "$SESSION")" "$(b64 "$SOCKET")" "$(b64 "$PWD")" "$(b64 "$KIND")" "$(b64 "$MACHINE")" "$(b64 "$(hostname)")" "$(b64 "$KEY")")
 if [ "$KIND" = tmux ]; then
     printf '\033Ptmux;\033%s\033\\' "$SEQ"   # tmux only lets it through as passthrough
 else
@@ -143,19 +206,18 @@ chmod 755 "$D/bin/trd-pty"
 printf '%s\n' "${"$"}{TRD_BACKEND:-native}" > "$D/backend"
 for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
     [ -f "$rc" ] || continue
-    grep -qF '# tabby-rdp' "$rc" && continue
-    # Only one line: turning desk off deletes exactly it, so on/off cycles leave the file as it was.
-    [ -z "$(tail -c1 "$rc")" ] || echo >> "$rc"
-    printf '[ -f "$HOME/.local/share/tabby-rdp/login.sh" ] && . "$HOME/.local/share/tabby-rdp/login.sh"  # tabby-rdp\n' >> "$rc"
+    LC_ALL=C grep -a -q -xF -- "$HOOK" "$rc" && continue
+    # Only one line: turning desk off deletes exactly it, so on/off cycles leave the file as it was. A line of its own:
+    # a newline first, unless the file is empty or its last byte is one (counted, as a NUL there reads as nothing).
+    { [ ! -s "$rc" ] || [ $(( $(tail -c1 "$rc" | wc -l) )) = 1 ] || echo; printf '%s\n' "$HOOK"; } 2>/dev/null >> "$rc" \
+        || say "RD_NOTE desk's line couldn't be added to $rc (read-only?): logins there don't start in a shared session"
 done
 else
     for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
-        if [ -f "$rc" ] && grep -qF '# tabby-rdp' "$rc"; then
-            sed -i.trd-bak '/# tabby-rdp$/d' "$rc" && rm -f "$rc.trd-bak"
-        fi
+        unhook "$rc" "$HOOK"
     done
     # Sessions already running keep going; new logins are plain again.
-    rm -f "$D/login.sh" "$D/tmux.conf" "$D/backend" "$D/bin/desk" "$D/bin/trd-pty"
+    rm -f "$D/login.sh" "$D/tmux.conf" "$D/backend" "$D/bin/desk" "$D/bin/trd-pty" "$D/desk-key"
 fi
 if [ ! -s "$D/rdp-password" ]; then
     ( umask 077; od -An -N18 -tx1 /dev/urandom | tr -d ' \n' > "$D/rdp-password" ) || fail "could not create credentials"
@@ -164,7 +226,11 @@ RD_USER=tabby
 RD_PASS=$(cat "$D/rdp-password")
 
 STATUS=$(grdctl --headless status --show-credentials 2>/dev/null)
-has () { printf '%s\n' "$STATUS" | grep -qxF "$(printf '\t%s' "$1")"; }
+TAB=$(printf '\t') NL='
+'
+# Whether grd's status has this line. Compared in the shell: as a command's argument, the password would show in the
+# process list on every connect.
+has () { case "$NL$STATUS$NL" in *"$NL$TAB$1$NL"*) return 0 ;; esac; return 1; }
 g () { grdctl --headless rdp "$@" >/dev/null 2>&1; }
 RESTART=0
 # grd reads the certificate at startup: a new one at the same path needs a restart too, or grd would keep serving
@@ -176,7 +242,18 @@ fi
 if ! has "View-only: no"; then g disable-view-only || fail "grdctl could not disable view-only"; RESTART=1; fi
 if ! has "Status: enabled"; then g enable || fail "grdctl could not enable RDP"; RESTART=1; fi
 if ! has "Username: $RD_USER" || ! has "Password: $RD_PASS"; then
-    g set-credentials "$RD_USER" "$RD_PASS" || fail "grdctl could not set credentials"
+    # Left off the command line, the password stays out of the process list: grdctl versions that ask for it then read
+    # it from their input. Where that didn't take, it goes as an argument. Without timeout(1) on the host, grdctl runs
+    # as it is: its input is a pipe that ends after the password, so it doesn't wait for more.
+    if command -v timeout >/dev/null 2>&1; then
+        printf '%s\n' "$RD_PASS" | timeout 10 grdctl --headless rdp set-credentials "$RD_USER" >/dev/null 2>&1
+    else
+        printf '%s\n' "$RD_PASS" | grdctl --headless rdp set-credentials "$RD_USER" >/dev/null 2>&1
+    fi
+    STATUS=$(grdctl --headless status --show-credentials 2>/dev/null)
+    if ! has "Username: $RD_USER" || ! has "Password: $RD_PASS"; then
+        g set-credentials "$RD_USER" "$RD_PASS" || fail "grdctl could not set credentials"
+    fi
     RESTART=1
 fi
 
@@ -309,6 +386,7 @@ if [ -s "$D/taken-over" ]; then
 fi
 # xrdp besides GNOME (on a port of its own; on grd's, one of them couldn't listen): offered as another desktop.
 [ -z "$XRDP_PORT" ] || [ "$XRDP_PORT" = "$PORT" ] || say "RD_XRDP port=$XRDP_PORT user=$(id -un)"
+[ -z "$DESK_KEY" ] || say "RD_DESK $DESK_KEY"
 say "RD_OK port=$PORT user=$RD_USER pass=$RD_PASS cert=$CERT"
 `;
 let trdPtySource = null;
@@ -343,9 +421,10 @@ async function prepareRemoteDesktop(target, desk, backend = 'native', client = '
     // it worth asking, so a Linux host costs nothing extra.
     if (/^RD_WINDOWS$/m.test(out) || !/^RD_(OK|XRDP|ERR) /m.test(out) && await isWindows(target)) {
         // Its RDP server makes its own certificate: trusted on first use, like a desktop behind the host.
-        return { kind: 'windows', port: 3389, username: target.key.replace(/@[^@]*$/, ''), password: '', certificate: '' };
+        return { kind: 'windows', port: 3389, username: (0, desktops_1.keyUser)(target.key), password: '', certificate: '' };
     }
-    const err = /^RD_ERR (.*)$/m.exec(out);
+    // The host's reason, as much of it as a status line shows: the host decides how long the line is.
+    const err = /^RD_ERR (.{0,1000})/m.exec(out);
     if (err) {
         throw new Error(err[1]);
     }
@@ -354,13 +433,15 @@ async function prepareRemoteDesktop(target, desk, backend = 'native', client = '
     if (ok) {
         const certificate = (0, rdcleanpath_1.normalizeFingerprint)(ok[4]);
         if (!certificate) {
-            throw new Error(`Remote setup reported no usable certificate fingerprint (${ok[4]})`);
+            // What the host put there, as long as it likes: as much of it as a fingerprint takes, for a status line.
+            throw new Error(`Remote setup reported no usable certificate fingerprint (${ok[4].slice(0, 100)})`);
         }
         const clients = Number(/^RD_CLIENTS (\d+)$/m.exec(out)?.[1] ?? 0);
         const taken = /^RD_TAKEN_OVER (\S+) (\d+)$/m.exec(out);
         return {
             kind: 'gnome', port: Number(ok[1]), username: ok[2], password: ok[3], certificate, xrdpPort: xrdp ? Number(xrdp[1]) : undefined, xrdpUser: xrdp?.[2],
-            clients, takenOver: taken && taken[1] !== client ? Number(taken[2]) : undefined,
+            clients, takenOver: taken && taken[1] !== client ? Number(taken[2]) : undefined, deskKey: /^RD_DESK ([0-9a-f]{32})$/m.exec(out)?.[1],
+            notes: [...out.matchAll(/^RD_NOTE (.+)$/gm)].map(m => m[1]),
         };
     }
     if (xrdp) {
@@ -369,4 +450,3 @@ async function prepareRemoteDesktop(target, desk, backend = 'native', client = '
     }
     throw new Error('Remote setup gave no result');
 }
-//# sourceMappingURL=remoteSetup.js.map

package/dist/sessionLog.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionLog = void 0;
+/**
+ * A line as a string of its own. V8 keeps a part cut out of a string (a slice, a pattern's match; 13 characters or
+ * more) as a view of the string it came from, and joining strings as a list of them: a short line made from a host's
+ * answer of megabytes would keep all of it in memory for as long as the line is kept. Joined to a character and cut
+ * from it again: V8 copies a joined string's characters into one string before it cuts a part out of it, so the line
+ * is a part of that copy, every character as it was, unpaired surrogates included. A copy through UTF-16 and back
+ * does the same at several times the cost, which every line logged pays.
+ */
+function copied(line) {
+    return (' ' + line).slice(1);
+}
+/**
+ * A desktop's connection log (DesktopSession.log): what the settings page's Copy log hands out. Much of it is of the
+ * remote's making (an RD Gateway's administrator's messages, a server's), which decides how many lines there are and
+ * when, for as long as the desktop stays open: kept whole, they could fill Tabby's memory and crash its window. So the
+ * log keeps the first lines (how the connection was set up) and the latest ones, with a line between them saying how
+ * many were left out, and each line is cut at MAX_LINE characters and kept as a copy of its own (see copied), which
+ * the text it was made from doesn't stay in memory with.
+ */
+class SessionLog extends Array {
+    constructor() {
+        super(...arguments);
+        /** How many lines were left out so far. */
+        this.dropped = 0;
+    }
+    // What is made from the log (filter, slice, map) is a plain array.
+    static get [Symbol.species]() {
+        return Array;
+    }
+    push(...lines) {
+        const { FIRST, LATEST, MAX_LINE } = SessionLog;
+        super.push(...lines.map(line => typeof line === 'string' ? copied(line.length > MAX_LINE ? `${line.slice(0, MAX_LINE)}…` : line) : line));
+        // Once the latest lines are twice as many as are kept, the older half of them goes in one step: each line then
+        // costs the same however many come.
+        const said = this.dropped ? 1 : 0;
+        const over = this.length - FIRST - said - LATEST;
+        if (over >= LATEST) {
+            this.dropped += over;
+            this.splice(FIRST, said + over, `(${this.dropped} lines left out here)`);
+        }
+        return this.length;
+    }
+}
+exports.SessionLog = SessionLog;
+/** The first lines, kept whatever follows. */
+SessionLog.FIRST = 200;
+/** At least this many of the latest lines are kept (and at most twice as many, see push). */
+SessionLog.LATEST = 2000;
+/** The longest a line is kept. */
+SessionLog.MAX_LINE = 4096;

package/dist/settingsPage.js

@@ -15,6 +15,7 @@ const path_1 = require("path");
 const tabby_core_1 = require("tabby-core");
 const tabby_settings_1 = require("tabby-settings");
 const accounts_1 = require("./accounts");
+const clipboard_1 = require("./clipboard");
 const desktop_service_1 = require("./desktop.service");
 const desktops_1 = require("./desktops");
 const drives_1 = require("./drives");
@@ -22,6 +23,7 @@ const osd_1 = require("./osd");
 const help_1 = require("./help");
 const updates_1 = require("./updates");
 const targets_1 = require("./targets");
+const unshowable_1 = require("./unshowable");
 const REPO = 'https://github.com/meanaverage/tabby-rdp';
 const k = (s) => `<kbd>${(0, help_1.esc)(s)}</kbd>`;
 /** The page's tabs (as Tabby's "Profiles & connections" page has Profiles and Advanced), each holding sections by topic. */
@@ -59,7 +61,7 @@ const STYLE = `
 .trd-settings .trd-card { display: flex; flex-direction: column; gap: 8px; padding: 12px; border-radius: 6px;
     border: 1px solid rgba(128, 128, 128, 0.25); }
 .trd-settings .trd-card .trd-card-title { font-weight: 600; display: flex; align-items: center; gap: 6px; }
-.trd-settings h4 .trd-info, .trd-settings .trd-lead .trd-info { margin-left: 4px; vertical-align: middle; font-size: 13px; }
+.trd-settings h4 .trd-info, .trd-settings .trd-lead .trd-info, .trd-settings .form-line .title .trd-info { margin-left: 4px; vertical-align: middle; font-size: 13px; }
 .trd-settings .trd-info { position: relative; display: inline-flex; opacity: 0.55; cursor: help; outline: none; font-weight: normal; }
 .trd-settings .trd-info:hover, .trd-settings .trd-info:focus { opacity: 1; }
 .trd-settings .trd-info::after { content: attr(data-tip); position: absolute; left: 0; top: calc(100% + 6px); z-index: 20; width: 260px;
@@ -265,7 +267,20 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
 
                 <h5>Sound</h5>
                 ${this.toggleLine('sound', 'Sound', 'Play the remote desktop\'s sound here. Applies on the next connection.')}
-                ${this.toggleLine('microphone', 'Microphone', 'Send your microphone while an app there records, with a red dot in the corner meanwhile. Applies on the next connection.')}
+                ${this.toggleLine('microphone', 'Microphone', 'Send your microphone to a remote desktop that asks for it, as one does while an app there records (a call, say). Meanwhile a red dot shows in the desktop\'s corner, and a red microphone in Tabby\'s header (in full screen, at the top of the window), also while the desktop is hidden. Its menu shows that desktop, or stops sending the microphone there until Send the microphone is turned back on in the desktop\'s menu, or Tabby quits. Turning the setting on applies on the next connection; off stops it at once.')}
+
+                <h5>Clipboard</h5>
+                <div class="form-line">
+                    <div class="header">
+                        <div class="title">Clipboard sharing ${this.info('A desktop that gets your clipboard sees what is on it whenever it has the keyboard: what you copy then, and what you copied elsewhere before clicking back into it, passwords included. One that sends its clipboard here can put anything on yours, such as a command for you to paste into a terminal. Off leaves the clipboard out of the connection altogether. Narrowed while a desktop is open, what you copy from then on stays here and the files offered there are taken back; the change applies in full once that desktop reconnects.')}</div>
+                        <div class="description">Which ways text, pictures and files copied on either side go. A desktop can have its
+                            own, in its profile or its edit form. Applies on the next connection; narrowing it also stops the
+                            sending from here at once to open desktops that follow the setting.</div>
+                    </div>
+                    <select class="form-control" data-setting="clipboard">
+                        ${Object.entries(clipboard_1.CLIPBOARD_LABELS).map(([mode, label]) => `<option value="${mode}">${(0, help_1.esc)(label)}</option>`).join('')}
+                    </select>
+                </div>
 
                 <h5>Shared folders</h5>
                 <div class="trd-lead">Folders from this computer as drives on the remote desktop, under <code>\\\\tsclient</code> in
@@ -378,7 +393,7 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
             <section data-topic="desktops">
                 <h4>Desktops</h4>
                 <div class="trd-lead">Remote desktop profiles, and desktops added from SSH tabs.
-                    ${this.info('A desktop added from an SSH tab\'s menu belongs to that host. That is for hosts without a profile, such as an ssh typed in a terminal.')}</div>
+                    ${this.info('A desktop added from an SSH tab\'s menu belongs to that host. That is for hosts without a profile, such as ssh run in a local terminal.')}</div>
                 <div class="trd-list" data-list="desktops"></div>
                 <div class="trd-add"><button class="btn btn-secondary btn-sm" data-action="desktop">Add a desktop…</button></div>
             </section>
@@ -589,37 +604,49 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
         // 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 ?? [];
+        // 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 address = `${o.host}:${o.port || 3389}`;
-            const via = o.via ? (this.config.store.profiles ?? []).find((x) => x.id === o.via)?.name ?? 'an SSH profile' : null;
+            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 [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)}` : o.username ? `Signs in as ${(0, help_1.esc)(o.username)}` : '',
-                o.kind && o.kind !== 'windows' ? (0, help_1.esc)(o.kind) : '',
-                o.gateway ? `Through the gateway ${(0, help_1.esc)(o.gateway)}${accountOf(o.gatewayAccount) ? `, as ${(0, help_1.esc)(accountOf(o.gatewayAccount).name)}` : ''}` : '',
+                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)}` : ''}` : '',
+                clipboard ? `Clipboard: ${(0, help_1.esc)(clipboard_1.CLIPBOARD_LABELS[clipboard].toLowerCase())}` : '',
             ].filter(Boolean).join('<br>');
-            return this.row((0, help_1.esc)(p.name ?? address), `${(0, help_1.esc)(address)}${via ? ` via ${(0, help_1.esc)(via)}` : ''}${details ? `<br>${details}` : ''}`, [
+            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();
-        const desktopRows = desktops.map((d, i) => {
+        // An item that is no entry describes no desktop, and isn't listed (see isDesktopEntry).
+        const desktopRows = desktops.flatMap((d, i) => {
+            if (!(0, desktops_1.isDesktopEntry)(d)) {
+                return [];
+            }
             // A Hyper-V VM has no address of its own: its console is its host's to give.
-            const address = d.hyperv ? 'Hyper-V VM' : `${d.host ?? '127.0.0.1'}:${d.port ?? 3389}`;
+            const { name, address, via, hyperv } = (0, desktops_1.entryText)(d);
             const account = accountOf(d.account);
+            const [username, kind, gateway, vm, mac] = [(0, desktops_1.configText)(d.username), (0, desktops_1.configText)(d.kind), (0, desktops_1.configText)(d.gateway), (0, desktops_1.configText)(d.wake?.vm), (0, desktops_1.configText)(d.wake?.mac)];
             const details = [
-                account ? `Signs in as ${(0, help_1.esc)(account.name)}` : d.username ? `Signs in as ${(0, help_1.esc)(d.username)}` : '',
-                d.kind && d.kind !== 'windows' ? (0, help_1.esc)(d.kind) : '',
-                d.gateway && !d.hyperv ? `Through the gateway ${(0, help_1.esc)(d.gateway)}${accountOf(d.gatewayAccount) ? `, as ${(0, help_1.esc)(accountOf(d.gatewayAccount).name)}` : ''}` : '',
-                d.wake?.vm ? `Starts VM ${(0, help_1.esc)(d.wake.vm)} when off` : d.wake?.mac ? `Wakes ${(0, help_1.esc)(d.wake.mac)} when off` : '',
+                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)}` : ''}` : '',
+                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>');
-            return this.row((0, help_1.esc)(d.name ?? address), `${(0, help_1.esc)(address)} ${d.hyperv ? 'on' : 'behind'} ${(0, help_1.esc)(d.via)}${details ? `<br>${details}` : ''}`, [
-                { label: 'Edit…', run: () => { this.desktop.editDesktopIn(this.root, i, true); } },
-                { label: 'Remove…', danger: true, run: () => { this.desktop.confirmRemoveDesktop(i); } },
-            ]);
+            return [this.row((0, help_1.esc)(name), `${hyperv ? 'Hyper-V VM' : (0, help_1.esc)(address)}${via ? ` ${hyperv ? 'on' : 'behind'} ${(0, help_1.esc)(via)}` : ''}${details ? `<br>${details}` : ''}`, [
+                    { label: 'Edit…', run: () => { this.desktop.editDesktopIn(this.root, i, true); } },
+                    { label: 'Remove…', danger: true, run: () => { this.desktop.confirmRemoveDesktop(i); } },
+                ])];
         });
         list.replaceChildren(...profileRows, ...desktopRows, this.empty(profileRows.length + desktopRows.length
             ? 'Profiles are also in Profiles &amp; connections; a desktop behind a host also in that host\'s SSH tab: right-click › Settings.'
@@ -645,7 +672,7 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
             }));
             row.insertBefore(check, row.querySelector('button'));
             return row;
-        }), ...folders.length ? [] : [this.empty('None shared. The clipboard still carries files either way: drop them on the desktop, or copy them there and save them here.')]);
+        }), ...folders.length ? [] : [this.empty('None shared. The clipboard carries files too, the ways it goes: drop them on the desktop, or copy them there and save them here.')]);
     }
     /** Asks for a folder and shares it under its own name (numbered when another share has it). */
     async shareFolder() {
@@ -958,17 +985,21 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
             return;
         }
         const entries = this.desktop.trustedCertificates();
-        list.replaceChildren(...entries.map(({ desktop, sha256 }) => {
+        list.replaceChildren(...entries.map(({ desktop, sha256, authority }) => {
             const [who, address] = desktop.includes('#') ? desktop.split('#', 2) : [desktop, ''];
-            const title = address ? who === 'gateway' ? `The gateway ${(0, help_1.esc)(address)}` : who === desktops_1.DIRECT_KEY ? `${(0, help_1.esc)(address)} (direct)` : `${(0, help_1.esc)(address)} behind ${(0, help_1.esc)(who)}` : (0, help_1.esc)(who);
-            // What else was decided about that server is said here, and forgotten with the certificate.
+            // A host's key as it reads; a machine reached through one is named as that host's ssh resolved it, which is
+            // its word: what could reorder or hide part of it shows as U+FFFD.
+            const host = (0, help_1.esc)((0, unshowable_1.showable)((0, desktops_1.shownKey)(who)));
+            const title = address ? who === 'gateway' ? `The gateway ${(0, help_1.esc)(address)}` : who === desktops_1.DIRECT_KEY ? `${(0, help_1.esc)(address)} (direct)` : `${(0, help_1.esc)(address)} behind ${host}` : host;
+            // How it came to be trusted, where that is known, and what else was decided about that server: forgotten with it.
+            const how = authority === true ? '<br>Valid for its name by a certificate authority' : authority === false ? '<br>Trusted by you' : '';
             const plain = this.desktop.signsInWithoutNla(desktop) ? '<br>Signs in without Network Level Authentication' : '';
-            return this.row(title, `SHA-256 ${(0, help_1.esc)(sha256.slice(0, 23))}…${plain}`, [
+            return this.row(title, `SHA-256 ${(0, help_1.esc)(sha256.slice(0, 23))}…${how}${plain}`, [
                 { label: 'Forget', run: () => this.desktop.forgetCertificate(desktop) },
             ]);
         }), this.empty(entries.length
-            ? 'A forgotten certificate is remembered again, without asking, on the next connection.'
-            : 'None yet. Windows and xrdp desktops\' certificates are remembered on first use and checked every time after; GNOME desktops only accept the one the plugin made.'));
+            ? 'A forgotten certificate is asked about again on the next connection, unless a certificate authority vouches for it; one behind an SSH host is remembered again without asking.'
+            : 'None yet. A desktop connected to directly, and a gateway, are asked about the first time unless a certificate authority vouches for them; a desktop behind an SSH host is remembered on first use. Each is checked every time after. GNOME desktops only accept the one the plugin made.'));
     }
     renderSessions() {
         const list = this.root.querySelector('[data-list=sessions]');
@@ -1031,7 +1062,10 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
             return null;
         }
     }
-    /** "Remove…" on a remote desktop profile: asks, then deletes it as Tabby's Profiles page would (saved account and certificate go too). */
+    /**
+     * "Remove…" on a remote desktop profile: asks, then deletes it as Tabby's Profiles page would (a direct one's saved
+     * passwords and certificate go too; see RDPProfilesService.deleteProfile).
+     */
     async removeProfile(id) {
         const profiles = this.injector.get(tabby_core_1.ProfilesService);
         const profile = (await profiles.getProfiles()).find(p => p.id === id);
@@ -1041,7 +1075,10 @@ let RemoteDesktopSettingsComponent = class RemoteDesktopSettingsComponent {
         const { response } = await this.platform.showMessageBox({
             type: 'warning',
             message: `Remove the profile "${profile.name}"?`,
-            detail: 'Its saved account and remembered certificate are forgotten too.',
+            // A saved account isn't the profile's: other desktops may sign in with it, and it stays.
+            detail: profile.options?.via
+                ? 'Its saved password and remembered certificate stay: they are those of the same desktop behind its SSH profile\'s host.'
+                : 'Its saved password and remembered certificate are forgotten too.',
             buttons: ['Remove', 'Keep'],
             defaultId: 1,
             cancelId: 1,
@@ -1135,4 +1172,3 @@ exports.RemoteDesktopSettingsComponent = RemoteDesktopSettingsComponent = __deco
         core_1.NgZone,
         tabby_core_1.HotkeysService])
 ], RemoteDesktopSettingsComponent);
-//# sourceMappingURL=settingsPage.js.map