tabby-rdp 0.2.7 → 0.3.1

package/dist/rdpProfile.js

@@ -0,0 +1,367 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RDPProfileOpener = exports.RDPCommands = exports.RDPProfilesService = exports.RDPProfileSettingsComponent = exports.RDPTabRecovery = exports.RDPTabComponent = void 0;
+const core_1 = require("@angular/core");
+const tabby_core_1 = require("tabby-core");
+const tabby_terminal_1 = require("tabby-terminal");
+const desktop_service_1 = require("./desktop.service");
+const desktopForm_1 = require("./desktopForm");
+const help_1 = require("./help");
+const desktops_1 = require("./desktops");
+const signin_1 = require("./signin");
+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. */
+const OPEN_DESKTOP = 'trdOpenDesktop';
+const RECOVERY_TYPE = 'app:rdp-tab';
+// ---- the tab -----------------------------------------------------------------------------------
+const TAB_STYLE = `
+rdp-tab { flex: auto; display: flex; position: relative; overflow: hidden; background: #111; }
+rdp-tab .trd-rdp-idle { position: absolute; inset: 0; display: flex; flex-direction: column; gap: 14px; align-items: center;
+    justify-content: center; padding: 2em; text-align: center; color: #bbb; font-size: 13px; white-space: pre-line; }
+`;
+/**
+ * A remote desktop tab: the desktop layer (the same one SSH tabs get) fills it, and there is no console under it.
+ * A component because Tabby opens profiles as tab components; it holds no UI of its own beyond a line and a Connect
+ * button for when no desktop is open (after Disconnect).
+ */
+let RDPTabComponent = class RDPTabComponent extends tabby_core_1.BaseTabComponent {
+    constructor(injector, element, desktop, targets, zone) {
+        super(injector);
+        this.element = element;
+        this.desktop = desktop;
+        this.targets = targets;
+        this.zone = zone;
+    }
+    ngOnInit() {
+        if (!this.title) {
+            this.setTitle(this.profile.name);
+        }
+        this.idle = document.createElement('div');
+        this.idle.className = 'trd-rdp-idle';
+        this.idle.innerHTML = '<div class="trd-rdp-idle-text"></div><button class="btn btn-secondary">Connect</button>';
+        this.idle.querySelector('button').addEventListener('click', () => this.zone.run(() => this.open()));
+        this.element.nativeElement.appendChild(this.idle);
+        this.subscribeUntilDestroyed(this.desktop.changed$, () => this.update());
+        this.update();
+        // Once the tab is laid out, so that the first connection gets the pane's size.
+        setTimeout(() => this.open(true));
+    }
+    update() {
+        const o = this.profile.options;
+        const text = o.via
+            ? `${this.profile.name} goes through an SSH profile that no longer exists. Choose another in its profile settings.`
+            : `${this.profile.name} (${(0, desktopForm_1.formatAddress)(o.host, o.port || 3389)}) is not connected.`;
+        this.idle.querySelector('.trd-rdp-idle-text').textContent = text;
+        this.idle.querySelector('button').style.display = o.via ? 'none' : '';
+        this.idle.style.display = this.desktop.has(this) ? 'none' : '';
+    }
+    async open(first = false) {
+        if (this.profile.options.via || !this.profile.options.host) {
+            return;
+        }
+        await this.targets.targetOf(this);
+        const elsewhere = first && this.desktop.isOpenElsewhere(this);
+        // Opened again while another tab has it: that tab comes forward (one desktop per server), and this one goes.
+        await this.desktop.showDesktop(this);
+        if (elsewhere) {
+            this.destroy();
+        }
+    }
+    async getRecoveryToken() {
+        return { type: RECOVERY_TYPE, profile: this.profile };
+    }
+};
+exports.RDPTabComponent = RDPTabComponent;
+exports.RDPTabComponent = RDPTabComponent = __decorate([
+    (0, core_1.Component)({
+        selector: 'rdp-tab',
+        template: '',
+        styles: [TAB_STYLE],
+        // The idle message is built by hand, outside the template, so its styles can't be scoped to it.
+        encapsulation: core_1.ViewEncapsulation.None,
+    }),
+    __metadata("design:paramtypes", [core_1.Injector,
+        core_1.ElementRef,
+        desktop_service_1.RemoteDesktopService,
+        targets_1.RemoteTargets,
+        core_1.NgZone])
+], RDPTabComponent);
+/** Reopens remote desktop tabs when Tabby restores its tabs (and for Duplicate). */
+let RDPTabRecovery = class RDPTabRecovery extends tabby_core_1.TabRecoveryProvider {
+    constructor(injector) {
+        super();
+        this.injector = injector;
+    }
+    async applicableTo(token) {
+        return token.type === RECOVERY_TYPE;
+    }
+    async recover(token) {
+        return {
+            type: RDPTabComponent,
+            inputs: { profile: this.injector.get(tabby_core_1.ProfilesService).getConfigProxyForProfile(token.profile) },
+        };
+    }
+};
+exports.RDPTabRecovery = RDPTabRecovery;
+exports.RDPTabRecovery = RDPTabRecovery = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [core_1.Injector])
+], RDPTabRecovery);
+// ---- 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.
+ */
+let RDPProfileSettingsComponent = class RDPProfileSettingsComponent {
+    constructor(element, injector) {
+        this.element = element;
+        this.injector = injector;
+    }
+    ngOnInit() {
+        const o = this.profile.options;
+        const account = () => `${o.username ?? ''}\n${o.domain ?? ''}`;
+        // 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 ?? '' };
+        const root = this.element.nativeElement;
+        root.innerHTML = `
+            <div class="mb-3">
+                <label>Address</label>
+                <input class="form-control" name="address" spellcheck="false" placeholder="e.g. 192.168.1.20, or pc.local:3390">
+                <div class="text-danger small" data-for="address"></div>
+            </div>
+            <div class="mb-3">
+                <label>Connect</label>
+                <select class="form-control" name="via"><option value="">Directly from this computer</option></select>
+                <div class="text-muted small">Through an SSH profile, the address is as that host sees it, and the desktop opens over its SSH tab.</div>
+            </div>
+            <div class="mb-3">
+                <label>Kind</label>
+                <select class="form-control" name="kind">
+                    <option value="windows">Windows (or another RDP server)</option>
+                    <option value="xrdp">xrdp (Linux: KDE, XFCE, MATE, …)</option>
+                    <option value="gnome">GNOME Remote Desktop (needs the graphics pipeline)</option>
+                </select>
+            </div>
+            <div class="mb-3">
+                <label>User name</label>
+                <input class="form-control" name="username" spellcheck="false" placeholder="Optional; asked when connecting. DOMAIN\\user works too">
+            </div>
+            <div class="mb-3">
+                <label>Domain</label>
+                <input class="form-control" name="domain" spellcheck="false" placeholder="Optional">
+            </div>`;
+        const field = (name) => root.querySelector(`[name="${name}"]`);
+        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 ?? '';
+        field('domain').value = o.domain ?? '';
+        field('address').addEventListener('input', () => {
+            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;
+            o.kind = kind === 'gnome' || kind === 'xrdp' ? kind : 'windows';
+        });
+        field('username').addEventListener('input', () => { o.username = field('username').value.trim(); });
+        field('domain').addEventListener('input', () => { o.domain = field('domain').value.trim(); });
+        const via = field('via');
+        via.addEventListener('change', () => { o.via = via.value; });
+        this.injector.get(tabby_core_1.ProfilesService).getProfiles().then(profiles => {
+            const ssh = profiles.filter(p => p.type === 'ssh' && !p.isTemplate && p.id);
+            if (o.via && !ssh.some(p => p.id === o.via)) {
+                via.append(new Option('(an SSH profile that no longer exists)', o.via));
+            }
+            via.append(...ssh.map(p => new Option(`Through ${p.name}`, p.id)));
+            via.value = o.via ?? '';
+        }, () => null);
+    }
+    save() {
+        const o = this.profile.options;
+        const { id, account, via } = 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.
+            if (!via) {
+                (0, signin_1.forgetCredentials)(`${desktops_1.DIRECT_KEY}#${id}`);
+                this.injector.get(desktop_service_1.RemoteDesktopService).forgetCertificatesFor(id, true);
+            }
+            return;
+        }
+        const accountChanged = `${o.username ?? ''}\n${o.domain ?? ''}` !== account;
+        this.injector.get(desktop_service_1.RemoteDesktopService).desktopEdited(id, (0, desktops_1.desktopIdOf)(o), accountChanged, !via).catch(() => null);
+    }
+};
+exports.RDPProfileSettingsComponent = RDPProfileSettingsComponent;
+exports.RDPProfileSettingsComponent = RDPProfileSettingsComponent = __decorate([
+    (0, core_1.Component)({
+        selector: 'rdp-profile-settings',
+        template: '',
+    }),
+    __metadata("design:paramtypes", [core_1.ElementRef, core_1.Injector])
+], RDPProfileSettingsComponent);
+// ---- the profile provider ----------------------------------------------------------------------
+let RDPProfilesService = class RDPProfilesService extends tabby_core_1.QuickConnectProfileProvider {
+    // ProfilesService depends on this provider: it is looked up when needed, not injected.
+    constructor(injector, config) {
+        super();
+        this.injector = injector;
+        this.config = config;
+        this.id = targets_1.RDP_PROFILE_TYPE;
+        this.name = 'Remote desktop (RDP)';
+        this.settingsComponent = RDPProfileSettingsComponent;
+        this.configDefaults = {
+            options: { host: '', port: 3389, kind: 'windows', username: '', domain: '', via: '' },
+            clearServiceMessagesOnConnect: false,
+        };
+    }
+    async getBuiltinProfiles() {
+        return [{
+                id: `${targets_1.RDP_PROFILE_TYPE}:template`,
+                type: targets_1.RDP_PROFILE_TYPE,
+                name: 'Remote desktop (RDP)',
+                icon: 'fas fa-desktop',
+                options: { host: '', port: 3389, kind: 'windows', username: '', domain: '', via: '' },
+                isBuiltin: true,
+                isTemplate: true,
+            }];
+    }
+    async getNewTabParameters(profile) {
+        if (profile.options.via) {
+            // The desktop behind an SSH host opens over that host's SSH tab, like any desktop behind a host.
+            const profiles = this.injector.get(tabby_core_1.ProfilesService);
+            const ssh = (await profiles.getProfiles()).find(p => p.id === profile.options.via);
+            const params = ssh && await profiles.newTabParametersForProfile(ssh);
+            if (params) {
+                params.inputs = { ...params.inputs, [OPEN_DESKTOP]: (0, desktops_1.desktopIdOf)(profile.options) };
+                return params;
+            }
+            // The SSH profile is gone: the tab says so.
+        }
+        return { type: RDPTabComponent, inputs: { profile } };
+    }
+    getSuggestedName(profile) {
+        return profile.options?.host || null;
+    }
+    getDescription(profile) {
+        const o = profile.options ?? {};
+        if (!o.host) {
+            return '';
+        }
+        const address = (0, desktopForm_1.formatAddress)(o.host, o.port || 3389);
+        const via = o.via ? (this.config.store.profiles ?? []).find((p) => p.id === o.via)?.name ?? 'an SSH profile' : null;
+        return via ? `${address} via ${via}` : address;
+    }
+    /** `[user@]host[:port]`, typed in Tabby's profile selector. */
+    quickConnect(query) {
+        const at = query.lastIndexOf('@');
+        const address = (0, desktopForm_1.parseAddress)(query.slice(at + 1));
+        if (!address) {
+            return null;
+        }
+        return {
+            name: query.trim(),
+            type: targets_1.RDP_PROFILE_TYPE,
+            options: { host: address.host, port: address.port, username: at > 0 ? query.slice(0, at).trim() : '' },
+        };
+    }
+    intoQuickConnectString(profile) {
+        const o = profile.options;
+        return o.via ? null : `${o.username ? `${o.username}@` : ''}${(0, desktopForm_1.formatAddress)(o.host, 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.
+        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();
+        }
+    }
+};
+exports.RDPProfilesService = RDPProfilesService;
+exports.RDPProfilesService = RDPProfilesService = __decorate([
+    (0, core_1.Injectable)({ providedIn: 'root' }),
+    __metadata("design:paramtypes", [core_1.Injector, tabby_core_1.ConfigService])
+], RDPProfilesService);
+/** In Tabby's command palette, also where no SSH tab (and so no Remote Desktop › Settings menu) is at hand. */
+let RDPCommands = class RDPCommands extends tabby_core_1.CommandProvider {
+    constructor(desktop, help) {
+        super();
+        this.desktop = desktop;
+        this.help = help;
+    }
+    async provide() {
+        return [{
+                id: 'tabby-rdp:import-rdp-file',
+                label: 'Remote desktop: import an .rdp file…',
+                run: () => this.desktop.importRdpFile(),
+            }, {
+                id: 'tabby-rdp:help',
+                label: 'Remote desktop: settings, keys and help',
+                run: async () => this.help.open(),
+            }];
+    }
+};
+exports.RDPCommands = RDPCommands;
+exports.RDPCommands = RDPCommands = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [desktop_service_1.RemoteDesktopService, help_1.RemoteDesktopHelp])
+], RDPCommands);
+/** Shows the desktop an RDP profile with `via` asked for, over the SSH tab opened for it, once SSH is connected. */
+let RDPProfileOpener = class RDPProfileOpener extends tabby_terminal_1.TerminalDecorator {
+    constructor(desktop, zone) {
+        super();
+        this.desktop = desktop;
+        this.zone = zone;
+    }
+    attach(terminal) {
+        const tab = terminal;
+        const id = tab[OPEN_DESKTOP];
+        if (!id || !(0, ssh_1.isSSHTab)(tab)) {
+            return;
+        }
+        // Only for the first connection, not after a reconnect.
+        delete tab[OPEN_DESKTOP];
+        let closed = false;
+        tab.destroyed$.subscribe(() => { closed = true; });
+        // Not before: the desktop layer would cover a password prompt or host key question in the terminal.
+        const wait = (tries) => {
+            if (closed) {
+                return;
+            }
+            if ((0, ssh_1.isConnected)(tab)) {
+                this.zone.run(() => this.desktop.showDesktop(tab, id));
+            }
+            else if (tries > 0) {
+                setTimeout(() => wait(tries - 1), 250);
+            }
+        };
+        this.zone.runOutsideAngular(() => wait(4 * 60 * 5));
+    }
+};
+exports.RDPProfileOpener = RDPProfileOpener;
+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/rdpProfile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdpProfile.js","sourceRoot":"","sources":["../src/rdpProfile.ts"],"names":[],"mappings":"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"}

package/dist/remoteSetup.js

@@ -3,15 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareRemoteDesktop = prepareRemoteDesktop;
 const fs = require("fs");
 const path = require("path");
-// Runs as the SSH user; needs no root. Prints exactly one `RD_OK port=N user=U pass=P` or `RD_ERR <reason>` line.
+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.
 // 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.)
 const SETUP_SCRIPT = String.raw `
 say () { printf '%s\n' "$*"; }
 fail () { say "RD_ERR $*"; exit 0; }
-command -v grdctl >/dev/null 2>&1 || fail "GNOME Remote Desktop (grdctl) is not installed"
-command -v gnome-shell >/dev/null 2>&1 || fail "gnome-shell is not installed"
+# A Windows host whose PATH has a POSIX sh (Git, MSYS2, Cygwin): its desktop is Windows' own RDP server.
+case "$(uname -s 2>/dev/null)" in CYGWIN*|MINGW*|MSYS*) say "RD_WINDOWS"; exit 0 ;; esac
+# xrdp serves the Linux desktops other than GNOME (KDE, XFCE, MATE, …). Its port is [Globals] port= in xrdp.ini
+# (default 3389): a number, or a listener such as tcp://:3390 (the first one, when there are several). Only used when
+# it runs and listens, so the host's own desktop isn't one that can't answer.
+XRDP_PORT= XRDP_WHY=
+if [ -f /etc/xrdp/xrdp.ini ]; then
+    P=$(sed -n '/^\[Globals\]/,/^\[/s/^[[:space:]]*port[[:space:]]*=[[:space:]]*//p' /etc/xrdp/xrdp.ini 2>/dev/null | tr -d '\r' | head -1)
+    P=${"$"}{P%%[[:space:]]*}
+    case $P in
+        '') P=3389 ;;
+        vsock://*) P= ;;
+        *:*) P=${"$"}{P##*:} ;;
+    esac
+    case $P in *[!0-9]*) P= ;; esac
+    if ! systemctl is-active -q xrdp 2>/dev/null && ! pgrep -x xrdp >/dev/null 2>&1; then
+        XRDP_WHY="xrdp is installed but not running (start it: sudo systemctl enable --now xrdp)"
+    elif [ -z "$P" ]; then
+        XRDP_WHY="xrdp does not listen on a TCP port (see port= in /etc/xrdp/xrdp.ini)"
+    elif command -v ss >/dev/null 2>&1 && ! ss -ltnH "sport = :$P" 2>/dev/null | grep -q .; then
+        XRDP_WHY="xrdp runs, but nothing listens on its port $P"
+    else
+        XRDP_PORT=$P
+    fi
+fi
+NO_GNOME=
+command -v grdctl >/dev/null 2>&1 || NO_GNOME="GNOME Remote Desktop (grdctl) is not installed"
+[ -n "$NO_GNOME" ] || command -v gnome-shell >/dev/null 2>&1 || NO_GNOME="gnome-shell is not installed"
+if [ -n "$NO_GNOME" ]; then
+    # No GNOME: the host's own desktop is xrdp's, if it runs. Nothing to set up for it: xrdp starts a session
+    # when the user signs in.
+    [ -z "$XRDP_PORT" ] || { say "RD_XRDP port=$XRDP_PORT user=$(id -un)"; exit 0; }
+    [ -z "$XRDP_WHY" ] || fail "$NO_GNOME, and $XRDP_WHY"
+    fail "$NO_GNOME. For other Linux desktops, install xrdp and a desktop (Debian, Ubuntu: sudo apt install xrdp xfce4)"
+fi
 if systemctl --user is-active -q gnome-remote-desktop.service; then
     fail "a desktop-session GNOME Remote Desktop is already running for this user"
 fi
@@ -28,10 +64,15 @@ for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
     fi
 done
 mkdir -p "$D" && chmod 700 "$D" || fail "could not create $D"
+NEW_CERT=0
 if [ ! -s "$D/tls.key" ]; then
     openssl req -new -newkey rsa:3072 -days 3650 -nodes -x509 -subj "/CN=$(hostname)" \
         -keyout "$D/tls.key" -out "$D/tls.crt" >/dev/null 2>&1 || fail "could not create a TLS certificate"
+    NEW_CERT=1
 fi
+# The plugin accepts only this certificate on grd's port.
+CERT=$(openssl x509 -in "$D/tls.crt" -noout -fingerprint -sha256 2>/dev/null | sed 's/^[^=]*=//')
+[ -n "$CERT" ] || fail "could not read the TLS certificate $D/tls.crt (openssl x509)"
 # '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.
@@ -83,7 +124,10 @@ elif [ -n "$TMUX" ]; then
     SOCKET=$(tmux display-message -p '#{socket_path}' 2>/dev/null)
     tmux set-option -p allow-passthrough on 2>/dev/null
 fi
-SEQ=$(printf '\033]7777;desk;%s;%s;%s;%s\007' "$(b64 "$SESSION")" "$(b64 "$SOCKET")" "$(b64 "$PWD")" "$(b64 "$KIND")")
+# 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)")")
 if [ "$KIND" = tmux ]; then
     printf '\033Ptmux;\033%s\033\\' "$SEQ"   # tmux only lets it through as passthrough
 else
@@ -122,7 +166,9 @@ STATUS=$(grdctl --headless status --show-credentials 2>/dev/null)
 has () { printf '%s\n' "$STATUS" | grep -qxF "$(printf '\t%s' "$1")"; }
 g () { grdctl --headless rdp "$@" >/dev/null 2>&1; }
 RESTART=0
-if ! has "TLS key: $D/tls.key" || ! has "TLS certificate: $D/tls.crt"; then
+# grd reads the certificate at startup: a new one at the same path needs a restart too, or grd would keep serving
+# the old one, which the plugin would then refuse.
+if [ $NEW_CERT = 1 ] || ! has "TLS key: $D/tls.key" || ! has "TLS certificate: $D/tls.crt"; then
     g set-tls-key "$D/tls.key" && g set-tls-cert "$D/tls.crt" || fail "grdctl could not set the TLS certificate"
     RESTART=1
 fi
@@ -194,26 +240,59 @@ PORT=$(grdctl --headless status 2>/dev/null | awk '/Port:/ { print $2; exit }')
 PORT=${"$"}{PORT:-3389}
 i=0; while [ $i -lt 40 ] && ! ss -ltnH "sport = :$PORT" 2>/dev/null | grep -q .; do sleep 0.25; i=$((i+1)); done
 ss -ltnH "sport = :$PORT" 2>/dev/null | grep -q . || fail "nothing is listening on port $PORT"
-say "RD_OK port=$PORT user=$RD_USER pass=$RD_PASS"
+# 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)"
+say "RD_OK port=$PORT user=$RD_USER pass=$RD_PASS cert=$CERT"
 `;
 let trdPtySource = null;
 function trdPty() {
     trdPtySource ??= fs.readFileSync(path.join(__dirname, '..', 'remote', 'trd-pty.py'), 'utf8');
     return trdPtySource;
 }
-/** Makes sure the remote user has a headless GNOME session served by grd, with fresh credentials. */
+/**
+ * Whether the SSH host is Windows, i.e. its shell is cmd.exe or PowerShell. One command each of the three shells answers
+ * differently: cmd expands %OS%, PowerShell $env:OS (both to Windows_NT), sh neither.
+ */
+async function isWindows(target) {
+    try {
+        return /Windows_NT/.test(await target.exec('echo %OS% $env:OS', ''));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Makes sure the remote user has a headless GNOME session served by grd, with fresh credentials. Without GNOME,
+ * reports xrdp's port instead, when xrdp runs there; on a Windows host (OpenSSH Server on Windows), Windows' own RDP
+ * server, which signs in with the Windows account (the SSH user, to start with).
+ */
 async function prepareRemoteDesktop(target, desk, backend = 'native') {
     const script = `TRD_DESK=${desk ? 1 : 0}\nTRD_BACKEND=${backend === 'tmux' ? 'tmux' : 'native'}\n` +
         SETUP_SCRIPT.replace('@@TRD_PTY_PY@@', trdPty().trimEnd());
     const out = await target.exec('sh -s', script);
+    // Without a sh, Windows prints its complaint on stderr, which exec() doesn't return: nothing came back. Only then is
+    // 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: '' };
+    }
     const err = /^RD_ERR (.*)$/m.exec(out);
     if (err) {
         throw new Error(err[1]);
     }
-    const ok = /^RD_OK port=(\d+) user=(\S+) pass=(\S+)$/m.exec(out);
-    if (!ok) {
-        throw new Error('Remote setup gave no result');
+    const ok = /^RD_OK port=(\d+) user=(\S+) pass=(\S+) cert=(\S+)$/m.exec(out);
+    const xrdp = /^RD_XRDP port=(\d+) user=(\S*)$/m.exec(out);
+    if (ok) {
+        const certificate = (0, rdcleanpath_1.normalizeFingerprint)(ok[4]);
+        if (!certificate) {
+            throw new Error(`Remote setup reported no usable certificate fingerprint (${ok[4]})`);
+        }
+        return { kind: 'gnome', port: Number(ok[1]), username: ok[2], password: ok[3], certificate, xrdpPort: xrdp ? Number(xrdp[1]) : undefined, xrdpUser: xrdp?.[2] };
+    }
+    if (xrdp) {
+        // xrdp makes its own certificate: trusted on first use, like a desktop behind the host.
+        return { kind: 'xrdp', port: Number(xrdp[1]), username: xrdp[2], password: '', certificate: '', xrdpPort: Number(xrdp[1]), xrdpUser: xrdp[2] };
     }
-    return { port: Number(ok[1]), username: ok[2], password: ok[3] };
+    throw new Error('Remote setup gave no result');
 }
 //# sourceMappingURL=remoteSetup.js.map

package/dist/remoteSetup.js.map

@@ -1 +1 @@
-{"version":3,"file":"remoteSetup.js","sourceRoot":"","sources":["../src/remoteSetup.ts"],"names":[],"mappings":";;AAsNA,oDAaC;AAnOD,yBAAwB;AACxB,6BAA4B;AAS5B,kHAAkH;AAClH,yGAAyG;AACzG,2GAA2G;AAC3G,yGAAyG;AACzG,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4BvB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA4DM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+DAwE2C,GAAG;;;;;;;;;;;;;;;;;;;;;;;;OAwB3D,GAAG;;;;CAIT,CAAA;AAKD,IAAI,YAAY,GAAkB,IAAI,CAAA;AACtC,SAAS,MAAM;IACX,YAAY,KAAK,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAA;IAC5F,OAAO,YAAY,CAAA;AACvB,CAAC;AAED,qGAAqG;AAC9F,KAAK,UAAU,oBAAoB,CAAE,MAAoB,EAAE,IAAa,EAAE,UAA0B,QAAQ;IAC/G,MAAM,MAAM,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI;QAC9F,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9D,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC9C,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACtC,IAAI,GAAG,EAAE,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3B,CAAC;IACD,MAAM,EAAE,GAAG,2CAA2C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChE,IAAI,CAAC,EAAE,EAAE,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AACpE,CAAC"}
+{"version":3,"file":"remoteSetup.js","sourceRoot":"","sources":["../src/remoteSetup.ts"],"names":[],"mappings":"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"}