v26.10.0 (#1573)

* feat: optional auto reconnect for dropped ssh sessions (#1321) * feat: tighter compact host rows with inline tags (#1325) * feat: bring back the alert feed homepage widget * feat: pick target terminals for snippets again * feat: share button on connection tabs again * feat: recent servers list when linking the desktop app * feat: list the fixed app shortcuts in keyboard shortcuts * fix: translate hardcoded toasts and drop em dashes from ui text * fix: translate leftover hardcoded ui text * fix: toolbar files button opens at the shell directory again * fix: show the remote desktop note under connection origin again * chore: openapi docs for host metrics manager routes * chore: openapi docs for undocumented routes and fix two broken doc blocks * fix: declare terminal.listSessions use for snippet targets * revert: drop the alert feed widget, the notification center replaces it * feat: restore the alert feed homepage widget * fix: quick connect fills the host address from plugin auth editors like tailscale * fix: docker container logs use the base background color * chore: fix dependabot alerts and apply safe npm upgrades * fix: proxmox stats tab reads its switch from plugin host settings * fix: count plugin ssh logins toward host status and stop showing reachable as a warning * fix: hide the built-in source pill in the host editor * fix: host status shows online when the port answers and only warns on a failed login * fix: drop the top border on the split layout menu * fix: host defaults tabs sit where the host editor puts them and skip plugins with nothing to default * fix: remote desktop auth method labels and notes for vnc and telnet * fix: add description to the web endpoint enable switch * fix: crowdin sync and pretranslate for plugin locales, run plugin tests on release * feat: move telemetry out of core into a usage statistics plugin * fix: recent activity card no longer cuts off host names early * fix: remove duplicate top border on split screen menu * fix: redesign session log player controls, fix tooltip overlap and drop dot separators * fix: file manager and sftp text showing raw i18n keys * fix: onboarding rerunning for existing users after upgrading * fix: fleet detail buttons overflowing the sidebar * fix: session log player scrolling off screen horizontally * fix: network graph lag when adding hosts and on every render * fix: maintenance index name, shared host read only view and badge polling * fix: meeting tabs, workspace tab merging, rail panels as tabs and general ui lag * chore: update release notes * fix: remote desktop tabs reconnecting on every tab switch * fix: build plugin sdk before linting in release workflow * chore: lint, format, and bump version to 2.9.0 * chore: skip crowdin pre-translate in release for now * chore: switch to calver, bump version to 26.10.0 * fix(sso): send the PKCE verifier for GitHub login (#1534) * fix(remote-desktop): clip cursor overflow without disabling zoom (#1535) * test(remote-desktop): preserve sessions beyond one hour (#1536) * fix(hosts): expose controls for overflowing editor tabs (#1537) * fix(hosts): expose controls for overflowing editor tabs * test(hosts): mock resize observation in admin panel tests * fix(status): skip TCP probes while host sessions are active (#1538) * fix(database): batch session activity persistence (#1539) * docs(api): describe cookie and API key authentication (#1540) * fix(snippets): repair missing note column on SQLite upgrades (#1541) * fix(docker): retain stored SSH credential association (#1543) * fix(file-manager): render transfer toasts without plugin hooks (#1546) * feat(hosts): keep compact row actions inline (#1547) * fix(auth): allow retrying unavailable second-factor interfaces (#1549) * fix(auth): reject unresolved legacy identity provisioning (#1550) * fix(desktop): ship the plugin SDK inside Mac App Store builds (#1551) * fix(tmux): pass full session info to the terminal's session picker (#1552) The tmux.sessions service reduced detected sessions to bare names, but the picker reads session.name, so every entry rendered blank and selecting one sent an empty name, which created a new session instead of attaching. * fix(ssh): read force keyboard-interactive as a boolean when resolving hosts (#1553) The column holds the text "true"/"false", and the resolver passed it through as-is. The string "false" is truthy, so the password provider treated every saved host as forced keyboard-interactive and left the password out. Jump hops are built straight from the resolved host, so a password hop whose server doesn't offer keyboard-interactive failed with "All configured authentication methods failed". * fix(database): batch database saves for bulk host writes (#1554) * fix(database): yield to the event loop between database saves Each SQLite save serializes and encrypts the whole database into new buffers, which V8 only releases once the event loop turns. Boot migrations and bulk host import write plugin settings per host and per key in an awaited loop, so hundreds of full copies piled up and the container ran out of memory. * fix(database): save once per bulk host write instead of once per row On SQLite every repository write force-saves the whole database. Boot plugin data migrations, host defaults materialization and the bulk host routes write one row per host per setting, so they serialized and encrypted the full database hundreds of times in a row. DatabaseSaveTrigger.batched wraps a function so force saves made while it runs collapse into a single save when it finishes. Nested scopes fold into the outer one, and work that outlives its scope saves normally. * feat(hosts): add instance-wide predefined tag suggestions (#1548) * feat(hosts): add shared predefined tag suggestions * style(hosts): format tag catalog routes * test(database): advance fake timers past the save yield (#1555) * fix(i18n): complete Simplified Chinese core and plugin translations (#1542) * fix(i18n): complete Chinese onboarding and navigation labels * fix(i18n): translate remaining Chinese core and plugin interfaces * fix(i18n): translate host editor tab overflow controls * fix(i18n): use consistent Chinese fleet terminology * fix(i18n): localize hardcoded controls and plugin views * fix(i18n): translate built-in homepage widget catalog * test(homepage): follow translated timezone placeholder * fix(i18n): translate plugin-provided homepage widgets * fix(i18n): localize feature settings section titles * fix: 2.8 oidc accounts unable to sign in after upgrading (#1381) * fix: plugins losing the saved ssh login when copying a host (#1391) * fix: fleets, proxmox and automations not getting the host sudo password * fix: host imports running a defaults pass and metrics restart per host (#1384) * fix: high cpu from status probes and full database saves on every sample (#1300) * fix: user data export freezing the server (#1393) * fix: op:// secret references rejected as ssh keys on credentials (#1394) * fix: slow file deletes from the trash lookups on every delete (#1390) * fix: add openapi docs and error handling to host tag routes * test: compare download stream buffers directly so it stops timing out * chore: drop em dash from host row comment * chore: update release notes for 2.9.1 * feat(ai): add remote coding agent sessions for SSH hosts (#1545) * feat(ai): add host coding agent sessions with configured providers * Wait for agent initialization and shutdown before resuming sessions * Keep Pi transcripts outside its configuration migration directory * Cover Pi session directory separation * Update core permission catalog expectations for remote agents * Install remote agent runtimes from verified official sources * Wait for the identity panel credentials request in its test * Add scoped SSH forwarding setup for remote agents * Verify forwarding setup through a fresh SSH connection * Bound the SSH forwarding verification timeout * Return the forwarding verification callback result * fix(ai): support agent send and interrupt keyboard shortcuts * feat(ai): add agent queues attachments worktrees and session recovery * fix(ai): handle deleted workspace paths and duplicate status events * fix(ai): accept file references in root workspaces * fix(ai): refresh paused queues after agent errors * fix(ai): store agent sessions in plugin tables and lock down OpenCode Agent sessions lived in a single ctx.kv value holding up to 2000 events, which passed the 256 KB kv limit within minutes of a normal run. Every save after that failed, so history, nativeId, queue and archive changes were lost and every event wrote a kv audit row. Sessions, events and queued prompts now have their own tables. A running agent appends events in batches at most once a second with a lazy save; session and queue changes save immediately. Prompts, drafts and stored event text are capped in UTF-8 bytes to fit MySQL TEXT. kv:own is no longer requested. The OpenCode server now requires a per-session password, so other local accounts on the host cannot drive the agent through its loopback port. * test(upgrade): include agent session tables in the reviewed upgrade SQL * test: run the posix-only ai agent tests on linux only * fix: restore space to add host tags and redesign predefined tags editor * fix: host key silently accepted when the host is missing from the database (#1397) * fix: clearer host login failed status label and fix its translations (#1396) * chore: add host key and status label fixes to release notes * fix: sso and ldap provider dialogs overflowing the screen and using mismatched toggles * chore: increment ver * fix(audit): store plugin entries with no acting user as a null user_id (#1556) Plugin audit entries written outside a request used the literal "system" as user_id. That column references users.id, so the insert was refused (Postgres logs it as an FK violation) and the entry was silently dropped. Write null instead and keep "system" / plugin:<id> in username. * chore: add sso/ldap dialog and audit log fixes to release notes * fix: tunnels and host settings missing from shared hosts on desktop * fix: remote desktop logins missing from shared hosts on desktop * fix: simplify host status to online/offline and keep it live without a refresh * chore: sync Crowdin translations for 2.9.1 * fix: build docker frontend/backend natively to stop arm64 hang, build sdk before openapi * chore: rework plugin readmes, json changelogs and standalone repo setup * chore: move plugins to their own repos and drop the plugins folder * chore(deps-dev): bump globals (#1560) Bumps the dev-minor-updates group with 1 update: [globals](https://github.com/sindresorhus/globals). Updates `globals` from 17.12.0 to 17.13.0 - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](https://github.com/sindresorhus/globals/compare/v17.12.0...v17.13.0) --- updated-dependencies: - dependency-name: globals dependency-version: 17.13.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: drop the 2.8 columns, moves and aliases kept for a downgrade * chore: remove the 2.9 finish list * feat: port the demo redesign with Manage and Settings tabs * chore: pin the plugin signing key and use TERMIX_PAT in workflows * chore: rename the plugin sdk to @termix-ssh/plugin-sdk * feat: add a publish workflow for the plugin sdk * chore: cleanup * fix: harden plugin sockets, public routes, prebuilt binaries and login fallback * chore: add a 2.9.1 upgrade check for postgres and mysql * fix: stop full database rewrites on every plugin db call * fix: stop full database rewrites on every plugin db call * fix: restore release video link in 2.9.2 notes * fix: use TERMIX_PAT in workflows * feat: pin the official plugins in the docker image * feat: implement plugin management UI * feat: shared list kit, settings search, rail order and ui consistency fixes * chore: run all workflows on blacksmith runners * chore: split dashboard quick actions into quarters and drop host status row lines * fix: open plain settings from the profile button, navigation only from the rail menu * feat: consent check, developer mode file installs, install counts and issue links for plugins * feat: row detail options for hosts and credentials, open manage from sidebar header * fix: unify connection failure screens and rebuild stale local plugins * feat: dev:all runner for web, electron and docker with plugin hot reload, termix-plugin dev * chore: clean up npm scripts, make npm run dev the full runner and drop concurrently * fix: settle quick connect panel loads in tests so they stop flaking * fix: stop the dev runner rebuilding plugins when windows reports file reads as changes * chore: update the plugin sdk ui export snapshot * feat: full screen onboarding with a plugin picker and per step versions * feat: changelog.md release notes, v tags, plugin release notes and videos * chore: add temp changelog * chore: release the plugin sdk as 1.0.1 * feat: show only the latest plugin release notes and cap long ones * chore: publish docker images to termix-ssh on ghcr and termixssh on docker hub * chore: rename docker hub token secret to DOCKERHUB_BUGATTIGUY527_TOKEN * chore: renew mac app store provisioning profile * chore: drop docs job from release workflow * chore: run sdk publish on github hosted runner * chore: remove dependabot * chore: general file cleanup * chore: rewrite readme and taglines for plugin-based termix * chore: drop optional from ai plugin row in readme * feat: per-repo issue forms and prefilled bug reports instead of the support repo * feat: add report a bug link to the your account settings section * fix: open settings goes to the plugin's page and hides when it has none * feat: show plugin features from the manifest on the plugin page * fix: retry failed or blocked plugins on restart instead of leaving them disabled * fix: refresh plugin settings after enabling a plugin and match select and disabled bar styling * feat: request a feature link for plugins and use the bug form for unverified plugins * feat: beta channels for core and plugins with one stable/beta release workflow * fix(sync): resolve shared hosts for connect-only recipients (#1568) * fix(ssh): accept full passwords in keyboard-interactive prompts (#1569) * fix(ssh): normalize PKCS8 private keys before connecting (#1570) * fix(sidebar): reclaim space from hidden folder actions (#1571) * fix(hosts): display protocol credential usernames for non-SSH hosts (#1572) * fix: ask for a push/TOTP menu choice as text instead of a push confirm * fix: keep client tunnels open when one of their connections fails (Support#1417) * fix: send plugin form uploads to the plugin's route (Support#1406, Support#1420) * fix: add missing sync ids to old snippet tables so snippets sync again (Support#1419) * fix: start the macOS local terminal when the shell or spawn helper is broken (Support#1418) * fix: refresh cached plugin translations when only a translation changes (Support#1411) * fix: import sshpk as a default so the backend starts under ESM * feat: add a plugin sdk changelog and tag sdk releases, release 1.0.2 * fix: drop the ./ from the plugin sdk bin path so npm stops warning * chore: name core and sdk releases Termix vX and Plugin SDK vX * fix: lock the desktop backend to the app's own origin (GHSA-frx8-qqgg-7j7g) * fix: trust devices by a server-issued token, not a client header (GHSA-6gr3-r7jx-wfmh) * fix: keep global settings out of non-admin data exports (GHSA-v3vp-ffww-q7pw) * fix: refuse sessionless tokens and keep the secrets file owner only * feat: add TRUSTED_PROXIES to choose who nginx takes client IPs from (GHSA-7j7m-85p4-2cpm) * chore: standardize repo setup files * chore: remove unused knip config * chore: add LICENSE and use Node 24 from .nvmrc * chore: update translation guidance, only en.json needs editing * feat: plugin docs and env manifest fields, in-app docs links, SDK 1.0.3 * fix: header separators render as borders and center the status divider * fix: lighter confirm prompt overlay to stop lag when it opens * fix: put plugin-only tailwind classes in core's utilities layer, SDK 1.0.4 * fix: dev stages local plugin builds on paths with spaces and builds them with the local SDK * fix: keep plugin tailwind variants in core's layer so overrides keep their order * fix: manage tab refetches before giving up on a host or credential it cannot find * fix: tab buttons like share show as soon as the terminal is ready * fix: folder rows no longer nest action buttons inside a button * fix: repin remote-desktop after its 1.0.0 re-release * chore: repin bundled plugins after the 1.0.0 re-release * fix: recent activity rows use the same separator as host status * feat: upload banner * fix: reject expired sessions on sockets, api key desktop links and 192.0.0.0/24 * fix: plugin sdk 1.0.5 with optional ui peers, safer timeouts and validate checks * fix: bundled plugins path for source runs and backend cleanup * fix: load plugin strings on guest pages, plugin wording and drop unused keys * fix: beta version stamping, homebrew cask bump, dockerignore and readme platforms * docs: 26.10.0 changelog * fix: current version in the version route example * chore: stop pushing the release- docker tag * feat: remove the donation reminder and its column * docs: note the removed donation reminder * fix: link server wizard always opens inline, onboarding card grows for it * feat: plugin text columns are longtext on mysql so they are not capped at 64KB * fix: linked desktops keep a plugin when its update from the server fails * chore: default mobile download links to v tags * fix: sso only accounts cannot sign in with a passkey or other local method * feat: note in the plugins tab that community plugins are coming * fix: plugin validate accepts beta versions * chore: pin bundled plugins rebuilt on sdk 1.0.5 * fix: skip locale fetches for disabled plugins * fix: show translated names for the built-in admin and user roles * fix: show host keys as SHA256 fingerprints like ssh-keygen * fix: host editor scrolls to a newly enabled protocol section * fix: pass the host to dashboard host row plugins * fix: plugin cards show dividers between author, version and category * fix: refuse plugin archives with paths outside the plugin folder * fix: theme picker shows one dropdown arrow * fix: read activity and audit times as UTC so they show in local time * fix: show the real error for a wrong password or code on plugin sign in * fix: explain that external sign in needs Auto-create external accounts * fix: clear leftover plugin unpack folders at startup * fix: shared session links open for guests again * fix: share panels no longer list yourself as a share target * fix: a host update without an auth type keeps the saved password * fix: guest pages get the tab ids a guest plugin registers * fix: refuse a 2.8 database, which already had a plugins table * fix: dashboard cards fit on a phone * fix: desktop setup no longer asks to secure the local account * fix: the desktop app keeps the desktop layout in a narrow window * fix: the desktop app shows the rail and no phone bar in a narrow window * fix: name every sync type in the Sync panel and pluralize the link prompt * chore: update the sdk ui snapshot for the host key dialog * fix: turning a plugin back on restarts the plugins it turned off * fix: quick connect asks to trust the host key * fix: revoking a manager also removes the shares they handed out * fix: database export works for users with TOTP on (#1426) * fix: rdp and vnc logins use the folder credential when none is picked (#1429) * fix: imported hosts get status checks without a restart * fix: re-pin bundled plugins after 1.0.0 re-release * fix: re-pin bundled plugins after search bar fix * chore: update app icon to smaller version * chore: round the readme logo, keep square source for app icons * feat: grid columns and table view in the plugins tab * fix: match the host key copy button to the fingerprint height * fix: use brand color for toggles in sync settings * fix: re-pin bundled plugins after 1.0.0 re-release * fix: web terminals failing auth behind a proxy that rewrites Host (Support#651) * fix: re-pin snippets and termix-identity after 1.0.0 overwrite * fix: re-pin file-manager after 1.0.0 overwrite * fix: re-pin file-manager after 1.0.0 overwrite * chore: remove Crowdin from the release workflow * chore: remove crowdin config --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: ZacharyZcR <zacharyzcr1984@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-10-30 15:15:24 +00:00 · 2026-10-10 14:58:27 -05:00
1 parent a075ff4808
commit 0149260926
@@ -123,7 +123,7 @@ describe("forwardAuditEntry", () => {
    );
  });

-  it("swallows transport errors — a dead SIEM must not break auditing", async () => {
+  it("swallows transport errors, a dead SIEM must not break auditing", async () => {
    safeFetch.mockRejectedValueOnce(new Error("ECONNREFUSED"));

    await expect(forwardAuditEntry(ENTRY, NOW, env)).resolves.toBe(false);
@@ -140,7 +140,7 @@ describe("forwardAuditEntry", () => {
      await forwardAuditEntry(ENTRY, NOW, env);
    }

-    // 5 per-entry warnings, then one suppression notice — not 8.
+    // 5 per-entry warnings, then one suppression notice, not 8.
    const perEntry = logs.warn.mock.calls.filter(
      (call) => call[0] === "Failed to forward audit entry",
    );
@@ -19,8 +19,14 @@ vi.mock("../../database/db/index.js", () => ({

 vi.mock("../../database/repositories/factory.js", () => ({
  createCurrentSettingsRepository: () => ({ get: async () => null }),
-  // No sessionId in our tokens, so the session branch is skipped.
-  createCurrentSessionRepository: () => ({ findById: async () => null }),
+  createCurrentSessionRepository: () => ({
+    findById: async (id: string) => ({
+      id,
+      expiresAt: new Date(Date.now() + 3600_000).toISOString(),
+    }),
+    touch: async () => {},
+    revoke: async () => {},
+  }),
  createCurrentUserRepository: () => ({
    findById: async (userId: string) => state.users.get(userId) ?? null,
  }),
@@ -128,7 +134,9 @@ function runMiddleware(token: string, headers: Record<string, string> = {}) {
 }

 function token(userId: string) {
-  return jwt.sign({ userId }, jwtSecret, { expiresIn: "1h" });
+  return jwt.sign({ userId, sessionId: `s-${userId}` }, jwtSecret, {
+    expiresIn: "1h",
+  });
 }

 beforeEach(() => {
@@ -75,17 +75,15 @@ function insertSession({ id, userId, sub, sid, providerId }: SessionInput) {
    .sqlite!.prepare(
      `INSERT INTO sessions (
        id, user_id, jwt_token, device_type, device_info,
-        oidc_sub, oidc_sid, sso_provider_id,
+        external_session_ref,
        created_at, expires_at, last_active_at
-      ) VALUES (?, ?, ?, 'browser', 'test', ?, ?, ?, ?, ?, ?)`,
+      ) VALUES (?, ?, ?, 'browser', 'test', ?, ?, ?, ?)`,
    )
    .run(
      id,
      userId,
      `token-${id}`,
-      sub,
-      sid,
-      providerId,
+      JSON.stringify({ providerId, sub, sid }),
      "2026-07-10T00:00:00.000Z",
      "2026-07-11T00:00:00.000Z",
      "2026-07-10T00:00:00.000Z",
@@ -108,9 +106,7 @@ describe("AuthManager.revokeSessionsByExternalSession", () => {
        jwt_token TEXT NOT NULL,
        device_type TEXT NOT NULL,
        device_info TEXT NOT NULL,
-        oidc_sub TEXT,
-        oidc_sid TEXT,
-        sso_provider_id INTEGER,
+        external_session_ref TEXT,
        created_at TEXT NOT NULL,
        expires_at TEXT NOT NULL,
        last_active_at TEXT NOT NULL
@@ -148,7 +144,7 @@ describe("AuthManager.revokeSessionsByExternalSession", () => {

    await expect(
      authManager.revokeSessionsByExternalSession({
-        ssoProviderId: 7,
+        providerId: 7,
        sub: "subject-1",
        sid: "session-1",
      }),
@@ -182,7 +178,7 @@ describe("AuthManager.revokeSessionsByExternalSession", () => {

    await expect(
      authManager.revokeSessionsByExternalSession({
-        ssoProviderId: 7,
+        providerId: 7,
        sub: "subject-1",
      }),
    ).resolves.toBe(2);
@@ -190,10 +186,34 @@ describe("AuthManager.revokeSessionsByExternalSession", () => {
    expect(sessionIds()).toEqual(["other-subject"]);
  });

+  it("leaves sessions with no or a broken reference alone", async () => {
+    mocks
+      .sqlite!.prepare(
+        `INSERT INTO sessions (
+          id, user_id, jwt_token, device_type, device_info,
+          external_session_ref, created_at, expires_at, last_active_at
+        ) VALUES (?, 'user-1', 't', 'browser', 'test', ?, 'a', 'b', 'c')`,
+      )
+      .run("broken", "{not json");
+    mocks
+      .sqlite!.prepare(
+        `INSERT INTO sessions (
+          id, user_id, jwt_token, device_type, device_info,
+          external_session_ref, created_at, expires_at, last_active_at
+        ) VALUES (?, 'user-1', 't', 'browser', 'test', NULL, 'a', 'b', 'c')`,
+      )
+      .run("password");
+
+    await expect(
+      authManager.revokeSessionsByExternalSession({ sub: "subject-1" }),
+    ).resolves.toBe(0);
+    expect(sessionIds()).toEqual(["broken", "password"]);
+  });
+
  it("does not persist when no session matches", async () => {
    await expect(
      authManager.revokeSessionsByExternalSession({
-        ssoProviderId: 7,
+        providerId: 7,
        sid: "missing",
      }),
    ).resolves.toBe(0);
@@ -213,7 +233,7 @@ describe("AuthManager.revokeSessionsByExternalSession", () => {

    await expect(
      authManager.revokeSessionsByExternalSession({
-        ssoProviderId: 7,
+        providerId: 7,
        sid: "session-1",
      }),
    ).rejects.toThrow("disk full");
@@ -18,7 +18,12 @@ vi.mock("../../database/db/index.js", () => ({

 vi.mock("../../database/repositories/factory.js", () => ({
  createCurrentSettingsRepository: () => ({ get: async () => null }),
-  createCurrentSessionRepository: () => ({}),
+  createCurrentSessionRepository: () => ({
+    findById: async (id: string) =>
+      id === "expired"
+        ? { id, expiresAt: new Date(Date.now() - 1000).toISOString() }
+        : { id },
+  }),
  createCurrentUserRepository: () => ({}),
  createCurrentApiKeyRepository: () => ({}),
  createCurrentTrustedDeviceRepository: () => ({}),
@@ -58,7 +63,7 @@ function makeLegacyDataKeyWrap(
 ): Record<string, string> {
  const iv = crypto.randomBytes(12);
  const cipher = crypto.createCipheriv("aes-256-gcm", encryptionKey, iv);
-  cipher.setAAD(Buffer.from(`${userId}:`, "utf8"));
+  cipher.setAAD(Buffer.from(`${userId}:s1`, "utf8"));
  const data = Buffer.concat([cipher.update(dek), cipher.final()]);
  return {
    version: "v1",
@@ -85,7 +90,11 @@ describe("AuthManager token handling", () => {
  it("adopts the DEK from a legacy dataKeyWrap token on verify", async () => {
    const dek = crypto.randomBytes(32);
    const token = jwt.sign(
-      { userId: "user-1", dataKeyWrap: makeLegacyDataKeyWrap("user-1", dek) },
+      {
+        userId: "user-1",
+        sessionId: "s1",
+        dataKeyWrap: makeLegacyDataKeyWrap("user-1", dek),
+      },
      jwtSecret,
      { expiresIn: "1h" },
    );
@@ -107,6 +116,7 @@ describe("AuthManager token handling", () => {
    const token = jwt.sign(
      {
        userId: "user-1",
+        sessionId: "s1",
        dataKeyWrap: makeLegacyDataKeyWrap("user-1", crypto.randomBytes(32)),
      },
      jwtSecret,
@@ -123,13 +133,79 @@ describe("AuthManager token handling", () => {
    wrap.tag = Buffer.from(
      Buffer.from(wrap.tag, "base64url").map((b) => b ^ 0xff),
    ).toString("base64url");
-    const token = jwt.sign({ userId: "user-1", dataKeyWrap: wrap }, jwtSecret, {
-      expiresIn: "1h",
-    });
+    const token = jwt.sign(
+      { userId: "user-1", sessionId: "s1", dataKeyWrap: wrap },
+      jwtSecret,
+      {
+        expiresIn: "1h",
+      },
+    );

    const payload = await authManager.verifyJWTToken(token);

    expect(payload?.userId).toBe("user-1");
    expect(mocks.adoptRecoveredDEK).not.toHaveBeenCalled();
  });
+
+  it("rejects a signed token with no session behind it", async () => {
+    const token = jwt.sign({ userId: "user-1" }, jwtSecret, {
+      expiresIn: "1h",
+    });
+    expect(await authManager.verifyJWTToken(token)).toBeNull();
+  });
+
+  it("rejects a token whose session has expired", async () => {
+    const token = jwt.sign(
+      { userId: "user-1", sessionId: "expired" },
+      jwtSecret,
+      { expiresIn: "1h" },
+    );
+    expect(await authManager.verifyJWTToken(token)).toBeNull();
+  });
+
+  it("still accepts the sessionless pending second-factor token", async () => {
+    const token = jwt.sign({ userId: "user-1", pendingTOTP: true }, jwtSecret, {
+      expiresIn: "10m",
+    });
+    const payload = await authManager.verifyJWTToken(token);
+    expect(payload?.pendingTOTP).toBe(true);
+  });
+
+  it("issues a one minute socket ticket bound to the session", async () => {
+    const ticket = await authManager.issueSocketTicket("user-1", "s1");
+    const payload = jwt.decode(ticket) as Record<string, number | string>;
+
+    expect(payload.userId).toBe("user-1");
+    expect(payload.sessionId).toBe("s1");
+    expect(payload.purpose).toBe("ws");
+    expect(Number(payload.exp) - Number(payload.iat)).toBe(60);
+  });
+
+  it("only accepts a socket ticket where a socket asks for it", async () => {
+    const ticket = await authManager.issueSocketTicket("user-1", "s1");
+
+    expect(await authManager.verifyJWTToken(ticket)).toBeNull();
+    const payload = await authManager.verifyJWTToken(ticket, {
+      allowSocketTicket: true,
+    });
+    expect(payload?.userId).toBe("user-1");
+  });
+
+  it("rejects a socket ticket whose session has expired", async () => {
+    const ticket = await authManager.issueSocketTicket("user-1", "expired");
+    expect(
+      await authManager.verifyJWTToken(ticket, { allowSocketTicket: true }),
+    ).toBeNull();
+  });
+
+  it("rejects a token with an unknown purpose", async () => {
+    const token = jwt.sign(
+      { userId: "user-1", sessionId: "s1", purpose: "other" },
+      jwtSecret,
+      { expiresIn: "1h" },
+    );
+    expect(
+      await authManager.verifyJWTToken(token, { allowSocketTicket: true }),
+    ).toBeNull();
+  });
 });
@@ -1,6 +1,9 @@
 import { afterEach, describe, expect, it } from "vitest";
 import type { Request } from "express";
-import { isCorsOriginAllowed } from "../../utils/cors-config.js";
+import {
+  isCorsOriginAllowed,
+  isDesktopAppOrigin,
+} from "../../utils/cors-config.js";

 function request(headers: Record<string, string> = {}): Request {
  return {
@@ -11,6 +14,7 @@ function request(headers: Record<string, string> = {}): Request {

 afterEach(() => {
  delete process.env.CORS_ALLOWED_ORIGINS;
+  delete process.env.ELECTRON_EMBEDDED;
 });

 describe("isCorsOriginAllowed", () => {
@@ -41,4 +45,41 @@ describe("isCorsOriginAllowed", () => {
    const req = request({ host: "termix.example" });
    expect(isCorsOriginAllowed(req, "https://attacker.example")).toBe(false);
  });
+
+  describe("embedded desktop backend", () => {
+    it("rejects other websites even with no allowlist", () => {
+      process.env.ELECTRON_EMBEDDED = "true";
+      const req = request({ host: "127.0.0.1:30001" });
+      expect(isCorsOriginAllowed(req, "https://evil.example")).toBe(false);
+    });
+
+    it("still allows the desktop app and the dev server", () => {
+      process.env.ELECTRON_EMBEDDED = "true";
+      const req = request({ host: "127.0.0.1:30001" });
+      expect(isCorsOriginAllowed(req, "file://")).toBe(true);
+      expect(isCorsOriginAllowed(req, "http://localhost:5173")).toBe(true);
+      expect(isCorsOriginAllowed(req, undefined)).toBe(true);
+    });
+
+    it("allows an explicitly configured origin", () => {
+      process.env.ELECTRON_EMBEDDED = "true";
+      process.env.CORS_ALLOWED_ORIGINS = "https://portal.example";
+      expect(isCorsOriginAllowed(request(), "https://portal.example")).toBe(
+        true,
+      );
+    });
+  });
+});
+
+describe("isDesktopAppOrigin", () => {
+  it("accepts no origin, file:// and the dev server", () => {
+    expect(isDesktopAppOrigin(undefined)).toBe(true);
+    expect(isDesktopAppOrigin("file://")).toBe(true);
+    expect(isDesktopAppOrigin("http://127.0.0.1:5173")).toBe(true);
+  });
+
+  it("rejects websites", () => {
+    expect(isDesktopAppOrigin("https://evil.example")).toBe(false);
+    expect(isDesktopAppOrigin("null")).toBe(false);
+  });
 });
@@ -1,129 +0,0 @@
-/**
- * The SSH connection options moving out of ssh_data.terminal_config into
- * the core ssh_options column, against a real SQLite database through the
- * same raw SQL helpers the boot path uses.
- */
-
-import Database from "better-sqlite3";
-import { drizzle } from "drizzle-orm/better-sqlite3";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const state = vi.hoisted(() => ({ db: null as unknown }));
-
-vi.mock("../../../database/db/index.js", () => ({ getDb: () => state.db }));
-vi.mock("../../../utils/logger.js", () => ({
-  databaseLogger: { info: vi.fn(), warn: vi.fn() },
-}));
-
-const { runSshOptionsMigration } =
-  await import("../../../utils/crypto-migration/ssh-options-migration.js");
-
-let sqlite: Database.Database;
-
-beforeEach(() => {
-  sqlite = new Database(":memory:");
-  sqlite.exec(`
-    CREATE TABLE ssh_data (
-      id INTEGER PRIMARY KEY,
-      terminal_config TEXT,
-      ssh_options TEXT
-    );
-  `);
-  state.db = drizzle(sqlite);
-});
-
-function insert(id: number, terminalConfig: unknown, sshOptions?: string) {
-  sqlite
-    .prepare(
-      "INSERT INTO ssh_data (id, terminal_config, ssh_options) VALUES (?, ?, ?)",
-    )
-    .run(
-      id,
-      terminalConfig === null ? null : JSON.stringify(terminalConfig),
-      sshOptions ?? null,
-    );
-}
-
-function options(id: number): unknown {
-  const row = sqlite
-    .prepare("SELECT ssh_options FROM ssh_data WHERE id = ?")
-    .get(id) as { ssh_options: string | null };
-  return row.ssh_options === null ? null : JSON.parse(row.ssh_options);
-}
-
-describe("runSshOptionsMigration", () => {
-  it("copies only the connection options, leaving the look and old tunnel keys", async () => {
-    insert(1, {
-      theme: "dracula",
-      fontSize: 16,
-      keepaliveInterval: 30,
-      keepaliveCountMax: 3,
-      allowLegacyAlgorithms: false,
-      agentSocketPath: "/run/agent.sock",
-      agentIdentity: "work",
-      agentForwarding: true,
-      environmentVariables: [{ key: "LANG", value: "C" }],
-      startupSnippetId: 4,
-      cfAccessClientId: "old",
-      cfTunnelHostname: "old.example.com",
-    });
-
-    const result = await runSshOptionsMigration();
-
-    expect(result.hostsMoved).toBe(1);
-    expect(options(1)).toEqual({
-      keepaliveInterval: 30,
-      keepaliveCountMax: 3,
-      allowLegacyAlgorithms: false,
-      agentSocketPath: "/run/agent.sock",
-      agentIdentity: "work",
-      agentForwarding: true,
-      environmentVariables: [{ key: "LANG", value: "C" }],
-    });
-    const terminalConfig = sqlite
-      .prepare("SELECT terminal_config FROM ssh_data WHERE id = 1")
-      .get() as { terminal_config: string };
-    expect(JSON.parse(terminalConfig.terminal_config).keepaliveInterval).toBe(
-      30,
-    );
-  });
-
-  it("marks a host with no options as done and skips hosts with no config", async () => {
-    insert(1, { theme: "dracula" });
-    insert(2, null);
-
-    const result = await runSshOptionsMigration();
-
-    expect(result.hostsMoved).toBe(0);
-    expect(options(1)).toEqual({});
-    expect(options(2)).toBeNull();
-  });
-
-  it("changes nothing on a second run, even after the options were edited", async () => {
-    insert(1, { keepaliveInterval: 30 });
-    insert(
-      2,
-      { keepaliveInterval: 45 },
-      JSON.stringify({ keepaliveCountMax: 9 }),
-    );
-    await runSshOptionsMigration();
-
-    sqlite
-      .prepare("UPDATE ssh_data SET ssh_options = ? WHERE id = 1")
-      .run(JSON.stringify({ keepaliveInterval: 90 }));
-    const second = await runSshOptionsMigration();
-
-    expect(second.hostsMoved).toBe(0);
-    expect(options(1)).toEqual({ keepaliveInterval: 90 });
-    expect(options(2)).toEqual({ keepaliveCountMax: 9 });
-  });
-
-  it("does not throw on a database without the column", async () => {
-    sqlite = new Database(":memory:");
-    sqlite.exec("CREATE TABLE ssh_data (id INTEGER PRIMARY KEY)");
-    state.db = drizzle(sqlite);
-    await expect(runSshOptionsMigration()).resolves.toEqual({
-      hostsMoved: 0,
-    });
-  });
-});
@@ -0,0 +1,23 @@
+import { describe, expect, it } from "vitest";
+import { selectExportableSettings } from "../../utils/export-settings.js";
+
+const rows = [
+  { key: "allow_registration", value: "true" },
+  { key: "audit_log_forward_token", value: "secret" },
+  { key: "reset_code_alice", value: "123456" },
+  { key: "temp_reset_token_alice", value: "abc" },
+  { key: "user_dek_v3_u1", value: "{}" },
+];
+
+describe("selectExportableSettings", () => {
+  it("gives a non-admin export no global settings", () => {
+    expect(selectExportableSettings(rows, false)).toEqual([]);
+  });
+
+  it("keeps instance config for admins but drops secrets", () => {
+    expect(selectExportableSettings(rows, true).map((r) => r.key)).toEqual([
+      "allow_registration",
+      "user_dek_v3_u1",
+    ]);
+  });
+});
@@ -1,143 +0,0 @@
-/**
- * The status half of ssh_data.stats_config moving into the core
- * status_check_enabled and status_check_interval columns. Run against a real
- * SQLite database through the same raw SQL helpers the boot path uses.
- */
-
-import Database from "better-sqlite3";
-import { drizzle } from "drizzle-orm/better-sqlite3";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const state = vi.hoisted(() => ({
-  settings: new Map<string, string>(),
-  db: null as unknown,
-}));
-
-vi.mock("../../database/db/index.js", () => ({ getDb: () => state.db }));
-vi.mock("../../database/repositories/factory.js", () => ({
-  createCurrentSettingsRepository: () => ({
-    get: async (key: string) => state.settings.get(key) ?? null,
-    set: async (key: string, value: string) => {
-      state.settings.set(key, value);
-    },
-  }),
-}));
-vi.mock("../../utils/logger.js", () => ({
-  databaseLogger: { info: vi.fn(), warn: vi.fn() },
-}));
-
-const {
-  runHostStatusConfigMigration,
-  statusConfigFromStatsConfig,
-  HOST_STATUS_CONFIG_MIGRATED,
-} =
-  await import("../../utils/crypto-migration/host-status-config-migration.js");
-
-let sqlite: Database.Database;
-
-function createHosts(withStatsConfig = true) {
-  sqlite = new Database(":memory:");
-  sqlite.exec(`
-    CREATE TABLE ssh_data (
-      id INTEGER PRIMARY KEY,
-      ${withStatsConfig ? "stats_config TEXT," : ""}
-      status_check_enabled INTEGER NOT NULL DEFAULT 1,
-      status_check_interval INTEGER
-    );
-  `);
-  state.db = drizzle(sqlite);
-}
-
-const hosts = () =>
-  sqlite
-    .prepare(
-      "SELECT id, status_check_enabled AS enabled, status_check_interval AS interval FROM ssh_data ORDER BY id",
-    )
-    .all();
-
-beforeEach(() => {
-  state.settings.clear();
-  createHosts();
-});
-
-describe("statusConfigFromStatsConfig", () => {
-  it.each([
-    [null, true, null],
-    ["{}", true, null],
-    ['{"statusCheckEnabled":false}', false, null],
-    ['{"disableTcpPing":true}', false, null],
-    ['{"useGlobalStatusInterval":false,"statusCheckInterval":45}', true, 45],
-    ['{"useGlobalStatusInterval":true,"statusCheckInterval":45}', true, null],
-    ['{"useGlobalStatusInterval":false,"statusCheckInterval":2}', true, null],
-    [
-      JSON.stringify(JSON.stringify({ statusCheckEnabled: false })),
-      false,
-      null,
-    ],
-    ["not json", true, null],
-  ])("%s", (raw, enabled, interval) => {
-    expect(statusConfigFromStatsConfig(raw)).toEqual({
-      statusCheckEnabled: enabled,
-      statusCheckInterval: interval,
-    });
-  });
-});
-
-describe("runHostStatusConfigMigration", () => {
-  it("copies each host's status options into the new columns", async () => {
-    const insert = sqlite.prepare(
-      "INSERT INTO ssh_data (id, stats_config) VALUES (?, ?)",
-    );
-    insert.run(1, JSON.stringify({ statusCheckEnabled: false }));
-    insert.run(
-      2,
-      JSON.stringify({
-        useGlobalStatusInterval: false,
-        statusCheckInterval: 45,
-      }),
-    );
-    insert.run(
-      3,
-      JSON.stringify({ disableTcpPing: true, metricsEnabled: false }),
-    );
-    insert.run(4, JSON.stringify({ metricsInterval: 10 }));
-    insert.run(5, null);
-
-    const result = await runHostStatusConfigMigration();
-
-    expect(result).toEqual({ skipped: false, hostsMoved: 3 });
-    expect(hosts()).toEqual([
-      { id: 1, enabled: 0, interval: null },
-      { id: 2, enabled: 1, interval: 45 },
-      { id: 3, enabled: 0, interval: null },
-      { id: 4, enabled: 1, interval: null },
-      { id: 5, enabled: 1, interval: null },
-    ]);
-    expect(state.settings.get(HOST_STATUS_CONFIG_MIGRATED)).toBe("true");
-  });
-
-  it("changes nothing the second time", async () => {
-    sqlite
-      .prepare("INSERT INTO ssh_data (id, stats_config) VALUES (?, ?)")
-      .run(1, JSON.stringify({ statusCheckEnabled: false }));
-    await runHostStatusConfigMigration();
-
-    // The user turns checks back on after the upgrade.
-    sqlite.exec("UPDATE ssh_data SET status_check_enabled = 1 WHERE id = 1");
-    expect(await runHostStatusConfigMigration()).toEqual({
-      skipped: true,
-      hostsMoved: 0,
-    });
-    expect(hosts()).toEqual([{ id: 1, enabled: 1, interval: null }]);
-  });
-
-  it("finishes on a fresh install that never had stats_config", async () => {
-    createHosts(false);
-    sqlite.exec("INSERT INTO ssh_data (id) VALUES (1)");
-    expect(await runHostStatusConfigMigration()).toEqual({
-      skipped: false,
-      hostsMoved: 0,
-    });
-    expect(state.settings.get(HOST_STATUS_CONFIG_MIGRATED)).toBe("true");
-  });
-});
@@ -0,0 +1,49 @@
+import { describe, expect, it } from "vitest";
+import {
+  compareSemver,
+  isPrereleaseVersion,
+  normalizeVersion,
+  updateStatus,
+} from "../../utils/latest-release.js";
+
+describe("normalizeVersion", () => {
+  it("reads tags and short versions and keeps the prerelease part", () => {
+    expect(normalizeVersion("v2.8")).toBe("2.8.0");
+    expect(normalizeVersion("release-2.9.1-tag")).toBe("2.9.1-tag");
+    expect(normalizeVersion("v26.11.0-beta.2")).toBe("26.11.0-beta.2");
+    expect(normalizeVersion("nightly")).toBeNull();
+  });
+});
+
+describe("compareSemver", () => {
+  it("orders betas below their stable release and by number", () => {
+    expect(compareSemver("26.11.0-beta.1", "26.11.0")).toBe(-1);
+    expect(compareSemver("26.11.0-beta.2", "26.11.0-beta.10")).toBe(-1);
+    expect(compareSemver("26.11.0-beta.1", "26.10.3")).toBe(1);
+    expect(compareSemver("v2.9.0", "2.9")).toBe(0);
+    expect(compareSemver("x", "2.9.0")).toBeNull();
+  });
+});
+
+describe("updateStatus", () => {
+  it("calls a newer release on the channel an update", () => {
+    expect(updateStatus("26.10.0", "26.10.1")).toBe("requires_update");
+    expect(updateStatus("26.11.0-beta.1", "26.11.0-beta.2")).toBe(
+      "requires_update",
+    );
+    expect(updateStatus("26.11.0-beta.2", "26.11.0")).toBe("requires_update");
+  });
+
+  it("marks betas and builds ahead of the newest release as beta", () => {
+    expect(updateStatus("26.11.0-beta.2", "26.11.0-beta.2")).toBe("beta");
+    expect(updateStatus("26.11.0-beta.2", "26.10.0")).toBe("beta");
+    expect(updateStatus("26.11.0", "26.10.0")).toBe("beta");
+    expect(updateStatus("26.10.0", "26.10.0")).toBe("up_to_date");
+    expect(updateStatus("26.10.0", null)).toBe("up_to_date");
+  });
+
+  it("knows a prerelease", () => {
+    expect(isPrereleaseVersion("26.11.0-beta.1")).toBe(true);
+    expect(isPrereleaseVersion("26.11.0")).toBe(false);
+  });
+});
@@ -22,6 +22,7 @@ describe("isBlockedAddress", () => {
    expect(isBlockedAddress("192.168.1.1")).toBe(true);
    expect(isBlockedAddress("127.0.0.1")).toBe(true);
    expect(isBlockedAddress("169.254.1.1")).toBe(true);
+    expect(isBlockedAddress("192.0.0.170")).toBe(true);
    expect(isBlockedAddress("100.64.0.1")).toBe(true);
  });

@@ -1,3 +1,6 @@
+import { generateKeyPairSync } from "node:crypto";
+import ssh2 from "ssh2";
+import sshpk from "sshpk";
 import { describe, it, expect } from "vitest";
 import { readFileSync } from "node:fs";
 import {
@@ -9,6 +12,8 @@ import {
  validateKeyPair,
 } from "../../utils/ssh-key-utils.js";

+const { parsePrivateKey } = sshpk;
+
 // A real OpenSSH ed25519 keypair generated solely for these tests. It grants no
 // access to anything and exists only so the ssh2 parsing path is exercised for
 // real rather than only via the text-fallback heuristics.
@@ -158,3 +163,64 @@ describe("validateKeyPair", () => {
    expect(result.error).toMatch(/private key/i);
  });
 });
+
+describe("PKCS#8 runtime key normalization", () => {
+  it.each(["ed25519", "rsa", "ec"] as const)(
+    "converts %s without changing its public key",
+    (type) => {
+      const { privateKey, publicKey } =
+        type === "rsa"
+          ? generateKeyPairSync("rsa", { modulusLength: 2048 })
+          : type === "ec"
+            ? generateKeyPairSync("ec", { namedCurve: "prime256v1" })
+            : generateKeyPairSync("ed25519");
+      const pem = privateKey
+        .export({ type: "pkcs8", format: "pem" })
+        .toString();
+      const prepared = preparePrivateKeyForSSH2(pem);
+      const parsed = ssh2.utils.parseKey(prepared);
+      expect(parsed).not.toBeInstanceOf(Error);
+      if (parsed instanceof Error) throw parsed;
+      expect(
+        parsePrivateKey(prepared).toPublic().toBuffer("pkcs8").toString(),
+      ).toBe(publicKey.export({ type: "spki", format: "pem" }).toString());
+    },
+  );
+
+  it("decrypts encrypted PKCS#8 only with the correct passphrase", () => {
+    const { privateKey } = generateKeyPairSync("ed25519");
+    const pem = privateKey
+      .export({
+        type: "pkcs8",
+        format: "pem",
+        cipher: "aes-256-cbc",
+        passphrase: " key passphrase ",
+      })
+      .toString();
+    expect(
+      ssh2.utils.parseKey(preparePrivateKeyForSSH2(pem, " key passphrase ")),
+    ).not.toBeInstanceOf(Error);
+    expect(() => preparePrivateKeyForSSH2(pem)).toThrow();
+    expect(() => preparePrivateKeyForSSH2(pem, "wrong")).toThrow();
+  });
+
+  it("keeps an already usable OpenSSH key unchanged", () => {
+    expect(preparePrivateKeyForSSH2(ED25519_PRIVATE).toString()).toBe(
+      ED25519_PRIVATE,
+    );
+  });
+
+  it("rejects unsupported X25519 keys", () => {
+    const { privateKey } = generateKeyPairSync("x25519");
+    const pem = privateKey.export({ type: "pkcs8", format: "pem" }).toString();
+    expect(() => preparePrivateKeyForSSH2(pem)).toThrow();
+  });
+
+  it("rejects malformed PKCS#8 instead of guessing from its header", () => {
+    expect(() =>
+      preparePrivateKeyForSSH2(
+        "-----BEGIN PRIVATE KEY-----\nAAAA\n-----END PRIVATE KEY-----",
+      ),
+    ).toThrow();
+  });
+});
@@ -3,8 +3,6 @@ import type { Request } from "express";
 import {
  detectPlatform,
  parseUserAgent,
-  generateDeviceFingerprint,
-  getDeviceId,
 } from "../../utils/user-agent-parser.js";

 function reqWith(headers: Record<string, string>): Request {
@@ -97,83 +95,3 @@ describe("parseUserAgent", () => {
    expect(info.os).toContain("iOS");
  });
 });
-
-describe("generateDeviceFingerprint", () => {
-  it("is stable for the same client device id", () => {
-    const a = generateDeviceFingerprint(
-      {
-        type: "web",
-        browser: "Chrome",
-        version: "120.5",
-        os: "Windows 10/11",
-        deviceInfo: "Chrome 120.5 on Windows 10/11",
-      },
-      "a".repeat(64),
-    );
-    const b = generateDeviceFingerprint(
-      {
-        type: "web",
-        browser: "Chrome",
-        version: "121.9",
-        os: "Windows 10/11",
-        deviceInfo: "Chrome 121.9 on Windows 10/11",
-      },
-      "a".repeat(64),
-    );
-    expect(a).toBe(b);
-  });
-
-  it("differs for two clients on the same platform", () => {
-    const a = generateDeviceFingerprint(
-      {
-        type: "desktop",
-        browser: "Termix Desktop",
-        version: "2.7.0",
-        os: "Linux",
-        deviceInfo: "",
-      },
-      "a".repeat(64),
-    );
-    const b = generateDeviceFingerprint(
-      {
-        type: "desktop",
-        browser: "Termix Desktop",
-        version: "2.7.0",
-        os: "Linux",
-        deviceInfo: "",
-      },
-      "b".repeat(64),
-    );
-    expect(a).not.toBe(b);
-  });
-
-  it("does not trust clients without a device id", () => {
-    const fp = generateDeviceFingerprint(
-      {
-        type: "desktop",
-        browser: "Termix Desktop",
-        version: "2.3.1",
-        os: "macOS",
-        deviceInfo: "",
-      },
-      null,
-    );
-    expect(fp).toBeNull();
-  });
-});
-
-describe("getDeviceId", () => {
-  it("accepts a 256-bit hex device id", () => {
-    const deviceId = "a".repeat(64);
-    expect(getDeviceId(reqWith({ "x-termix-device-id": deviceId }))).toBe(
-      deviceId,
-    );
-  });
-
-  it("rejects missing or malformed device ids", () => {
-    expect(getDeviceId(reqWith({}))).toBeNull();
-    expect(
-      getDeviceId(reqWith({ "x-termix-device-id": "shared-linux" })),
-    ).toBeNull();
-  });
-});
@@ -83,4 +83,29 @@ describe("the jwt cookie on a socket", () => {
      ),
    ).toBe(true);
  });
+
+  it("trusts the browser's same-origin mark behind a proxy that rewrites Host", () => {
+    expect(
+      extractWebSocketToken(
+        request({
+          cookie: "jwt=cookie-token",
+          host: "10.0.0.5:8080",
+          origin: "https://termix.example.com",
+          "sec-fetch-site": "same-origin",
+        }),
+      ),
+    ).toBe("cookie-token");
+  });
+
+  it("still ignores the cookie from a sibling subdomain", () => {
+    expect(
+      isCookieOriginAllowed(
+        request({
+          host: "termix.example.com",
+          origin: "https://evil.example.com",
+          "sec-fetch-site": "same-site",
+        }),
+      ),
+    ).toBe(false);
+  });
 });