gitspace 0.2.0-rc.1
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/.claude/settings.local.json +21 -0
- package/.gitspace/bundle.json +50 -0
- package/.gitspace/select/01-status.sh +40 -0
- package/.gitspace/setup/01-install-deps.sh +12 -0
- package/.gitspace/setup/02-typecheck.sh +16 -0
- package/AGENTS.md +439 -0
- package/CLAUDE.md +1 -0
- package/LICENSE +25 -0
- package/README.md +607 -0
- package/bin/gssh +62 -0
- package/bun.lock +647 -0
- package/docs/CONNECTION.md +623 -0
- package/docs/GATEWAY-WORKER.md +319 -0
- package/docs/GETTING-STARTED.md +448 -0
- package/docs/GITSPACE-PLATFORM.md +1819 -0
- package/docs/INFRASTRUCTURE.md +1347 -0
- package/docs/PROTOCOL.md +619 -0
- package/docs/QUICKSTART.md +174 -0
- package/docs/RELAY.md +327 -0
- package/docs/REMOTE-DESIGN.md +549 -0
- package/docs/ROADMAP.md +564 -0
- package/docs/SITE_DOCS_FIGMA_MAKE.md +1167 -0
- package/docs/STACK-DESIGN.md +588 -0
- package/docs/UNIFIED_ARCHITECTURE.md +292 -0
- package/experiments/pty-benchmark.ts +148 -0
- package/experiments/pty-latency.ts +100 -0
- package/experiments/router/client.ts +199 -0
- package/experiments/router/protocol.ts +74 -0
- package/experiments/router/router.ts +217 -0
- package/experiments/router/session.ts +180 -0
- package/experiments/router/test.ts +133 -0
- package/experiments/socket-bandwidth.ts +77 -0
- package/homebrew/gitspace.rb +45 -0
- package/landing-page/ATTRIBUTIONS.md +3 -0
- package/landing-page/README.md +11 -0
- package/landing-page/bun.lock +801 -0
- package/landing-page/guidelines/Guidelines.md +61 -0
- package/landing-page/index.html +37 -0
- package/landing-page/package.json +90 -0
- package/landing-page/postcss.config.mjs +15 -0
- package/landing-page/public/_redirects +1 -0
- package/landing-page/public/favicon.png +0 -0
- package/landing-page/src/app/App.tsx +53 -0
- package/landing-page/src/app/components/figma/ImageWithFallback.tsx +27 -0
- package/landing-page/src/app/components/ui/accordion.tsx +66 -0
- package/landing-page/src/app/components/ui/alert-dialog.tsx +157 -0
- package/landing-page/src/app/components/ui/alert.tsx +66 -0
- package/landing-page/src/app/components/ui/aspect-ratio.tsx +11 -0
- package/landing-page/src/app/components/ui/avatar.tsx +53 -0
- package/landing-page/src/app/components/ui/badge.tsx +46 -0
- package/landing-page/src/app/components/ui/breadcrumb.tsx +109 -0
- package/landing-page/src/app/components/ui/button.tsx +57 -0
- package/landing-page/src/app/components/ui/calendar.tsx +75 -0
- package/landing-page/src/app/components/ui/card.tsx +92 -0
- package/landing-page/src/app/components/ui/carousel.tsx +241 -0
- package/landing-page/src/app/components/ui/chart.tsx +353 -0
- package/landing-page/src/app/components/ui/checkbox.tsx +32 -0
- package/landing-page/src/app/components/ui/collapsible.tsx +33 -0
- package/landing-page/src/app/components/ui/command.tsx +177 -0
- package/landing-page/src/app/components/ui/context-menu.tsx +252 -0
- package/landing-page/src/app/components/ui/dialog.tsx +135 -0
- package/landing-page/src/app/components/ui/drawer.tsx +132 -0
- package/landing-page/src/app/components/ui/dropdown-menu.tsx +257 -0
- package/landing-page/src/app/components/ui/form.tsx +168 -0
- package/landing-page/src/app/components/ui/hover-card.tsx +44 -0
- package/landing-page/src/app/components/ui/input-otp.tsx +77 -0
- package/landing-page/src/app/components/ui/input.tsx +21 -0
- package/landing-page/src/app/components/ui/label.tsx +24 -0
- package/landing-page/src/app/components/ui/menubar.tsx +276 -0
- package/landing-page/src/app/components/ui/navigation-menu.tsx +168 -0
- package/landing-page/src/app/components/ui/pagination.tsx +127 -0
- package/landing-page/src/app/components/ui/popover.tsx +48 -0
- package/landing-page/src/app/components/ui/progress.tsx +31 -0
- package/landing-page/src/app/components/ui/radio-group.tsx +45 -0
- package/landing-page/src/app/components/ui/resizable.tsx +56 -0
- package/landing-page/src/app/components/ui/scroll-area.tsx +58 -0
- package/landing-page/src/app/components/ui/select.tsx +189 -0
- package/landing-page/src/app/components/ui/separator.tsx +28 -0
- package/landing-page/src/app/components/ui/sheet.tsx +139 -0
- package/landing-page/src/app/components/ui/sidebar.tsx +726 -0
- package/landing-page/src/app/components/ui/skeleton.tsx +13 -0
- package/landing-page/src/app/components/ui/slider.tsx +63 -0
- package/landing-page/src/app/components/ui/sonner.tsx +25 -0
- package/landing-page/src/app/components/ui/switch.tsx +31 -0
- package/landing-page/src/app/components/ui/table.tsx +116 -0
- package/landing-page/src/app/components/ui/tabs.tsx +66 -0
- package/landing-page/src/app/components/ui/textarea.tsx +18 -0
- package/landing-page/src/app/components/ui/toggle-group.tsx +73 -0
- package/landing-page/src/app/components/ui/toggle.tsx +47 -0
- package/landing-page/src/app/components/ui/tooltip.tsx +61 -0
- package/landing-page/src/app/components/ui/use-mobile.ts +21 -0
- package/landing-page/src/app/components/ui/utils.ts +6 -0
- package/landing-page/src/components/docs/DocsContent.tsx +718 -0
- package/landing-page/src/components/docs/DocsSidebar.tsx +84 -0
- package/landing-page/src/components/landing/CTA.tsx +59 -0
- package/landing-page/src/components/landing/Comparison.tsx +84 -0
- package/landing-page/src/components/landing/FaultyTerminal.tsx +424 -0
- package/landing-page/src/components/landing/Features.tsx +201 -0
- package/landing-page/src/components/landing/Hero.tsx +142 -0
- package/landing-page/src/components/landing/Pricing.tsx +140 -0
- package/landing-page/src/components/landing/Roadmap.tsx +86 -0
- package/landing-page/src/components/landing/Security.tsx +81 -0
- package/landing-page/src/components/landing/TerminalWindow.tsx +27 -0
- package/landing-page/src/components/landing/UseCases.tsx +55 -0
- package/landing-page/src/components/landing/Workflow.tsx +101 -0
- package/landing-page/src/components/layout/DashboardNavbar.tsx +37 -0
- package/landing-page/src/components/layout/Footer.tsx +55 -0
- package/landing-page/src/components/layout/LandingNavbar.tsx +82 -0
- package/landing-page/src/components/ui/badge.tsx +39 -0
- package/landing-page/src/components/ui/breadcrumb.tsx +115 -0
- package/landing-page/src/components/ui/button.tsx +57 -0
- package/landing-page/src/components/ui/card.tsx +79 -0
- package/landing-page/src/components/ui/mock-terminal.tsx +68 -0
- package/landing-page/src/components/ui/separator.tsx +28 -0
- package/landing-page/src/lib/utils.ts +6 -0
- package/landing-page/src/main.tsx +10 -0
- package/landing-page/src/pages/Dashboard.tsx +133 -0
- package/landing-page/src/pages/DocsPage.tsx +79 -0
- package/landing-page/src/pages/LandingPage.tsx +31 -0
- package/landing-page/src/pages/TerminalView.tsx +106 -0
- package/landing-page/src/styles/fonts.css +0 -0
- package/landing-page/src/styles/index.css +3 -0
- package/landing-page/src/styles/tailwind.css +4 -0
- package/landing-page/src/styles/theme.css +181 -0
- package/landing-page/vite.config.ts +19 -0
- package/npm/darwin-arm64/bin/gssh +0 -0
- package/npm/darwin-arm64/package.json +20 -0
- package/package.json +74 -0
- package/scripts/build.ts +284 -0
- package/scripts/release.ts +140 -0
- package/src/__tests__/test-utils.ts +298 -0
- package/src/commands/__tests__/serve-messages.test.ts +190 -0
- package/src/commands/access.ts +298 -0
- package/src/commands/add.ts +452 -0
- package/src/commands/auth.ts +364 -0
- package/src/commands/connect.ts +287 -0
- package/src/commands/directory.ts +16 -0
- package/src/commands/host.ts +396 -0
- package/src/commands/identity.ts +184 -0
- package/src/commands/list.ts +200 -0
- package/src/commands/relay.ts +315 -0
- package/src/commands/remove.ts +241 -0
- package/src/commands/serve.ts +1493 -0
- package/src/commands/share.ts +456 -0
- package/src/commands/status.ts +125 -0
- package/src/commands/switch.ts +353 -0
- package/src/commands/tmux.ts +317 -0
- package/src/core/__tests__/access.test.ts +240 -0
- package/src/core/access.ts +277 -0
- package/src/core/bundle.ts +342 -0
- package/src/core/config.ts +510 -0
- package/src/core/git.ts +317 -0
- package/src/core/github.ts +151 -0
- package/src/core/identity.ts +631 -0
- package/src/core/linear.ts +225 -0
- package/src/core/shell.ts +161 -0
- package/src/core/trusted-relays.ts +315 -0
- package/src/index.ts +821 -0
- package/src/lib/remote-session/index.ts +7 -0
- package/src/lib/remote-session/protocol.ts +267 -0
- package/src/lib/remote-session/session-handler.ts +581 -0
- package/src/lib/remote-session/workspace-scanner.ts +167 -0
- package/src/lib/tmux-lite/README.md +81 -0
- package/src/lib/tmux-lite/cli.ts +796 -0
- package/src/lib/tmux-lite/crypto/__tests__/helpers/handshake-runner.ts +349 -0
- package/src/lib/tmux-lite/crypto/__tests__/helpers/mock-relay.ts +291 -0
- package/src/lib/tmux-lite/crypto/__tests__/helpers/test-identities.ts +142 -0
- package/src/lib/tmux-lite/crypto/__tests__/integration/authorization.integration.test.ts +339 -0
- package/src/lib/tmux-lite/crypto/__tests__/integration/e2e-communication.integration.test.ts +477 -0
- package/src/lib/tmux-lite/crypto/__tests__/integration/error-handling.integration.test.ts +499 -0
- package/src/lib/tmux-lite/crypto/__tests__/integration/handshake.integration.test.ts +371 -0
- package/src/lib/tmux-lite/crypto/__tests__/integration/security.integration.test.ts +573 -0
- package/src/lib/tmux-lite/crypto/access-control.test.ts +512 -0
- package/src/lib/tmux-lite/crypto/access-control.ts +320 -0
- package/src/lib/tmux-lite/crypto/frames.test.ts +262 -0
- package/src/lib/tmux-lite/crypto/frames.ts +141 -0
- package/src/lib/tmux-lite/crypto/handshake.ts +894 -0
- package/src/lib/tmux-lite/crypto/identity.test.ts +220 -0
- package/src/lib/tmux-lite/crypto/identity.ts +286 -0
- package/src/lib/tmux-lite/crypto/index.ts +51 -0
- package/src/lib/tmux-lite/crypto/invites.test.ts +381 -0
- package/src/lib/tmux-lite/crypto/invites.ts +215 -0
- package/src/lib/tmux-lite/crypto/keyexchange.ts +435 -0
- package/src/lib/tmux-lite/crypto/keys.test.ts +58 -0
- package/src/lib/tmux-lite/crypto/keys.ts +47 -0
- package/src/lib/tmux-lite/crypto/secretbox.test.ts +169 -0
- package/src/lib/tmux-lite/crypto/secretbox.ts +124 -0
- package/src/lib/tmux-lite/handshake-handler.ts +451 -0
- package/src/lib/tmux-lite/protocol.test.ts +307 -0
- package/src/lib/tmux-lite/protocol.ts +266 -0
- package/src/lib/tmux-lite/relay-client.ts +506 -0
- package/src/lib/tmux-lite/server.ts +1250 -0
- package/src/lib/tmux-lite/shell-integration.sh +37 -0
- package/src/lib/tmux-lite/terminal-queries.test.ts +54 -0
- package/src/lib/tmux-lite/terminal-queries.ts +49 -0
- package/src/relay/__tests__/e2e-flow.test.ts +1284 -0
- package/src/relay/__tests__/helpers/auth.ts +354 -0
- package/src/relay/__tests__/helpers/ports.ts +51 -0
- package/src/relay/__tests__/protocol-validation.test.ts +265 -0
- package/src/relay/authorization.ts +303 -0
- package/src/relay/embedded-assets.generated.d.ts +15 -0
- package/src/relay/identity.ts +352 -0
- package/src/relay/index.ts +57 -0
- package/src/relay/pipes.test.ts +427 -0
- package/src/relay/pipes.ts +195 -0
- package/src/relay/protocol.ts +804 -0
- package/src/relay/registries.test.ts +437 -0
- package/src/relay/registries.ts +593 -0
- package/src/relay/server.test.ts +1323 -0
- package/src/relay/server.ts +1092 -0
- package/src/relay/signing.ts +238 -0
- package/src/relay/types.ts +69 -0
- package/src/serve/client-session-manager.ts +622 -0
- package/src/serve/daemon.ts +497 -0
- package/src/serve/pty-session.ts +236 -0
- package/src/serve/types.ts +169 -0
- package/src/shared/components/Flow.tsx +453 -0
- package/src/shared/components/Flow.tui.tsx +343 -0
- package/src/shared/components/Flow.web.tsx +442 -0
- package/src/shared/components/Inbox.tsx +446 -0
- package/src/shared/components/Inbox.tui.tsx +262 -0
- package/src/shared/components/Inbox.web.tsx +329 -0
- package/src/shared/components/MachineList.tsx +187 -0
- package/src/shared/components/MachineList.tui.tsx +161 -0
- package/src/shared/components/MachineList.web.tsx +210 -0
- package/src/shared/components/ProjectList.tsx +176 -0
- package/src/shared/components/ProjectList.tui.tsx +109 -0
- package/src/shared/components/ProjectList.web.tsx +143 -0
- package/src/shared/components/SpacesBrowser.tsx +332 -0
- package/src/shared/components/SpacesBrowser.tui.tsx +163 -0
- package/src/shared/components/SpacesBrowser.web.tsx +221 -0
- package/src/shared/components/index.ts +103 -0
- package/src/shared/hooks/index.ts +16 -0
- package/src/shared/hooks/useNavigation.ts +226 -0
- package/src/shared/index.ts +122 -0
- package/src/shared/providers/LocalMachineProvider.ts +425 -0
- package/src/shared/providers/MachineProvider.ts +165 -0
- package/src/shared/providers/RemoteMachineProvider.ts +444 -0
- package/src/shared/providers/index.ts +26 -0
- package/src/shared/types.ts +145 -0
- package/src/tui/adapters.ts +120 -0
- package/src/tui/app.tsx +1816 -0
- package/src/tui/components/Terminal.tsx +580 -0
- package/src/tui/hooks/index.ts +35 -0
- package/src/tui/hooks/useAppState.ts +314 -0
- package/src/tui/hooks/useDaemonStatus.ts +174 -0
- package/src/tui/hooks/useInboxTUI.ts +113 -0
- package/src/tui/hooks/useRemoteMachines.ts +209 -0
- package/src/tui/index.ts +24 -0
- package/src/tui/state.ts +299 -0
- package/src/tui/terminal-bracketed-paste.test.ts +45 -0
- package/src/tui/terminal-bracketed-paste.ts +47 -0
- package/src/types/bundle.ts +112 -0
- package/src/types/config.ts +89 -0
- package/src/types/errors.ts +206 -0
- package/src/types/identity.ts +284 -0
- package/src/types/workspace-fuzzy.ts +49 -0
- package/src/types/workspace.ts +151 -0
- package/src/utils/bun-socket-writer.ts +80 -0
- package/src/utils/deps.ts +127 -0
- package/src/utils/fuzzy-match.ts +125 -0
- package/src/utils/logger.ts +127 -0
- package/src/utils/markdown.ts +254 -0
- package/src/utils/onboarding.ts +229 -0
- package/src/utils/prompts.ts +114 -0
- package/src/utils/run-commands.ts +112 -0
- package/src/utils/run-scripts.ts +142 -0
- package/src/utils/sanitize.ts +98 -0
- package/src/utils/secrets.ts +122 -0
- package/src/utils/shell-escape.ts +40 -0
- package/src/utils/utf8.ts +79 -0
- package/src/utils/workspace-state.ts +47 -0
- package/src/web/README.md +73 -0
- package/src/web/bun.lock +575 -0
- package/src/web/eslint.config.js +23 -0
- package/src/web/index.html +16 -0
- package/src/web/package.json +37 -0
- package/src/web/public/vite.svg +1 -0
- package/src/web/src/App.tsx +604 -0
- package/src/web/src/assets/react.svg +1 -0
- package/src/web/src/components/Terminal.tsx +207 -0
- package/src/web/src/hooks/useRelayConnection.ts +224 -0
- package/src/web/src/hooks/useTerminal.ts +699 -0
- package/src/web/src/index.css +55 -0
- package/src/web/src/lib/crypto/__tests__/web-terminal.test.ts +1158 -0
- package/src/web/src/lib/crypto/frames.ts +205 -0
- package/src/web/src/lib/crypto/handshake.ts +396 -0
- package/src/web/src/lib/crypto/identity.ts +128 -0
- package/src/web/src/lib/crypto/keyexchange.ts +246 -0
- package/src/web/src/lib/crypto/relay-signing.ts +53 -0
- package/src/web/src/lib/invite.ts +58 -0
- package/src/web/src/lib/storage/identity-store.ts +94 -0
- package/src/web/src/main.tsx +10 -0
- package/src/web/src/types/identity.ts +45 -0
- package/src/web/tsconfig.app.json +28 -0
- package/src/web/tsconfig.json +7 -0
- package/src/web/tsconfig.node.json +26 -0
- package/src/web/vite.config.ts +31 -0
- package/todo-security.md +92 -0
- package/tsconfig.json +23 -0
- package/worker/.wrangler/state/v3/d1/miniflare-D1DatabaseObject/12b7107e435bf1b9a8713a7f320472a63e543104d633d89a26f8d21f4e4ef182.sqlite +0 -0
- package/worker/.wrangler/state/v3/d1/miniflare-D1DatabaseObject/12b7107e435bf1b9a8713a7f320472a63e543104d633d89a26f8d21f4e4ef182.sqlite-shm +0 -0
- package/worker/.wrangler/state/v3/d1/miniflare-D1DatabaseObject/12b7107e435bf1b9a8713a7f320472a63e543104d633d89a26f8d21f4e4ef182.sqlite-wal +0 -0
- package/worker/.wrangler/state/v3/d1/miniflare-D1DatabaseObject/1a1ac3db1ab86ecf712f90322868a9aabc2c7dc9fe2dfbe94f9b075096276b0f.sqlite +0 -0
- package/worker/.wrangler/state/v3/d1/miniflare-D1DatabaseObject/1a1ac3db1ab86ecf712f90322868a9aabc2c7dc9fe2dfbe94f9b075096276b0f.sqlite-shm +0 -0
- package/worker/.wrangler/state/v3/d1/miniflare-D1DatabaseObject/1a1ac3db1ab86ecf712f90322868a9aabc2c7dc9fe2dfbe94f9b075096276b0f.sqlite-wal +0 -0
- package/worker/bun.lock +237 -0
- package/worker/package.json +22 -0
- package/worker/schema.sql +96 -0
- package/worker/src/handlers/auth.ts +451 -0
- package/worker/src/handlers/subdomains.ts +376 -0
- package/worker/src/handlers/user.ts +98 -0
- package/worker/src/index.ts +70 -0
- package/worker/src/middleware/auth.ts +152 -0
- package/worker/src/services/cloudflare.ts +609 -0
- package/worker/src/types.ts +96 -0
- package/worker/tsconfig.json +15 -0
- package/worker/wrangler.toml +26 -0
|
@@ -0,0 +1,894 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* X3DH (Extended Triple Diffie-Hellman) handshake protocol implementation
|
|
3
|
+
*
|
|
4
|
+
* This module implements a 4-message mutual authentication handshake:
|
|
5
|
+
* 1. ClientHello: Client sends ephemeral key and nonce
|
|
6
|
+
* 2. ServerHello: Server sends identity, signed pre-key, ephemeral key, and nonce
|
|
7
|
+
* 3. ClientAuth: Client proves identity and provides authorization
|
|
8
|
+
* 4. ServerAuth: Server proves identity and returns authorization result
|
|
9
|
+
*
|
|
10
|
+
* The handshake provides:
|
|
11
|
+
* - Perfect forward secrecy (ephemeral keys)
|
|
12
|
+
* - Mutual authentication (both parties prove identity)
|
|
13
|
+
* - Authorization (invite tokens or access lists)
|
|
14
|
+
* - Protection against replay attacks (nonces, timestamps)
|
|
15
|
+
* - Protection against man-in-the-middle (signed pre-keys)
|
|
16
|
+
*
|
|
17
|
+
* Key derivation uses triple DH:
|
|
18
|
+
* - DH1 = client_ephemeral × server_signed_prekey
|
|
19
|
+
* - DH2 = client_ephemeral × server_identity_keyexchange
|
|
20
|
+
* - DH3 = client_ephemeral × server_ephemeral
|
|
21
|
+
*
|
|
22
|
+
* @module handshake
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
import { randomBytes } from "node:crypto";
|
|
26
|
+
import { createHmac } from "node:crypto";
|
|
27
|
+
import { sign, verify, deriveIdentityId } from "./identity.js";
|
|
28
|
+
import {
|
|
29
|
+
x25519SharedSecret,
|
|
30
|
+
generateEphemeralKeypair,
|
|
31
|
+
deriveSessionKeysFromMultiple,
|
|
32
|
+
validateX25519PublicKey,
|
|
33
|
+
} from "./keyexchange.js";
|
|
34
|
+
import type {
|
|
35
|
+
Identity,
|
|
36
|
+
KeyExchangeKeypair,
|
|
37
|
+
SessionKeys,
|
|
38
|
+
X3DHInitMessage,
|
|
39
|
+
X3DHResponseMessage,
|
|
40
|
+
X3DHAuthMessage,
|
|
41
|
+
X3DHResultMessage,
|
|
42
|
+
HandshakePhase,
|
|
43
|
+
} from "../../../types/identity.js";
|
|
44
|
+
|
|
45
|
+
// ============================================================================
|
|
46
|
+
// Constants
|
|
47
|
+
// ============================================================================
|
|
48
|
+
|
|
49
|
+
/** Nonce length (32 bytes, 256 bits) */
|
|
50
|
+
const NONCE_LENGTH = 32;
|
|
51
|
+
|
|
52
|
+
/** Maximum allowed clock skew for timestamp validation (5 minutes) */
|
|
53
|
+
const MAX_TIMESTAMP_SKEW_MS = 5 * 60 * 1000;
|
|
54
|
+
|
|
55
|
+
/** Protocol version */
|
|
56
|
+
const PROTOCOL_VERSION = 1;
|
|
57
|
+
|
|
58
|
+
// ============================================================================
|
|
59
|
+
// Client State
|
|
60
|
+
// ============================================================================
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Client-side handshake state
|
|
64
|
+
*
|
|
65
|
+
* Tracks the client's progress through the handshake phases and
|
|
66
|
+
* maintains ephemeral keys and received server information.
|
|
67
|
+
*/
|
|
68
|
+
export interface X3DHClientState {
|
|
69
|
+
/** Current handshake phase */
|
|
70
|
+
phase: HandshakePhase;
|
|
71
|
+
/** Client's ephemeral keypair */
|
|
72
|
+
ephemeral: KeyExchangeKeypair;
|
|
73
|
+
/** Client-generated nonce for replay protection */
|
|
74
|
+
clientNonce: Uint8Array;
|
|
75
|
+
/** Server's nonce (received in ServerHello) */
|
|
76
|
+
serverNonce?: Uint8Array;
|
|
77
|
+
/** Server's Ed25519 identity public key (received in ServerHello) */
|
|
78
|
+
peerIdentityKey?: Uint8Array;
|
|
79
|
+
/** Server's X25519 key exchange public key (received in ServerHello) */
|
|
80
|
+
peerKeyExchangeKey?: Uint8Array;
|
|
81
|
+
/** Server's ephemeral X25519 public key (received in ServerHello) */
|
|
82
|
+
peerEphemeralKey?: Uint8Array;
|
|
83
|
+
/** Server's signed X25519 pre-key (received in ServerHello) */
|
|
84
|
+
peerSignedPreKey?: Uint8Array;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// ============================================================================
|
|
88
|
+
// Server State
|
|
89
|
+
// ============================================================================
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* Server-side handshake state
|
|
93
|
+
*
|
|
94
|
+
* Tracks the server's progress through the handshake phases and
|
|
95
|
+
* maintains pre-signed keys and received client information.
|
|
96
|
+
*/
|
|
97
|
+
export interface X3DHServerState {
|
|
98
|
+
/** Current handshake phase */
|
|
99
|
+
phase: HandshakePhase;
|
|
100
|
+
/** Server's signed pre-key (signed with identity key) */
|
|
101
|
+
signedPreKey: KeyExchangeKeypair;
|
|
102
|
+
/** Signature over signedPreKey.publicKey using identity signing key */
|
|
103
|
+
signedPreKeySignature: Uint8Array;
|
|
104
|
+
/** Server's ephemeral keypair */
|
|
105
|
+
ephemeral: KeyExchangeKeypair;
|
|
106
|
+
/** Server-generated nonce for replay protection */
|
|
107
|
+
serverNonce: Uint8Array;
|
|
108
|
+
/** Client's nonce (received in ClientHello) */
|
|
109
|
+
clientNonce?: Uint8Array;
|
|
110
|
+
/** Client's ephemeral X25519 public key (received in ClientHello) */
|
|
111
|
+
clientEphemeralKey?: Uint8Array;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
// ============================================================================
|
|
115
|
+
// Client-Side Functions
|
|
116
|
+
// ============================================================================
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* Create initial ClientHello message
|
|
120
|
+
*
|
|
121
|
+
* Initiates the handshake by generating an ephemeral keypair and nonce.
|
|
122
|
+
* The client sends their ephemeral public key and nonce to the server.
|
|
123
|
+
*
|
|
124
|
+
* @param machineIdHint - Optional machine ID for relay routing
|
|
125
|
+
* @returns Client state and ClientHello message
|
|
126
|
+
* @throws {Error} If key or nonce generation fails
|
|
127
|
+
*
|
|
128
|
+
* @example
|
|
129
|
+
* ```typescript
|
|
130
|
+
* const { state, message } = createClientHello("machine-123");
|
|
131
|
+
* // Send message to server
|
|
132
|
+
* await relay.send(message);
|
|
133
|
+
* ```
|
|
134
|
+
*/
|
|
135
|
+
export function createClientHello(machineIdHint?: string): {
|
|
136
|
+
state: X3DHClientState;
|
|
137
|
+
message: X3DHInitMessage;
|
|
138
|
+
} {
|
|
139
|
+
// Generate ephemeral keypair and nonce
|
|
140
|
+
const ephemeral = generateEphemeralKeypair();
|
|
141
|
+
const clientNonce = randomBytes(NONCE_LENGTH);
|
|
142
|
+
|
|
143
|
+
const state: X3DHClientState = {
|
|
144
|
+
phase: "awaiting_server_hello",
|
|
145
|
+
ephemeral,
|
|
146
|
+
clientNonce,
|
|
147
|
+
};
|
|
148
|
+
|
|
149
|
+
const message: X3DHInitMessage = {
|
|
150
|
+
version: PROTOCOL_VERSION,
|
|
151
|
+
ephemeralKey: Buffer.from(ephemeral.publicKey).toString("base64"),
|
|
152
|
+
timestamp: Date.now(),
|
|
153
|
+
clientNonce: Buffer.from(clientNonce).toString("base64"),
|
|
154
|
+
machineIdHint,
|
|
155
|
+
};
|
|
156
|
+
|
|
157
|
+
return { state, message };
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* Process ServerHello response
|
|
162
|
+
*
|
|
163
|
+
* Validates the server's response including:
|
|
164
|
+
* - Protocol version
|
|
165
|
+
* - Timestamp (replay protection)
|
|
166
|
+
* - Signature on signed pre-key (authenticity)
|
|
167
|
+
* - Public key validity
|
|
168
|
+
*
|
|
169
|
+
* @param state - Current client state (must be in awaiting_server_hello phase)
|
|
170
|
+
* @param response - ServerHello message from server
|
|
171
|
+
* @returns Updated client state, or null if validation fails
|
|
172
|
+
*
|
|
173
|
+
* @example
|
|
174
|
+
* ```typescript
|
|
175
|
+
* const message = await relay.receive();
|
|
176
|
+
* const newState = processServerHello(state, message);
|
|
177
|
+
* if (!newState) {
|
|
178
|
+
* throw new Error("Invalid ServerHello");
|
|
179
|
+
* }
|
|
180
|
+
* ```
|
|
181
|
+
*/
|
|
182
|
+
export function processServerHello(
|
|
183
|
+
state: X3DHClientState,
|
|
184
|
+
response: X3DHResponseMessage
|
|
185
|
+
): X3DHClientState | null {
|
|
186
|
+
// Validate phase
|
|
187
|
+
if (state.phase !== "awaiting_server_hello") {
|
|
188
|
+
return null;
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
// Validate protocol version
|
|
192
|
+
if (response.version !== PROTOCOL_VERSION) {
|
|
193
|
+
return null;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
// Validate timestamp (replay protection)
|
|
197
|
+
const now = Date.now();
|
|
198
|
+
const timeDiff = Math.abs(now - response.timestamp);
|
|
199
|
+
if (timeDiff > MAX_TIMESTAMP_SKEW_MS) {
|
|
200
|
+
return null;
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
try {
|
|
204
|
+
// Decode server keys
|
|
205
|
+
const peerIdentityKey = new Uint8Array(
|
|
206
|
+
Buffer.from(response.identityKey, "base64")
|
|
207
|
+
);
|
|
208
|
+
const peerKeyExchangeKey = new Uint8Array(
|
|
209
|
+
Buffer.from(response.keyExchangeKey, "base64")
|
|
210
|
+
);
|
|
211
|
+
const peerEphemeralKey = new Uint8Array(
|
|
212
|
+
Buffer.from(response.ephemeralKey, "base64")
|
|
213
|
+
);
|
|
214
|
+
const peerSignedPreKey = new Uint8Array(
|
|
215
|
+
Buffer.from(response.signedPreKey, "base64")
|
|
216
|
+
);
|
|
217
|
+
const preKeySignature = new Uint8Array(
|
|
218
|
+
Buffer.from(response.preKeySignature, "base64")
|
|
219
|
+
);
|
|
220
|
+
const serverNonce = new Uint8Array(
|
|
221
|
+
Buffer.from(response.serverNonce, "base64")
|
|
222
|
+
);
|
|
223
|
+
|
|
224
|
+
// Validate key lengths
|
|
225
|
+
if (peerIdentityKey.length !== 32) return null;
|
|
226
|
+
if (serverNonce.length !== NONCE_LENGTH) return null;
|
|
227
|
+
|
|
228
|
+
// Validate X25519 public keys
|
|
229
|
+
if (!validateX25519PublicKey(peerKeyExchangeKey)) return null;
|
|
230
|
+
if (!validateX25519PublicKey(peerEphemeralKey)) return null;
|
|
231
|
+
if (!validateX25519PublicKey(peerSignedPreKey)) return null;
|
|
232
|
+
|
|
233
|
+
// Verify signature on signed pre-key
|
|
234
|
+
const isValid = verify(peerSignedPreKey, preKeySignature, peerIdentityKey);
|
|
235
|
+
if (!isValid) {
|
|
236
|
+
return null;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
// Update state
|
|
240
|
+
return {
|
|
241
|
+
...state,
|
|
242
|
+
phase: "awaiting_server_auth",
|
|
243
|
+
serverNonce,
|
|
244
|
+
peerIdentityKey,
|
|
245
|
+
peerKeyExchangeKey,
|
|
246
|
+
peerEphemeralKey,
|
|
247
|
+
peerSignedPreKey,
|
|
248
|
+
};
|
|
249
|
+
} catch {
|
|
250
|
+
return null;
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
/**
|
|
255
|
+
* Create ClientAuth message
|
|
256
|
+
*
|
|
257
|
+
* Computes session keys and proves client identity. The identity proof
|
|
258
|
+
* is an HMAC over both nonces using a shared secret derived from the
|
|
259
|
+
* client's signing key.
|
|
260
|
+
*
|
|
261
|
+
* Session keys are derived from triple DH:
|
|
262
|
+
* - DH1 = client_ephemeral × server_signed_prekey
|
|
263
|
+
* - DH2 = client_ephemeral × server_identity_keyexchange
|
|
264
|
+
* - DH3 = client_ephemeral × server_ephemeral
|
|
265
|
+
*
|
|
266
|
+
* @param state - Current client state (must be in awaiting_server_auth phase)
|
|
267
|
+
* @param identity - Client's identity for authentication
|
|
268
|
+
* @param authorization - Authorization method (access list or invite token)
|
|
269
|
+
* @returns Updated state, ClientAuth message, and derived session keys
|
|
270
|
+
* @throws {Error} If state is invalid or key derivation fails
|
|
271
|
+
*
|
|
272
|
+
* @example
|
|
273
|
+
* ```typescript
|
|
274
|
+
* const { state: newState, message, sessionKeys } = createClientAuth(
|
|
275
|
+
* state,
|
|
276
|
+
* myIdentity,
|
|
277
|
+
* { type: "invite", inviteToken: "token123" }
|
|
278
|
+
* );
|
|
279
|
+
* await relay.send(message);
|
|
280
|
+
* // Store sessionKeys for later use
|
|
281
|
+
* ```
|
|
282
|
+
*/
|
|
283
|
+
export function createClientAuth(
|
|
284
|
+
state: X3DHClientState,
|
|
285
|
+
identity: Identity,
|
|
286
|
+
authorization: X3DHAuthMessage["authorization"]
|
|
287
|
+
): {
|
|
288
|
+
state: X3DHClientState;
|
|
289
|
+
message: X3DHAuthMessage;
|
|
290
|
+
sessionKeys: SessionKeys;
|
|
291
|
+
} {
|
|
292
|
+
// Validate phase
|
|
293
|
+
if (state.phase !== "awaiting_server_auth") {
|
|
294
|
+
throw new Error(
|
|
295
|
+
`Invalid phase for ClientAuth: ${state.phase}, expected awaiting_server_auth`
|
|
296
|
+
);
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
// Ensure we have server keys
|
|
300
|
+
if (
|
|
301
|
+
!state.peerSignedPreKey ||
|
|
302
|
+
!state.peerEphemeralKey ||
|
|
303
|
+
!state.peerIdentityKey ||
|
|
304
|
+
!state.peerKeyExchangeKey ||
|
|
305
|
+
!state.serverNonce
|
|
306
|
+
) {
|
|
307
|
+
throw new Error("Missing server keys in state");
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
// Compute triple DH
|
|
311
|
+
// DH1: client_ephemeral × server_signed_prekey
|
|
312
|
+
const dh1 = x25519SharedSecret(
|
|
313
|
+
state.ephemeral.privateKey,
|
|
314
|
+
state.peerSignedPreKey
|
|
315
|
+
);
|
|
316
|
+
|
|
317
|
+
// DH2: client_ephemeral × server_identity_keyexchange
|
|
318
|
+
const dh2 = x25519SharedSecret(
|
|
319
|
+
state.ephemeral.privateKey,
|
|
320
|
+
state.peerKeyExchangeKey
|
|
321
|
+
);
|
|
322
|
+
|
|
323
|
+
// DH3: client_ephemeral × server_ephemeral
|
|
324
|
+
const dh3 = x25519SharedSecret(
|
|
325
|
+
state.ephemeral.privateKey,
|
|
326
|
+
state.peerEphemeralKey
|
|
327
|
+
);
|
|
328
|
+
|
|
329
|
+
// Derive session keys from triple DH
|
|
330
|
+
const salt = new Uint8Array(state.clientNonce.length + state.serverNonce.length);
|
|
331
|
+
salt.set(state.clientNonce, 0);
|
|
332
|
+
salt.set(state.serverNonce, state.clientNonce.length);
|
|
333
|
+
|
|
334
|
+
const sessionKeys = deriveSessionKeysFromMultiple(
|
|
335
|
+
[dh1, dh2, dh3],
|
|
336
|
+
salt,
|
|
337
|
+
true // Client is initiator
|
|
338
|
+
);
|
|
339
|
+
|
|
340
|
+
// Create identity proof (HMAC over both nonces)
|
|
341
|
+
const transcript = new Uint8Array(state.clientNonce.length + state.serverNonce.length);
|
|
342
|
+
transcript.set(state.clientNonce, 0);
|
|
343
|
+
transcript.set(state.serverNonce, state.clientNonce.length);
|
|
344
|
+
|
|
345
|
+
const identityProof = createHmac("sha256", sessionKeys.sendKey)
|
|
346
|
+
.update(transcript)
|
|
347
|
+
.digest();
|
|
348
|
+
|
|
349
|
+
// Create signature transcript for identity proof
|
|
350
|
+
// This proves the client possesses the signing key, not just knows the public key
|
|
351
|
+
// Signs: clientEphemeral || serverEphemeral || clientNonce || serverNonce
|
|
352
|
+
const signatureTranscript = new Uint8Array(
|
|
353
|
+
state.ephemeral.publicKey.length +
|
|
354
|
+
state.peerEphemeralKey.length +
|
|
355
|
+
state.clientNonce.length +
|
|
356
|
+
state.serverNonce.length
|
|
357
|
+
);
|
|
358
|
+
let offset = 0;
|
|
359
|
+
signatureTranscript.set(state.ephemeral.publicKey, offset);
|
|
360
|
+
offset += state.ephemeral.publicKey.length;
|
|
361
|
+
signatureTranscript.set(state.peerEphemeralKey, offset);
|
|
362
|
+
offset += state.peerEphemeralKey.length;
|
|
363
|
+
signatureTranscript.set(state.clientNonce, offset);
|
|
364
|
+
offset += state.clientNonce.length;
|
|
365
|
+
signatureTranscript.set(state.serverNonce, offset);
|
|
366
|
+
|
|
367
|
+
// Sign the transcript with the client's identity signing key
|
|
368
|
+
const identitySignature = sign(signatureTranscript, identity.signing.secretKey);
|
|
369
|
+
|
|
370
|
+
// Create message
|
|
371
|
+
const message: X3DHAuthMessage = {
|
|
372
|
+
version: PROTOCOL_VERSION,
|
|
373
|
+
identityKey: Buffer.from(identity.signing.publicKey).toString("base64"),
|
|
374
|
+
keyExchangeKey: Buffer.from(identity.keyExchange.publicKey).toString(
|
|
375
|
+
"base64"
|
|
376
|
+
),
|
|
377
|
+
identityProof: Buffer.from(identityProof).toString("base64"),
|
|
378
|
+
identitySignature: Buffer.from(identitySignature).toString("base64"),
|
|
379
|
+
authorization,
|
|
380
|
+
};
|
|
381
|
+
|
|
382
|
+
const newState: X3DHClientState = {
|
|
383
|
+
...state,
|
|
384
|
+
phase: "awaiting_server_auth",
|
|
385
|
+
};
|
|
386
|
+
|
|
387
|
+
return { state: newState, message, sessionKeys };
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
/**
|
|
391
|
+
* Process ServerAuth response
|
|
392
|
+
*
|
|
393
|
+
* Validates the server's identity proof and checks authorization result.
|
|
394
|
+
* On success, returns the established session keys and permissions.
|
|
395
|
+
*
|
|
396
|
+
* @param state - Current client state
|
|
397
|
+
* @param response - ServerAuth message from server
|
|
398
|
+
* @param sessionKeys - Session keys derived in createClientAuth
|
|
399
|
+
* @returns Handshake result with session keys and permissions, or null if validation fails
|
|
400
|
+
*
|
|
401
|
+
* @example
|
|
402
|
+
* ```typescript
|
|
403
|
+
* const response = await relay.receive();
|
|
404
|
+
* const result = processServerAuth(state, response, sessionKeys);
|
|
405
|
+
* if (!result) {
|
|
406
|
+
* throw new Error("Handshake failed");
|
|
407
|
+
* }
|
|
408
|
+
* console.log("Connected with accessType:", result.authResult.accessType);
|
|
409
|
+
* ```
|
|
410
|
+
*/
|
|
411
|
+
export function processServerAuth(
|
|
412
|
+
state: X3DHClientState,
|
|
413
|
+
response: X3DHResultMessage,
|
|
414
|
+
sessionKeys: SessionKeys
|
|
415
|
+
): {
|
|
416
|
+
sessionKeys: SessionKeys;
|
|
417
|
+
peerIdentityId: string;
|
|
418
|
+
authResult: X3DHResultMessage["result"];
|
|
419
|
+
} | null {
|
|
420
|
+
// Validate protocol version
|
|
421
|
+
if (response.version !== PROTOCOL_VERSION) {
|
|
422
|
+
return null;
|
|
423
|
+
}
|
|
424
|
+
|
|
425
|
+
// Check authorization result
|
|
426
|
+
if (response.result.type === "rejected") {
|
|
427
|
+
return null;
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
try {
|
|
431
|
+
// Decode server identity key
|
|
432
|
+
const serverIdentityKey = new Uint8Array(
|
|
433
|
+
Buffer.from(response.identityKey, "base64")
|
|
434
|
+
);
|
|
435
|
+
|
|
436
|
+
// Verify it matches what we received in ServerHello
|
|
437
|
+
if (!state.peerIdentityKey) {
|
|
438
|
+
return null;
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
if (!arraysEqual(serverIdentityKey, state.peerIdentityKey)) {
|
|
442
|
+
return null;
|
|
443
|
+
}
|
|
444
|
+
|
|
445
|
+
// Verify identity proof
|
|
446
|
+
const identityProof = new Uint8Array(
|
|
447
|
+
Buffer.from(response.identityProof, "base64")
|
|
448
|
+
);
|
|
449
|
+
|
|
450
|
+
// Recreate transcript
|
|
451
|
+
if (!state.serverNonce) {
|
|
452
|
+
return null;
|
|
453
|
+
}
|
|
454
|
+
|
|
455
|
+
const transcript = new Uint8Array(
|
|
456
|
+
state.clientNonce.length + state.serverNonce.length
|
|
457
|
+
);
|
|
458
|
+
transcript.set(state.clientNonce, 0);
|
|
459
|
+
transcript.set(state.serverNonce, state.clientNonce.length);
|
|
460
|
+
|
|
461
|
+
// Verify HMAC
|
|
462
|
+
const expectedProof = createHmac("sha256", sessionKeys.receiveKey)
|
|
463
|
+
.update(transcript)
|
|
464
|
+
.digest();
|
|
465
|
+
|
|
466
|
+
if (!arraysEqual(identityProof, expectedProof)) {
|
|
467
|
+
return null;
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
// Derive peer identity ID
|
|
471
|
+
const peerIdentityId = deriveIdentityId(serverIdentityKey);
|
|
472
|
+
|
|
473
|
+
return {
|
|
474
|
+
sessionKeys,
|
|
475
|
+
peerIdentityId,
|
|
476
|
+
authResult: response.result,
|
|
477
|
+
};
|
|
478
|
+
} catch {
|
|
479
|
+
return null;
|
|
480
|
+
}
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
// ============================================================================
|
|
484
|
+
// Server-Side Functions
|
|
485
|
+
// ============================================================================
|
|
486
|
+
|
|
487
|
+
/**
|
|
488
|
+
* Create server state for a new handshake
|
|
489
|
+
*
|
|
490
|
+
* Generates and signs a pre-key, and creates an ephemeral keypair.
|
|
491
|
+
* The signed pre-key provides authentication and the ephemeral key
|
|
492
|
+
* provides forward secrecy.
|
|
493
|
+
*
|
|
494
|
+
* @param identity - Server's identity
|
|
495
|
+
* @returns Initial server state
|
|
496
|
+
* @throws {Error} If key generation or signing fails
|
|
497
|
+
*
|
|
498
|
+
* @example
|
|
499
|
+
* ```typescript
|
|
500
|
+
* const serverState = createServerState(machineIdentity);
|
|
501
|
+
* // Keep state in memory for this handshake
|
|
502
|
+
* handshakes.set(sessionId, serverState);
|
|
503
|
+
* ```
|
|
504
|
+
*/
|
|
505
|
+
export function createServerState(identity: Identity): X3DHServerState {
|
|
506
|
+
// Generate signed pre-key
|
|
507
|
+
const signedPreKey = generateEphemeralKeypair();
|
|
508
|
+
const signedPreKeySignature = sign(
|
|
509
|
+
signedPreKey.publicKey,
|
|
510
|
+
identity.signing.secretKey
|
|
511
|
+
);
|
|
512
|
+
|
|
513
|
+
// Generate ephemeral keypair
|
|
514
|
+
const ephemeral = generateEphemeralKeypair();
|
|
515
|
+
|
|
516
|
+
// Generate server nonce
|
|
517
|
+
const serverNonce = randomBytes(NONCE_LENGTH);
|
|
518
|
+
|
|
519
|
+
return {
|
|
520
|
+
phase: "idle",
|
|
521
|
+
signedPreKey,
|
|
522
|
+
signedPreKeySignature,
|
|
523
|
+
ephemeral,
|
|
524
|
+
serverNonce,
|
|
525
|
+
};
|
|
526
|
+
}
|
|
527
|
+
|
|
528
|
+
/**
|
|
529
|
+
* Process ClientHello message
|
|
530
|
+
*
|
|
531
|
+
* Validates the client's initial message and extracts their ephemeral
|
|
532
|
+
* public key and nonce.
|
|
533
|
+
*
|
|
534
|
+
* @param state - Current server state (must be in idle phase)
|
|
535
|
+
* @param message - ClientHello message from client
|
|
536
|
+
* @returns Updated server state, or null if validation fails
|
|
537
|
+
*
|
|
538
|
+
* @example
|
|
539
|
+
* ```typescript
|
|
540
|
+
* const clientHello = await relay.receive();
|
|
541
|
+
* const newState = processClientHello(state, clientHello);
|
|
542
|
+
* if (!newState) {
|
|
543
|
+
* throw new Error("Invalid ClientHello");
|
|
544
|
+
* }
|
|
545
|
+
* ```
|
|
546
|
+
*/
|
|
547
|
+
export function processClientHello(
|
|
548
|
+
state: X3DHServerState,
|
|
549
|
+
message: X3DHInitMessage
|
|
550
|
+
): X3DHServerState | null {
|
|
551
|
+
// Validate phase
|
|
552
|
+
if (state.phase !== "idle") {
|
|
553
|
+
return null;
|
|
554
|
+
}
|
|
555
|
+
|
|
556
|
+
// Validate protocol version
|
|
557
|
+
if (message.version !== PROTOCOL_VERSION) {
|
|
558
|
+
return null;
|
|
559
|
+
}
|
|
560
|
+
|
|
561
|
+
// Validate timestamp (replay protection)
|
|
562
|
+
const now = Date.now();
|
|
563
|
+
const timeDiff = Math.abs(now - message.timestamp);
|
|
564
|
+
if (timeDiff > MAX_TIMESTAMP_SKEW_MS) {
|
|
565
|
+
return null;
|
|
566
|
+
}
|
|
567
|
+
|
|
568
|
+
try {
|
|
569
|
+
// Decode client ephemeral key and nonce
|
|
570
|
+
const clientEphemeralKey = new Uint8Array(
|
|
571
|
+
Buffer.from(message.ephemeralKey, "base64")
|
|
572
|
+
);
|
|
573
|
+
const clientNonce = new Uint8Array(
|
|
574
|
+
Buffer.from(message.clientNonce, "base64")
|
|
575
|
+
);
|
|
576
|
+
|
|
577
|
+
// Validate key and nonce lengths
|
|
578
|
+
if (!validateX25519PublicKey(clientEphemeralKey)) return null;
|
|
579
|
+
if (clientNonce.length !== NONCE_LENGTH) return null;
|
|
580
|
+
|
|
581
|
+
// Update state
|
|
582
|
+
return {
|
|
583
|
+
...state,
|
|
584
|
+
phase: "awaiting_client_auth",
|
|
585
|
+
clientEphemeralKey,
|
|
586
|
+
clientNonce,
|
|
587
|
+
};
|
|
588
|
+
} catch {
|
|
589
|
+
return null;
|
|
590
|
+
}
|
|
591
|
+
}
|
|
592
|
+
|
|
593
|
+
/**
|
|
594
|
+
* Create ServerHello response
|
|
595
|
+
*
|
|
596
|
+
* Sends the server's identity, signed pre-key, ephemeral key, and nonce
|
|
597
|
+
* to the client.
|
|
598
|
+
*
|
|
599
|
+
* @param state - Current server state (must be in awaiting_client_auth phase)
|
|
600
|
+
* @param identity - Server's identity
|
|
601
|
+
* @returns Updated state and ServerHello message
|
|
602
|
+
* @throws {Error} If state is invalid
|
|
603
|
+
*
|
|
604
|
+
* @example
|
|
605
|
+
* ```typescript
|
|
606
|
+
* const { state: newState, message } = createServerHello(state, machineIdentity);
|
|
607
|
+
* await relay.send(message);
|
|
608
|
+
* ```
|
|
609
|
+
*/
|
|
610
|
+
export function createServerHello(
|
|
611
|
+
state: X3DHServerState,
|
|
612
|
+
identity: Identity
|
|
613
|
+
): { state: X3DHServerState; message: X3DHResponseMessage } {
|
|
614
|
+
// Validate phase
|
|
615
|
+
if (state.phase !== "awaiting_client_auth") {
|
|
616
|
+
throw new Error(
|
|
617
|
+
`Invalid phase for ServerHello: ${state.phase}, expected awaiting_client_auth`
|
|
618
|
+
);
|
|
619
|
+
}
|
|
620
|
+
|
|
621
|
+
const message: X3DHResponseMessage = {
|
|
622
|
+
version: PROTOCOL_VERSION,
|
|
623
|
+
identityKey: Buffer.from(identity.signing.publicKey).toString("base64"),
|
|
624
|
+
keyExchangeKey: Buffer.from(identity.keyExchange.publicKey).toString("base64"),
|
|
625
|
+
ephemeralKey: Buffer.from(state.ephemeral.publicKey).toString("base64"),
|
|
626
|
+
signedPreKey: Buffer.from(state.signedPreKey.publicKey).toString("base64"),
|
|
627
|
+
preKeySignature: Buffer.from(state.signedPreKeySignature).toString(
|
|
628
|
+
"base64"
|
|
629
|
+
),
|
|
630
|
+
serverNonce: Buffer.from(state.serverNonce).toString("base64"),
|
|
631
|
+
timestamp: Date.now(),
|
|
632
|
+
};
|
|
633
|
+
|
|
634
|
+
return { state, message };
|
|
635
|
+
}
|
|
636
|
+
|
|
637
|
+
/**
|
|
638
|
+
* Process ClientAuth message
|
|
639
|
+
*
|
|
640
|
+
* Validates the client's identity proof and authorization.
|
|
641
|
+
* Returns the client's identity ID and authorization method for
|
|
642
|
+
* access control checks.
|
|
643
|
+
*
|
|
644
|
+
* @param state - Current server state
|
|
645
|
+
* @param message - ClientAuth message from client
|
|
646
|
+
* @param identity - Server's identity
|
|
647
|
+
* @returns Client identity ID and authorization, or null if validation fails
|
|
648
|
+
*
|
|
649
|
+
* @example
|
|
650
|
+
* ```typescript
|
|
651
|
+
* const clientAuth = await relay.receive();
|
|
652
|
+
* const result = processClientAuth(state, clientAuth, machineIdentity);
|
|
653
|
+
* if (!result) {
|
|
654
|
+
* // Send rejection
|
|
655
|
+
* return;
|
|
656
|
+
* }
|
|
657
|
+
* // Check authorization (access list or invite token)
|
|
658
|
+
* const permissions = await checkAuthorization(result);
|
|
659
|
+
* ```
|
|
660
|
+
*/
|
|
661
|
+
export function processClientAuth(
|
|
662
|
+
state: X3DHServerState,
|
|
663
|
+
message: X3DHAuthMessage,
|
|
664
|
+
identity: Identity
|
|
665
|
+
): {
|
|
666
|
+
peerIdentityId: string;
|
|
667
|
+
authorization: X3DHAuthMessage["authorization"];
|
|
668
|
+
clientIdentityKey: Uint8Array;
|
|
669
|
+
clientKeyExchangeKey: Uint8Array;
|
|
670
|
+
} | null {
|
|
671
|
+
// Validate protocol version
|
|
672
|
+
if (message.version !== PROTOCOL_VERSION) {
|
|
673
|
+
return null;
|
|
674
|
+
}
|
|
675
|
+
|
|
676
|
+
// Ensure we have client ephemeral key
|
|
677
|
+
if (!state.clientEphemeralKey || !state.clientNonce) {
|
|
678
|
+
return null;
|
|
679
|
+
}
|
|
680
|
+
|
|
681
|
+
try {
|
|
682
|
+
// Decode client identity keys
|
|
683
|
+
const clientIdentityKey = new Uint8Array(
|
|
684
|
+
Buffer.from(message.identityKey, "base64")
|
|
685
|
+
);
|
|
686
|
+
const clientKeyExchangeKey = new Uint8Array(
|
|
687
|
+
Buffer.from(message.keyExchangeKey, "base64")
|
|
688
|
+
);
|
|
689
|
+
const identityProof = new Uint8Array(
|
|
690
|
+
Buffer.from(message.identityProof, "base64")
|
|
691
|
+
);
|
|
692
|
+
|
|
693
|
+
// Decode identity signature (required for security)
|
|
694
|
+
if (!message.identitySignature) {
|
|
695
|
+
return null; // Signature is required
|
|
696
|
+
}
|
|
697
|
+
const identitySignature = new Uint8Array(
|
|
698
|
+
Buffer.from(message.identitySignature, "base64")
|
|
699
|
+
);
|
|
700
|
+
|
|
701
|
+
// Validate key lengths
|
|
702
|
+
if (clientIdentityKey.length !== 32) return null;
|
|
703
|
+
if (!validateX25519PublicKey(clientKeyExchangeKey)) return null;
|
|
704
|
+
if (identitySignature.length !== 64) return null; // Ed25519 signature is 64 bytes
|
|
705
|
+
|
|
706
|
+
// Compute triple DH (server side)
|
|
707
|
+
// DH1: server_signed_prekey × client_ephemeral
|
|
708
|
+
const dh1 = x25519SharedSecret(
|
|
709
|
+
state.signedPreKey.privateKey,
|
|
710
|
+
state.clientEphemeralKey
|
|
711
|
+
);
|
|
712
|
+
|
|
713
|
+
// DH2: server_identity_keyexchange × client_ephemeral
|
|
714
|
+
const dh2 = x25519SharedSecret(
|
|
715
|
+
identity.keyExchange.privateKey,
|
|
716
|
+
state.clientEphemeralKey
|
|
717
|
+
);
|
|
718
|
+
|
|
719
|
+
// DH3: server_ephemeral × client_ephemeral
|
|
720
|
+
const dh3 = x25519SharedSecret(
|
|
721
|
+
state.ephemeral.privateKey,
|
|
722
|
+
state.clientEphemeralKey
|
|
723
|
+
);
|
|
724
|
+
|
|
725
|
+
// Derive session keys (server is NOT initiator)
|
|
726
|
+
const salt = new Uint8Array(state.clientNonce.length + state.serverNonce.length);
|
|
727
|
+
salt.set(state.clientNonce, 0);
|
|
728
|
+
salt.set(state.serverNonce, state.clientNonce.length);
|
|
729
|
+
|
|
730
|
+
const sessionKeys = deriveSessionKeysFromMultiple(
|
|
731
|
+
[dh1, dh2, dh3],
|
|
732
|
+
salt,
|
|
733
|
+
false // Server is NOT initiator
|
|
734
|
+
);
|
|
735
|
+
|
|
736
|
+
// Verify identity proof
|
|
737
|
+
const transcript = new Uint8Array(
|
|
738
|
+
state.clientNonce.length + state.serverNonce.length
|
|
739
|
+
);
|
|
740
|
+
transcript.set(state.clientNonce, 0);
|
|
741
|
+
transcript.set(state.serverNonce, state.clientNonce.length);
|
|
742
|
+
|
|
743
|
+
const expectedProof = createHmac("sha256", sessionKeys.receiveKey)
|
|
744
|
+
.update(transcript)
|
|
745
|
+
.digest();
|
|
746
|
+
|
|
747
|
+
if (!arraysEqual(identityProof, expectedProof)) {
|
|
748
|
+
return null;
|
|
749
|
+
}
|
|
750
|
+
|
|
751
|
+
// Verify identity signature - this proves the client possesses the signing key
|
|
752
|
+
// Recreate signature transcript: clientEphemeral || serverEphemeral || clientNonce || serverNonce
|
|
753
|
+
const signatureTranscript = new Uint8Array(
|
|
754
|
+
state.clientEphemeralKey.length +
|
|
755
|
+
state.ephemeral.publicKey.length +
|
|
756
|
+
state.clientNonce.length +
|
|
757
|
+
state.serverNonce.length
|
|
758
|
+
);
|
|
759
|
+
let sigOffset = 0;
|
|
760
|
+
signatureTranscript.set(state.clientEphemeralKey, sigOffset);
|
|
761
|
+
sigOffset += state.clientEphemeralKey.length;
|
|
762
|
+
signatureTranscript.set(state.ephemeral.publicKey, sigOffset);
|
|
763
|
+
sigOffset += state.ephemeral.publicKey.length;
|
|
764
|
+
signatureTranscript.set(state.clientNonce, sigOffset);
|
|
765
|
+
sigOffset += state.clientNonce.length;
|
|
766
|
+
signatureTranscript.set(state.serverNonce, sigOffset);
|
|
767
|
+
|
|
768
|
+
// Verify the signature using the client's claimed identity key
|
|
769
|
+
const isValidSignature = verify(signatureTranscript, identitySignature, clientIdentityKey);
|
|
770
|
+
if (!isValidSignature) {
|
|
771
|
+
return null; // Client cannot prove they own the signing key
|
|
772
|
+
}
|
|
773
|
+
|
|
774
|
+
// Derive peer identity ID
|
|
775
|
+
const peerIdentityId = deriveIdentityId(clientIdentityKey);
|
|
776
|
+
|
|
777
|
+
return {
|
|
778
|
+
peerIdentityId,
|
|
779
|
+
authorization: message.authorization,
|
|
780
|
+
clientIdentityKey,
|
|
781
|
+
clientKeyExchangeKey,
|
|
782
|
+
};
|
|
783
|
+
} catch {
|
|
784
|
+
return null;
|
|
785
|
+
}
|
|
786
|
+
}
|
|
787
|
+
|
|
788
|
+
/**
|
|
789
|
+
* Create ServerAuth response
|
|
790
|
+
*
|
|
791
|
+
* Sends the server's identity proof and authorization result.
|
|
792
|
+
* Also computes and returns the session keys for the established session.
|
|
793
|
+
*
|
|
794
|
+
* @param identity - Server's identity
|
|
795
|
+
* @param state - Current server state
|
|
796
|
+
* @param clientIdentityKey - Client's identity public key (from processClientAuth)
|
|
797
|
+
* @param result - Authorization result (accepted or rejected)
|
|
798
|
+
* @returns ServerAuth message and session keys
|
|
799
|
+
* @throws {Error} If state is invalid or key derivation fails
|
|
800
|
+
*
|
|
801
|
+
* @example
|
|
802
|
+
* ```typescript
|
|
803
|
+
* const permissions = { read: true, write: true, manage: false };
|
|
804
|
+
* const { message, sessionKeys } = createServerAuth(
|
|
805
|
+
* machineIdentity,
|
|
806
|
+
* state,
|
|
807
|
+
* clientIdentityKey,
|
|
808
|
+
* { type: "accepted", permissions }
|
|
809
|
+
* );
|
|
810
|
+
* await relay.send(message);
|
|
811
|
+
* // Store sessionKeys for this session
|
|
812
|
+
* sessions.set(sessionId, sessionKeys);
|
|
813
|
+
* ```
|
|
814
|
+
*/
|
|
815
|
+
export function createServerAuth(
|
|
816
|
+
identity: Identity,
|
|
817
|
+
state: X3DHServerState,
|
|
818
|
+
_clientIdentityKey: Uint8Array,
|
|
819
|
+
result: X3DHResultMessage["result"]
|
|
820
|
+
): { message: X3DHResultMessage; sessionKeys: SessionKeys } {
|
|
821
|
+
// Ensure we have client keys
|
|
822
|
+
if (!state.clientEphemeralKey || !state.clientNonce) {
|
|
823
|
+
throw new Error("Missing client keys in state");
|
|
824
|
+
}
|
|
825
|
+
|
|
826
|
+
// Compute triple DH (same as in processClientAuth)
|
|
827
|
+
const dh1 = x25519SharedSecret(
|
|
828
|
+
state.signedPreKey.privateKey,
|
|
829
|
+
state.clientEphemeralKey
|
|
830
|
+
);
|
|
831
|
+
const dh2 = x25519SharedSecret(
|
|
832
|
+
identity.keyExchange.privateKey,
|
|
833
|
+
state.clientEphemeralKey
|
|
834
|
+
);
|
|
835
|
+
const dh3 = x25519SharedSecret(
|
|
836
|
+
state.ephemeral.privateKey,
|
|
837
|
+
state.clientEphemeralKey
|
|
838
|
+
);
|
|
839
|
+
|
|
840
|
+
// Derive session keys
|
|
841
|
+
const salt = new Uint8Array(state.clientNonce.length + state.serverNonce.length);
|
|
842
|
+
salt.set(state.clientNonce, 0);
|
|
843
|
+
salt.set(state.serverNonce, state.clientNonce.length);
|
|
844
|
+
|
|
845
|
+
const sessionKeys = deriveSessionKeysFromMultiple(
|
|
846
|
+
[dh1, dh2, dh3],
|
|
847
|
+
salt,
|
|
848
|
+
false // Server is NOT initiator
|
|
849
|
+
);
|
|
850
|
+
|
|
851
|
+
// Create identity proof
|
|
852
|
+
const transcript = new Uint8Array(
|
|
853
|
+
state.clientNonce.length + state.serverNonce.length
|
|
854
|
+
);
|
|
855
|
+
transcript.set(state.clientNonce, 0);
|
|
856
|
+
transcript.set(state.serverNonce, state.clientNonce.length);
|
|
857
|
+
|
|
858
|
+
const identityProof = createHmac("sha256", sessionKeys.sendKey)
|
|
859
|
+
.update(transcript)
|
|
860
|
+
.digest();
|
|
861
|
+
|
|
862
|
+
const message: X3DHResultMessage = {
|
|
863
|
+
version: PROTOCOL_VERSION,
|
|
864
|
+
identityKey: Buffer.from(identity.signing.publicKey).toString("base64"),
|
|
865
|
+
identityProof: Buffer.from(identityProof).toString("base64"),
|
|
866
|
+
result,
|
|
867
|
+
};
|
|
868
|
+
|
|
869
|
+
return { message, sessionKeys };
|
|
870
|
+
}
|
|
871
|
+
|
|
872
|
+
// ============================================================================
|
|
873
|
+
// Helper Functions
|
|
874
|
+
// ============================================================================
|
|
875
|
+
|
|
876
|
+
/**
|
|
877
|
+
* Compare two Uint8Arrays for equality (constant-time)
|
|
878
|
+
*
|
|
879
|
+
* @param a - First array
|
|
880
|
+
* @param b - Second array
|
|
881
|
+
* @returns True if arrays are equal, false otherwise
|
|
882
|
+
*/
|
|
883
|
+
function arraysEqual(a: Uint8Array, b: Uint8Array): boolean {
|
|
884
|
+
if (a.length !== b.length) {
|
|
885
|
+
return false;
|
|
886
|
+
}
|
|
887
|
+
|
|
888
|
+
let result = 0;
|
|
889
|
+
for (let i = 0; i < a.length; i++) {
|
|
890
|
+
result |= a[i] ^ b[i];
|
|
891
|
+
}
|
|
892
|
+
|
|
893
|
+
return result === 0;
|
|
894
|
+
}
|