@cotal-ai/core 0.167.0 → 0.169.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.
- package/dist/agent-file.d.ts.map +1 -1
- package/dist/agent-file.js +12 -9
- package/dist/agent-file.js.map +1 -1
- package/dist/connector-setup.d.ts +2 -0
- package/dist/connector-setup.d.ts.map +1 -1
- package/dist/connector.d.ts +8 -11
- package/dist/connector.d.ts.map +1 -1
- package/dist/control-exchange.d.ts +114 -0
- package/dist/control-exchange.d.ts.map +1 -0
- package/dist/control-exchange.js +416 -0
- package/dist/control-exchange.js.map +1 -0
- package/dist/endpoint-call.d.ts +6 -3
- package/dist/endpoint-call.d.ts.map +1 -1
- package/dist/endpoint-call.js +30 -14
- package/dist/endpoint-call.js.map +1 -1
- package/dist/endpoint-delivery-plane.d.ts +337 -0
- package/dist/endpoint-delivery-plane.d.ts.map +1 -0
- package/dist/endpoint-delivery-plane.js +1291 -0
- package/dist/endpoint-delivery-plane.js.map +1 -0
- package/dist/endpoint-envelope.d.ts +2 -1
- package/dist/endpoint-envelope.d.ts.map +1 -1
- package/dist/endpoint-envelope.js +9 -3
- package/dist/endpoint-envelope.js.map +1 -1
- package/dist/endpoint-history.d.ts +370 -0
- package/dist/endpoint-history.d.ts.map +1 -0
- package/dist/endpoint-history.js +969 -0
- package/dist/endpoint-history.js.map +1 -0
- package/dist/endpoint-inbound.d.ts +10 -0
- package/dist/endpoint-inbound.d.ts.map +1 -0
- package/dist/endpoint-inbound.js +28 -0
- package/dist/endpoint-inbound.js.map +1 -0
- package/dist/endpoint-provenance.d.ts +11 -0
- package/dist/endpoint-provenance.d.ts.map +1 -0
- package/dist/endpoint-provenance.js +20 -0
- package/dist/endpoint-provenance.js.map +1 -0
- package/dist/endpoint-serve.d.ts +11 -1
- package/dist/endpoint-serve.d.ts.map +1 -1
- package/dist/endpoint-serve.js +43 -14
- package/dist/endpoint-serve.js.map +1 -1
- package/dist/endpoint-subjects.d.ts +3 -0
- package/dist/endpoint-subjects.d.ts.map +1 -1
- package/dist/endpoint-subjects.js +3 -0
- package/dist/endpoint-subjects.js.map +1 -1
- package/dist/endpoint.d.ts +80 -252
- package/dist/endpoint.d.ts.map +1 -1
- package/dist/endpoint.js +248 -2027
- package/dist/endpoint.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/launch-material.d.ts +9 -3
- package/dist/launch-material.d.ts.map +1 -1
- package/dist/launch-material.js +22 -2
- package/dist/launch-material.js.map +1 -1
- package/dist/provision-jwt.d.ts +518 -0
- package/dist/provision-jwt.d.ts.map +1 -0
- package/dist/provision-jwt.js +641 -0
- package/dist/provision-jwt.js.map +1 -0
- package/dist/provision-permissions.d.ts +72 -0
- package/dist/provision-permissions.d.ts.map +1 -0
- package/dist/provision-permissions.js +2015 -0
- package/dist/provision-permissions.js.map +1 -0
- package/dist/provision-resources.d.ts +66 -0
- package/dist/provision-resources.d.ts.map +1 -0
- package/dist/provision-resources.js +61 -0
- package/dist/provision-resources.js.map +1 -0
- package/dist/provision-server-config.d.ts +115 -0
- package/dist/provision-server-config.d.ts.map +1 -0
- package/dist/provision-server-config.js +169 -0
- package/dist/provision-server-config.js.map +1 -0
- package/dist/provision.d.ts +19 -707
- package/dist/provision.d.ts.map +1 -1
- package/dist/provision.js +4 -2860
- package/dist/provision.js.map +1 -1
- package/dist/remote-manager-authority.d.ts +1 -1
- package/dist/run-journal.d.ts +2 -0
- package/dist/run-journal.d.ts.map +1 -1
- package/dist/run-journal.js +1 -1
- package/dist/run-journal.js.map +1 -1
- package/package.json +5 -1
|
@@ -0,0 +1,416 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The local control exchange: how a connector's control server and each of its clients (the
|
|
3
|
+
* lifecycle hook relay, the Manager's stop and session calls) prove to each other that both hold the
|
|
4
|
+
* endpoint's key. Neither side ever sends the key.
|
|
5
|
+
*
|
|
6
|
+
* A client used to send the key in its first frame and print whatever came back. A stand-in that
|
|
7
|
+
* took the name of a server that had exited (another local user on a shared `/tmp`, or any process
|
|
8
|
+
* on the Windows pipe namespace) received the key and answered the hook. With remote permission
|
|
9
|
+
* answers, a hook's reply can be "allow this tool call". So the exchange proves both ends:
|
|
10
|
+
*
|
|
11
|
+
* C → S {"v":1,"nonce":"<Nc>"}\n
|
|
12
|
+
* S → C {"v":1,"nonce":"<Ns>","mac":"<Ms>"}\n
|
|
13
|
+
* C → S <Mc> <request JSON>\n
|
|
14
|
+
* S → C <Mr> <reply JSON>\n
|
|
15
|
+
* C → S <Mk>\n (only when the request asked for a delivery receipt)
|
|
16
|
+
*
|
|
17
|
+
* `Nc` and `Ns` are 32 fresh random bytes each, base64url without padding (43 characters). Every
|
|
18
|
+
* MAC is HMAC-SHA256 keyed with the UTF-8 bytes of the endpoint key, base64url without padding (43
|
|
19
|
+
* characters from `A-Z a-z 0-9 - _`), over these exact bytes (`\0` is one zero byte; the request and
|
|
20
|
+
* reply are the bytes between the single space and the newline, and must be valid UTF-8):
|
|
21
|
+
*
|
|
22
|
+
* Ms = HMAC(K, "cotal-control/1\0server\0" Nc "\0" Ns)
|
|
23
|
+
* Mc = HMAC(K, "cotal-control/1\0client\0" Nc "\0" Ns "\0" request)
|
|
24
|
+
* Mr = HMAC(K, "cotal-control/1\0reply\0" Nc "\0" Ns "\0" reply)
|
|
25
|
+
* Mk = HMAC(K, "cotal-control/1\0receipt\0" Nc "\0" Ns "\0" reply)
|
|
26
|
+
*
|
|
27
|
+
* The role word keeps one side's MAC from being reflected as the other's, and both nonces make each
|
|
28
|
+
* MAC good for one connection only. `Mk` binds the receipt to the reply it confirms, so a process
|
|
29
|
+
* that forwards the connection without the key cannot confirm a reply it dropped. MACs are compared
|
|
30
|
+
* in constant time, after the presented one is checked against the alphabet and length above. The
|
|
31
|
+
* exchange authenticates both ends, the request, the reply and the receipt; it does not encrypt.
|
|
32
|
+
*
|
|
33
|
+
* Every line is bounded in bytes, complete or not, before it is parsed or a MAC is computed over
|
|
34
|
+
* it: the hello and the challenge at 1 KiB, a request's JSON at {@link MAX_CONTROL_REQUEST_BYTES},
|
|
35
|
+
* a reply's JSON at the caller's `maxReplyBytes`. The 44 bytes of MAC and space before a request or
|
|
36
|
+
* reply do not count against its bound.
|
|
37
|
+
*
|
|
38
|
+
* The version travels with the endpoint and its key (the launch material, `LaunchSpec.control`), and
|
|
39
|
+
* a build speaks exactly one. A client and server of different versions refuse each other: the hello
|
|
40
|
+
* and the challenge each carry `v`, a mismatch drops the connection, and the version is inside every
|
|
41
|
+
* MAC. Nothing is negotiated on the wire and there is no fallback.
|
|
42
|
+
*
|
|
43
|
+
* Off Windows the socket also sits in a directory only its user can enter, made fresh for each
|
|
44
|
+
* launch under an unguessable name, and checked for owner and mode by the server before it binds and
|
|
45
|
+
* by every client before it connects, so another user cannot create a name there at all. On Windows
|
|
46
|
+
* the pipe namespace is global, and the exchange is the boundary.
|
|
47
|
+
*/
|
|
48
|
+
import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
|
|
49
|
+
import { lstatSync } from "node:fs";
|
|
50
|
+
import { connect } from "node:net";
|
|
51
|
+
import { dirname } from "node:path";
|
|
52
|
+
/** The one exchange version this build speaks. */
|
|
53
|
+
export const CONTROL_PROTOCOL_VERSION = 1;
|
|
54
|
+
/** How long a server keeps a connection that has not yet proved it holds the key: from accept until
|
|
55
|
+
* a request with a good MAC has arrived. A silent or slow client is dropped here, so a local process
|
|
56
|
+
* cannot camp on a finite pipe instance. */
|
|
57
|
+
export const CONTROL_SERVER_AUTH_DEADLINE_MS = 5_000;
|
|
58
|
+
/** How long a client waits, from connect, for the server to prove it holds the key. Separate from
|
|
59
|
+
* the server's deadline and shorter than any caller's reply budget, so a stand-in that says nothing
|
|
60
|
+
* cannot hold a hook for its whole budget. */
|
|
61
|
+
export const CONTROL_CLIENT_PROOF_DEADLINE_MS = 1_000;
|
|
62
|
+
/** Cap on the hello and the challenge, which are a version and a nonce or two. */
|
|
63
|
+
const MAX_HANDSHAKE_LINE_BYTES = 1024;
|
|
64
|
+
/** Cap on a request's JSON. A request is one small lifecycle event or an op. */
|
|
65
|
+
export const MAX_CONTROL_REQUEST_BYTES = 1 << 20;
|
|
66
|
+
const BASE64URL_43 = /^[A-Za-z0-9_-]{43}$/;
|
|
67
|
+
const MAC_CHARS = 43;
|
|
68
|
+
/** The MAC and the single space before a request or reply body. */
|
|
69
|
+
const MAC_PREFIX_BYTES = MAC_CHARS + 1;
|
|
70
|
+
const NEWLINE = 0x0a;
|
|
71
|
+
const SPACE = 0x20;
|
|
72
|
+
const utf8 = new TextDecoder("utf-8", { fatal: true });
|
|
73
|
+
/** Throw unless `version` is the one this build speaks. `where` names the carrier for the message. */
|
|
74
|
+
export function assertControlVersion(version, where) {
|
|
75
|
+
if (version === CONTROL_PROTOCOL_VERSION)
|
|
76
|
+
return;
|
|
77
|
+
throw new Error(`${where} carries control protocol version ${JSON.stringify(version)}, and this build speaks only ` +
|
|
78
|
+
`version ${CONTROL_PROTOCOL_VERSION}. A launcher and connector from different releases refuse each ` +
|
|
79
|
+
`other instead of falling back; upgrade both to the same release.`);
|
|
80
|
+
}
|
|
81
|
+
/** Refuse a reply cap that bounds nothing. The type requires one, but a JavaScript caller can omit it
|
|
82
|
+
* or pass `NaN` or `Infinity`, and every length comparison against those lets the reply through. */
|
|
83
|
+
function assertReplyCap(opts) {
|
|
84
|
+
const cap = opts?.maxReplyBytes;
|
|
85
|
+
if (typeof cap !== "number" || !Number.isSafeInteger(cap) || cap < 0)
|
|
86
|
+
throw new Error(`maxReplyBytes must be a finite, non-negative whole number of bytes, not ${typeof cap === "number" ? cap : typeof cap}`);
|
|
87
|
+
}
|
|
88
|
+
/** Refuse an endpoint this build cannot speak to, before any socket is opened or bound. */
|
|
89
|
+
export function assertControlEndpoint(endpoint) {
|
|
90
|
+
assertControlVersion(endpoint.version, "the control endpoint");
|
|
91
|
+
if (typeof endpoint.token !== "string" || !endpoint.token)
|
|
92
|
+
throw new Error("the control endpoint has no key");
|
|
93
|
+
}
|
|
94
|
+
function transcriptMac(token, role, nc, ns, body) {
|
|
95
|
+
const mac = createHmac("sha256", Buffer.from(token, "utf8"));
|
|
96
|
+
mac.update(`cotal-control/${CONTROL_PROTOCOL_VERSION}\0${role}\0${nc}\0${ns}`, "utf8");
|
|
97
|
+
if (body !== undefined)
|
|
98
|
+
mac.update("\0", "utf8").update(body);
|
|
99
|
+
return mac.digest("base64url");
|
|
100
|
+
}
|
|
101
|
+
/** Constant-time match of a presented MAC against the expected one. The presented MAC must be 43
|
|
102
|
+
* characters of the base64url alphabet first, so no second spelling of the same bytes passes. */
|
|
103
|
+
function macMatches(presented, expected) {
|
|
104
|
+
if (typeof presented !== "string" || !BASE64URL_43.test(presented))
|
|
105
|
+
return false;
|
|
106
|
+
return timingSafeEqual(Buffer.from(presented, "ascii"), Buffer.from(expected, "ascii"));
|
|
107
|
+
}
|
|
108
|
+
/** Split `<MAC> <body>` and verify the MAC over the body's exact bytes. Returns the body as text, or
|
|
109
|
+
* undefined when the shape, the MAC or the UTF-8 is wrong. */
|
|
110
|
+
function openSealed(line, expected) {
|
|
111
|
+
if (line.length < MAC_PREFIX_BYTES || line[MAC_CHARS] !== SPACE)
|
|
112
|
+
return undefined;
|
|
113
|
+
const body = line.subarray(MAC_PREFIX_BYTES);
|
|
114
|
+
if (!macMatches(line.subarray(0, MAC_CHARS).toString("latin1"), expected(body)))
|
|
115
|
+
return undefined;
|
|
116
|
+
try {
|
|
117
|
+
return utf8.decode(body);
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
return undefined;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
/** Parse a handshake line as a JSON object, or undefined when it is not valid UTF-8 JSON. */
|
|
124
|
+
function parseHandshake(line) {
|
|
125
|
+
try {
|
|
126
|
+
const value = JSON.parse(utf8.decode(line));
|
|
127
|
+
return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
|
|
128
|
+
}
|
|
129
|
+
catch {
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Feed a byte stream in, get newline-terminated lines out. `cap()` is the byte bound of the line
|
|
135
|
+
* being read now, MAC included; a line longer than that, complete or not, calls `oversize` instead.
|
|
136
|
+
* `onLine` returns false to stop reading.
|
|
137
|
+
*/
|
|
138
|
+
function lineReader(cap, onLine, oversize) {
|
|
139
|
+
let buf = Buffer.alloc(0);
|
|
140
|
+
let stopped = false;
|
|
141
|
+
return (chunk) => {
|
|
142
|
+
if (stopped)
|
|
143
|
+
return;
|
|
144
|
+
buf = buf.length ? Buffer.concat([buf, chunk]) : chunk;
|
|
145
|
+
for (;;) {
|
|
146
|
+
const limit = cap();
|
|
147
|
+
const nl = buf.indexOf(NEWLINE);
|
|
148
|
+
const length = nl < 0 ? buf.length : nl;
|
|
149
|
+
if (length > limit) {
|
|
150
|
+
stopped = true;
|
|
151
|
+
return oversize();
|
|
152
|
+
}
|
|
153
|
+
if (nl < 0)
|
|
154
|
+
return;
|
|
155
|
+
const line = buf.subarray(0, nl);
|
|
156
|
+
buf = buf.subarray(nl + 1);
|
|
157
|
+
if (!onLine(line)) {
|
|
158
|
+
stopped = true;
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
const nonce = () => randomBytes(32).toString("base64url");
|
|
165
|
+
/** The directory a POSIX control socket lives in, or undefined where no directory applies. */
|
|
166
|
+
function socketDir(path) {
|
|
167
|
+
return process.platform === "win32" ? undefined : dirname(path);
|
|
168
|
+
}
|
|
169
|
+
/** Throw unless `dir` is a real directory owned by this user and closed to group and others. The
|
|
170
|
+
* message names what is wrong and how to recover. */
|
|
171
|
+
function assertPrivateDir(dir) {
|
|
172
|
+
const st = lstatSync(dir);
|
|
173
|
+
const uid = process.getuid();
|
|
174
|
+
const problem = st.isSymbolicLink()
|
|
175
|
+
? "is a symbolic link, not a directory"
|
|
176
|
+
: !st.isDirectory()
|
|
177
|
+
? "is not a directory"
|
|
178
|
+
: st.uid !== uid
|
|
179
|
+
? `is owned by uid ${st.uid}, not by this user (uid ${uid})`
|
|
180
|
+
: (st.mode & 0o077) !== 0
|
|
181
|
+
? `has mode ${(st.mode & 0o7777).toString(8)}, which lets group or others in`
|
|
182
|
+
: undefined;
|
|
183
|
+
if (problem)
|
|
184
|
+
throw new Error(`control socket directory ${dir} ${problem}, so it is not a private directory of this user. ` +
|
|
185
|
+
`Remove it if you did not create it, or point TMPDIR at a directory only you can write, and relaunch.`);
|
|
186
|
+
}
|
|
187
|
+
/** Check the directory a control socket is about to be bound in: it must already exist, as a real
|
|
188
|
+
* directory owned by this user and closed to group and others. A server calls this before it binds.
|
|
189
|
+
* It never makes the directory, because by then the path is public: the launcher makes it when it
|
|
190
|
+
* mints the path, and a hand-driven path must name a directory its user made. No-op on Windows. */
|
|
191
|
+
export function assertControlSocketDir(path) {
|
|
192
|
+
if (path.startsWith("\0"))
|
|
193
|
+
throw new Error("control socket path is in the Linux abstract namespace, which any local user can bind; use a path in a private directory");
|
|
194
|
+
const dir = socketDir(path);
|
|
195
|
+
if (!dir)
|
|
196
|
+
return;
|
|
197
|
+
try {
|
|
198
|
+
assertPrivateDir(dir);
|
|
199
|
+
}
|
|
200
|
+
catch (e) {
|
|
201
|
+
if (e.code !== "ENOENT")
|
|
202
|
+
throw e;
|
|
203
|
+
throw new Error(`control socket directory ${dir} does not exist. The launcher makes it when it mints the endpoint; ` +
|
|
204
|
+
`for a hand-driven COTAL_CONTROL_SOCKET, make it yourself with mode 0700.`);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
/** Check the directory a control socket lives in before connecting to it. Every client calls this
|
|
208
|
+
* right before each dial. Always ok on Windows, where the exchange is the only boundary. */
|
|
209
|
+
export function checkControlSocketDir(path) {
|
|
210
|
+
if (path.startsWith("\0"))
|
|
211
|
+
return { ok: false, absent: false, reason: "the path is in the Linux abstract namespace, which any local user can bind" };
|
|
212
|
+
const dir = socketDir(path);
|
|
213
|
+
if (!dir)
|
|
214
|
+
return { ok: true };
|
|
215
|
+
try {
|
|
216
|
+
assertPrivateDir(dir);
|
|
217
|
+
return { ok: true };
|
|
218
|
+
}
|
|
219
|
+
catch (e) {
|
|
220
|
+
const code = e.code;
|
|
221
|
+
return { ok: false, absent: code === "ENOENT", reason: e.message };
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
/**
|
|
225
|
+
* The client half, on a socket that has just connected. Sends the hello, waits up to
|
|
226
|
+
* {@link CONTROL_CLIENT_PROOF_DEADLINE_MS} for the server's proof, sends the MAC'd `request`, and
|
|
227
|
+
* calls `done` with the reply's JSON text once its MAC verifies, plus the receipt line (`<Mk>\n`) a
|
|
228
|
+
* caller writes back when it asked for one and the reply has reached its own output. Every caller
|
|
229
|
+
* bounds the reply: `maxReplyBytes` caps its JSON in bytes, complete or not, and a cap that is not a
|
|
230
|
+
* finite, non-negative whole number throws before anything is sent. `onRequestSent` runs once
|
|
231
|
+
* the request has been written, so a caller whose own deadline or socket error ends the exchange
|
|
232
|
+
* later can say the server may have handled it.
|
|
233
|
+
*
|
|
234
|
+
* Any failure (a wrong version, a bad MAC or nonce, a malformed or oversized line, the proof
|
|
235
|
+
* deadline, the connection closing first) destroys the socket and calls `done` with the reason.
|
|
236
|
+
* Nothing from an unproven server is ever handed back. On success the socket stays open, so a caller
|
|
237
|
+
* can send its receipt; the caller owns it from there, and owns the overall reply deadline.
|
|
238
|
+
*/
|
|
239
|
+
export function clientExchange(sock, endpoint, request, done, opts) {
|
|
240
|
+
assertReplyCap(opts);
|
|
241
|
+
assertControlEndpoint(endpoint);
|
|
242
|
+
const nc = nonce();
|
|
243
|
+
let ns;
|
|
244
|
+
let requestSent = false;
|
|
245
|
+
let settled = false;
|
|
246
|
+
const finish = (result) => {
|
|
247
|
+
if (settled)
|
|
248
|
+
return;
|
|
249
|
+
settled = true;
|
|
250
|
+
clearTimeout(proof);
|
|
251
|
+
sock.off("data", onData);
|
|
252
|
+
sock.off("end", onEnd);
|
|
253
|
+
sock.off("close", onEnd);
|
|
254
|
+
if (!result.ok)
|
|
255
|
+
sock.destroy();
|
|
256
|
+
done(result);
|
|
257
|
+
};
|
|
258
|
+
const refuse = (reason) => (finish({ ok: false, reason, requestSent }), false);
|
|
259
|
+
const proof = setTimeout(() => refuse("the server did not prove it holds the key in time"), opts.proofDeadlineMs ?? CONTROL_CLIENT_PROOF_DEADLINE_MS);
|
|
260
|
+
proof.unref?.();
|
|
261
|
+
const onEnd = () => void refuse("the connection closed before a proven reply");
|
|
262
|
+
const onLine = (line) => {
|
|
263
|
+
if (ns === undefined) {
|
|
264
|
+
const challenge = parseHandshake(line);
|
|
265
|
+
if (!challenge)
|
|
266
|
+
return refuse("the server's challenge is not JSON");
|
|
267
|
+
if (challenge.v !== CONTROL_PROTOCOL_VERSION)
|
|
268
|
+
return refuse(`the server speaks control protocol ${JSON.stringify(challenge.v)}, not ${CONTROL_PROTOCOL_VERSION}`);
|
|
269
|
+
if (typeof challenge.nonce !== "string" || !BASE64URL_43.test(challenge.nonce))
|
|
270
|
+
return refuse("the server's nonce is malformed");
|
|
271
|
+
if (!macMatches(challenge.mac, transcriptMac(endpoint.token, "server", nc, challenge.nonce)))
|
|
272
|
+
return refuse("the server did not prove it holds the key");
|
|
273
|
+
ns = challenge.nonce;
|
|
274
|
+
clearTimeout(proof);
|
|
275
|
+
const body = Buffer.from(JSON.stringify(request), "utf8");
|
|
276
|
+
try {
|
|
277
|
+
requestSent = true;
|
|
278
|
+
sock.write(Buffer.concat([Buffer.from(`${transcriptMac(endpoint.token, "client", nc, ns, body)} `, "ascii"), body, Buffer.from("\n")]));
|
|
279
|
+
}
|
|
280
|
+
catch {
|
|
281
|
+
return refuse("the connection closed before the request was sent");
|
|
282
|
+
}
|
|
283
|
+
opts.onRequestSent?.();
|
|
284
|
+
return true;
|
|
285
|
+
}
|
|
286
|
+
const proven = ns;
|
|
287
|
+
const reply = openSealed(line, (body) => transcriptMac(endpoint.token, "reply", nc, proven, body));
|
|
288
|
+
if (reply === undefined)
|
|
289
|
+
return refuse("the reply's MAC does not verify");
|
|
290
|
+
const receipt = `${transcriptMac(endpoint.token, "receipt", nc, proven, line.subarray(MAC_PREFIX_BYTES))}\n`;
|
|
291
|
+
finish({ ok: true, reply, receipt });
|
|
292
|
+
return false;
|
|
293
|
+
};
|
|
294
|
+
const onData = lineReader(() => (ns === undefined ? MAX_HANDSHAKE_LINE_BYTES : MAC_PREFIX_BYTES + opts.maxReplyBytes), onLine, () => void refuse(ns === undefined ? "the server's challenge is oversized" : "the reply is oversized"));
|
|
295
|
+
sock.on("data", onData);
|
|
296
|
+
sock.on("end", onEnd);
|
|
297
|
+
sock.on("close", onEnd);
|
|
298
|
+
try {
|
|
299
|
+
sock.write(JSON.stringify({ v: CONTROL_PROTOCOL_VERSION, nonce: nc }) + "\n");
|
|
300
|
+
}
|
|
301
|
+
catch {
|
|
302
|
+
refuse("the connection closed before the hello was sent");
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
/**
|
|
306
|
+
* The server half, on a freshly accepted socket. Answers the hello with the server's proof, then
|
|
307
|
+
* verifies the client's MAC'd request and calls `onRequest`. The socket's listeners are detached
|
|
308
|
+
* first, so the caller reads the connection from there on, as raw bytes.
|
|
309
|
+
*
|
|
310
|
+
* Anything else is dropped before `onRequest` runs: a wrong version, a malformed hello, a bad MAC,
|
|
311
|
+
* an oversized line, invalid UTF-8, or no proven request within
|
|
312
|
+
* {@link CONTROL_SERVER_AUTH_DEADLINE_MS} of accept. A dropped connection gets no reply. The deadline
|
|
313
|
+
* is absolute, not idle, so a client dribbling one byte at a time cannot keep resetting it.
|
|
314
|
+
*/
|
|
315
|
+
export function serverExchange(sock, endpoint, onRequest, opts = {}) {
|
|
316
|
+
assertControlEndpoint(endpoint);
|
|
317
|
+
let nc;
|
|
318
|
+
const ns = nonce();
|
|
319
|
+
let settled = false;
|
|
320
|
+
const drop = () => {
|
|
321
|
+
if (!settled) {
|
|
322
|
+
settled = true;
|
|
323
|
+
clearTimeout(deadline);
|
|
324
|
+
sock.destroy();
|
|
325
|
+
}
|
|
326
|
+
return false;
|
|
327
|
+
};
|
|
328
|
+
const deadline = setTimeout(drop, opts.deadlineMs ?? CONTROL_SERVER_AUTH_DEADLINE_MS);
|
|
329
|
+
deadline.unref?.(); // never hold the process open on an unproven connection
|
|
330
|
+
const onClose = () => {
|
|
331
|
+
settled = true;
|
|
332
|
+
clearTimeout(deadline);
|
|
333
|
+
};
|
|
334
|
+
const onLine = (line) => {
|
|
335
|
+
if (settled)
|
|
336
|
+
return false;
|
|
337
|
+
if (nc === undefined) {
|
|
338
|
+
const hello = parseHandshake(line);
|
|
339
|
+
if (!hello || hello.v !== CONTROL_PROTOCOL_VERSION || typeof hello.nonce !== "string" || !BASE64URL_43.test(hello.nonce))
|
|
340
|
+
return drop();
|
|
341
|
+
nc = hello.nonce;
|
|
342
|
+
try {
|
|
343
|
+
sock.write(JSON.stringify({ v: CONTROL_PROTOCOL_VERSION, nonce: ns, mac: transcriptMac(endpoint.token, "server", nc, ns) }) + "\n");
|
|
344
|
+
}
|
|
345
|
+
catch {
|
|
346
|
+
return drop();
|
|
347
|
+
}
|
|
348
|
+
return true;
|
|
349
|
+
}
|
|
350
|
+
const proven = nc;
|
|
351
|
+
const request = openSealed(line, (body) => transcriptMac(endpoint.token, "client", proven, ns, body));
|
|
352
|
+
if (request === undefined)
|
|
353
|
+
return drop();
|
|
354
|
+
settled = true;
|
|
355
|
+
clearTimeout(deadline);
|
|
356
|
+
sock.off("data", onData);
|
|
357
|
+
sock.off("close", onClose);
|
|
358
|
+
onRequest({
|
|
359
|
+
request,
|
|
360
|
+
seal: (text) => {
|
|
361
|
+
const body = Buffer.from(text, "utf8");
|
|
362
|
+
const receipt = transcriptMac(endpoint.token, "receipt", proven, ns, body);
|
|
363
|
+
return {
|
|
364
|
+
line: `${transcriptMac(endpoint.token, "reply", proven, ns, body)} ${text}\n`,
|
|
365
|
+
receiptMatches: (presented) => macMatches(presented, receipt),
|
|
366
|
+
};
|
|
367
|
+
},
|
|
368
|
+
});
|
|
369
|
+
return false;
|
|
370
|
+
};
|
|
371
|
+
const onData = lineReader(() => (nc === undefined ? MAX_HANDSHAKE_LINE_BYTES : MAC_PREFIX_BYTES + MAX_CONTROL_REQUEST_BYTES), onLine, () => void drop());
|
|
372
|
+
sock.on("data", onData);
|
|
373
|
+
sock.on("close", onClose);
|
|
374
|
+
}
|
|
375
|
+
/**
|
|
376
|
+
* One request and its proven reply over a fresh connection, for a client that needs nothing more
|
|
377
|
+
* (the Manager's stop and session calls). Resolves with the reply's JSON text. Rejects before dialing
|
|
378
|
+
* when `maxReplyBytes` is not a finite, non-negative whole number, and rejects when the socket's
|
|
379
|
+
* directory is not private, the dial fails, the server does not prove itself, the reply's
|
|
380
|
+
* JSON is over `maxReplyBytes`, or nothing proven arrives within `timeoutMs`. The key is never sent.
|
|
381
|
+
*/
|
|
382
|
+
export function controlCall(endpoint, request, opts) {
|
|
383
|
+
return new Promise((resolve, reject) => {
|
|
384
|
+
assertReplyCap(opts);
|
|
385
|
+
assertControlEndpoint(endpoint);
|
|
386
|
+
const dir = checkControlSocketDir(endpoint.path);
|
|
387
|
+
if (!dir.ok)
|
|
388
|
+
return reject(new Error(dir.reason));
|
|
389
|
+
let sock;
|
|
390
|
+
let settled = false;
|
|
391
|
+
const finish = (error, reply) => {
|
|
392
|
+
if (settled)
|
|
393
|
+
return;
|
|
394
|
+
settled = true;
|
|
395
|
+
clearTimeout(timer);
|
|
396
|
+
sock?.destroy();
|
|
397
|
+
if (error)
|
|
398
|
+
reject(error);
|
|
399
|
+
else
|
|
400
|
+
resolve(reply);
|
|
401
|
+
};
|
|
402
|
+
const timer = setTimeout(() => finish(new Error("control call timed out")), opts.timeoutMs);
|
|
403
|
+
timer.unref?.();
|
|
404
|
+
try {
|
|
405
|
+
sock = connect(endpoint.path);
|
|
406
|
+
}
|
|
407
|
+
catch (e) {
|
|
408
|
+
return finish(e instanceof Error ? e : new Error(String(e)));
|
|
409
|
+
}
|
|
410
|
+
sock.on("error", (e) => finish(e));
|
|
411
|
+
sock.on("connect", () => clientExchange(sock, endpoint, request, (result) => (result.ok ? finish(undefined, result.reply) : finish(new Error(result.reason))), {
|
|
412
|
+
maxReplyBytes: opts.maxReplyBytes,
|
|
413
|
+
}));
|
|
414
|
+
});
|
|
415
|
+
}
|
|
416
|
+
//# sourceMappingURL=control-exchange.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"control-exchange.js","sourceRoot":"","sources":["../src/control-exchange.ts"],"names":[],"mappings":"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"}
|
package/dist/endpoint-call.d.ts
CHANGED
|
@@ -171,11 +171,14 @@ export declare function buildPrincipalRequest(space: string, to: {
|
|
|
171
171
|
* Call one command of a principal's own endpoint on the principal route (SPEC 13.21) and await its
|
|
172
172
|
* reply within `deadlineMs`. The caller subscribes its reply read for this nonce with the head
|
|
173
173
|
* wildcarded, so the one subscription receives the reply and the sentinel, then publishes with the
|
|
174
|
-
* sentinel as the transport reply. A
|
|
175
|
-
*
|
|
174
|
+
* sentinel as the transport reply. A message on any other head is not this reply, and the wait goes
|
|
175
|
+
* on; a frame with stored-message provenance is dropped. A reply counts only when its subject is the
|
|
176
|
+
* one the addressed process derives, its id echoes the request and its output validates against the
|
|
177
|
+
* pinned contract.
|
|
176
178
|
*
|
|
177
179
|
* Application-level failure is the returned reply's `ok: false`. This boundary throws only for its
|
|
178
|
-
* own refusals: invalid args
|
|
180
|
+
* own refusals: invalid args or a `deadlineMs` over {@link EP_PRINCIPAL_MAX_DEADLINE_MS}
|
|
181
|
+
* `bad-request`, `not-executed`, before anything is published; no responder on the sentinel `unavailable`,
|
|
179
182
|
* `not-executed`; a refused publish `permission-denied`, `not-executed` (the caller holds no row);
|
|
180
183
|
* the deadline `deadline-exceeded`, `unknown`; and a reply that does not parse, echo or validate
|
|
181
184
|
* `internal`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-call.d.ts","sourceRoot":"","sources":["../src/endpoint-call.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAO,cAAc,EAAgB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"endpoint-call.d.ts","sourceRoot":"","sources":["../src/endpoint-call.ts"],"names":[],"mappings":"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"}
|
package/dist/endpoint-call.js
CHANGED
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
import { base64url } from "./base64url.js";
|
|
4
4
|
import { PermissionViolationError } from "@nats-io/nats-core";
|
|
5
5
|
import { BROKER_REFUSAL_CAUSE, openPublishDenialWatch } from "./endpoint-publish-denial.js";
|
|
6
|
+
import { carriesStoredReplyProvenance } from "./endpoint-provenance.js";
|
|
6
7
|
import { spacePrefix } from "./subjects.js";
|
|
7
|
-
import { epRequestSubject, parseEpSubject, callerRailTokens, epPlaneTokens, assertIdToken, assertLifecycleToken, assertBoundedOwner, epPrincipalRequestSubject, epPrincipalReplySubject, epPrincipalCallerReplyFilter, epPrincipalNoRespondersSubject, isIssuedCaller } from "./endpoint-subjects.js";
|
|
8
|
+
import { epRequestSubject, parseEpSubject, callerRailTokens, epPlaneTokens, assertIdToken, assertLifecycleToken, assertBoundedOwner, epPrincipalRequestSubject, epPrincipalReplySubject, epPrincipalCallerReplyFilter, epPrincipalNoRespondersSubject, isIssuedCaller, EP_PRINCIPAL_MAX_DEADLINE_MS } from "./endpoint-subjects.js";
|
|
8
9
|
import { EpEnvelopeError, EP_UNBOUND_RESPONDER, EP_UNANSWERED, EP_REGISTRY_READ_FAILED, EP_UNDECLARED_ARG, EP_BIND_REFUSED, bindRefusalMarked, parseEndpointReply, assertArgsValid, assertOutputValid } from "./endpoint-envelope.js";
|
|
9
10
|
const nonce = () => base64url(globalThis.crypto.getRandomValues(new Uint8Array(24))); // 32 tokens of [A-Za-z0-9_-], 192 bits
|
|
10
11
|
function subjectTarget(t) {
|
|
@@ -410,10 +411,13 @@ export async function epCall(nc, space, route, op, opts) {
|
|
|
410
411
|
return attributed;
|
|
411
412
|
}
|
|
412
413
|
/** The exchange every call shares (SPEC 13.5): subscribe the reply filter BEFORE publishing,
|
|
413
|
-
* publish with the no-responders sentinel as the transport reply, and settle on the first message
|
|
414
|
-
*
|
|
415
|
-
*
|
|
416
|
-
*
|
|
414
|
+
* publish with the no-responders sentinel as the transport reply, and settle on the first message
|
|
415
|
+
* that counts. A stored message never counts (see {@link carriesStoredReplyProvenance}): a
|
|
416
|
+
* JetStream read, such as a Direct Get, delivers one on any subject its requester names.
|
|
417
|
+
* With `accepts`, a message on a reply subject it refuses does not count either, and the wait goes
|
|
418
|
+
* on. The broker's no-responders status counts only on the sentinel, which no responder holds a
|
|
419
|
+
* publish grant for: there it is `unavailable`, `not-executed`, and any other message there is
|
|
420
|
+
* dropped; a 503 on any other subject is a responder frame and takes the ordinary reply path. A refused publish is `permission-denied`
|
|
417
421
|
* (the watch is registered before the publish it watches), the deadline is `deadline-exceeded`,
|
|
418
422
|
* `unknown`, and an abort is `unavailable`, `unknown`. Subscription and publication share one
|
|
419
423
|
* promise executor, so a closed or draining connection cannot strand a rejected reply wait.
|
|
@@ -424,6 +428,8 @@ async function exchange(nc, x) {
|
|
|
424
428
|
let denialWatch;
|
|
425
429
|
let onAbort;
|
|
426
430
|
let published = false;
|
|
431
|
+
/** A refused reply read, waiting for its flush. */
|
|
432
|
+
let readRefusal;
|
|
427
433
|
const cancelled = new Promise((_, reject) => {
|
|
428
434
|
onAbort = () => reject(new EpEnvelopeError("unavailable", `${x.what} observation cancelled; the request may have executed`, published ? [{ ...x.unanswered, requestId: x.requestId }] : undefined, "unknown"));
|
|
429
435
|
x.signal?.addEventListener("abort", onAbort, { once: true });
|
|
@@ -435,12 +441,15 @@ async function exchange(nc, x) {
|
|
|
435
441
|
callback: (err, msg) => {
|
|
436
442
|
if (err) {
|
|
437
443
|
if (x.readRefused === "permission" && err instanceof PermissionViolationError) {
|
|
438
|
-
|
|
444
|
+
const refusal = readRefusal = new EpEnvelopeError("permission-denied", `the broker refused this caller's reply read "${x.replyFilter}" for ${x.what}: the request was published and may have run, and its reply cannot be read here; ${BROKER_REFUSAL_CAUSE}`, [{ ...x.unanswered, requestId: x.requestId }], "unknown");
|
|
445
|
+
void nc.flush().catch(() => undefined).then(() => new Promise((resolve) => setImmediate(resolve))).then(() => reject(refusal));
|
|
439
446
|
return;
|
|
440
447
|
}
|
|
441
448
|
reject(new EpEnvelopeError("unavailable", `the caller's reply subscription failed: ${err.message}`));
|
|
442
449
|
return;
|
|
443
450
|
}
|
|
451
|
+
if (carriesStoredReplyProvenance(msg))
|
|
452
|
+
return;
|
|
444
453
|
// Broker no-responders is authoritative ONLY on the reserved sentinel reply-to: no responder
|
|
445
454
|
// holds a publish grant for it (§13.9), so only the broker's control frame reaches it. A 503
|
|
446
455
|
// status header on a NORMAL responder subject is just a responder frame carrying a status
|
|
@@ -453,9 +462,12 @@ async function exchange(nc, x) {
|
|
|
453
462
|
reject(new EpEnvelopeError("unavailable", `no responder for ${x.what} (SPEC 13.5)`, [x.unanswered], "not-executed"));
|
|
454
463
|
return;
|
|
455
464
|
}
|
|
456
|
-
|
|
465
|
+
// Anything else there means nothing: a peer can name the sentinel as the reply subject of
|
|
466
|
+
// a JetStream API request, which the broker answers there. The wait goes on.
|
|
457
467
|
return;
|
|
458
468
|
}
|
|
469
|
+
if (x.accepts && !x.accepts(msg.subject))
|
|
470
|
+
return;
|
|
459
471
|
resolve({ subject: msg.subject, data: msg.data });
|
|
460
472
|
},
|
|
461
473
|
});
|
|
@@ -463,7 +475,7 @@ async function exchange(nc, x) {
|
|
|
463
475
|
nc.publish(x.subject, x.body, { reply: x.sentinel });
|
|
464
476
|
published = true;
|
|
465
477
|
});
|
|
466
|
-
const timeout = new Promise((_, reject) => { timer = setTimeout(() => reject(new EpEnvelopeError("deadline-exceeded", `no reply to ${x.what} within the ${x.deadlineMs}ms budget (SPEC 13.5)`, [{ ...x.unanswered, requestId: x.requestId }], "unknown")), x.deadlineMs); });
|
|
478
|
+
const timeout = new Promise((_, reject) => { timer = setTimeout(() => reject(readRefusal ?? new EpEnvelopeError("deadline-exceeded", `no reply to ${x.what} within the ${x.deadlineMs}ms budget (SPEC 13.5)`, [{ ...x.unanswered, requestId: x.requestId }], "unknown")), x.deadlineMs); });
|
|
467
479
|
return await Promise.race([outcome, timeout, denialWatch.denied, cancelled]);
|
|
468
480
|
}
|
|
469
481
|
finally {
|
|
@@ -487,6 +499,8 @@ export function buildPrincipalRequest(space, to, op, verb) {
|
|
|
487
499
|
throw new EpEnvelopeError("bad-request", "a principal-route request carries no bind: the runtime id in the subject pins the process (SPEC 13.21)", undefined, "not-executed");
|
|
488
500
|
if (isIssuedCaller(op.caller))
|
|
489
501
|
throw new EpEnvelopeError("bad-request", "the principal route has no versioned form; it carries the caller triple only (SPEC 13.21)", undefined, "not-executed");
|
|
502
|
+
if (verb.deadlineMs > EP_PRINCIPAL_MAX_DEADLINE_MS)
|
|
503
|
+
throw new EpEnvelopeError("bad-request", `deadlineMs ${verb.deadlineMs} exceeds the principal route's ${EP_PRINCIPAL_MAX_DEADLINE_MS}ms maximum (SPEC 13.21)`, undefined, "not-executed");
|
|
490
504
|
const args = validatedArgs(op);
|
|
491
505
|
const n = nonce();
|
|
492
506
|
const subject = epPrincipalRequestSubject(space, {
|
|
@@ -498,11 +512,14 @@ export function buildPrincipalRequest(space, to, op, verb) {
|
|
|
498
512
|
* Call one command of a principal's own endpoint on the principal route (SPEC 13.21) and await its
|
|
499
513
|
* reply within `deadlineMs`. The caller subscribes its reply read for this nonce with the head
|
|
500
514
|
* wildcarded, so the one subscription receives the reply and the sentinel, then publishes with the
|
|
501
|
-
* sentinel as the transport reply. A
|
|
502
|
-
*
|
|
515
|
+
* sentinel as the transport reply. A message on any other head is not this reply, and the wait goes
|
|
516
|
+
* on; a frame with stored-message provenance is dropped. A reply counts only when its subject is the
|
|
517
|
+
* one the addressed process derives, its id echoes the request and its output validates against the
|
|
518
|
+
* pinned contract.
|
|
503
519
|
*
|
|
504
520
|
* Application-level failure is the returned reply's `ok: false`. This boundary throws only for its
|
|
505
|
-
* own refusals: invalid args
|
|
521
|
+
* own refusals: invalid args or a `deadlineMs` over {@link EP_PRINCIPAL_MAX_DEADLINE_MS}
|
|
522
|
+
* `bad-request`, `not-executed`, before anything is published; no responder on the sentinel `unavailable`,
|
|
506
523
|
* `not-executed`; a refused publish `permission-denied`, `not-executed` (the caller holds no row);
|
|
507
524
|
* the deadline `deadline-exceeded`, `unknown`; and a reply that does not parse, echo or validate
|
|
508
525
|
* `internal`.
|
|
@@ -518,13 +535,12 @@ export async function epPrincipalCall(nc, space, to, op, opts) {
|
|
|
518
535
|
sentinel: epPrincipalNoRespondersSubject(space, op.caller, req.n),
|
|
519
536
|
what: `${op.endpoint}.${op.command}`,
|
|
520
537
|
unanswered: { kind: EP_UNANSWERED, endpoint: op.endpoint, command: op.command, rail: PRINCIPAL_RAIL },
|
|
538
|
+
// The head is wildcarded in the subscription, so a message from any other head is not this reply.
|
|
539
|
+
accepts: (subject) => subject === expected,
|
|
521
540
|
// A credential minted before the rows lacks the reply read and the request row both.
|
|
522
541
|
readRefused: "permission",
|
|
523
542
|
refusal: () => new EpEnvelopeError("permission-denied", `the call for ${op.endpoint}.${op.command} was REFUSED BY THE BROKER, not unanswered: this caller's credential does not authorize publishing to "${req.subject}", the "${to.authority}" form for ${to.principal.owner}.${to.principal.actor}. The agent may be serving; ${BROKER_REFUSAL_CAUSE}`, undefined, "not-executed"),
|
|
524
543
|
});
|
|
525
|
-
// The head is wildcarded in the subscription, so a message from any other head is not this reply.
|
|
526
|
-
if (msg.subject !== expected)
|
|
527
|
-
throw new EpEnvelopeError("internal", `a message on the caller's principal-route reply read came from "${msg.subject}", not from the addressed process "${expected}" (SPEC 13.21)`);
|
|
528
544
|
let raw;
|
|
529
545
|
try {
|
|
530
546
|
raw = JSON.parse(new TextDecoder().decode(msg.data));
|