@serfab/cadre-host 0.10.0 → 0.12.0

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.
Files changed (158) hide show
  1. package/README.md +406 -296
  2. package/dist/bin/host.d.ts +11 -7
  3. package/dist/bin/host.js +40 -12
  4. package/dist/bin/host.js.map +1 -1
  5. package/dist/installer/config.d.ts +4 -4
  6. package/dist/installer/config.js +5 -39
  7. package/dist/installer/config.js.map +1 -1
  8. package/dist/installer/identity.d.ts +8 -1
  9. package/dist/installer/identity.js +8 -1
  10. package/dist/installer/identity.js.map +1 -1
  11. package/dist/orchestrator/host-process-orchestrator.d.ts +2 -2
  12. package/dist/orchestrator/host-process-orchestrator.js +9 -4
  13. package/dist/orchestrator/host-process-orchestrator.js.map +1 -1
  14. package/dist/server/settings-store.d.ts +1 -1
  15. package/dist/server/settings-store.js +5 -1
  16. package/dist/server/settings-store.js.map +1 -1
  17. package/dist/server/static.js +38 -38
  18. package/dist/ui/assets/index-C-iks41M.js.map +1 -1
  19. package/dist/ui/index.html +12 -12
  20. package/package.json +4 -4
  21. package/service/cadre-host.service.tmpl +16 -16
  22. package/service/com.serfab.cadre-host.plist.tmpl +35 -35
  23. package/service/install-service.ps1 +98 -98
  24. package/service/uninstall-service.ps1 +19 -19
  25. package/src/__tests__/build-targets.test.ts +26 -26
  26. package/src/__tests__/cli-invite.smoke.test.ts +192 -192
  27. package/src/__tests__/cli-nat.smoke.test.ts +212 -212
  28. package/src/__tests__/cli.smoke.test.ts +51 -46
  29. package/src/__tests__/global-setup.ts +56 -51
  30. package/src/__tests__/host-owner.smoke.test.ts +123 -123
  31. package/src/__tests__/orchestrator-env-scrub.test.ts +140 -140
  32. package/src/__tests__/orchestrator-node-identity.test.ts +5 -5
  33. package/src/__tests__/orchestrator-owner.test.ts +198 -198
  34. package/src/__tests__/orchestrator-pin-keys.test.ts +153 -153
  35. package/src/__tests__/orchestrator-push.test.ts +145 -145
  36. package/src/__tests__/orchestrator.test.ts +951 -951
  37. package/src/auth/__tests__/duration.test.ts +28 -28
  38. package/src/auth/__tests__/self-label.test.ts +85 -85
  39. package/src/auth/__tests__/trust-circle-store.test.ts +115 -115
  40. package/src/auth/__tests__/trust-circle.test.ts +445 -445
  41. package/src/auth/duration.ts +33 -33
  42. package/src/auth/index.ts +21 -21
  43. package/src/auth/self-label.ts +74 -74
  44. package/src/auth/trust-circle-store.ts +155 -155
  45. package/src/auth/types.ts +99 -99
  46. package/src/bin/__tests__/cli-reference.test.ts +167 -0
  47. package/src/bin/host.ts +1326 -1299
  48. package/src/donation/__tests__/donation-service.test.ts +1068 -1068
  49. package/src/donation/__tests__/donation-supervisor.test.ts +510 -510
  50. package/src/donation/__tests__/fake-orchestrator.test.ts +168 -168
  51. package/src/donation/__tests__/fake-orchestrator.ts +225 -225
  52. package/src/donation/__tests__/grant-service.test.ts +213 -213
  53. package/src/donation/__tests__/grant-store.test.ts +113 -113
  54. package/src/donation/donation-service.ts +962 -962
  55. package/src/donation/donation-store.ts +171 -171
  56. package/src/donation/donation-supervisor.ts +388 -388
  57. package/src/donation/grant-service.ts +200 -200
  58. package/src/donation/grant-store.ts +152 -152
  59. package/src/donation/index.ts +64 -64
  60. package/src/donation/types.ts +243 -243
  61. package/src/installer/__tests__/config.test.ts +134 -112
  62. package/src/installer/__tests__/identity.test.ts +34 -34
  63. package/src/installer/__tests__/paths.test.ts +47 -47
  64. package/src/installer/__tests__/service-host.test.ts +62 -62
  65. package/src/installer/__tests__/wizard.test.ts +64 -64
  66. package/src/installer/config.ts +5 -43
  67. package/src/installer/identity.ts +56 -49
  68. package/src/installer/paths.ts +109 -109
  69. package/src/installer/platform.ts +27 -27
  70. package/src/installer/service-host/index.ts +21 -21
  71. package/src/installer/service-host/template.ts +21 -21
  72. package/src/installer/wizard.ts +103 -103
  73. package/src/nat/__tests__/address-resolver.test.ts +82 -82
  74. package/src/nat/__tests__/ddns-duckdns.test.ts +83 -83
  75. package/src/nat/__tests__/ddns-updater.test.ts +253 -253
  76. package/src/nat/__tests__/external-ip.test.ts +124 -124
  77. package/src/nat/__tests__/nat-service.test.ts +18 -0
  78. package/src/nat/__tests__/nat-store.test.ts +93 -93
  79. package/src/nat/__tests__/port-mapper.test.ts +191 -191
  80. package/src/nat/__tests__/reachability.test.ts +24 -24
  81. package/src/nat/__tests__/secrets.test.ts +178 -178
  82. package/src/nat/address-resolver.ts +51 -51
  83. package/src/nat/ddns/duckdns.ts +76 -76
  84. package/src/nat/ddns/index.ts +55 -55
  85. package/src/nat/ddns/updater.ts +243 -243
  86. package/src/nat/external-ip.ts +154 -154
  87. package/src/nat/index.ts +71 -71
  88. package/src/nat/nat-service.ts +501 -501
  89. package/src/nat/nat-store.ts +154 -154
  90. package/src/nat/port-mapper.ts +329 -329
  91. package/src/nat/reachability.ts +34 -34
  92. package/src/nat/secrets/file-store.ts +130 -130
  93. package/src/nat/secrets/index.ts +112 -112
  94. package/src/nat/secrets/keytar-store.ts +67 -67
  95. package/src/nat/types.ts +159 -159
  96. package/src/orchestrator/__tests__/node-identity.test.ts +62 -62
  97. package/src/orchestrator/host-process-orchestrator.ts +9 -4
  98. package/src/orchestrator/index.ts +10 -10
  99. package/src/orchestrator/log-rotator.ts +53 -53
  100. package/src/orchestrator/node-identity.ts +40 -40
  101. package/src/orchestrator/pid-liveness.ts +24 -24
  102. package/src/orchestrator/port-allocator.ts +91 -91
  103. package/src/orchestrator/state-store.ts +90 -90
  104. package/src/orchestrator/types.ts +141 -141
  105. package/src/owner/__tests__/owner-node-client.test.ts +194 -194
  106. package/src/owner/index.ts +12 -12
  107. package/src/owner/owner-node-client.ts +259 -259
  108. package/src/push/__tests__/push.test.ts +90 -90
  109. package/src/push/index.ts +146 -146
  110. package/src/server/__tests__/bus.test.ts +38 -38
  111. package/src/server/__tests__/error-handler.test.ts +118 -118
  112. package/src/server/__tests__/grants-admin-route.test.ts +73 -73
  113. package/src/server/__tests__/grants-route.test.ts +263 -263
  114. package/src/server/__tests__/nodes-route.test.ts +259 -259
  115. package/src/server/__tests__/origin-guard.test.ts +72 -72
  116. package/src/server/__tests__/publishers.test.ts +216 -216
  117. package/src/server/__tests__/server.smoke.test.ts +253 -253
  118. package/src/server/__tests__/settings-route.test.ts +195 -194
  119. package/src/server/__tests__/sse-route.test.ts +119 -119
  120. package/src/server/__tests__/static.test.ts +145 -145
  121. package/src/server/__tests__/status-route.test.ts +134 -134
  122. package/src/server/__tests__/strands-route.test.ts +233 -233
  123. package/src/server/error-handler.ts +178 -178
  124. package/src/server/events/bus.ts +42 -42
  125. package/src/server/events/sse-route.ts +81 -81
  126. package/src/server/events/types.ts +23 -23
  127. package/src/server/index.ts +267 -267
  128. package/src/server/origin-guard.ts +84 -84
  129. package/src/server/routes/grants-admin.ts +41 -41
  130. package/src/server/routes/grants.ts +210 -210
  131. package/src/server/routes/nat.ts +63 -63
  132. package/src/server/routes/nodes.ts +170 -170
  133. package/src/server/routes/settings.ts +123 -123
  134. package/src/server/routes/status.ts +118 -118
  135. package/src/server/routes/strands.ts +54 -54
  136. package/src/server/routes/trust-circle.ts +49 -49
  137. package/src/server/routes/update.ts +43 -43
  138. package/src/server/server.ts +122 -122
  139. package/src/server/settings-store.ts +5 -1
  140. package/src/server/static.ts +207 -207
  141. package/src/strands/__tests__/strand-service.test.ts +165 -165
  142. package/src/strands/index.ts +14 -14
  143. package/src/strands/strand-service.ts +135 -135
  144. package/src/strands/types.ts +102 -102
  145. package/src/update/__tests__/apply.test.ts +158 -158
  146. package/src/update/__tests__/manifest.test.ts +128 -128
  147. package/src/update/__tests__/release-key.test.ts +42 -42
  148. package/src/update/__tests__/sign.test.ts +78 -78
  149. package/src/update/__tests__/store.test.ts +81 -81
  150. package/src/update/__tests__/update-service.integration.test.ts +256 -256
  151. package/src/update/__tests__/version.test.ts +31 -31
  152. package/src/update/apply.ts +190 -190
  153. package/src/update/index.ts +341 -341
  154. package/src/update/release-key.ts +71 -71
  155. package/src/update/sign.ts +74 -74
  156. package/src/update/store.ts +101 -101
  157. package/src/update/types.ts +109 -109
  158. package/src/update/version.ts +80 -80
@@ -1,123 +1,123 @@
1
- /**
2
- * Server-level smoke: the /auth/* HTTP contract over the owner-node
3
- * channel adapter. Validates the two behaviours the realignment must
4
- * preserve:
5
- * 1. With the node up, POST /auth/invites returns an encodedInvite (no 500).
6
- * 2. With the node refusing connections, GET /auth/trust-circle still lists
7
- * local labels, and POST /auth/invites returns 503 (not a raw 500).
8
- *
9
- * The owner node is represented by a stub HTTP server matching the 6.6
10
- * admin contract (the spawn path itself is covered by
11
- * orchestrator-owner.test.ts).
12
- */
13
-
14
- import { afterEach, beforeEach, describe, expect, it } from 'vitest';
15
- import Fastify from 'fastify';
16
- import http from 'node:http';
17
- import { mkdtempSync, rmSync } from 'node:fs';
18
- import { tmpdir } from 'node:os';
19
- import { join } from 'node:path';
20
-
21
- import { TrustCircleService, TrustCircleStore, createTrustCircleHandlers } from '../auth/index.js';
22
- import { OwnerNodeClient } from '../owner/index.js';
23
- import { registerErrorHandler } from '../server/error-handler.js';
24
- import { registerTrustCircleRoutes } from '../server/routes/trust-circle.js';
25
- import { EventBus } from '../server/events/bus.js';
26
-
27
- const TOKEN = 'tok';
28
-
29
- let tmpRoot: string;
30
- beforeEach(() => { tmpRoot = mkdtempSync(join(tmpdir(), 'cadre-host-smoke-')); });
31
- afterEach(() => { try { rmSync(tmpRoot, { recursive: true, force: true }); } catch { /* ignore */ } });
32
-
33
- function buildApp(service: TrustCircleService) {
34
- const app = Fastify();
35
- registerErrorHandler(app);
36
- registerTrustCircleRoutes(app, { handlers: createTrustCircleHandlers(service), events: new EventBus() });
37
- return app;
38
- }
39
-
40
- describe('host /auth delegation — node up', () => {
41
- let server: http.Server;
42
- let baseUrl: string;
43
-
44
- beforeEach(async () => {
45
- server = http.createServer((req, res) => {
46
- const chunks: Buffer[] = [];
47
- req.on('data', (c) => chunks.push(c as Buffer));
48
- req.on('end', () => {
49
- if (req.headers['authorization'] !== `Bearer ${TOKEN}`) {
50
- res.writeHead(401); res.end(JSON.stringify({ ok: false, error: { code: 'not_authorized', message: 'x' } })); return;
51
- }
52
- if (req.url === '/admin/invites' && req.method === 'POST') {
53
- res.writeHead(200, { 'content-type': 'application/json' });
54
- res.end(JSON.stringify({ ok: true, data: { invite: { partyId: 'p', ownerAddrs: [], token: 't', createdAt: 1 }, encodedInvite: 'ENC' } }));
55
- return;
56
- }
57
- if (req.url === '/admin/members' && req.method === 'GET') {
58
- res.writeHead(200, { 'content-type': 'application/json' });
59
- res.end(JSON.stringify({ ok: true, data: { members: [] } }));
60
- return;
61
- }
62
- res.writeHead(400); res.end(JSON.stringify({ ok: false, error: { code: 'bad_request', message: req.url } }));
63
- });
64
- });
65
- await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', () => resolve()));
66
- const a = server.address();
67
- baseUrl = `http://127.0.0.1:${typeof a === 'object' && a ? a.port : 0}`;
68
- });
69
-
70
- afterEach(async () => { await new Promise<void>((resolve) => server.close(() => resolve())); });
71
-
72
- it('POST /auth/invites returns an encodedInvite (no 500)', async () => {
73
- const client = new OwnerNodeClient({ baseUrl, token: TOKEN });
74
- const service = new TrustCircleService({ cadreNode: client, store: new TrustCircleStore(tmpRoot) });
75
- const app = buildApp(service);
76
- try {
77
- const res = await app.inject({ method: 'POST', url: '/auth/invites', payload: { label: 'Mom' } });
78
- expect(res.statusCode).toBe(200);
79
- const body = res.json() as { encodedInvite: string };
80
- expect(body.encodedInvite).toBe('ENC');
81
- } finally {
82
- await app.close();
83
- }
84
- });
85
- });
86
-
87
- describe('host /auth delegation — node refusing connections', () => {
88
- let closedBaseUrl: string;
89
-
90
- beforeEach(async () => {
91
- const tmp = http.createServer();
92
- const port = await new Promise<number>((resolve) => {
93
- tmp.listen(0, '127.0.0.1', () => {
94
- const a = tmp.address();
95
- resolve(typeof a === 'object' && a ? a.port : 0);
96
- });
97
- });
98
- await new Promise<void>((resolve) => tmp.close(() => resolve()));
99
- closedBaseUrl = `http://127.0.0.1:${port}`;
100
- });
101
-
102
- it('GET /auth/trust-circle lists local labels and POST /auth/invites returns 503', async () => {
103
- const store = new TrustCircleStore(tmpRoot);
104
- store.addMember({ peerId: '12D3KooWLocal', label: 'My laptop', addedAt: '2025-01-01T00:00:00Z' });
105
-
106
- const client = new OwnerNodeClient({ baseUrl: closedBaseUrl, token: TOKEN });
107
- const service = new TrustCircleService({ cadreNode: client, store });
108
- const app = buildApp(service);
109
- try {
110
- const list = await app.inject({ method: 'GET', url: '/auth/trust-circle' });
111
- expect(list.statusCode).toBe(200);
112
- const snap = list.json() as { members: Array<{ peerId: string; label: string }> };
113
- expect(snap.members.some((m) => m.peerId === '12D3KooWLocal' && m.label === 'My laptop')).toBe(true);
114
-
115
- const invite = await app.inject({ method: 'POST', url: '/auth/invites', payload: { label: 'Dad' } });
116
- expect(invite.statusCode).toBe(503);
117
- const body = invite.json() as { error: { code: string } };
118
- expect(body.error.code).toBe('node_unavailable');
119
- } finally {
120
- await app.close();
121
- }
122
- });
123
- });
1
+ /**
2
+ * Server-level smoke: the /auth/* HTTP contract over the owner-node
3
+ * channel adapter. Validates the two behaviours the realignment must
4
+ * preserve:
5
+ * 1. With the node up, POST /auth/invites returns an encodedInvite (no 500).
6
+ * 2. With the node refusing connections, GET /auth/trust-circle still lists
7
+ * local labels, and POST /auth/invites returns 503 (not a raw 500).
8
+ *
9
+ * The owner node is represented by a stub HTTP server matching the 6.6
10
+ * admin contract (the spawn path itself is covered by
11
+ * orchestrator-owner.test.ts).
12
+ */
13
+
14
+ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
15
+ import Fastify from 'fastify';
16
+ import http from 'node:http';
17
+ import { mkdtempSync, rmSync } from 'node:fs';
18
+ import { tmpdir } from 'node:os';
19
+ import { join } from 'node:path';
20
+
21
+ import { TrustCircleService, TrustCircleStore, createTrustCircleHandlers } from '../auth/index.js';
22
+ import { OwnerNodeClient } from '../owner/index.js';
23
+ import { registerErrorHandler } from '../server/error-handler.js';
24
+ import { registerTrustCircleRoutes } from '../server/routes/trust-circle.js';
25
+ import { EventBus } from '../server/events/bus.js';
26
+
27
+ const TOKEN = 'tok';
28
+
29
+ let tmpRoot: string;
30
+ beforeEach(() => { tmpRoot = mkdtempSync(join(tmpdir(), 'cadre-host-smoke-')); });
31
+ afterEach(() => { try { rmSync(tmpRoot, { recursive: true, force: true }); } catch { /* ignore */ } });
32
+
33
+ function buildApp(service: TrustCircleService) {
34
+ const app = Fastify();
35
+ registerErrorHandler(app);
36
+ registerTrustCircleRoutes(app, { handlers: createTrustCircleHandlers(service), events: new EventBus() });
37
+ return app;
38
+ }
39
+
40
+ describe('host /auth delegation — node up', () => {
41
+ let server: http.Server;
42
+ let baseUrl: string;
43
+
44
+ beforeEach(async () => {
45
+ server = http.createServer((req, res) => {
46
+ const chunks: Buffer[] = [];
47
+ req.on('data', (c) => chunks.push(c as Buffer));
48
+ req.on('end', () => {
49
+ if (req.headers['authorization'] !== `Bearer ${TOKEN}`) {
50
+ res.writeHead(401); res.end(JSON.stringify({ ok: false, error: { code: 'not_authorized', message: 'x' } })); return;
51
+ }
52
+ if (req.url === '/admin/invites' && req.method === 'POST') {
53
+ res.writeHead(200, { 'content-type': 'application/json' });
54
+ res.end(JSON.stringify({ ok: true, data: { invite: { partyId: 'p', ownerAddrs: [], token: 't', createdAt: 1 }, encodedInvite: 'ENC' } }));
55
+ return;
56
+ }
57
+ if (req.url === '/admin/members' && req.method === 'GET') {
58
+ res.writeHead(200, { 'content-type': 'application/json' });
59
+ res.end(JSON.stringify({ ok: true, data: { members: [] } }));
60
+ return;
61
+ }
62
+ res.writeHead(400); res.end(JSON.stringify({ ok: false, error: { code: 'bad_request', message: req.url } }));
63
+ });
64
+ });
65
+ await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', () => resolve()));
66
+ const a = server.address();
67
+ baseUrl = `http://127.0.0.1:${typeof a === 'object' && a ? a.port : 0}`;
68
+ });
69
+
70
+ afterEach(async () => { await new Promise<void>((resolve) => server.close(() => resolve())); });
71
+
72
+ it('POST /auth/invites returns an encodedInvite (no 500)', async () => {
73
+ const client = new OwnerNodeClient({ baseUrl, token: TOKEN });
74
+ const service = new TrustCircleService({ cadreNode: client, store: new TrustCircleStore(tmpRoot) });
75
+ const app = buildApp(service);
76
+ try {
77
+ const res = await app.inject({ method: 'POST', url: '/auth/invites', payload: { label: 'Mom' } });
78
+ expect(res.statusCode).toBe(200);
79
+ const body = res.json() as { encodedInvite: string };
80
+ expect(body.encodedInvite).toBe('ENC');
81
+ } finally {
82
+ await app.close();
83
+ }
84
+ });
85
+ });
86
+
87
+ describe('host /auth delegation — node refusing connections', () => {
88
+ let closedBaseUrl: string;
89
+
90
+ beforeEach(async () => {
91
+ const tmp = http.createServer();
92
+ const port = await new Promise<number>((resolve) => {
93
+ tmp.listen(0, '127.0.0.1', () => {
94
+ const a = tmp.address();
95
+ resolve(typeof a === 'object' && a ? a.port : 0);
96
+ });
97
+ });
98
+ await new Promise<void>((resolve) => tmp.close(() => resolve()));
99
+ closedBaseUrl = `http://127.0.0.1:${port}`;
100
+ });
101
+
102
+ it('GET /auth/trust-circle lists local labels and POST /auth/invites returns 503', async () => {
103
+ const store = new TrustCircleStore(tmpRoot);
104
+ store.addMember({ peerId: '12D3KooWLocal', label: 'My laptop', addedAt: '2025-01-01T00:00:00Z' });
105
+
106
+ const client = new OwnerNodeClient({ baseUrl: closedBaseUrl, token: TOKEN });
107
+ const service = new TrustCircleService({ cadreNode: client, store });
108
+ const app = buildApp(service);
109
+ try {
110
+ const list = await app.inject({ method: 'GET', url: '/auth/trust-circle' });
111
+ expect(list.statusCode).toBe(200);
112
+ const snap = list.json() as { members: Array<{ peerId: string; label: string }> };
113
+ expect(snap.members.some((m) => m.peerId === '12D3KooWLocal' && m.label === 'My laptop')).toBe(true);
114
+
115
+ const invite = await app.inject({ method: 'POST', url: '/auth/invites', payload: { label: 'Dad' } });
116
+ expect(invite.statusCode).toBe(503);
117
+ const body = invite.json() as { error: { code: string } };
118
+ expect(body.error.code).toBe('node_unavailable');
119
+ } finally {
120
+ await app.close();
121
+ }
122
+ });
123
+ });
@@ -1,140 +1,140 @@
1
- /**
2
- * HostProcessOrchestrator env-scrub test — the manager's own `process.env` must
3
- * not leak `CADRE_*` config-override vars into spawned children.
4
- *
5
- * `launchChild` used to build each child's environment as
6
- * `{ ...process.env, ...extraEnv, <fixed per-child vars> }`, so ANY `CADRE_*`
7
- * var set on the manager (not just the ones the orchestrator deliberately
8
- * sets) reached every child. Because `@serfab/cadre-cli` treats an inherited
9
- * `CADRE_*` var as a config override that beats the per-child config file, a
10
- * `CADRE_PARTY_ID` set on the manager could silently pull every child into
11
- * that party.
12
- *
13
- * A fake CLI records the vars under test from its environment to a file so
14
- * the scrub is observable without a real cadre node.
15
- */
16
-
17
- import { afterEach, beforeEach, describe, expect, it } from 'vitest';
18
- import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
19
- import { tmpdir } from 'node:os';
20
- import { join } from 'node:path';
21
-
22
- import { HostProcessOrchestrator } from '../orchestrator/host-process-orchestrator.js';
23
-
24
- // Writes the vars under test (as seen in the child env) next to the startup token.
25
- const FAKE_CLI = `
26
- import fs from 'node:fs';
27
- import path from 'node:path';
28
- const args = process.argv.slice(2);
29
- const get = (flag) => { const i = args.indexOf(flag); return i >= 0 ? args[i + 1] : undefined; };
30
- const tokenPath = get('--startup-token-file');
31
- const token = process.env.CADRE_STARTUP_TOKEN ?? '';
32
- if (tokenPath) {
33
- const dir = path.dirname(tokenPath);
34
- const record = {
35
- CADRE_PARTY_ID: process.env.CADRE_PARTY_ID ?? null,
36
- CADRE_STORAGE_PATH: process.env.CADRE_STORAGE_PATH ?? null,
37
- CADRE_ADMIN_PORT: process.env.CADRE_ADMIN_PORT ?? null,
38
- DEBUG: process.env.DEBUG ?? null,
39
- };
40
- try { fs.writeFileSync(path.join(dir, 'env-seen.json'), JSON.stringify(record), 'utf8'); } catch (e) { console.error(e); }
41
- if (token) { try { fs.writeFileSync(tokenPath, token, 'utf8'); } catch (e) { console.error(e); } }
42
- }
43
- process.on('SIGTERM', () => process.exit(0));
44
- setInterval(() => {}, 1 << 30);
45
- `;
46
-
47
- let tmpRoot: string;
48
- let scriptPath: string;
49
- const orchestrators: HostProcessOrchestrator[] = [];
50
- let savedEnv: Record<string, string | undefined>;
51
-
52
- beforeEach(() => {
53
- tmpRoot = mkdtempSync(join(tmpdir(), 'cadre-host-env-scrub-'));
54
- scriptPath = join(tmpRoot, 'fake-cli.mjs');
55
- writeFileSync(scriptPath, FAKE_CLI, 'utf8');
56
- savedEnv = {
57
- CADRE_PARTY_ID: process.env.CADRE_PARTY_ID,
58
- CADRE_STORAGE_PATH: process.env.CADRE_STORAGE_PATH,
59
- CADRE_ADMIN_PORT: process.env.CADRE_ADMIN_PORT,
60
- DEBUG: process.env.DEBUG,
61
- };
62
- });
63
-
64
- afterEach(async () => {
65
- for (const orch of orchestrators) {
66
- for (const n of orch.listNodes()) {
67
- try { await orch.removeContainer(n.dockerId); } catch { /* ignore */ }
68
- }
69
- }
70
- orchestrators.length = 0;
71
- await sleep(50);
72
- try { rmSync(tmpRoot, { recursive: true, force: true }); } catch { /* ignore */ }
73
- for (const [key, value] of Object.entries(savedEnv)) {
74
- if (value === undefined) delete process.env[key];
75
- else process.env[key] = value;
76
- }
77
- });
78
-
79
- function makeOrchestrator(rootDir: string): HostProcessOrchestrator {
80
- mkdirSync(rootDir, { recursive: true });
81
- const orch = new HostProcessOrchestrator({
82
- rootDir,
83
- portRange: { start: 18000, end: 18499 },
84
- stopTimeoutMs: 1500,
85
- spawn: { entrypoint: scriptPath },
86
- });
87
- orchestrators.push(orch);
88
- return orch;
89
- }
90
-
91
- async function waitForFile(path: string, timeoutMs = 5000): Promise<string> {
92
- const deadline = Date.now() + timeoutMs;
93
- while (Date.now() < deadline) {
94
- if (existsSync(path)) return readFileSync(path, 'utf8');
95
- await sleep(50);
96
- }
97
- throw new Error(`file never appeared: ${path}`);
98
- }
99
-
100
- function sleep(ms: number): Promise<void> {
101
- return new Promise((res) => setTimeout(res, ms));
102
- }
103
-
104
- describe('HostProcessOrchestrator child env scrub', () => {
105
- it('does not leak manager CADRE_* config-override vars into children, but passes through non-CADRE vars', async () => {
106
- process.env.CADRE_PARTY_ID = 'conflicting-party';
107
- process.env.CADRE_STORAGE_PATH = '/tmp/should-not-leak';
108
- // Not an ENV_MAPPINGS config override — read directly by the cli's `start`
109
- // command — so it only stays scrubbed if the scrub is prefix-wide.
110
- process.env.CADRE_ADMIN_PORT = '19999';
111
- process.env.DEBUG = 'some:value';
112
-
113
- const rootDir = join(tmpRoot, 'a');
114
- const orch = makeOrchestrator(rootDir);
115
- await orch.init();
116
-
117
- await orch.createContainer({
118
- containerId: 'child-1',
119
- partyId: 'party-1',
120
- bootstrapNodes: [],
121
- profile: 'storage',
122
- });
123
- await orch.createContainer({
124
- containerId: 'child-2',
125
- partyId: 'party-2',
126
- bootstrapNodes: [],
127
- profile: 'storage',
128
- });
129
-
130
- const seen1 = JSON.parse(await waitForFile(join(rootDir, 'child-1', 'env-seen.json')));
131
- const seen2 = JSON.parse(await waitForFile(join(rootDir, 'child-2', 'env-seen.json')));
132
-
133
- for (const seen of [seen1, seen2]) {
134
- expect(seen.CADRE_PARTY_ID).toBeNull();
135
- expect(seen.CADRE_STORAGE_PATH).toBeNull();
136
- expect(seen.CADRE_ADMIN_PORT).toBeNull();
137
- expect(seen.DEBUG).toBe('some:value');
138
- }
139
- });
140
- });
1
+ /**
2
+ * HostProcessOrchestrator env-scrub test — the manager's own `process.env` must
3
+ * not leak `CADRE_*` config-override vars into spawned children.
4
+ *
5
+ * `launchChild` used to build each child's environment as
6
+ * `{ ...process.env, ...extraEnv, <fixed per-child vars> }`, so ANY `CADRE_*`
7
+ * var set on the manager (not just the ones the orchestrator deliberately
8
+ * sets) reached every child. Because `@serfab/cadre-cli` treats an inherited
9
+ * `CADRE_*` var as a config override that beats the per-child config file, a
10
+ * `CADRE_PARTY_ID` set on the manager could silently pull every child into
11
+ * that party.
12
+ *
13
+ * A fake CLI records the vars under test from its environment to a file so
14
+ * the scrub is observable without a real cadre node.
15
+ */
16
+
17
+ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
18
+ import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
19
+ import { tmpdir } from 'node:os';
20
+ import { join } from 'node:path';
21
+
22
+ import { HostProcessOrchestrator } from '../orchestrator/host-process-orchestrator.js';
23
+
24
+ // Writes the vars under test (as seen in the child env) next to the startup token.
25
+ const FAKE_CLI = `
26
+ import fs from 'node:fs';
27
+ import path from 'node:path';
28
+ const args = process.argv.slice(2);
29
+ const get = (flag) => { const i = args.indexOf(flag); return i >= 0 ? args[i + 1] : undefined; };
30
+ const tokenPath = get('--startup-token-file');
31
+ const token = process.env.CADRE_STARTUP_TOKEN ?? '';
32
+ if (tokenPath) {
33
+ const dir = path.dirname(tokenPath);
34
+ const record = {
35
+ CADRE_PARTY_ID: process.env.CADRE_PARTY_ID ?? null,
36
+ CADRE_STORAGE_PATH: process.env.CADRE_STORAGE_PATH ?? null,
37
+ CADRE_ADMIN_PORT: process.env.CADRE_ADMIN_PORT ?? null,
38
+ DEBUG: process.env.DEBUG ?? null,
39
+ };
40
+ try { fs.writeFileSync(path.join(dir, 'env-seen.json'), JSON.stringify(record), 'utf8'); } catch (e) { console.error(e); }
41
+ if (token) { try { fs.writeFileSync(tokenPath, token, 'utf8'); } catch (e) { console.error(e); } }
42
+ }
43
+ process.on('SIGTERM', () => process.exit(0));
44
+ setInterval(() => {}, 1 << 30);
45
+ `;
46
+
47
+ let tmpRoot: string;
48
+ let scriptPath: string;
49
+ const orchestrators: HostProcessOrchestrator[] = [];
50
+ let savedEnv: Record<string, string | undefined>;
51
+
52
+ beforeEach(() => {
53
+ tmpRoot = mkdtempSync(join(tmpdir(), 'cadre-host-env-scrub-'));
54
+ scriptPath = join(tmpRoot, 'fake-cli.mjs');
55
+ writeFileSync(scriptPath, FAKE_CLI, 'utf8');
56
+ savedEnv = {
57
+ CADRE_PARTY_ID: process.env.CADRE_PARTY_ID,
58
+ CADRE_STORAGE_PATH: process.env.CADRE_STORAGE_PATH,
59
+ CADRE_ADMIN_PORT: process.env.CADRE_ADMIN_PORT,
60
+ DEBUG: process.env.DEBUG,
61
+ };
62
+ });
63
+
64
+ afterEach(async () => {
65
+ for (const orch of orchestrators) {
66
+ for (const n of orch.listNodes()) {
67
+ try { await orch.removeContainer(n.dockerId); } catch { /* ignore */ }
68
+ }
69
+ }
70
+ orchestrators.length = 0;
71
+ await sleep(50);
72
+ try { rmSync(tmpRoot, { recursive: true, force: true }); } catch { /* ignore */ }
73
+ for (const [key, value] of Object.entries(savedEnv)) {
74
+ if (value === undefined) delete process.env[key];
75
+ else process.env[key] = value;
76
+ }
77
+ });
78
+
79
+ function makeOrchestrator(rootDir: string): HostProcessOrchestrator {
80
+ mkdirSync(rootDir, { recursive: true });
81
+ const orch = new HostProcessOrchestrator({
82
+ rootDir,
83
+ portRange: { start: 18000, end: 18499 },
84
+ stopTimeoutMs: 1500,
85
+ spawn: { entrypoint: scriptPath },
86
+ });
87
+ orchestrators.push(orch);
88
+ return orch;
89
+ }
90
+
91
+ async function waitForFile(path: string, timeoutMs = 5000): Promise<string> {
92
+ const deadline = Date.now() + timeoutMs;
93
+ while (Date.now() < deadline) {
94
+ if (existsSync(path)) return readFileSync(path, 'utf8');
95
+ await sleep(50);
96
+ }
97
+ throw new Error(`file never appeared: ${path}`);
98
+ }
99
+
100
+ function sleep(ms: number): Promise<void> {
101
+ return new Promise((res) => setTimeout(res, ms));
102
+ }
103
+
104
+ describe('HostProcessOrchestrator child env scrub', () => {
105
+ it('does not leak manager CADRE_* config-override vars into children, but passes through non-CADRE vars', async () => {
106
+ process.env.CADRE_PARTY_ID = 'conflicting-party';
107
+ process.env.CADRE_STORAGE_PATH = '/tmp/should-not-leak';
108
+ // Not an ENV_MAPPINGS config override — read directly by the cli's `start`
109
+ // command — so it only stays scrubbed if the scrub is prefix-wide.
110
+ process.env.CADRE_ADMIN_PORT = '19999';
111
+ process.env.DEBUG = 'some:value';
112
+
113
+ const rootDir = join(tmpRoot, 'a');
114
+ const orch = makeOrchestrator(rootDir);
115
+ await orch.init();
116
+
117
+ await orch.createContainer({
118
+ containerId: 'child-1',
119
+ partyId: 'party-1',
120
+ bootstrapNodes: [],
121
+ profile: 'storage',
122
+ });
123
+ await orch.createContainer({
124
+ containerId: 'child-2',
125
+ partyId: 'party-2',
126
+ bootstrapNodes: [],
127
+ profile: 'storage',
128
+ });
129
+
130
+ const seen1 = JSON.parse(await waitForFile(join(rootDir, 'child-1', 'env-seen.json')));
131
+ const seen2 = JSON.parse(await waitForFile(join(rootDir, 'child-2', 'env-seen.json')));
132
+
133
+ for (const seen of [seen1, seen2]) {
134
+ expect(seen.CADRE_PARTY_ID).toBeNull();
135
+ expect(seen.CADRE_STORAGE_PATH).toBeNull();
136
+ expect(seen.CADRE_ADMIN_PORT).toBeNull();
137
+ expect(seen.DEBUG).toBe('some:value');
138
+ }
139
+ });
140
+ });
@@ -6,9 +6,9 @@
6
6
  * opens the file-backed bootstrap-peer / trusted-owner stores only when a
7
7
  * protobuf identity key file is configured). The orchestrator therefore writes
8
8
  * `<workdir>/identity.key` once per container and passes it as
9
- * `--identity-protobuf`.
9
+ * `--identity-file`.
10
10
  *
11
- * A fake CLI records the `--identity-protobuf` argument it was launched with, so
11
+ * A fake CLI records the `--identity-file` argument it was launched with, so
12
12
  * the spawn wiring is observable without a real cadre node.
13
13
  */
14
14
 
@@ -20,7 +20,7 @@ import { join } from 'node:path';
20
20
  import { HostProcessOrchestrator, OWNER_CONTAINER_ID } from '../orchestrator/host-process-orchestrator.js';
21
21
  import { loadIdentity } from '../installer/identity.js';
22
22
 
23
- // Writes the --identity-protobuf argument (as seen on its own command line) next
23
+ // Writes the --identity-file argument (as seen on its own command line) next
24
24
  // to the startup token, then behaves like a minimal long-lived node.
25
25
  const FAKE_CLI = `
26
26
  import fs from 'node:fs';
@@ -31,7 +31,7 @@ const tokenPath = get('--startup-token-file');
31
31
  const token = process.env.CADRE_STARTUP_TOKEN ?? '';
32
32
  if (tokenPath) {
33
33
  const dir = path.dirname(tokenPath);
34
- try { fs.writeFileSync(path.join(dir, 'identity-arg.txt'), get('--identity-protobuf') ?? '', 'utf8'); } catch (e) { console.error(e); }
34
+ try { fs.writeFileSync(path.join(dir, 'identity-arg.txt'), get('--identity-file') ?? '', 'utf8'); } catch (e) { console.error(e); }
35
35
  if (token) { try { fs.writeFileSync(tokenPath, token, 'utf8'); } catch (e) { console.error(e); } }
36
36
  }
37
37
  process.on('SIGTERM', () => process.exit(0));
@@ -88,7 +88,7 @@ function sleep(ms: number): Promise<void> {
88
88
  }
89
89
 
90
90
  describe('HostProcessOrchestrator node identity', () => {
91
- it('passes --identity-protobuf pointing at a real key inside the node workdir', async () => {
91
+ it('passes --identity-file pointing at a real key inside the node workdir', async () => {
92
92
  const rootDir = join(tmpRoot, 'a');
93
93
  const orch = makeOrchestrator(rootDir);
94
94
  await orch.init();