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,435 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* X25519 ECDH key exchange and HKDF key derivation for secure sessions
|
|
3
|
+
*
|
|
4
|
+
* This module provides:
|
|
5
|
+
* - X25519 ephemeral key generation
|
|
6
|
+
* - ECDH shared secret computation
|
|
7
|
+
* - HKDF-based session key derivation with domain separation
|
|
8
|
+
* - Support for multiple shared secrets (X3DH protocol)
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import { x25519 } from "@noble/curves/ed25519.js";
|
|
12
|
+
import { hkdf } from "@noble/hashes/hkdf.js";
|
|
13
|
+
import { sha256 } from "@noble/hashes/sha2.js";
|
|
14
|
+
import { randomBytes } from "node:crypto";
|
|
15
|
+
import type { KeyExchangeKeypair, SessionKeys } from "../../../types/identity.js";
|
|
16
|
+
|
|
17
|
+
// ============================================================================
|
|
18
|
+
// Constants
|
|
19
|
+
// ============================================================================
|
|
20
|
+
|
|
21
|
+
/** X25519 key length (32 bytes) */
|
|
22
|
+
export const X25519_KEY_LENGTH = 32;
|
|
23
|
+
|
|
24
|
+
/** Session key length (32 bytes, 256 bits for ChaCha20-Poly1305) */
|
|
25
|
+
export const SESSION_KEY_LENGTH = 32;
|
|
26
|
+
|
|
27
|
+
/** HKDF salt length (32 bytes) */
|
|
28
|
+
const HKDF_SALT_LENGTH = 32;
|
|
29
|
+
|
|
30
|
+
/** HKDF domain separation for send key */
|
|
31
|
+
const INFO_SEND = "spaces-v1-send";
|
|
32
|
+
|
|
33
|
+
/** HKDF domain separation for receive key */
|
|
34
|
+
const INFO_RECEIVE = "spaces-v1-receive";
|
|
35
|
+
|
|
36
|
+
/** HKDF domain separation for session ID */
|
|
37
|
+
const INFO_SESSION_ID = "spaces-v1-session-id";
|
|
38
|
+
|
|
39
|
+
// ============================================================================
|
|
40
|
+
// X25519 Operations
|
|
41
|
+
// ============================================================================
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Compute X25519 ECDH shared secret
|
|
45
|
+
*
|
|
46
|
+
* @param ourPrivateKey - Our X25519 private key (32 bytes)
|
|
47
|
+
* @param theirPublicKey - Their X25519 public key (32 bytes)
|
|
48
|
+
* @returns Shared secret (32 bytes)
|
|
49
|
+
* @throws {Error} If key lengths are invalid or computation fails
|
|
50
|
+
*
|
|
51
|
+
* @example
|
|
52
|
+
* ```typescript
|
|
53
|
+
* const alice = generateEphemeralKeypair();
|
|
54
|
+
* const bob = generateEphemeralKeypair();
|
|
55
|
+
* const sharedA = x25519SharedSecret(alice.privateKey, bob.publicKey);
|
|
56
|
+
* const sharedB = x25519SharedSecret(bob.privateKey, alice.publicKey);
|
|
57
|
+
* // sharedA === sharedB
|
|
58
|
+
* ```
|
|
59
|
+
*/
|
|
60
|
+
export function x25519SharedSecret(
|
|
61
|
+
ourPrivateKey: Uint8Array,
|
|
62
|
+
theirPublicKey: Uint8Array
|
|
63
|
+
): Uint8Array {
|
|
64
|
+
if (ourPrivateKey.length !== X25519_KEY_LENGTH) {
|
|
65
|
+
throw new Error(
|
|
66
|
+
`Invalid private key length: expected ${X25519_KEY_LENGTH}, got ${ourPrivateKey.length}`
|
|
67
|
+
);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
if (theirPublicKey.length !== X25519_KEY_LENGTH) {
|
|
71
|
+
throw new Error(
|
|
72
|
+
`Invalid public key length: expected ${X25519_KEY_LENGTH}, got ${theirPublicKey.length}`
|
|
73
|
+
);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
try {
|
|
77
|
+
const sharedSecret = x25519.getSharedSecret(ourPrivateKey, theirPublicKey);
|
|
78
|
+
return sharedSecret;
|
|
79
|
+
} catch (error) {
|
|
80
|
+
throw new Error(
|
|
81
|
+
`X25519 shared secret computation failed: ${error instanceof Error ? error.message : String(error)}`
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Generate a random X25519 ephemeral keypair
|
|
88
|
+
*
|
|
89
|
+
* @returns New keypair with 32-byte private and public keys
|
|
90
|
+
* @throws {Error} If random generation fails
|
|
91
|
+
*
|
|
92
|
+
* @example
|
|
93
|
+
* ```typescript
|
|
94
|
+
* const ephemeral = generateEphemeralKeypair();
|
|
95
|
+
* console.log(ephemeral.publicKey.length); // 32
|
|
96
|
+
* console.log(ephemeral.privateKey.length); // 32
|
|
97
|
+
* ```
|
|
98
|
+
*/
|
|
99
|
+
export function generateEphemeralKeypair(): KeyExchangeKeypair {
|
|
100
|
+
try {
|
|
101
|
+
const privateKey = randomBytes(X25519_KEY_LENGTH);
|
|
102
|
+
const publicKey = x25519.getPublicKey(privateKey);
|
|
103
|
+
|
|
104
|
+
return {
|
|
105
|
+
privateKey,
|
|
106
|
+
publicKey,
|
|
107
|
+
};
|
|
108
|
+
} catch (error) {
|
|
109
|
+
throw new Error(
|
|
110
|
+
`Failed to generate ephemeral keypair: ${error instanceof Error ? error.message : String(error)}`
|
|
111
|
+
);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
/**
|
|
116
|
+
* All 8 known X25519 low-order points (little-endian representation)
|
|
117
|
+
*
|
|
118
|
+
* These points have small order (dividing 8) and can cause security issues:
|
|
119
|
+
* - DH with these points produces predictable outputs
|
|
120
|
+
* - Can enable small-subgroup attacks
|
|
121
|
+
*
|
|
122
|
+
* Security: All of these must be rejected as public keys
|
|
123
|
+
*/
|
|
124
|
+
const LOW_ORDER_POINTS: Uint8Array[] = [
|
|
125
|
+
// 0 - the identity point (already handled by all-zeros check, but explicit)
|
|
126
|
+
new Uint8Array(32).fill(0),
|
|
127
|
+
|
|
128
|
+
// 1 - point (1, *)
|
|
129
|
+
new Uint8Array([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
|
|
130
|
+
|
|
131
|
+
// Order-8 points (in little-endian hex):
|
|
132
|
+
// e0eb7a7c3b41b8ae1656e3faf19fc46ada098deb9c32b1fd866205eb80f93f81 (non-canonical, not needed)
|
|
133
|
+
|
|
134
|
+
// 0xecffffff...7f = p - 1 (2^255 - 19 - 1)
|
|
135
|
+
new Uint8Array([0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f]),
|
|
136
|
+
|
|
137
|
+
// Point with high bit set: 0x0000...80
|
|
138
|
+
new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80]),
|
|
139
|
+
|
|
140
|
+
// 1 with high bit set: 0x0100...80
|
|
141
|
+
new Uint8Array([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80]),
|
|
142
|
+
|
|
143
|
+
// p - 1 with high bit set
|
|
144
|
+
new Uint8Array([0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
|
|
145
|
+
|
|
146
|
+
// Additional dangerous point: 325606250916557431795983626356110631294008115727848805560023387167927233504
|
|
147
|
+
// In little-endian bytes: 0xe0eb7a7c3b41b8ae1656e3faf19fc46ada098deb9c32b1fd866205eb80f93f81
|
|
148
|
+
new Uint8Array([0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3, 0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, 0xb1, 0xfd, 0x86, 0x62, 0x05, 0xeb, 0x80, 0xf9, 0x3f, 0x81]),
|
|
149
|
+
|
|
150
|
+
// 5f9c95bca3508c24b1d0b15b72633f78f59b2ab008637a1405f5bf5c20c9b010
|
|
151
|
+
new Uint8Array([0x5f, 0x9c, 0x95, 0xbc, 0xa3, 0x50, 0x8c, 0x24, 0xb1, 0xd0, 0xb1, 0x5b, 0x72, 0x63, 0x3f, 0x78, 0xf5, 0x9b, 0x2a, 0xb0, 0x08, 0x63, 0x7a, 0x14, 0x05, 0xf5, 0xbf, 0x5c, 0x20, 0xc9, 0xb0, 0x10]),
|
|
152
|
+
];
|
|
153
|
+
|
|
154
|
+
/**
|
|
155
|
+
* Compare two Uint8Arrays in constant time
|
|
156
|
+
* Security: Prevents timing attacks when comparing keys
|
|
157
|
+
*/
|
|
158
|
+
function constantTimeEqual(a: Uint8Array, b: Uint8Array): boolean {
|
|
159
|
+
if (a.length !== b.length) return false;
|
|
160
|
+
let result = 0;
|
|
161
|
+
for (let i = 0; i < a.length; i++) {
|
|
162
|
+
result |= a[i] ^ b[i];
|
|
163
|
+
}
|
|
164
|
+
return result === 0;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* Check if a public key is a known low-order point
|
|
169
|
+
* Security: Returns true if the key is dangerous and should be rejected
|
|
170
|
+
*/
|
|
171
|
+
function isLowOrderPoint(publicKey: Uint8Array): boolean {
|
|
172
|
+
for (const lowOrderPoint of LOW_ORDER_POINTS) {
|
|
173
|
+
if (constantTimeEqual(publicKey, lowOrderPoint)) {
|
|
174
|
+
return true;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
return false;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/**
|
|
181
|
+
* Validate an X25519 public key
|
|
182
|
+
*
|
|
183
|
+
* Security checks:
|
|
184
|
+
* - Correct length (32 bytes)
|
|
185
|
+
* - Not all zeros (identity point)
|
|
186
|
+
* - Not any of the 8 known low-order points (prevents small-subgroup attacks)
|
|
187
|
+
* - Valid for scalar multiplication (library check)
|
|
188
|
+
*
|
|
189
|
+
* @param publicKey - Public key to validate
|
|
190
|
+
* @returns True if valid, false otherwise
|
|
191
|
+
*
|
|
192
|
+
* @example
|
|
193
|
+
* ```typescript
|
|
194
|
+
* const keypair = generateEphemeralKeypair();
|
|
195
|
+
* console.log(validateX25519PublicKey(keypair.publicKey)); // true
|
|
196
|
+
* console.log(validateX25519PublicKey(new Uint8Array(32))); // false (all zeros)
|
|
197
|
+
* ```
|
|
198
|
+
*/
|
|
199
|
+
export function validateX25519PublicKey(publicKey: Uint8Array): boolean {
|
|
200
|
+
// Check length
|
|
201
|
+
if (publicKey.length !== X25519_KEY_LENGTH) {
|
|
202
|
+
return false;
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
// Check not a low-order point (includes all zeros, 1, p-1, and other dangerous points)
|
|
206
|
+
if (isLowOrderPoint(publicKey)) {
|
|
207
|
+
return false;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
// Additional check: try to use it in a scalar multiplication
|
|
211
|
+
// If it's invalid, @noble/curves will throw
|
|
212
|
+
try {
|
|
213
|
+
const testPrivate = new Uint8Array(32);
|
|
214
|
+
testPrivate[0] = 9; // Small non-zero scalar
|
|
215
|
+
const result = x25519.getSharedSecret(testPrivate, publicKey);
|
|
216
|
+
|
|
217
|
+
// Security: Check result is not all zeros (indicates small-order point)
|
|
218
|
+
const isAllZeros = result.every((byte: number) => byte === 0);
|
|
219
|
+
if (isAllZeros) {
|
|
220
|
+
return false;
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
return true;
|
|
224
|
+
} catch {
|
|
225
|
+
return false;
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
// ============================================================================
|
|
230
|
+
// HKDF Key Derivation
|
|
231
|
+
// ============================================================================
|
|
232
|
+
|
|
233
|
+
/**
|
|
234
|
+
* Derive session keys from a single shared secret using HKDF-SHA256
|
|
235
|
+
*
|
|
236
|
+
* Uses domain separation to derive independent send/receive keys:
|
|
237
|
+
* - sendKey = HKDF(secret, salt, "spaces-v1-send")
|
|
238
|
+
* - receiveKey = HKDF(secret, salt, "spaces-v1-receive")
|
|
239
|
+
*
|
|
240
|
+
* If isInitiator=false, send and receive keys are swapped (for peer).
|
|
241
|
+
*
|
|
242
|
+
* @param sharedSecret - ECDH shared secret (32 bytes)
|
|
243
|
+
* @param salt - Optional salt (default: random 32 bytes)
|
|
244
|
+
* @param isInitiator - Whether we initiated the handshake (default: true)
|
|
245
|
+
* @returns Session keys with send/receive keys and session ID
|
|
246
|
+
* @throws {Error} If shared secret is invalid or derivation fails
|
|
247
|
+
*
|
|
248
|
+
* @example
|
|
249
|
+
* ```typescript
|
|
250
|
+
* const alice = generateEphemeralKeypair();
|
|
251
|
+
* const bob = generateEphemeralKeypair();
|
|
252
|
+
* const salt = generateSessionSalt();
|
|
253
|
+
*
|
|
254
|
+
* const sharedSecret = x25519SharedSecret(alice.privateKey, bob.publicKey);
|
|
255
|
+
* const aliceKeys = deriveSessionKeys(sharedSecret, salt, true);
|
|
256
|
+
* const bobKeys = deriveSessionKeys(sharedSecret, salt, false);
|
|
257
|
+
*
|
|
258
|
+
* // Alice's sendKey === Bob's receiveKey
|
|
259
|
+
* // Alice's receiveKey === Bob's sendKey
|
|
260
|
+
* ```
|
|
261
|
+
*/
|
|
262
|
+
export function deriveSessionKeys(
|
|
263
|
+
sharedSecret: Uint8Array,
|
|
264
|
+
salt?: Uint8Array,
|
|
265
|
+
isInitiator: boolean = true
|
|
266
|
+
): SessionKeys {
|
|
267
|
+
if (sharedSecret.length !== X25519_KEY_LENGTH) {
|
|
268
|
+
throw new Error(
|
|
269
|
+
`Invalid shared secret length: expected ${X25519_KEY_LENGTH}, got ${sharedSecret.length}`
|
|
270
|
+
);
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
// Generate random salt if not provided
|
|
274
|
+
// HKDF accepts any salt length; we use 32 bytes as default
|
|
275
|
+
const actualSalt = salt ?? randomBytes(HKDF_SALT_LENGTH);
|
|
276
|
+
|
|
277
|
+
if (actualSalt.length === 0) {
|
|
278
|
+
throw new Error("Salt cannot be empty");
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
try {
|
|
282
|
+
// Derive send key
|
|
283
|
+
const sendKeyInfo = new TextEncoder().encode(INFO_SEND);
|
|
284
|
+
const sendKey = hkdf(
|
|
285
|
+
sha256,
|
|
286
|
+
sharedSecret,
|
|
287
|
+
actualSalt,
|
|
288
|
+
sendKeyInfo,
|
|
289
|
+
SESSION_KEY_LENGTH
|
|
290
|
+
);
|
|
291
|
+
|
|
292
|
+
// Derive receive key
|
|
293
|
+
const receiveKeyInfo = new TextEncoder().encode(INFO_RECEIVE);
|
|
294
|
+
const receiveKey = hkdf(
|
|
295
|
+
sha256,
|
|
296
|
+
sharedSecret,
|
|
297
|
+
actualSalt,
|
|
298
|
+
receiveKeyInfo,
|
|
299
|
+
SESSION_KEY_LENGTH
|
|
300
|
+
);
|
|
301
|
+
|
|
302
|
+
// Derive session ID (for key rotation tracking)
|
|
303
|
+
const sessionIdInfo = new TextEncoder().encode(INFO_SESSION_ID);
|
|
304
|
+
const sessionIdBytes = hkdf(
|
|
305
|
+
sha256,
|
|
306
|
+
sharedSecret,
|
|
307
|
+
actualSalt,
|
|
308
|
+
sessionIdInfo,
|
|
309
|
+
16 // 128-bit session ID
|
|
310
|
+
);
|
|
311
|
+
const sessionId = Buffer.from(sessionIdBytes).toString("base64url");
|
|
312
|
+
|
|
313
|
+
// If not initiator, swap send/receive keys
|
|
314
|
+
if (!isInitiator) {
|
|
315
|
+
return {
|
|
316
|
+
sendKey: receiveKey,
|
|
317
|
+
receiveKey: sendKey,
|
|
318
|
+
sessionId,
|
|
319
|
+
};
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
return {
|
|
323
|
+
sendKey,
|
|
324
|
+
receiveKey,
|
|
325
|
+
sessionId,
|
|
326
|
+
};
|
|
327
|
+
} catch (error) {
|
|
328
|
+
throw new Error(
|
|
329
|
+
`Session key derivation failed: ${error instanceof Error ? error.message : String(error)}`
|
|
330
|
+
);
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
/**
|
|
335
|
+
* Derive session keys from multiple shared secrets (X3DH protocol)
|
|
336
|
+
*
|
|
337
|
+
* Combines multiple ECDH outputs into a single master secret:
|
|
338
|
+
* - masterSecret = HKDF(concat(DH1, DH2, ...), salt, "spaces-v1-master")
|
|
339
|
+
* - Then derives send/receive keys from masterSecret
|
|
340
|
+
*
|
|
341
|
+
* This is used in X3DH handshake which computes multiple DH operations:
|
|
342
|
+
* - DH(ephemeral, signedPreKey)
|
|
343
|
+
* - DH(identity, ephemeral)
|
|
344
|
+
* - DH(ephemeral, ephemeral)
|
|
345
|
+
* - DH(ephemeral, identityKey)
|
|
346
|
+
*
|
|
347
|
+
* @param sharedSecrets - Array of ECDH shared secrets (each 32 bytes)
|
|
348
|
+
* @param salt - Optional salt (default: random 32 bytes)
|
|
349
|
+
* @param isInitiator - Whether we initiated the handshake (default: true)
|
|
350
|
+
* @returns Session keys with send/receive keys and session ID
|
|
351
|
+
* @throws {Error} If any shared secret is invalid or derivation fails
|
|
352
|
+
*
|
|
353
|
+
* @example
|
|
354
|
+
* ```typescript
|
|
355
|
+
* const dh1 = x25519SharedSecret(ephemeral1, preKey);
|
|
356
|
+
* const dh2 = x25519SharedSecret(identity, ephemeral2);
|
|
357
|
+
* const dh3 = x25519SharedSecret(ephemeral1, ephemeral2);
|
|
358
|
+
*
|
|
359
|
+
* const keys = deriveSessionKeysFromMultiple([dh1, dh2, dh3]);
|
|
360
|
+
* ```
|
|
361
|
+
*/
|
|
362
|
+
export function deriveSessionKeysFromMultiple(
|
|
363
|
+
sharedSecrets: Uint8Array[],
|
|
364
|
+
salt?: Uint8Array,
|
|
365
|
+
isInitiator: boolean = true
|
|
366
|
+
): SessionKeys {
|
|
367
|
+
if (sharedSecrets.length === 0) {
|
|
368
|
+
throw new Error("At least one shared secret is required");
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
// Validate all shared secrets
|
|
372
|
+
for (let i = 0; i < sharedSecrets.length; i++) {
|
|
373
|
+
if (sharedSecrets[i].length !== X25519_KEY_LENGTH) {
|
|
374
|
+
throw new Error(
|
|
375
|
+
`Invalid shared secret at index ${i}: expected ${X25519_KEY_LENGTH} bytes, got ${sharedSecrets[i].length}`
|
|
376
|
+
);
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
// Generate random salt if not provided
|
|
381
|
+
// HKDF accepts any salt length; we use 32 bytes as default
|
|
382
|
+
const actualSalt = salt ?? randomBytes(HKDF_SALT_LENGTH);
|
|
383
|
+
|
|
384
|
+
if (actualSalt.length === 0) {
|
|
385
|
+
throw new Error("Salt cannot be empty");
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
try {
|
|
389
|
+
// Concatenate all shared secrets
|
|
390
|
+
const totalLength = sharedSecrets.length * X25519_KEY_LENGTH;
|
|
391
|
+
const concatenated = new Uint8Array(totalLength);
|
|
392
|
+
for (let i = 0; i < sharedSecrets.length; i++) {
|
|
393
|
+
concatenated.set(sharedSecrets[i], i * X25519_KEY_LENGTH);
|
|
394
|
+
}
|
|
395
|
+
|
|
396
|
+
// Derive master secret from concatenated secrets
|
|
397
|
+
const masterInfo = new TextEncoder().encode("spaces-v1-master");
|
|
398
|
+
const masterSecret = hkdf(
|
|
399
|
+
sha256,
|
|
400
|
+
concatenated,
|
|
401
|
+
actualSalt,
|
|
402
|
+
masterInfo,
|
|
403
|
+
X25519_KEY_LENGTH
|
|
404
|
+
);
|
|
405
|
+
|
|
406
|
+
// Now derive session keys from master secret
|
|
407
|
+
return deriveSessionKeys(masterSecret, actualSalt, isInitiator);
|
|
408
|
+
} catch (error) {
|
|
409
|
+
throw new Error(
|
|
410
|
+
`Multi-secret session key derivation failed: ${error instanceof Error ? error.message : String(error)}`
|
|
411
|
+
);
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
|
|
415
|
+
/**
|
|
416
|
+
* Generate a random salt for session key derivation
|
|
417
|
+
*
|
|
418
|
+
* @returns Random 32-byte salt
|
|
419
|
+
* @throws {Error} If random generation fails
|
|
420
|
+
*
|
|
421
|
+
* @example
|
|
422
|
+
* ```typescript
|
|
423
|
+
* const salt = generateSessionSalt();
|
|
424
|
+
* const keys = deriveSessionKeys(sharedSecret, salt);
|
|
425
|
+
* ```
|
|
426
|
+
*/
|
|
427
|
+
export function generateSessionSalt(): Uint8Array {
|
|
428
|
+
try {
|
|
429
|
+
return randomBytes(HKDF_SALT_LENGTH);
|
|
430
|
+
} catch (error) {
|
|
431
|
+
throw new Error(
|
|
432
|
+
`Failed to generate session salt: ${error instanceof Error ? error.message : String(error)}`
|
|
433
|
+
);
|
|
434
|
+
}
|
|
435
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test";
|
|
2
|
+
import {
|
|
3
|
+
generateSalt,
|
|
4
|
+
deriveKey,
|
|
5
|
+
SALT_LENGTH,
|
|
6
|
+
KEY_LENGTH,
|
|
7
|
+
} from "./keys";
|
|
8
|
+
|
|
9
|
+
describe("generateSalt", () => {
|
|
10
|
+
test("generates salt of correct length", () => {
|
|
11
|
+
const salt = generateSalt();
|
|
12
|
+
expect(salt).toBeInstanceOf(Buffer);
|
|
13
|
+
expect(salt.length).toBe(SALT_LENGTH);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
test("generates unique salts", () => {
|
|
17
|
+
const salt1 = generateSalt();
|
|
18
|
+
const salt2 = generateSalt();
|
|
19
|
+
expect(salt1.equals(salt2)).toBe(false);
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
describe("deriveKey", () => {
|
|
24
|
+
test("derives key of correct length", async () => {
|
|
25
|
+
const salt = generateSalt();
|
|
26
|
+
const key = await deriveKey("test-secret", salt);
|
|
27
|
+
expect(key).toBeInstanceOf(Buffer);
|
|
28
|
+
expect(key.length).toBe(KEY_LENGTH);
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
test("same secret + salt produces same key", async () => {
|
|
32
|
+
const salt = generateSalt();
|
|
33
|
+
const key1 = await deriveKey("test-secret", salt);
|
|
34
|
+
const key2 = await deriveKey("test-secret", salt);
|
|
35
|
+
expect(key1.equals(key2)).toBe(true);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
test("different secrets produce different keys", async () => {
|
|
39
|
+
const salt = generateSalt();
|
|
40
|
+
const key1 = await deriveKey("secret-1", salt);
|
|
41
|
+
const key2 = await deriveKey("secret-2", salt);
|
|
42
|
+
expect(key1.equals(key2)).toBe(false);
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
test("different salts produce different keys", async () => {
|
|
46
|
+
const salt1 = generateSalt();
|
|
47
|
+
const salt2 = generateSalt();
|
|
48
|
+
const key1 = await deriveKey("test-secret", salt1);
|
|
49
|
+
const key2 = await deriveKey("test-secret", salt2);
|
|
50
|
+
expect(key1.equals(key2)).toBe(false);
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
test("accepts Uint8Array salt", async () => {
|
|
54
|
+
const salt = new Uint8Array(generateSalt());
|
|
55
|
+
const key = await deriveKey("test-secret", salt);
|
|
56
|
+
expect(key.length).toBe(KEY_LENGTH);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Key derivation for encrypted secret storage
|
|
3
|
+
*
|
|
4
|
+
* Uses scrypt for password-based key derivation.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { scrypt, randomBytes, type ScryptOptions } from "node:crypto";
|
|
8
|
+
|
|
9
|
+
/** Salt length in bytes */
|
|
10
|
+
export const SALT_LENGTH = 16;
|
|
11
|
+
|
|
12
|
+
/** Derived key length in bytes (256-bit for chacha20-poly1305) */
|
|
13
|
+
export const KEY_LENGTH = 32;
|
|
14
|
+
|
|
15
|
+
/** scrypt parameters (N=2^15, r=8, p=1) - balance of security and performance */
|
|
16
|
+
export const SCRYPT_PARAMS = {
|
|
17
|
+
N: 2 ** 15, // CPU/memory cost
|
|
18
|
+
r: 8, // Block size
|
|
19
|
+
p: 1, // Parallelization
|
|
20
|
+
maxmem: 64 * 1024 * 1024, // 64MB max memory
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Generate a random salt for key derivation
|
|
25
|
+
*/
|
|
26
|
+
export function generateSalt(): Buffer {
|
|
27
|
+
return randomBytes(SALT_LENGTH);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Derive a 256-bit key from a secret and salt using scrypt
|
|
32
|
+
*
|
|
33
|
+
* @param secret - The secret/password to derive from
|
|
34
|
+
* @param salt - Random salt (use generateSalt())
|
|
35
|
+
* @returns 32-byte key suitable for chacha20-poly1305
|
|
36
|
+
*/
|
|
37
|
+
export function deriveKey(
|
|
38
|
+
secret: string,
|
|
39
|
+
salt: Buffer | Uint8Array
|
|
40
|
+
): Promise<Buffer> {
|
|
41
|
+
return new Promise((resolve, reject) => {
|
|
42
|
+
scrypt(secret, salt, KEY_LENGTH, SCRYPT_PARAMS, (err, derivedKey) => {
|
|
43
|
+
if (err) reject(err);
|
|
44
|
+
else resolve(derivedKey);
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test";
|
|
2
|
+
import {
|
|
3
|
+
encrypt,
|
|
4
|
+
decrypt,
|
|
5
|
+
seal,
|
|
6
|
+
open,
|
|
7
|
+
generateNonce,
|
|
8
|
+
NONCE_LENGTH,
|
|
9
|
+
AUTH_TAG_LENGTH,
|
|
10
|
+
} from "./secretbox";
|
|
11
|
+
import { randomBytes } from "node:crypto";
|
|
12
|
+
|
|
13
|
+
// Generate a valid 256-bit key for testing
|
|
14
|
+
const testKey = randomBytes(32);
|
|
15
|
+
|
|
16
|
+
describe("generateNonce", () => {
|
|
17
|
+
test("generates nonce of correct length", () => {
|
|
18
|
+
const nonce = generateNonce();
|
|
19
|
+
expect(nonce).toBeInstanceOf(Buffer);
|
|
20
|
+
expect(nonce.length).toBe(NONCE_LENGTH);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
test("generates unique nonces", () => {
|
|
24
|
+
const nonce1 = generateNonce();
|
|
25
|
+
const nonce2 = generateNonce();
|
|
26
|
+
expect(nonce1.equals(nonce2)).toBe(false);
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
describe("encrypt/decrypt", () => {
|
|
31
|
+
test("encrypts and decrypts data", () => {
|
|
32
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
33
|
+
const { nonce, ciphertext } = encrypt(plaintext, testKey);
|
|
34
|
+
|
|
35
|
+
expect(nonce.length).toBe(NONCE_LENGTH);
|
|
36
|
+
expect(ciphertext.length).toBe(plaintext.length + AUTH_TAG_LENGTH);
|
|
37
|
+
|
|
38
|
+
const decrypted = decrypt(ciphertext, nonce, testKey);
|
|
39
|
+
expect(decrypted).not.toBeNull();
|
|
40
|
+
expect(decrypted!.equals(plaintext)).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
test("encrypts empty data", () => {
|
|
44
|
+
const plaintext = Buffer.from("");
|
|
45
|
+
const { nonce, ciphertext } = encrypt(plaintext, testKey);
|
|
46
|
+
|
|
47
|
+
expect(ciphertext.length).toBe(AUTH_TAG_LENGTH);
|
|
48
|
+
|
|
49
|
+
const decrypted = decrypt(ciphertext, nonce, testKey);
|
|
50
|
+
expect(decrypted).not.toBeNull();
|
|
51
|
+
expect(decrypted!.length).toBe(0);
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
test("encrypts large data", () => {
|
|
55
|
+
const plaintext = randomBytes(1024 * 1024); // 1MB
|
|
56
|
+
const { nonce, ciphertext } = encrypt(plaintext, testKey);
|
|
57
|
+
|
|
58
|
+
const decrypted = decrypt(ciphertext, nonce, testKey);
|
|
59
|
+
expect(decrypted).not.toBeNull();
|
|
60
|
+
expect(decrypted!.equals(plaintext)).toBe(true);
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
test("same plaintext produces different ciphertext (random nonce)", () => {
|
|
64
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
65
|
+
const result1 = encrypt(plaintext, testKey);
|
|
66
|
+
const result2 = encrypt(plaintext, testKey);
|
|
67
|
+
|
|
68
|
+
expect(result1.nonce.equals(result2.nonce)).toBe(false);
|
|
69
|
+
expect(result1.ciphertext.equals(result2.ciphertext)).toBe(false);
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
test("decryption fails with wrong key", () => {
|
|
73
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
74
|
+
const { nonce, ciphertext } = encrypt(plaintext, testKey);
|
|
75
|
+
|
|
76
|
+
const wrongKey = randomBytes(32);
|
|
77
|
+
const decrypted = decrypt(ciphertext, nonce, wrongKey);
|
|
78
|
+
expect(decrypted).toBeNull();
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
test("decryption fails with wrong nonce", () => {
|
|
82
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
83
|
+
const { ciphertext } = encrypt(plaintext, testKey);
|
|
84
|
+
|
|
85
|
+
const wrongNonce = generateNonce();
|
|
86
|
+
const decrypted = decrypt(ciphertext, wrongNonce, testKey);
|
|
87
|
+
expect(decrypted).toBeNull();
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test("decryption fails with tampered ciphertext", () => {
|
|
91
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
92
|
+
const { nonce, ciphertext } = encrypt(plaintext, testKey);
|
|
93
|
+
|
|
94
|
+
// Tamper with the ciphertext
|
|
95
|
+
ciphertext[0] ^= 0xff;
|
|
96
|
+
const decrypted = decrypt(ciphertext, nonce, testKey);
|
|
97
|
+
expect(decrypted).toBeNull();
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
test("decryption fails with tampered auth tag", () => {
|
|
101
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
102
|
+
const { nonce, ciphertext } = encrypt(plaintext, testKey);
|
|
103
|
+
|
|
104
|
+
// Tamper with the auth tag (last 16 bytes)
|
|
105
|
+
ciphertext[ciphertext.length - 1] ^= 0xff;
|
|
106
|
+
const decrypted = decrypt(ciphertext, nonce, testKey);
|
|
107
|
+
expect(decrypted).toBeNull();
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
test("accepts Uint8Array inputs", () => {
|
|
111
|
+
const plaintext = new Uint8Array([1, 2, 3, 4, 5]);
|
|
112
|
+
const key = new Uint8Array(testKey);
|
|
113
|
+
const { nonce, ciphertext } = encrypt(plaintext, key);
|
|
114
|
+
|
|
115
|
+
const decrypted = decrypt(ciphertext, nonce, key);
|
|
116
|
+
expect(decrypted).not.toBeNull();
|
|
117
|
+
expect(Buffer.from(decrypted!).equals(Buffer.from(plaintext))).toBe(true);
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
describe("seal/open", () => {
|
|
122
|
+
test("seals and opens data", () => {
|
|
123
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
124
|
+
const sealed = seal(plaintext, testKey);
|
|
125
|
+
|
|
126
|
+
expect(sealed.length).toBe(NONCE_LENGTH + plaintext.length + AUTH_TAG_LENGTH);
|
|
127
|
+
|
|
128
|
+
const opened = open(sealed, testKey);
|
|
129
|
+
expect(opened).not.toBeNull();
|
|
130
|
+
expect(opened!.equals(plaintext)).toBe(true);
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
test("sealed format is nonce || ciphertext || authTag", () => {
|
|
134
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
135
|
+
const sealed = seal(plaintext, testKey);
|
|
136
|
+
|
|
137
|
+
// Extract nonce and use decrypt to verify format
|
|
138
|
+
const nonce = sealed.slice(0, NONCE_LENGTH);
|
|
139
|
+
const ciphertext = sealed.slice(NONCE_LENGTH);
|
|
140
|
+
|
|
141
|
+
const decrypted = decrypt(ciphertext, nonce, testKey);
|
|
142
|
+
expect(decrypted).not.toBeNull();
|
|
143
|
+
expect(decrypted!.equals(plaintext)).toBe(true);
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
test("open fails with wrong key", () => {
|
|
147
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
148
|
+
const sealed = seal(plaintext, testKey);
|
|
149
|
+
|
|
150
|
+
const wrongKey = randomBytes(32);
|
|
151
|
+
const opened = open(sealed, wrongKey);
|
|
152
|
+
expect(opened).toBeNull();
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
test("open fails with too short input", () => {
|
|
156
|
+
const tooShort = Buffer.alloc(NONCE_LENGTH + AUTH_TAG_LENGTH - 1);
|
|
157
|
+
const opened = open(tooShort, testKey);
|
|
158
|
+
expect(opened).toBeNull();
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
test("open fails with tampered data", () => {
|
|
162
|
+
const plaintext = Buffer.from("Hello, World!");
|
|
163
|
+
const sealed = seal(plaintext, testKey);
|
|
164
|
+
|
|
165
|
+
sealed[NONCE_LENGTH + 5] ^= 0xff; // Tamper with ciphertext
|
|
166
|
+
const opened = open(sealed, testKey);
|
|
167
|
+
expect(opened).toBeNull();
|
|
168
|
+
});
|
|
169
|
+
});
|