@pi-chamber/web 1.0.4 → 1.0.5-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/cli.js +21 -2
- package/bin/cli.test.js +164 -4
- package/bin/lib/DOCUMENTATION.md +3 -3
- package/bin/lib/cli-args.js +96 -13
- package/bin/lib/commands-connect-url-tailscale.test.js +136 -0
- package/bin/lib/commands-connect-url.js +146 -39
- package/bin/lib/commands-connect-url.test.js +126 -0
- package/bin/lib/commands-serve.js +45 -2
- package/bin/lib/commands-status.js +28 -5
- package/bin/lib/commands-status.test.js +107 -0
- package/bin/lib/commands-tunnel.js +36 -10
- package/dist/assets/{DiagramView-BpG1c3Hi.js → DiagramView-BWG8peHt.js} +1 -1
- package/dist/assets/DiffView-C_uRNQMT.js +18 -0
- package/dist/assets/{FileSaveConflictDialog-DP7k9a-i.js → FileSaveConflictDialog-DlH8IWDL.js} +2 -2
- package/dist/assets/FilesView-RnF9JBPu.js +6 -0
- package/dist/assets/{GitHubDetailScaffold-UxLAMAOl.js → GitHubDetailScaffold-BTRvUnwh.js} +2 -2
- package/dist/assets/{GitHubLinkPicker-Bh9RO1yK.js → GitHubLinkPicker-CGi8p2zF.js} +1 -1
- package/dist/assets/{GitHubListPrimitives-DQyhT5wG.js → GitHubListPrimitives-XckcmdeA.js} +1 -1
- package/dist/assets/{GitView-XBBheKRM.js → GitView-DyPJ8Oay.js} +4 -4
- package/dist/assets/{IssuesSurface-BA1kpvAJ.js → IssuesSurface-rQ78ziEu.js} +3 -3
- package/dist/assets/{JsonTreeView-BAaEPL4O.js → JsonTreeView-Cy5NKUzx.js} +1 -1
- package/dist/assets/{MarkdownRendererImpl-DzgDmUsL.js → MarkdownRendererImpl-C5AlnAbG.js} +1 -1
- package/dist/assets/{PatchDiff-BMEUsgXH.js → PatchDiff-D6048My1.js} +1 -1
- package/dist/assets/PierreDiffViewer-_000TWrM.js +135 -0
- package/dist/assets/PullRequestsSurface-eACi4Yxm.js +2 -0
- package/dist/assets/SessionSwitcherContent-CFMjBIfH.js +1 -0
- package/dist/assets/SessionSwitcherDropdown-CINW_ydZ.js +2 -0
- package/dist/assets/SessionUnreadDot-YZJi4IFP.js +1 -0
- package/dist/assets/SettingsView-DBiQXIji.js +6 -0
- package/dist/assets/{SettingsWindow-j0e99YI0.js → SettingsWindow-Wvd56oG1.js} +1 -1
- package/dist/assets/StickyHorizontalScrollbar-BMITjK4e.js +8 -0
- package/dist/assets/{ToolOutputDialog-VlS12Xyq.js → ToolOutputDialog-DeDXQNWw.js} +4 -4
- package/dist/assets/{ToolPartDiffPreview-DdSneZws.js → ToolPartDiffPreview-DuN8fldE.js} +1 -1
- package/dist/assets/{VirtualizedFileDiff-BqiXjvP6.js → VirtualizedFileDiff-BYVjUxk9.js} +4 -4
- package/dist/assets/{Virtualizer-Cp_cJWbI.js → Virtualizer-DP6HbEeC.js} +1 -1
- package/dist/assets/{collapsible-C7oyikVm.js → collapsible-BOcd0lzY.js} +1 -1
- package/dist/assets/{computeVirtualFileMetrics-BJjC-tXV.js → computeVirtualFileMetrics-E4gJTgVF.js} +1 -1
- package/dist/assets/{contextFileOpenGuard-BBzqKGei.js → contextFileOpenGuard-CcGZtZsz.js} +1 -1
- package/dist/assets/{gitStatusPredicates-Dq-E5DaH.js → gitStatusPredicates-C2H7tf7t.js} +1 -1
- package/dist/assets/{githubLink-Cryd7GkG.js → githubLink-DTEEkgAl.js} +5 -5
- package/dist/assets/{index-BbhXFTId.js → index-BKc_DF05.js} +1 -1
- package/dist/assets/index-DWSrsQWl.js +11 -0
- package/dist/assets/index-DsQIBAWK.css +1 -0
- package/dist/assets/main-BNoO2jRw.js +136 -0
- package/dist/assets/main-DnCR4Jva.js +2 -0
- package/dist/assets/{markdownCore-B9AuEyYi.js → markdownCore-CP1hsIRw.js} +2 -2
- package/dist/assets/{miniChat-CgOaJfD8.js → miniChat-BBI_B4OS.js} +2 -2
- package/dist/assets/mobile-dRWyYBgl.js +2 -0
- package/dist/assets/{nativeFileSave-BzhtrDoD.js → nativeFileSave-CFuugNKV.js} +1 -1
- package/dist/assets/pi-session-focus-preference-Cw78V7mw.js +9 -0
- package/dist/assets/{renderDiffWithHighlighter-CVLsdtQ5.js → renderDiffWithHighlighter-kdzNWs8-.js} +1 -1
- package/dist/assets/renderElectronMiniChatApp-uVOQvccp.js +2 -0
- package/dist/assets/{renderFileWithHighlighter-DJ9mk2bZ.js → renderFileWithHighlighter-BdeYSXwS.js} +1 -1
- package/dist/assets/renderMobileApp-Cdg1IAhJ.js +11 -0
- package/dist/assets/runtimeEndpointReset-thviM404.js +62 -0
- package/dist/assets/{runtimeSurface-DBiUWYK2.js → runtimeSurface-Der4qUnI.js} +1 -1
- package/dist/assets/useAppFontEffects-Bd0btzjJ.js +212 -0
- package/dist/assets/{useFilesViewSearch-D2Au5Xgt.js → useFilesViewSearch-Yvk43YOy.js} +3 -3
- package/dist/assets/useGitHubRemoteSearch-BUjSEnXC.js +1 -0
- package/dist/assets/{useSwitcherItems-Dej8BzXI.js → useSwitcherItems-D2opwbRZ.js} +1 -1
- package/dist/assets/{vendor-aparajita-capacitor-secure-storage-BYohCVY0.js → vendor-aparajita-capacitor-secure-storage-BDrMx_CE.js} +1 -1
- package/dist/assets/{vendor-base-ui-BscvGUFt.js → vendor-base-ui-CKRUCG-f.js} +1 -1
- package/dist/assets/{vendor-boot-Dgb9NVFe.js → vendor-boot-EC6IyLt1.js} +13 -13
- package/dist/assets/{vendor-capacitor-app-BjdQVib9.js → vendor-capacitor-app-BaupizkW.js} +1 -1
- package/dist/assets/{vendor-capacitor-keyboard-eTtI5go3.js → vendor-capacitor-keyboard-9BVxykO7.js} +1 -1
- package/dist/assets/{vendor-capacitor-status-bar-9rNIGxlO.js → vendor-capacitor-status-bar-BsrUwiaA.js} +1 -1
- package/dist/assets/{vendor-codemirror-autocomplete-DxS3jwvE.js → vendor-codemirror-autocomplete-CGpAsPWp.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-angular-DdjXl9e2.js → vendor-codemirror-lang-angular-CDJoHJSY.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-cpp--aMr7NVt.js → vendor-codemirror-lang-cpp-BmHofQls.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-css-CZ_qxZY9.js → vendor-codemirror-lang-css-RM2HqXZ0.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-go-Ca-y2Alu.js → vendor-codemirror-lang-go-Crwca_X7.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-html-COZ0L5wT.js → vendor-codemirror-lang-html-CHSHUpwq.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-java-D3Rf3QNJ.js → vendor-codemirror-lang-java-lhQXgWu0.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-javascript-DwJ-IvCs.js → vendor-codemirror-lang-javascript-Dw4kFO4e.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-jinja-D_5lod6k.js → vendor-codemirror-lang-jinja-_pAC3UTN.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-json-BG8C7OpC.js → vendor-codemirror-lang-json-B-b1vAv-.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-less-CVEkoaTw.js → vendor-codemirror-lang-less-xIgOi1ze.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-liquid-U9vj0m8w.js → vendor-codemirror-lang-liquid-CP49m5dB.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-markdown-DqlYH9gY.js → vendor-codemirror-lang-markdown-BTht2ATe.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-php-BFEiEVA1.js → vendor-codemirror-lang-php-BguZDhaO.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-python-Cz1dQXQd.js → vendor-codemirror-lang-python-CH6_em9L.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-rust-C_CoD9mj.js → vendor-codemirror-lang-rust-EG_DtGyi.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-sass-BuR0aKh5.js → vendor-codemirror-lang-sass-BknY5Qpo.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-sql-DggNUjdM.js → vendor-codemirror-lang-sql-B0f-qCZo.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-vue-DFZHi2J3.js → vendor-codemirror-lang-vue-CyGn9snv.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-wast-zuTN3SHT.js → vendor-codemirror-lang-wast-CsFfSyyB.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-xml-CrcvhI-k.js → vendor-codemirror-lang-xml-Cdan_Jp1.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-yaml-DcVWsakb.js → vendor-codemirror-lang-yaml-COI5hck8.js} +1 -1
- package/dist/assets/{vendor-codemirror-language-data-CCLITgCF.js → vendor-codemirror-language-data-CqU7kHmg.js} +2 -2
- package/dist/assets/{vendor-codemirror-search-H7NOEdbX.js → vendor-codemirror-search-DUfSCF9S.js} +1 -1
- package/dist/assets/{vendor-lezer-cpp-C8aD2KAr.js → vendor-lezer-cpp-DMZOJzBa.js} +1 -1
- package/dist/assets/{vendor-lezer-css-2lbTJF-Y.js → vendor-lezer-css-DUkkbMp7.js} +1 -1
- package/dist/assets/{vendor-lezer-go-Bw6LFTrZ.js → vendor-lezer-go-CHIhCNY6.js} +1 -1
- package/dist/assets/{vendor-lezer-html-D7ym2z7S.js → vendor-lezer-html-B3h0MOrG.js} +1 -1
- package/dist/assets/{vendor-lezer-java-CZhK7w21.js → vendor-lezer-java-tMazV_6X.js} +1 -1
- package/dist/assets/{vendor-lezer-javascript-rpKeTHZp.js → vendor-lezer-javascript-ctwLWf4v.js} +1 -1
- package/dist/assets/{vendor-lezer-json-C7jwsd2G.js → vendor-lezer-json-BP_UAzLL.js} +1 -1
- package/dist/assets/{vendor-lezer-lr-DR-ylqNN.js → vendor-lezer-lr-B8TQctNw.js} +1 -1
- package/dist/assets/{vendor-lezer-markdown-Bir0m5nB.js → vendor-lezer-markdown-aGLZf_3h.js} +1 -1
- package/dist/assets/{vendor-lezer-php-y0hIEfo1.js → vendor-lezer-php-D5zCNzlt.js} +1 -1
- package/dist/assets/{vendor-lezer-python-D64A9lNV.js → vendor-lezer-python-EJ4Im4y2.js} +1 -1
- package/dist/assets/{vendor-lezer-rust-E3ZA9T2L.js → vendor-lezer-rust-DO5c7OtA.js} +1 -1
- package/dist/assets/{vendor-lezer-sass-C5UFI9SP.js → vendor-lezer-sass-CMi6zfXI.js} +1 -1
- package/dist/assets/{vendor-lezer-xml-DOy7FzCR.js → vendor-lezer-xml-0MHMeZDp.js} +1 -1
- package/dist/assets/{vendor-lezer-yaml-kEjaSCvZ.js → vendor-lezer-yaml-BE2EFjpA.js} +1 -1
- package/dist/assets/{vendor-replit-codemirror-vim-BLfh0LPy.js → vendor-replit-codemirror-vim-AnOuN8yJ.js} +1 -1
- package/dist/assets/{web-components-C7CmoFxi.js → web-components-BeROQeen.js} +3 -3
- package/dist/index.html +4 -4
- package/dist/mini-chat.html +3 -3
- package/dist/mobile.html +3 -3
- package/dist/sw.js +1 -1
- package/package.json +1 -2
- package/server/index.js +72 -30
- package/server/lib/client-auth/DOCUMENTATION.md +15 -1
- package/server/lib/client-auth/pairing.js +2 -12
- package/server/lib/client-auth/remote-clients.js +2 -12
- package/server/lib/cloudflare-tunnel.js +0 -132
- package/server/lib/fs/DOCUMENTATION.md +8 -0
- package/server/lib/fs/atomic-write.js +111 -0
- package/server/lib/fs/atomic-write.test.js +133 -0
- package/server/lib/notifications/DOCUMENTATION.md +43 -32
- package/server/lib/notifications/pi-notification-watcher.js +8 -7
- package/server/lib/notifications/pi-notification-watcher.test.js +88 -2
- package/server/lib/pi/routes-extension-events.test.js +231 -0
- package/server/lib/pi/routes.js +137 -4
- package/server/lib/pi/routes.test.js +248 -2
- package/server/lib/pi/session-daemon/DOCUMENTATION.md +17 -4
- package/server/lib/pi/session-daemon/daemon-process.js +2 -0
- package/server/lib/pi/session-daemon/engines/index.js +6 -0
- package/server/lib/pi/session-daemon/extension-bridge-draft.test.js +1 -1
- package/server/lib/pi/session-daemon/extension-bridge.js +24 -0
- package/server/lib/pi/session-daemon/extension-message-render.js +74 -0
- package/server/lib/pi/session-daemon/extension-message-render.test.js +164 -0
- package/server/lib/pi/session-daemon/extension-tool-render.js +13 -6
- package/server/lib/pi/session-daemon/pending-input.js +188 -0
- package/server/lib/pi/session-daemon/pending-input.test.js +202 -0
- package/server/lib/pi/session-daemon/session-daemon-engines.test.js +828 -0
- package/server/lib/pi/session-daemon/session-daemon-extensions.test.js +296 -6
- package/server/lib/pi/session-daemon/session-daemon-turn.e2e.test.js +9 -0
- package/server/lib/pi/session-daemon/session-daemon.js +219 -19
- package/server/lib/pi/session-daemon/session-daemon.test.js +30 -2
- package/server/lib/pi/session-daemon/session-engine-router.js +390 -0
- package/server/lib/pi/session-daemon/session-engine-router.test.js +515 -0
- package/server/lib/pi/session-daemon/session-engines.js +467 -0
- package/server/lib/pi/session-daemon/session-engines.test.js +383 -0
- package/server/lib/pi/snippets-store.js +8 -17
- package/server/lib/pi/ui-settings-store.js +6 -10
- package/server/lib/pi/ui-settings-store.test.js +37 -1
- package/server/lib/relay/DOCUMENTATION.md +6 -4
- package/server/lib/relay/identity-store.js +116 -0
- package/server/lib/relay/identity-store.test.js +169 -0
- package/server/lib/relay/identity.js +6 -4
- package/server/lib/relay/server-id.js +63 -0
- package/server/lib/relay/server-id.test.js +132 -0
- package/server/lib/relay/signing-key.js +14 -11
- package/server/lib/security/bind-host.js +6 -2
- package/server/lib/security/bind-host.test.js +17 -0
- package/server/lib/server/core-routes.js +27 -1
- package/server/lib/server/lan-addresses.js +18 -6
- package/server/lib/server/lan-addresses.test.js +28 -0
- package/server/lib/server/tunnel-auth.js +47 -7
- package/server/lib/server/tunnel-auth.rate-limit.test.js +164 -0
- package/server/lib/server/tunnel-service.DOCUMENTATION.md +3 -4
- package/server/lib/server/tunnel-service.js +23 -20
- package/server/lib/server/tunnel-service.test.js +19 -2
- package/server/lib/stt/config-store.js +5 -15
- package/server/lib/tailscale/DOCUMENTATION.md +285 -0
- package/server/lib/tailscale/nc-probe.js +220 -0
- package/server/lib/tailscale/routes.js +45 -0
- package/server/lib/tailscale/service.js +1012 -0
- package/server/lib/tailscale/tailscale.js +302 -0
- package/server/lib/tailscale/tailscale.test.js +2080 -0
- package/server/lib/tunnels/DOCUMENTATION.md +3 -4
- package/server/lib/tunnels/providers/cloudflare.js +1 -22
- package/server/lib/tunnels/types.js +0 -2
- package/server/lib/ui-auth/DOCUMENTATION.md +31 -0
- package/server/lib/ui-auth/ui-auth.js +80 -6
- package/server/lib/ui-auth/ui-auth.test.js +136 -0
- package/server/lib/ui-auth/ui-passkeys.js +2 -13
- package/server/lib/update-job-store.js +4 -6
- package/dist/assets/DiffView-BxwoRCYx.js +0 -18
- package/dist/assets/FilesView-D_2QcdUt.js +0 -6
- package/dist/assets/PierreDiffViewer-BW8MO-O6.js +0 -134
- package/dist/assets/PullRequestsSurface-B3ictm4I.js +0 -2
- package/dist/assets/SessionSwitcherContent-rLoyVqgs.js +0 -1
- package/dist/assets/SessionSwitcherDropdown-CfySKnUu.js +0 -2
- package/dist/assets/SessionUnreadDot-CmEF9sxM.js +0 -1
- package/dist/assets/SettingsView-BiwlwnTK.js +0 -6
- package/dist/assets/index-BnZVqcki.js +0 -11
- package/dist/assets/index-BnieExes.css +0 -1
- package/dist/assets/main-9O5IAtT_.js +0 -136
- package/dist/assets/main-DWGwALIw.js +0 -2
- package/dist/assets/mobile-BbJcYVym.js +0 -2
- package/dist/assets/pi-session-focus-preference-Bmk1iOvn.js +0 -10
- package/dist/assets/renderElectronMiniChatApp-R5o9NwFC.js +0 -2
- package/dist/assets/renderMobileApp-CQ9tWYIj.js +0 -11
- package/dist/assets/runtimeEndpointReset-CtK4C_5h.js +0 -62
- package/dist/assets/useAppFontEffects-DviRbaCJ.js +0 -212
- package/dist/assets/useGitHubRemoteSearch-D-K7aolk.js +0 -1
- package/dist/assets/vendor-capacitor-push-notifications-CBKq2Arn.js +0 -1
- package/server/lib/notifications/delivery-runtime.js +0 -314
- package/server/lib/notifications/delivery-runtime.test.js +0 -85
- package/server/lib/notifications/routes.js +0 -74
- package/server/lib/relay/service.js +0 -9
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
// Host-local relay identity store.
|
|
2
|
+
//
|
|
3
|
+
// Holds ONLY the two long-lived relay identity keypairs:
|
|
4
|
+
// `relaySigningKey` (ECDSA P-256; defines serverId) and `relayEncryptionKey`
|
|
5
|
+
// (ECDH P-256; the E2EE trust anchor). Backed by the dedicated host-local file
|
|
6
|
+
// `<dataDir>/relay-identity.json` — never `<dataDir>/settings.json`.
|
|
7
|
+
//
|
|
8
|
+
// settings.json is portable (copied between hosts) and is rewritten by the UI
|
|
9
|
+
// settings store on every UI settings write, so host identity keys must not
|
|
10
|
+
// live there: a UI save would delete them and the next start would generate a
|
|
11
|
+
// new keypair, changing serverId and orphaning every paired device.
|
|
12
|
+
//
|
|
13
|
+
// Migration: installs whose settings.json still holds a key keep their
|
|
14
|
+
// serverId — when relay-identity.json does not exist (ENOENT), reads fall back
|
|
15
|
+
// to the two keys in settings.json and copy them into relay-identity.json right
|
|
16
|
+
// away, because the next UI settings save rewrites settings.json without them.
|
|
17
|
+
// The server resolves its identity at startup so this copy happens before
|
|
18
|
+
// anything else touches settings.json. This store never writes to or modifies
|
|
19
|
+
// settings.json.
|
|
20
|
+
|
|
21
|
+
import fs from 'node:fs';
|
|
22
|
+
import path from 'node:path';
|
|
23
|
+
|
|
24
|
+
const IDENTITY_FILE_NAME = 'relay-identity.json';
|
|
25
|
+
const SETTINGS_FILE_NAME = 'settings.json';
|
|
26
|
+
|
|
27
|
+
const pickIdentityKeys = (value) => {
|
|
28
|
+
const picked = {};
|
|
29
|
+
if (value && typeof value === 'object') {
|
|
30
|
+
if (value.relaySigningKey !== undefined) picked.relaySigningKey = value.relaySigningKey;
|
|
31
|
+
if (value.relayEncryptionKey !== undefined) picked.relayEncryptionKey = value.relayEncryptionKey;
|
|
32
|
+
}
|
|
33
|
+
return picked;
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* @param {{
|
|
38
|
+
* dataDir: string,
|
|
39
|
+
* fsPromises?: Pick<typeof fs.promises, 'readFile' | 'writeFile' | 'mkdir' | 'rename'>,
|
|
40
|
+
* }} deps
|
|
41
|
+
* @returns {{
|
|
42
|
+
* readSettingsFromDiskMigrated: () => Promise<object>,
|
|
43
|
+
* writeSettingsToDisk: (settings: object) => Promise<void>,
|
|
44
|
+
* readSettingsStrict: () => Promise<object>,
|
|
45
|
+
* }}
|
|
46
|
+
*/
|
|
47
|
+
export const createRelayIdentityStore = ({ dataDir, fsPromises = fs.promises }) => {
|
|
48
|
+
const identityPath = path.join(dataDir, IDENTITY_FILE_NAME);
|
|
49
|
+
const settingsPath = path.join(dataDir, SETTINGS_FILE_NAME);
|
|
50
|
+
|
|
51
|
+
// Persists ONLY the two identity keys from the merged settings object the
|
|
52
|
+
// callers pass — nothing else may be persisted here. Atomic (temp file +
|
|
53
|
+
// rename in the same dir) so a crash never leaves a half-written store.
|
|
54
|
+
const writeSettingsToDisk = async (settings) => {
|
|
55
|
+
const serialized = JSON.stringify(pickIdentityKeys(settings), null, 2);
|
|
56
|
+
const tmpPath = `${identityPath}.tmp-${process.pid}`;
|
|
57
|
+
await fsPromises.mkdir(path.dirname(identityPath), { recursive: true });
|
|
58
|
+
await fsPromises.writeFile(tmpPath, serialized, { encoding: 'utf8', mode: 0o600 });
|
|
59
|
+
await fsPromises.rename(tmpPath, identityPath);
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
// Copies legacy keys found in settings.json into relay-identity.json.
|
|
63
|
+
// Best-effort: on failure the keys are still returned, and the next read
|
|
64
|
+
// retries the copy while settings.json still holds them.
|
|
65
|
+
const adoptLegacyKeys = async (keys) => {
|
|
66
|
+
if (Object.keys(keys).length === 0) return keys;
|
|
67
|
+
try {
|
|
68
|
+
await writeSettingsToDisk(keys);
|
|
69
|
+
} catch {
|
|
70
|
+
}
|
|
71
|
+
return keys;
|
|
72
|
+
};
|
|
73
|
+
|
|
74
|
+
// Lenient like the previous settings.json accessor: any read/parse failure
|
|
75
|
+
// maps to `{}`. ENOENT of the identity file falls back to the legacy
|
|
76
|
+
// settings.json keys (migration); nothing else falls back.
|
|
77
|
+
const readSettingsFromDiskMigrated = async () => {
|
|
78
|
+
try {
|
|
79
|
+
return JSON.parse(await fsPromises.readFile(identityPath, 'utf8'));
|
|
80
|
+
} catch (error) {
|
|
81
|
+
if (error?.code !== 'ENOENT') return {};
|
|
82
|
+
let legacy;
|
|
83
|
+
try {
|
|
84
|
+
legacy = pickIdentityKeys(JSON.parse(await fsPromises.readFile(settingsPath, 'utf8')));
|
|
85
|
+
} catch {
|
|
86
|
+
return {};
|
|
87
|
+
}
|
|
88
|
+
return adoptLegacyKeys(legacy);
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
// Regeneration gate: ENOENT of relay-identity.json falls back to
|
|
93
|
+
// settings.json (where settings ENOENT means first run → `{}`); any OTHER
|
|
94
|
+
// read error or a JSON parse error of either file THROWS, so a corrupt
|
|
95
|
+
// store is never clobbered with a fresh key (a new key means a new
|
|
96
|
+
// serverId, orphaning every previously paired device).
|
|
97
|
+
const readSettingsStrict = async () => {
|
|
98
|
+
let raw;
|
|
99
|
+
try {
|
|
100
|
+
raw = await fsPromises.readFile(identityPath, 'utf8');
|
|
101
|
+
} catch (error) {
|
|
102
|
+
if (error?.code !== 'ENOENT') throw error;
|
|
103
|
+
let settingsRaw;
|
|
104
|
+
try {
|
|
105
|
+
settingsRaw = await fsPromises.readFile(settingsPath, 'utf8');
|
|
106
|
+
} catch (settingsError) {
|
|
107
|
+
if (settingsError?.code === 'ENOENT') return {};
|
|
108
|
+
throw settingsError;
|
|
109
|
+
}
|
|
110
|
+
return adoptLegacyKeys(pickIdentityKeys(JSON.parse(settingsRaw)));
|
|
111
|
+
}
|
|
112
|
+
return JSON.parse(raw);
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
return { readSettingsFromDiskMigrated, writeSettingsToDisk, readSettingsStrict };
|
|
116
|
+
};
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { describe, expect, it } from 'bun:test';
|
|
2
|
+
import crypto from 'node:crypto';
|
|
3
|
+
import { mkdtemp, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
|
|
7
|
+
import { deriveServerId } from './signing-key.js';
|
|
8
|
+
import { createRelayIdentityRuntime } from './identity.js';
|
|
9
|
+
import { createRelayIdentityStore } from './identity-store.js';
|
|
10
|
+
import { createServerIdResolver } from './server-id.js';
|
|
11
|
+
import { createPiUiSettingsStore } from '../pi/ui-settings-store.js';
|
|
12
|
+
|
|
13
|
+
const makeDataDir = () => mkdtemp(join(tmpdir(), 'pichamber-relay-identity-'));
|
|
14
|
+
|
|
15
|
+
const readIdentity = async (dataDir) =>
|
|
16
|
+
JSON.parse(await readFile(join(dataDir, 'relay-identity.json'), 'utf8'));
|
|
17
|
+
|
|
18
|
+
const generateSigningKey = () => {
|
|
19
|
+
const { privateKey, publicKey } = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
|
|
20
|
+
return {
|
|
21
|
+
privateJwk: privateKey.export({ format: 'jwk' }),
|
|
22
|
+
publicJwk: publicKey.export({ format: 'jwk' }),
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
describe('relay identity store', () => {
|
|
27
|
+
it('round-trips only the two identity keys with mode 0600 and never modifies settings.json', async () => {
|
|
28
|
+
const dataDir = await makeDataDir();
|
|
29
|
+
try {
|
|
30
|
+
const settingsPath = join(dataDir, 'settings.json');
|
|
31
|
+
await writeFile(settingsPath, JSON.stringify({ theme: 'dark', fontSize: 14 }, null, 2), 'utf8');
|
|
32
|
+
const before = await readFile(settingsPath, 'utf8');
|
|
33
|
+
|
|
34
|
+
const store = createRelayIdentityStore({ dataDir });
|
|
35
|
+
await store.writeSettingsToDisk({
|
|
36
|
+
theme: 'dark',
|
|
37
|
+
fontSize: 14,
|
|
38
|
+
privateRelay: { enabled: true },
|
|
39
|
+
relaySigningKey: generateSigningKey(),
|
|
40
|
+
relayEncryptionKey: generateSigningKey(),
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
const persisted = await readIdentity(dataDir);
|
|
44
|
+
expect(Object.keys(persisted).sort()).toEqual(['relayEncryptionKey', 'relaySigningKey']);
|
|
45
|
+
expect(persisted.relaySigningKey.privateJwk).toBeDefined();
|
|
46
|
+
expect(persisted.relayEncryptionKey.privateJwk).toBeDefined();
|
|
47
|
+
|
|
48
|
+
// Atomic write leaves no temp files; the identity file is owner-only.
|
|
49
|
+
expect((await readdir(dataDir)).filter((name) => name.includes('.tmp-'))).toEqual([]);
|
|
50
|
+
expect((await stat(join(dataDir, 'relay-identity.json'))).mode & 0o777).toBe(0o600);
|
|
51
|
+
|
|
52
|
+
// settings.json is never written to or modified.
|
|
53
|
+
expect(await readFile(settingsPath, 'utf8')).toBe(before);
|
|
54
|
+
|
|
55
|
+
// Lenient + strict reads agree with what was written.
|
|
56
|
+
expect(await store.readSettingsFromDiskMigrated()).toEqual(persisted);
|
|
57
|
+
expect(await store.readSettingsStrict()).toEqual(persisted);
|
|
58
|
+
} finally {
|
|
59
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it('migrates keys present only in settings.json into relay-identity.json on read', async () => {
|
|
64
|
+
const dataDir = await makeDataDir();
|
|
65
|
+
try {
|
|
66
|
+
const relaySigningKey = generateSigningKey();
|
|
67
|
+
await writeFile(
|
|
68
|
+
join(dataDir, 'settings.json'),
|
|
69
|
+
JSON.stringify({ theme: 'dark', relaySigningKey }, null, 2),
|
|
70
|
+
'utf8',
|
|
71
|
+
);
|
|
72
|
+
|
|
73
|
+
const store = createRelayIdentityStore({ dataDir });
|
|
74
|
+
// Lenient read falls back to the legacy keys so serverId is stable.
|
|
75
|
+
const migrated = await store.readSettingsFromDiskMigrated();
|
|
76
|
+
expect(migrated.relaySigningKey).toEqual(relaySigningKey);
|
|
77
|
+
// The fallback copies the key into relay-identity.json right away: the
|
|
78
|
+
// next UI settings save rewrites settings.json without it.
|
|
79
|
+
expect((await readIdentity(dataDir)).relaySigningKey).toEqual(relaySigningKey);
|
|
80
|
+
expect((await stat(join(dataDir, 'relay-identity.json'))).mode & 0o777).toBe(0o600);
|
|
81
|
+
|
|
82
|
+
// Strict read sees the same key (no regeneration gate trip).
|
|
83
|
+
expect((await store.readSettingsStrict()).relaySigningKey).toEqual(relaySigningKey);
|
|
84
|
+
|
|
85
|
+
// A later write keeps the migrated key alongside the new one.
|
|
86
|
+
await store.writeSettingsToDisk({ ...migrated, relayEncryptionKey: generateSigningKey() });
|
|
87
|
+
const persisted = await readIdentity(dataDir);
|
|
88
|
+
expect(persisted.relaySigningKey).toEqual(relaySigningKey);
|
|
89
|
+
expect(persisted.relayEncryptionKey.privateJwk).toBeDefined();
|
|
90
|
+
|
|
91
|
+
// Legacy settings.json still holds its copy; the store never edits it.
|
|
92
|
+
expect(JSON.parse(await readFile(join(dataDir, 'settings.json'), 'utf8')).relaySigningKey)
|
|
93
|
+
.toEqual(relaySigningKey);
|
|
94
|
+
} finally {
|
|
95
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
it('missing everywhere reads lenient {}, corrupt identity file throws strict with no regeneration', async () => {
|
|
100
|
+
const dataDir = await makeDataDir();
|
|
101
|
+
try {
|
|
102
|
+
const store = createRelayIdentityStore({ dataDir });
|
|
103
|
+
// ENOENT of both files: lenient and strict both yield `{}` (first run).
|
|
104
|
+
expect(await store.readSettingsFromDiskMigrated()).toEqual({});
|
|
105
|
+
expect(await store.readSettingsStrict()).toEqual({});
|
|
106
|
+
|
|
107
|
+
await writeFile(join(dataDir, 'relay-identity.json'), '{ not json', 'utf8');
|
|
108
|
+
// Lenient maps the corrupt store to `{}`...
|
|
109
|
+
expect(await store.readSettingsFromDiskMigrated()).toEqual({});
|
|
110
|
+
// ...but strict THROWS so callers never regenerate over a corrupt store.
|
|
111
|
+
await expect(store.readSettingsStrict()).rejects.toThrow();
|
|
112
|
+
// Nothing regenerated or clobbered the corrupt file.
|
|
113
|
+
expect(await readFile(join(dataDir, 'relay-identity.json'), 'utf8')).toBe('{ not json');
|
|
114
|
+
} finally {
|
|
115
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it('REGRESSION: a UI settings write no longer changes serverId; CLI and server resolvers agree', async () => {
|
|
120
|
+
const dataDir = await makeDataDir();
|
|
121
|
+
try {
|
|
122
|
+
const before = await createServerIdResolver({ dataDir, crypto }).getServerId();
|
|
123
|
+
expect(typeof before).toBe('string');
|
|
124
|
+
|
|
125
|
+
// Simulate the exact bug: a UI settings save rewrites settings.json.
|
|
126
|
+
const uiStore = createPiUiSettingsStore({ file: join(dataDir, 'settings.json') });
|
|
127
|
+
await uiStore.write({ fontSize: 15 });
|
|
128
|
+
expect(JSON.parse(await readFile(join(dataDir, 'settings.json'), 'utf8')).fontSize).toBe(15);
|
|
129
|
+
|
|
130
|
+
// A FRESH resolver (new process) must return the SAME serverId.
|
|
131
|
+
const after = await createServerIdResolver({ dataDir, crypto }).getServerId();
|
|
132
|
+
expect(after).toBe(before);
|
|
133
|
+
|
|
134
|
+
// The CLI path (createRelayIdentityRuntime over the identity store)
|
|
135
|
+
// agrees with the server resolver.
|
|
136
|
+
const cliIdentity = await createRelayIdentityRuntime({
|
|
137
|
+
crypto,
|
|
138
|
+
...createRelayIdentityStore({ dataDir }),
|
|
139
|
+
}).getRelayIdentity();
|
|
140
|
+
expect(cliIdentity.serverId).toBe(before);
|
|
141
|
+
expect(deriveServerId({ crypto }, (await readIdentity(dataDir)).relaySigningKey.publicJwk))
|
|
142
|
+
.toBe(before);
|
|
143
|
+
} finally {
|
|
144
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
145
|
+
}
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
it('REGRESSION: an upgraded install keeps its serverId across a UI settings save', async () => {
|
|
149
|
+
const dataDir = await makeDataDir();
|
|
150
|
+
try {
|
|
151
|
+
// Pre-fix layout: the key lives only in an unmarked settings.json.
|
|
152
|
+
const relaySigningKey = generateSigningKey();
|
|
153
|
+
await writeFile(join(dataDir, 'settings.json'), JSON.stringify({ relaySigningKey }, null, 2), 'utf8');
|
|
154
|
+
const legacyId = deriveServerId({ crypto }, relaySigningKey.publicJwk);
|
|
155
|
+
|
|
156
|
+
// Server start resolves the identity, which migrates the key.
|
|
157
|
+
expect(await createServerIdResolver({ dataDir, crypto }).getServerId()).toBe(legacyId);
|
|
158
|
+
|
|
159
|
+
// The UI settings store rewrites settings.json without the key.
|
|
160
|
+
await createPiUiSettingsStore({ file: join(dataDir, 'settings.json') }).write({ fontSize: 15 });
|
|
161
|
+
expect(JSON.parse(await readFile(join(dataDir, 'settings.json'), 'utf8')).relaySigningKey).toBeUndefined();
|
|
162
|
+
|
|
163
|
+
// Next start: same serverId, read from relay-identity.json.
|
|
164
|
+
expect(await createServerIdResolver({ dataDir, crypto }).getServerId()).toBe(legacyId);
|
|
165
|
+
} finally {
|
|
166
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
});
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
// Host relay identity: the EXISTING ECDSA P-256 signing keypair (
|
|
2
|
-
//
|
|
1
|
+
// Host relay identity: the EXISTING ECDSA P-256 signing keypair (via
|
|
2
|
+
// signing-key.js — same store, same serverId) plus a NEW
|
|
3
3
|
// long-lived ECDH P-256 encryption keypair for the E2EE channel (WebCrypto
|
|
4
4
|
// keys are single-purpose, so signing and encryption keys must differ).
|
|
5
|
-
//
|
|
6
|
-
//
|
|
5
|
+
// Both keypairs persist as `relaySigningKey` / `relayEncryptionKey` in the
|
|
6
|
+
// host-local `<dataDir>/relay-identity.json` (see `identity-store.js`) — never
|
|
7
|
+
// settings.json, which is portable between hosts and rewritten by the UI
|
|
8
|
+
// settings store.
|
|
7
9
|
|
|
8
10
|
import {
|
|
9
11
|
canonicalPublicJwkString,
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
// Server-side resolver for the ONE stable server identity (`serverId`).
|
|
2
|
+
//
|
|
3
|
+
// The identity is the hash of the public relay signing key:
|
|
4
|
+
// `deriveServerId({ crypto }, publicJwk)` = base64url(SHA-256(canonical public
|
|
5
|
+
// JWK)), from the keypair stored as `relaySigningKey` in the host-local
|
|
6
|
+
// `<PiChamber data dir>/relay-identity.json` (see `identity-store.js`) — the
|
|
7
|
+
// same store the CLI (`pichamber pair` → `buildRelayPairingCandidate` →
|
|
8
|
+
// `createRelayIdentityRuntime(...).getRelayIdentity()`) uses, so the server
|
|
9
|
+
// and the CLI always report the same id. It is exposed unauthenticated on
|
|
10
|
+
// `/health` and `/api/version` and on
|
|
11
|
+
// `GET /api/client-auth/connection/candidates` so clients can verify that a
|
|
12
|
+
// learned/probed address belongs to the expected server BEFORE sending a
|
|
13
|
+
// bearer token there. The Tailscale probe compares against this same id —
|
|
14
|
+
// resolved from `relay-identity.json` via the injected `getServerId`.
|
|
15
|
+
// settings.json is portable (copied between hosts) and is rewritten by the
|
|
16
|
+
// UI settings store, so it must never hold host identity keys.
|
|
17
|
+
|
|
18
|
+
import fs from 'node:fs';
|
|
19
|
+
|
|
20
|
+
import { deriveServerId, getOrCreateRelaySigningKeypair } from './signing-key.js';
|
|
21
|
+
import { createRelayIdentityStore } from './identity-store.js';
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* @param {{
|
|
25
|
+
* dataDir: string,
|
|
26
|
+
* crypto: typeof import('node:crypto'),
|
|
27
|
+
* fsPromises?: Pick<typeof fs.promises, 'readFile' | 'writeFile' | 'mkdir' | 'rename'>,
|
|
28
|
+
* }} deps
|
|
29
|
+
* @returns {{ getServerId: () => Promise<string> }}
|
|
30
|
+
*/
|
|
31
|
+
export const createServerIdResolver = ({ dataDir, crypto, fsPromises = fs.promises }) => {
|
|
32
|
+
// Host-local identity store (relay-identity.json, with settings.json
|
|
33
|
+
// migration fallback) — the same store the CLI pairing command uses.
|
|
34
|
+
const { readSettingsFromDiskMigrated, writeSettingsToDisk, readSettingsStrict } =
|
|
35
|
+
createRelayIdentityStore({ dataDir, fsPromises });
|
|
36
|
+
|
|
37
|
+
let cachedServerId = null;
|
|
38
|
+
let inflightServerId = null;
|
|
39
|
+
|
|
40
|
+
const getServerId = () => {
|
|
41
|
+
if (cachedServerId) return Promise.resolve(cachedServerId);
|
|
42
|
+
if (inflightServerId) return inflightServerId;
|
|
43
|
+
inflightServerId = (async () => {
|
|
44
|
+
try {
|
|
45
|
+
const { publicJwk } = await getOrCreateRelaySigningKeypair({
|
|
46
|
+
crypto,
|
|
47
|
+
readSettingsFromDiskMigrated,
|
|
48
|
+
writeSettingsToDisk,
|
|
49
|
+
readSettingsStrict,
|
|
50
|
+
});
|
|
51
|
+
cachedServerId = deriveServerId({ crypto }, publicJwk);
|
|
52
|
+
return cachedServerId;
|
|
53
|
+
} catch (error) {
|
|
54
|
+
// Let a later call retry; callers treat a throwing getServerId as "no id".
|
|
55
|
+
inflightServerId = null;
|
|
56
|
+
throw error;
|
|
57
|
+
}
|
|
58
|
+
})();
|
|
59
|
+
return inflightServerId;
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
return { getServerId };
|
|
63
|
+
};
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import { describe, expect, it } from 'bun:test';
|
|
2
|
+
import crypto from 'node:crypto';
|
|
3
|
+
import { mkdtemp, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
|
|
7
|
+
import { deriveServerId } from './signing-key.js';
|
|
8
|
+
import { createRelayIdentityRuntime } from './identity.js';
|
|
9
|
+
import { createRelayIdentityStore } from './identity-store.js';
|
|
10
|
+
import { createServerIdResolver } from './server-id.js';
|
|
11
|
+
|
|
12
|
+
const makeDataDir = () => mkdtemp(join(tmpdir(), 'pichamber-server-id-'));
|
|
13
|
+
|
|
14
|
+
const readIdentity = async (dataDir) =>
|
|
15
|
+
JSON.parse(await readFile(join(dataDir, 'relay-identity.json'), 'utf8'));
|
|
16
|
+
|
|
17
|
+
const readSettings = async (dataDir) =>
|
|
18
|
+
JSON.parse(await readFile(join(dataDir, 'settings.json'), 'utf8'));
|
|
19
|
+
|
|
20
|
+
const generateSigningKey = () => {
|
|
21
|
+
const { privateKey, publicKey } = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
|
|
22
|
+
return {
|
|
23
|
+
privateJwk: privateKey.export({ format: 'jwk' }),
|
|
24
|
+
publicJwk: publicKey.export({ format: 'jwk' }),
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
describe('server id resolver', () => {
|
|
29
|
+
it('migrates a legacy settings.json key (same serverId) without touching settings.json', async () => {
|
|
30
|
+
const dataDir = await makeDataDir();
|
|
31
|
+
try {
|
|
32
|
+
const relaySigningKey = generateSigningKey();
|
|
33
|
+
await writeFile(
|
|
34
|
+
join(dataDir, 'settings.json'),
|
|
35
|
+
JSON.stringify({ theme: 'dark', relaySigningKey }, null, 2),
|
|
36
|
+
'utf8',
|
|
37
|
+
);
|
|
38
|
+
|
|
39
|
+
const serverId = await createServerIdResolver({ dataDir, crypto }).getServerId();
|
|
40
|
+
expect(serverId).toBe(deriveServerId({ crypto }, relaySigningKey.publicJwk));
|
|
41
|
+
|
|
42
|
+
// Legacy settings.json is never modified by identity reads.
|
|
43
|
+
const stored = await readSettings(dataDir);
|
|
44
|
+
expect(stored.theme).toBe('dark');
|
|
45
|
+
expect(stored.relaySigningKey).toEqual(relaySigningKey);
|
|
46
|
+
|
|
47
|
+
// Same store, same id as the CLI pairing-candidate identity — which
|
|
48
|
+
// persists the migrated key into relay-identity.json on its first write.
|
|
49
|
+
const relayIdentity = await createRelayIdentityRuntime({
|
|
50
|
+
crypto,
|
|
51
|
+
...createRelayIdentityStore({ dataDir }),
|
|
52
|
+
}).getRelayIdentity();
|
|
53
|
+
expect(relayIdentity.serverId).toBe(serverId);
|
|
54
|
+
expect((await readIdentity(dataDir)).relaySigningKey).toEqual(relaySigningKey);
|
|
55
|
+
} finally {
|
|
56
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it('generates once on first run and persists the key for later resolvers', async () => {
|
|
61
|
+
const dataDir = await makeDataDir();
|
|
62
|
+
try {
|
|
63
|
+
const id = await createServerIdResolver({ dataDir, crypto }).getServerId();
|
|
64
|
+
expect(typeof id).toBe('string');
|
|
65
|
+
|
|
66
|
+
const stored = await readIdentity(dataDir);
|
|
67
|
+
expect(stored.relaySigningKey?.privateJwk).toBeDefined();
|
|
68
|
+
expect(stored.relaySigningKey?.publicJwk).toBeDefined();
|
|
69
|
+
expect(id).toBe(deriveServerId({ crypto }, stored.relaySigningKey.publicJwk));
|
|
70
|
+
|
|
71
|
+
// No stray temp files from the atomic write; the identity file is owner-only.
|
|
72
|
+
expect((await readdir(dataDir)).filter((name) => name.includes('.tmp-'))).toEqual([]);
|
|
73
|
+
expect((await stat(join(dataDir, 'relay-identity.json'))).mode & 0o777).toBe(0o600);
|
|
74
|
+
|
|
75
|
+
// Identity never touches the portable settings file.
|
|
76
|
+
await expect(readFile(join(dataDir, 'settings.json'), 'utf8')).rejects.toThrow();
|
|
77
|
+
|
|
78
|
+
// A second resolver instance reads the persisted key, never regenerates.
|
|
79
|
+
expect(await createServerIdResolver({ dataDir, crypto }).getServerId()).toBe(id);
|
|
80
|
+
expect((await readIdentity(dataDir)).relaySigningKey).toEqual(stored.relaySigningKey);
|
|
81
|
+
} finally {
|
|
82
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it('shares one in-flight generation across concurrent first calls', async () => {
|
|
87
|
+
const dataDir = await makeDataDir();
|
|
88
|
+
try {
|
|
89
|
+
let generations = 0;
|
|
90
|
+
const countingCrypto = {
|
|
91
|
+
...crypto,
|
|
92
|
+
generateKeyPairSync: (...args) => {
|
|
93
|
+
generations += 1;
|
|
94
|
+
return crypto.generateKeyPairSync(...args);
|
|
95
|
+
},
|
|
96
|
+
};
|
|
97
|
+
const resolver = createServerIdResolver({ dataDir, crypto: countingCrypto });
|
|
98
|
+
const [first, second] = await Promise.all([resolver.getServerId(), resolver.getServerId()]);
|
|
99
|
+
expect(first).toBe(second);
|
|
100
|
+
expect(generations).toBe(1);
|
|
101
|
+
} finally {
|
|
102
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
it('rejects on a corrupt identity file and never overwrites it', async () => {
|
|
107
|
+
const dataDir = await makeDataDir();
|
|
108
|
+
try {
|
|
109
|
+
await writeFile(join(dataDir, 'relay-identity.json'), '{ not json', 'utf8');
|
|
110
|
+
const resolver = createServerIdResolver({ dataDir, crypto });
|
|
111
|
+
await expect(resolver.getServerId()).rejects.toThrow();
|
|
112
|
+
// A retry still rejects (the failure cleared the in-flight promise)
|
|
113
|
+
// and the corrupt file is left untouched — never clobbered with a key.
|
|
114
|
+
await expect(resolver.getServerId()).rejects.toThrow();
|
|
115
|
+
expect(await readFile(join(dataDir, 'relay-identity.json'), 'utf8')).toBe('{ not json');
|
|
116
|
+
} finally {
|
|
117
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it('rejects on a corrupt legacy settings.json and never overwrites it', async () => {
|
|
122
|
+
const dataDir = await makeDataDir();
|
|
123
|
+
try {
|
|
124
|
+
await writeFile(join(dataDir, 'settings.json'), '{ not json', 'utf8');
|
|
125
|
+
const resolver = createServerIdResolver({ dataDir, crypto });
|
|
126
|
+
await expect(resolver.getServerId()).rejects.toThrow();
|
|
127
|
+
expect(await readFile(join(dataDir, 'settings.json'), 'utf8')).toBe('{ not json');
|
|
128
|
+
} finally {
|
|
129
|
+
await rm(dataDir, { recursive: true, force: true });
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
});
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
// Per-server relay signing identity (ECDSA P-256)
|
|
2
|
-
//
|
|
3
|
-
// relay
|
|
4
|
-
//
|
|
5
|
-
// `
|
|
6
|
-
//
|
|
1
|
+
// Per-server relay signing identity (ECDSA P-256). The keypair defines the
|
|
2
|
+
// host's serverId (base64url(SHA-256(canonical public JWK))): the private
|
|
3
|
+
// relay's routing id and the identity paired clients pin via /health.
|
|
4
|
+
// Storage is via the injected accessors backed by the host-local
|
|
5
|
+
// `<dataDir>/relay-identity.json` (see `identity-store.js`) — never
|
|
6
|
+
// settings.json, which is portable between hosts and rewritten by the UI
|
|
7
|
+
// settings store. Existing installs migrate: when the
|
|
8
|
+
// identity file does not exist, reads fall back to the legacy settings.json
|
|
9
|
+
// keys so serverId stays stable (paired devices pin it).
|
|
7
10
|
|
|
8
11
|
/**
|
|
9
12
|
* @param {{
|
|
@@ -26,8 +29,8 @@ export const getOrCreateRelaySigningKeypair = async ({ crypto, readSettingsFromD
|
|
|
26
29
|
}
|
|
27
30
|
// Regeneration gate: the lenient settings reader maps read failures to `{}`,
|
|
28
31
|
// indistinguishable from "first run". Minting a new keypair changes serverId,
|
|
29
|
-
// which orphans every paired device
|
|
30
|
-
// clobber the
|
|
32
|
+
// which orphans every paired device AND the write below would
|
|
33
|
+
// clobber the identity file with the empty spread. Re-verify with the strict
|
|
31
34
|
// reader (throws on corrupt/unreadable) before generating; if it finds the
|
|
32
35
|
// key the lenient read lost, use it and generate nothing.
|
|
33
36
|
let verifiedSettings = settings;
|
|
@@ -39,7 +42,7 @@ export const getOrCreateRelaySigningKeypair = async ({ crypto, readSettingsFromD
|
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
44
|
// Loud on purpose: a new signing key means a new serverId — every previously
|
|
42
|
-
// paired device
|
|
45
|
+
// paired device is orphaned. Expected exactly once, on first run.
|
|
43
46
|
console.warn('[relay-identity] Generating NEW relay signing keypair (serverId changes; previously paired devices must re-pair)');
|
|
44
47
|
const { privateKey, publicKey } = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
|
|
45
48
|
const privateJwk = privateKey.export({ format: 'jwk' });
|
|
@@ -55,8 +58,8 @@ export const canonicalPublicJwkString = (jwk) =>
|
|
|
55
58
|
JSON.stringify({ crv: jwk.crv, kty: jwk.kty, x: jwk.x, y: jwk.y });
|
|
56
59
|
|
|
57
60
|
/**
|
|
58
|
-
* serverId = base64url(SHA-256(canonical public JWK)).
|
|
59
|
-
* relay's
|
|
61
|
+
* serverId = base64url(SHA-256(canonical public JWK)). This id is the
|
|
62
|
+
* private relay's routing key, so the derivation must stay stable.
|
|
60
63
|
* @param {{ crypto: typeof import('node:crypto') }} deps
|
|
61
64
|
* @param {JsonWebKey} publicJwk
|
|
62
65
|
*/
|
|
@@ -31,8 +31,12 @@ export const isLoopbackBindHost = (host) => {
|
|
|
31
31
|
|
|
32
32
|
export const isNetworkExposedBindHost = (host) => !isLoopbackBindHost(host);
|
|
33
33
|
|
|
34
|
-
export const isUnsafeUnauthenticatedLanAllowed = (env = process.env) =>
|
|
35
|
-
|
|
34
|
+
export const isUnsafeUnauthenticatedLanAllowed = (env = process.env) => {
|
|
35
|
+
const raw = env?.PICHAMBER_ALLOW_UNAUTHENTICATED_LAN;
|
|
36
|
+
if (typeof raw !== 'string') return raw === true || raw === 1;
|
|
37
|
+
const normalized = raw.trim().toLowerCase();
|
|
38
|
+
return normalized === 'true' || normalized === '1';
|
|
39
|
+
};
|
|
36
40
|
|
|
37
41
|
export const getUnauthenticatedLanErrorMessage = (host) =>
|
|
38
42
|
`PiChamber refuses to bind to ${host || 'a network-exposed host'} without UI authentication. `
|
|
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest';
|
|
|
2
2
|
import {
|
|
3
3
|
isLoopbackBindHost,
|
|
4
4
|
isNetworkExposedBindHost,
|
|
5
|
+
isUnsafeUnauthenticatedLanAllowed,
|
|
5
6
|
} from './bind-host.js';
|
|
6
7
|
|
|
7
8
|
describe('bind host exposure classification', () => {
|
|
@@ -34,3 +35,19 @@ describe('bind host exposure classification', () => {
|
|
|
34
35
|
}
|
|
35
36
|
});
|
|
36
37
|
});
|
|
38
|
+
|
|
39
|
+
describe('unsafe unauthenticated LAN flag parsing (F10)', () => {
|
|
40
|
+
it("accepts 'true' and '1' case-insensitively with surrounding whitespace", () => {
|
|
41
|
+
for (const value of ['true', 'TRUE', ' True ', '1', ' 1 ']) {
|
|
42
|
+
expect(isUnsafeUnauthenticatedLanAllowed({ PICHAMBER_ALLOW_UNAUTHENTICATED_LAN: value }), value).toBe(true);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it('rejects anything else, including the old duplicated-operand gap', () => {
|
|
47
|
+
for (const value of ['false', '0', 'yes', '', '2', 'trueish']) {
|
|
48
|
+
expect(isUnsafeUnauthenticatedLanAllowed({ PICHAMBER_ALLOW_UNAUTHENTICATED_LAN: value }), value).toBe(false);
|
|
49
|
+
}
|
|
50
|
+
expect(isUnsafeUnauthenticatedLanAllowed({})).toBe(false);
|
|
51
|
+
expect(isUnsafeUnauthenticatedLanAllowed(undefined)).toBe(false);
|
|
52
|
+
});
|
|
53
|
+
});
|
|
@@ -425,6 +425,10 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
425
425
|
// server can actually be reached on (LAN derived from the server bind, not
|
|
426
426
|
// the UI origin), for the create-device dialog.
|
|
427
427
|
getPairingTransports = () => ({ local: null, lan: null, relayAvailable: true }),
|
|
428
|
+
// Returns the active Tailscale pairing candidate
|
|
429
|
+
// ({ type: 'tailscale', url, mode, priority }) when the mapping is live,
|
|
430
|
+
// else null. Injected lazily because the service reconciles after listen.
|
|
431
|
+
getTailscalePairingCandidate = () => null,
|
|
428
432
|
// Returns ALL direct LAN URLs the server is currently reachable on (client-
|
|
429
433
|
// reached address first, then interface scan) for the candidates-refresh
|
|
430
434
|
// endpoint. Empty when the server is loopback-only.
|
|
@@ -623,6 +627,9 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
623
627
|
// false → direct only, never relay;
|
|
624
628
|
// undefined → legacy: advertise relay only if it is already enabled.
|
|
625
629
|
// `includeDirect === false` produces a relay-only link (no direct candidate).
|
|
630
|
+
// A live Tailscale mapping is advertised as a `tailscale` candidate between
|
|
631
|
+
// the direct and relay candidates (priority 20): clients redeem over it
|
|
632
|
+
// like any direct URL. Old clients drop the unknown type and use the rest.
|
|
626
633
|
const pairingServerCandidates = async (req, { preferredServerUrl, includeRelay, includeDirect = true } = {}) => {
|
|
627
634
|
const candidates = [];
|
|
628
635
|
if (includeDirect) {
|
|
@@ -637,6 +644,16 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
637
644
|
candidates.push({ type, url: direct, priority: 10 });
|
|
638
645
|
}
|
|
639
646
|
}
|
|
647
|
+
if (includeDirect) {
|
|
648
|
+
try {
|
|
649
|
+
const tailscaleCandidate = getTailscalePairingCandidate();
|
|
650
|
+
if (tailscaleCandidate && typeof tailscaleCandidate.url === 'string') {
|
|
651
|
+
candidates.push(tailscaleCandidate);
|
|
652
|
+
}
|
|
653
|
+
} catch {
|
|
654
|
+
// A Tailscale status failure must not break direct pairing.
|
|
655
|
+
}
|
|
656
|
+
}
|
|
640
657
|
// The client races candidates and falls back to relay only if the direct URL
|
|
641
658
|
// is unreachable (relay carries a higher priority number).
|
|
642
659
|
if (includeRelay !== false) {
|
|
@@ -897,7 +914,8 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
897
914
|
// candidates are a snapshot: when DHCP hands this machine a new address, the
|
|
898
915
|
// device's saved LAN candidate goes stale and it is stuck on the relay forever.
|
|
899
916
|
// A client that connected over any live transport calls this to learn the
|
|
900
|
-
// server's present LAN URLs (plus the relay candidate when enabled
|
|
917
|
+
// server's present LAN URLs (plus the relay candidate when enabled, plus the
|
|
918
|
+
// live Tailscale candidate when active) and update
|
|
901
919
|
// its saved candidate set. `serverId` lets the client bind the response — and
|
|
902
920
|
// later /health probes of the learned addresses — to this server's identity
|
|
903
921
|
// before trusting them with its bearer token.
|
|
@@ -917,6 +935,14 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
917
935
|
const normalized = normalizeCandidateUrl(url);
|
|
918
936
|
if (normalized) candidates.push({ type: 'lan', url: normalized, priority: 10 });
|
|
919
937
|
}
|
|
938
|
+
try {
|
|
939
|
+
const tailscaleCandidate = getTailscalePairingCandidate();
|
|
940
|
+
if (tailscaleCandidate && typeof tailscaleCandidate.url === 'string') {
|
|
941
|
+
candidates.push(tailscaleCandidate);
|
|
942
|
+
}
|
|
943
|
+
} catch {
|
|
944
|
+
// Tailscale status failure must not break the direct-candidate refresh.
|
|
945
|
+
}
|
|
920
946
|
try {
|
|
921
947
|
const relayCandidate = await getRelayPairingCandidate({ ensureEnabled: false });
|
|
922
948
|
if (relayCandidate) candidates.push(relayCandidate);
|