@serve.zone/interfaces 32.40.1 → 32.42.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/changelog.md +64 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusterrelaycredential.d.ts +72 -0
- package/dist_ts/data/clusterrelaycredential.js +82 -1
- package/dist_ts/data/corestorecontroltoken.d.ts +90 -0
- package/dist_ts/data/corestorecontroltoken.js +106 -0
- package/dist_ts/data/index.d.ts +2 -0
- package/dist_ts/data/index.js +3 -1
- package/dist_ts/data/networkaddressplan.js +3 -12
- package/dist_ts/data/networkauthority.d.ts +16 -0
- package/dist_ts/data/networkauthority.js +45 -1
- package/dist_ts/data/networkcredential.d.ts +12 -8
- package/dist_ts/data/networkcredential.js +18 -13
- package/dist_ts/data/networkegressretirement.d.ts +105 -0
- package/dist_ts/data/networkegressretirement.js +113 -0
- package/dist_ts/data/noderetirement.d.ts +24 -4
- package/dist_ts/data/noderetirement.js +20 -3
- package/dist_ts/private/networkcontract.d.ts +2 -0
- package/dist_ts/private/networkcontract.js +10 -1
- package/dist_ts/requests/cluster.d.ts +34 -0
- package/dist_ts/requests/corestorecontrol.d.ts +33 -0
- package/dist_ts/requests/corestorecontrol.js +2 -0
- package/dist_ts/requests/index.d.ts +2 -1
- package/dist_ts/requests/index.js +3 -2
- package/dist_ts/requests/node.d.ts +9 -1
- package/package.json +3 -3
- package/readme.md +176 -23
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusterrelaycredential.ts +149 -0
- package/ts/data/corestorecontroltoken.ts +195 -0
- package/ts/data/index.ts +2 -0
- package/ts/data/networkaddressplan.ts +3 -13
- package/ts/data/networkauthority.ts +46 -0
- package/ts/data/networkcredential.ts +17 -12
- package/ts/data/networkegressretirement.ts +195 -0
- package/ts/data/noderetirement.ts +41 -5
- package/ts/private/networkcontract.ts +9 -0
- package/ts/requests/cluster.ts +44 -0
- package/ts/requests/corestorecontrol.ts +43 -0
- package/ts/requests/index.ts +2 -0
- package/ts/requests/node.ts +9 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,69 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-10-02 - 32.42.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- A cluster topology change no longer ends every node's managed VPN membership. The new
|
|
8
|
+
`continuesRuntimeNetworkProtection(previous, next)` states which protected-authority successor
|
|
9
|
+
only adds: the same authority, or exactly its next step that keeps every egress owner, pool,
|
|
10
|
+
resolver and platform endpoint unchanged and still covers every protected address.
|
|
11
|
+
`continuesRuntimeManagedVpnMembership` and `bindGetRuntimeManagedVpnCredentialSuccessor` accept
|
|
12
|
+
such a step where they required the same authority, so a node joining the egress or a cluster
|
|
13
|
+
hub joining the platform endpoints keeps each member's key pair and hub session. A step that
|
|
14
|
+
removes or changes anything, or skips a step, still ends the membership, and every egress owner
|
|
15
|
+
still acknowledges the new authority with its own protection receipt before an allocation binds
|
|
16
|
+
to it.
|
|
17
|
+
- An administrator can store the Corestore control token without an exec into Cloudly's process.
|
|
18
|
+
`requests.corestorecontrol.IReq_Admin_Cloudly_SetCorestoreControlToken`
|
|
19
|
+
(`setCorestoreControlToken { identity, token, expected }`) stores it for both Corestore provider
|
|
20
|
+
configs, fenced on the exact `data.TCorestoreControlTokenState` the administrator last read
|
|
21
|
+
(absent, or present at a revision), and answers the produced state and a value-free receipt
|
|
22
|
+
Cloudly writes with the token. `IReq_Admin_Cloudly_GetCorestoreControlTokenState` answers the
|
|
23
|
+
state and its most recent receipts. `data.corestoreControlTokenSetRefusals` names the refusals;
|
|
24
|
+
`bindCorestoreControlTokenSet` and the exact-keyed snapshots check an answer without ever
|
|
25
|
+
quoting the token, and the request reader admits only a token `isCorestoreControlToken` admits.
|
|
26
|
+
- An egress owner can now leave the protected authority. `IRuntimeNetworkEgressRetirement` is the
|
|
27
|
+
controller-owned fence for one owner, recorded against the exact authority it leaves: its node
|
|
28
|
+
retirement row, both node credentials revoked, every DNS and managed VPN window it was issued
|
|
29
|
+
ended, every handoff and workload lease quarantined, and every remaining owner's acknowledged
|
|
30
|
+
projection head free of its endpoints. `snapshotRuntimeNetworkEgressRetirement` reads it with exact
|
|
31
|
+
keys and `computeRuntimeNetworkEgressRetirementDigest` seals it.
|
|
32
|
+
`bindRuntimeNetworkProtectedAuthorityRetirement(previous, next, fences, retiredOwners)` is the pure,
|
|
33
|
+
fail-closed successor rule: an owner may be absent from `next` only behind a fence bound to the
|
|
34
|
+
exact `previous`, a fence for an owner still named refuses the step, a fenced owner never returns,
|
|
35
|
+
and pools, prefix coverage and — when an owner leaves — resolvers are kept. Owners may join in the
|
|
36
|
+
same step. Before this, an owner that left blocked every new allocation after the next protection
|
|
37
|
+
change, permanently.
|
|
38
|
+
- `INodeRuntimeRetirement` states its `disposition` (`withdrawn` or `lost`,
|
|
39
|
+
`nodeRuntimeRetirementDispositions`, `snapshotNodeRuntimeRetirementDisposition`), and
|
|
40
|
+
`retireClusterNode` takes an optional `disposition`: absent asks for `withdrawn`, the retirement
|
|
41
|
+
it always described, and `lost` escalates a `withdrawn` retirement still `retiring`. The new
|
|
42
|
+
refusal `node-still-reporting` refuses `lost` for a node that still reports. Cloudly serves
|
|
43
|
+
neither yet, so no stored row or caller is affected.
|
|
44
|
+
|
|
45
|
+
### Fixes
|
|
46
|
+
|
|
47
|
+
- Require `@push.rocks/smartlog` ^4.0.3, which reaches `@push.rocks/smartcrypto` 3 and no longer brings `node-forge` (advisory GHSA-86w9-cpqp-85rv, no patched release) into consumers' production trees.
|
|
48
|
+
|
|
49
|
+
### Maintenance
|
|
50
|
+
|
|
51
|
+
- Release tooling: `@git.zone/tsbuild` 5.1.1 and pnpm 12.7.0.
|
|
52
|
+
|
|
53
|
+
## 2026-10-02 - 32.41.0
|
|
54
|
+
|
|
55
|
+
### Features
|
|
56
|
+
|
|
57
|
+
- An administrator can export a cluster relay's bearer without an exec into Cloudly's process.
|
|
58
|
+
`exportClusterRelayAuthorization { identity, clusterId, expectedGeneration }` answers
|
|
59
|
+
`IClusterRelayAuthorizationExport`: the sealed relay credential at exactly that generation, the
|
|
60
|
+
bearer it delivered (`authorization`) and the audit `receipt` Cloudly writes before it answers.
|
|
61
|
+
Cloudly mints nothing to answer it; a new bearer is a `rotate` followed by an export.
|
|
62
|
+
`getClusterRelayAuthorizationExports { identity, clusterId }` answers the value-free receipts.
|
|
63
|
+
`data.clusterRelayAuthorizationExportRefusals` names the refusals, and
|
|
64
|
+
`bindClusterRelayAuthorizationExport`, `isClusterRelayAuthorization` and the exact-keyed
|
|
65
|
+
snapshots let a reader check an answer before it writes the bearer, without ever quoting it.
|
|
66
|
+
|
|
3
67
|
## 2026-10-02 - 32.40.1
|
|
4
68
|
|
|
5
69
|
### Fixes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.42.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -106,6 +106,50 @@ export interface IClusterLegacyRelayCredentialRetirementResult {
|
|
|
106
106
|
/** A replay returns the recorded invalidation; nothing is revoked twice. */
|
|
107
107
|
replayed: boolean;
|
|
108
108
|
}
|
|
109
|
+
/**
|
|
110
|
+
* What an administrator names to export one cluster's relay bearer: the cluster, at exactly the
|
|
111
|
+
* generation `getClusterRelayCredential` answered. Never a minimum: a rotation that committed
|
|
112
|
+
* after that read is refused rather than answered with a bearer the operator did not ask for.
|
|
113
|
+
*/
|
|
114
|
+
export interface IClusterRelayAuthorizationExportRequest {
|
|
115
|
+
clusterId: string;
|
|
116
|
+
expectedGeneration: number;
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* The audit record of one answered export, which Cloudly writes before it answers the bearer.
|
|
120
|
+
*
|
|
121
|
+
* Append-only and value-free: it names who received which credential's bearer and when, never
|
|
122
|
+
* the bearer or a hash of it. Every answered export writes one, so a retried export is a second
|
|
123
|
+
* receipt rather than a replay: each is a separate handover of the same bearer.
|
|
124
|
+
*/
|
|
125
|
+
export interface IClusterRelayAuthorizationExportReceipt {
|
|
126
|
+
id: string;
|
|
127
|
+
clusterId: string;
|
|
128
|
+
/** The exact relay credential whose bearer was answered: identity, generation and digest. */
|
|
129
|
+
credential: IRuntimeAuthorityReference;
|
|
130
|
+
/** The administrator the bearer was answered to, read from the verified credential. */
|
|
131
|
+
actorId: string;
|
|
132
|
+
exportedAt: number;
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* One cluster's relay bearer, answered to an administrator so it can be handed to the relay
|
|
136
|
+
* without reaching into Cloudly's process.
|
|
137
|
+
*
|
|
138
|
+
* The only member of this contract that carries a bearer. It is the delivered version the
|
|
139
|
+
* credential names, at the requested generation, proved against the hash that generation issued;
|
|
140
|
+
* Cloudly mints nothing to answer it. The reader owns the bytes: it writes them where the relay
|
|
141
|
+
* reads them and never logs, prints or persists them anywhere else.
|
|
142
|
+
*/
|
|
143
|
+
export interface IClusterRelayAuthorizationExport {
|
|
144
|
+
/** The relay credential the bearer authenticates as, at exactly the requested generation. */
|
|
145
|
+
credential: IClusterRelayCredential;
|
|
146
|
+
/**
|
|
147
|
+
* The bearer, byte for byte what the relay presents: `clusterRelayToken_`, the credential's
|
|
148
|
+
* 64-hex `id`, `_` and 64 hex characters, with no line terminator.
|
|
149
|
+
*/
|
|
150
|
+
authorization: string;
|
|
151
|
+
receipt: IClusterRelayAuthorizationExportReceipt;
|
|
152
|
+
}
|
|
109
153
|
export declare const clusterRelayCredentialContract: Readonly<{
|
|
110
154
|
readonly credentialDigestDomain: "serve.zone/cluster-relay-credential";
|
|
111
155
|
readonly legacyCredentialDigestDomain: "serve.zone/cluster-relay-legacy-credential";
|
|
@@ -114,6 +158,12 @@ export declare const clusterRelayCredentialContract: Readonly<{
|
|
|
114
158
|
/** Every reason Cloudly answers instead of mutating or retiring a cluster relay authority. */
|
|
115
159
|
export declare const clusterRelayCredentialRefusals: readonly ["relay-credential-absent", "legacy-credential-absent", "legacy-credential-already-retired", "legacy-retirement-replacement-not-current", "legacy-retirement-registration-not-current", "legacy-retirement-relay-not-live", "conflict"];
|
|
116
160
|
export type TClusterRelayCredentialRefusal = typeof clusterRelayCredentialRefusals[number];
|
|
161
|
+
/**
|
|
162
|
+
* Every reason Cloudly answers instead of a relay bearer. Its own family, because an export
|
|
163
|
+
* changes no record: it has no `conflict`, and a generation it was not asked for is a mismatch.
|
|
164
|
+
*/
|
|
165
|
+
export declare const clusterRelayAuthorizationExportRefusals: readonly ["relay-credential-absent", "relay-credential-generation-mismatch", "relay-authorization-missing", "relay-authorization-ambiguous"];
|
|
166
|
+
export type TClusterRelayAuthorizationExportRefusal = typeof clusterRelayAuthorizationExportRefusals[number];
|
|
117
167
|
/** Structural copy only; whether the record is the cluster's current one is Cloudly's to decide. */
|
|
118
168
|
export declare const snapshotClusterRelayCredential: (valueArg: unknown) => IClusterRelayCredential;
|
|
119
169
|
export declare const computeClusterRelayCredentialDigest: (valueArg: unknown) => Promise<TSha256Digest>;
|
|
@@ -138,4 +188,26 @@ export declare const bindClusterLegacyRelayCredentialInvalidation: (invalidation
|
|
|
138
188
|
legacyCredential: IClusterLegacyRelayCredential;
|
|
139
189
|
acceptedRegistration: IClusterRelayAcceptedRegistration;
|
|
140
190
|
}>;
|
|
191
|
+
/**
|
|
192
|
+
* Whether a value has the exact shape of a relay bearer: `clusterRelayToken_<64 hex>_<64 hex>`.
|
|
193
|
+
*
|
|
194
|
+
* Shape only: whether it authenticates is Cloudly's to decide against the hash it keeps.
|
|
195
|
+
*/
|
|
196
|
+
export declare const isClusterRelayAuthorization: (valueArg: unknown) => valueArg is string;
|
|
197
|
+
export declare const snapshotClusterRelayAuthorizationExportRequest: (valueArg: unknown) => IClusterRelayAuthorizationExportRequest;
|
|
198
|
+
export declare const snapshotClusterRelayAuthorizationExportReceipt: (valueArg: unknown) => IClusterRelayAuthorizationExportReceipt;
|
|
199
|
+
/**
|
|
200
|
+
* Structural copy of an export answer. A refusal never quotes the answer, because it carries a
|
|
201
|
+
* bearer: every failure is the contract's one value-free message.
|
|
202
|
+
*/
|
|
203
|
+
export declare const snapshotClusterRelayAuthorizationExport: (valueArg: unknown) => IClusterRelayAuthorizationExport;
|
|
204
|
+
/**
|
|
205
|
+
* Joins an export answer to the request it answers, before a reader writes a byte of the bearer.
|
|
206
|
+
*
|
|
207
|
+
* The credential is sealed with its own digest and is the requested cluster's at exactly the
|
|
208
|
+
* requested generation; the bearer names that credential; the receipt names that cluster and that
|
|
209
|
+
* exact credential. Content join only: whether the bearer authenticates is Cloudly's to prove,
|
|
210
|
+
* and Cloudly proves it before it answers.
|
|
211
|
+
*/
|
|
212
|
+
export declare const bindClusterRelayAuthorizationExport: (exportArg: unknown, requestArg: unknown) => Promise<IClusterRelayAuthorizationExport>;
|
|
141
213
|
export {};
|
|
@@ -22,6 +22,20 @@ export const clusterRelayCredentialRefusals = Object.freeze([
|
|
|
22
22
|
/** An expected generation was not the exact current one, or a mutation ID met a changed body. */
|
|
23
23
|
'conflict',
|
|
24
24
|
]);
|
|
25
|
+
/**
|
|
26
|
+
* Every reason Cloudly answers instead of a relay bearer. Its own family, because an export
|
|
27
|
+
* changes no record: it has no `conflict`, and a generation it was not asked for is a mismatch.
|
|
28
|
+
*/
|
|
29
|
+
export const clusterRelayAuthorizationExportRefusals = Object.freeze([
|
|
30
|
+
/** No relay credential is minted for the cluster. */
|
|
31
|
+
'relay-credential-absent',
|
|
32
|
+
/** The credential is at another generation than the one named, before the read or after it. */
|
|
33
|
+
'relay-credential-generation-mismatch',
|
|
34
|
+
/** The version the credential delivered is not stored as an active version. */
|
|
35
|
+
'relay-authorization-missing',
|
|
36
|
+
/** The secret's active version, or its bytes, are not what the credential issued. */
|
|
37
|
+
'relay-authorization-ambiguous',
|
|
38
|
+
]);
|
|
25
39
|
const fail = () => { throw new Error('Cluster relay credential contract rejected.'); };
|
|
26
40
|
const safe = (operationArg) => {
|
|
27
41
|
try {
|
|
@@ -189,4 +203,71 @@ export const bindClusterLegacyRelayCredentialInvalidation = async (invalidationA
|
|
|
189
203
|
return fail();
|
|
190
204
|
}
|
|
191
205
|
};
|
|
192
|
-
|
|
206
|
+
const clusterRelayAuthorizationPrefix = 'clusterRelayToken_';
|
|
207
|
+
const clusterRelayAuthorizationPattern = /^clusterRelayToken_[a-f0-9]{64}_[a-f0-9]{64}$/;
|
|
208
|
+
/**
|
|
209
|
+
* Whether a value has the exact shape of a relay bearer: `clusterRelayToken_<64 hex>_<64 hex>`.
|
|
210
|
+
*
|
|
211
|
+
* Shape only: whether it authenticates is Cloudly's to decide against the hash it keeps.
|
|
212
|
+
*/
|
|
213
|
+
export const isClusterRelayAuthorization = (valueArg) => typeof valueArg === 'string' && clusterRelayAuthorizationPattern.test(valueArg);
|
|
214
|
+
/** The credential identity a relay bearer names: the 64 hex characters after its prefix. */
|
|
215
|
+
const clusterRelayAuthorizationCredentialId = (authorizationArg) => authorizationArg.slice(clusterRelayAuthorizationPrefix.length, clusterRelayAuthorizationPrefix.length + 64);
|
|
216
|
+
export const snapshotClusterRelayAuthorizationExportRequest = (valueArg) => safe(() => {
|
|
217
|
+
const value = networkRecord(captureNetwork(valueArg), ['clusterId', 'expectedGeneration']);
|
|
218
|
+
return {
|
|
219
|
+
clusterId: networkId(value.clusterId),
|
|
220
|
+
expectedGeneration: networkCounter(value.expectedGeneration),
|
|
221
|
+
};
|
|
222
|
+
});
|
|
223
|
+
export const snapshotClusterRelayAuthorizationExportReceipt = (valueArg) => safe(() => {
|
|
224
|
+
const value = networkRecord(captureNetwork(valueArg), [
|
|
225
|
+
'id', 'clusterId', 'credential', 'actorId', 'exportedAt',
|
|
226
|
+
]);
|
|
227
|
+
return {
|
|
228
|
+
id: networkId(value.id),
|
|
229
|
+
clusterId: networkId(value.clusterId),
|
|
230
|
+
credential: networkReference(value.credential),
|
|
231
|
+
actorId: networkId(value.actorId),
|
|
232
|
+
exportedAt: networkCounter(value.exportedAt),
|
|
233
|
+
};
|
|
234
|
+
});
|
|
235
|
+
/**
|
|
236
|
+
* Structural copy of an export answer. A refusal never quotes the answer, because it carries a
|
|
237
|
+
* bearer: every failure is the contract's one value-free message.
|
|
238
|
+
*/
|
|
239
|
+
export const snapshotClusterRelayAuthorizationExport = (valueArg) => safe(() => {
|
|
240
|
+
const value = networkRecord(captureNetwork(valueArg), ['credential', 'authorization', 'receipt']);
|
|
241
|
+
requireNetwork(isClusterRelayAuthorization(value.authorization));
|
|
242
|
+
return {
|
|
243
|
+
credential: snapshotClusterRelayCredential(value.credential),
|
|
244
|
+
authorization: value.authorization,
|
|
245
|
+
receipt: snapshotClusterRelayAuthorizationExportReceipt(value.receipt),
|
|
246
|
+
};
|
|
247
|
+
});
|
|
248
|
+
/**
|
|
249
|
+
* Joins an export answer to the request it answers, before a reader writes a byte of the bearer.
|
|
250
|
+
*
|
|
251
|
+
* The credential is sealed with its own digest and is the requested cluster's at exactly the
|
|
252
|
+
* requested generation; the bearer names that credential; the receipt names that cluster and that
|
|
253
|
+
* exact credential. Content join only: whether the bearer authenticates is Cloudly's to prove,
|
|
254
|
+
* and Cloudly proves it before it answers.
|
|
255
|
+
*/
|
|
256
|
+
export const bindClusterRelayAuthorizationExport = async (exportArg, requestArg) => {
|
|
257
|
+
try {
|
|
258
|
+
const request = snapshotClusterRelayAuthorizationExportRequest(requestArg);
|
|
259
|
+
const answer = snapshotClusterRelayAuthorizationExport(exportArg);
|
|
260
|
+
if ((await validateClusterRelayCredential(answer.credential)).length)
|
|
261
|
+
fail();
|
|
262
|
+
requireNetwork(answer.credential.clusterId === request.clusterId
|
|
263
|
+
&& answer.credential.generation === request.expectedGeneration
|
|
264
|
+
&& clusterRelayAuthorizationCredentialId(answer.authorization) === answer.credential.id
|
|
265
|
+
&& answer.receipt.clusterId === request.clusterId
|
|
266
|
+
&& networkEqual(answer.receipt.credential, networkReferenceOf(answer.credential)));
|
|
267
|
+
return answer;
|
|
268
|
+
}
|
|
269
|
+
catch {
|
|
270
|
+
return fail();
|
|
271
|
+
}
|
|
272
|
+
};
|
|
273
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusterrelaycredential.js","sourceRoot":"","sources":["../../ts/data/clusterrelaycredential.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether Cloudly holds the Corestore control token, and at which revision. Value-free.
|
|
3
|
+
*
|
|
4
|
+
* There is one token for both Corestore provider configs, so this is one state rather than one per
|
|
5
|
+
* provider. `revision` is 1 for the first token ever stored and advances by exactly one with every
|
|
6
|
+
* accepted set, whichever path set it. No request removes a token, so a present token never turns
|
|
7
|
+
* absent again.
|
|
8
|
+
*/
|
|
9
|
+
export type TCorestoreControlTokenState = {
|
|
10
|
+
state: 'absent';
|
|
11
|
+
} | {
|
|
12
|
+
state: 'present';
|
|
13
|
+
revision: number;
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* What an administrator names to store the Corestore control token: the token, and the state the
|
|
17
|
+
* administrator last read. Never a minimum: a set that committed after that read is refused rather
|
|
18
|
+
* than overwritten.
|
|
19
|
+
*
|
|
20
|
+
* `token` is the secret itself, the only member of this contract that carries it. A sender never
|
|
21
|
+
* logs, hooks or persists the request; Cloudly never answers or records the token.
|
|
22
|
+
*/
|
|
23
|
+
export interface ICorestoreControlTokenSetRequest {
|
|
24
|
+
token: string;
|
|
25
|
+
expected: TCorestoreControlTokenState;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Which path stored a token: an administrator's typed request, or the `secrets
|
|
29
|
+
* set-corestore-control-token` command run inside Cloudly's container.
|
|
30
|
+
*/
|
|
31
|
+
export type TCorestoreControlTokenSetPath = 'admin-request' | 'container-cli';
|
|
32
|
+
/**
|
|
33
|
+
* The audit record of one accepted set, which Cloudly writes in the transaction that stores the
|
|
34
|
+
* token. Append-only and value-free: it names which revision was stored, by whom, how and when,
|
|
35
|
+
* never the token or a hash of it.
|
|
36
|
+
*/
|
|
37
|
+
export interface ICorestoreControlTokenSetReceipt {
|
|
38
|
+
id: string;
|
|
39
|
+
/** The revision this set stored. */
|
|
40
|
+
revision: number;
|
|
41
|
+
via: TCorestoreControlTokenSetPath;
|
|
42
|
+
/** The administrator read from the verified credential, or `operator:secrets-cli`. */
|
|
43
|
+
actorId: string;
|
|
44
|
+
setAt: number;
|
|
45
|
+
}
|
|
46
|
+
/** What Cloudly answers to an accepted set: the state it produced and its receipt. Value-free. */
|
|
47
|
+
export interface ICorestoreControlTokenSetResult {
|
|
48
|
+
state: {
|
|
49
|
+
state: 'present';
|
|
50
|
+
revision: number;
|
|
51
|
+
};
|
|
52
|
+
receipt: ICorestoreControlTokenSetReceipt;
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* The token's state and its most recent receipts, oldest first: every receipt while the token has
|
|
56
|
+
* been set at most `corestoreControlTokenMaximumReceipts` times, the latest that many after. Value-free.
|
|
57
|
+
*/
|
|
58
|
+
export interface ICorestoreControlTokenStateRead {
|
|
59
|
+
state: TCorestoreControlTokenState;
|
|
60
|
+
receipts: ICorestoreControlTokenSetReceipt[];
|
|
61
|
+
}
|
|
62
|
+
/** Every reason Cloudly answers instead of storing a Corestore control token. */
|
|
63
|
+
export declare const corestoreControlTokenSetRefusals: readonly ["token-invalid", "token-present", "token-absent", "token-revision-mismatch", "provider-unavailable"];
|
|
64
|
+
export type TCorestoreControlTokenSetRefusal = typeof corestoreControlTokenSetRefusals[number];
|
|
65
|
+
/** The actor a receipt names when the in-container command stored the token. */
|
|
66
|
+
export declare const corestoreControlTokenContainerCliActorId: "operator:secrets-cli";
|
|
67
|
+
/** The most receipts one state read answers: the latest ones, once a token has been set more often. */
|
|
68
|
+
export declare const corestoreControlTokenMaximumReceipts = 4096;
|
|
69
|
+
export declare const snapshotCorestoreControlTokenState: (valueArg: unknown) => TCorestoreControlTokenState;
|
|
70
|
+
/**
|
|
71
|
+
* Structural copy of a set request. A refusal never quotes the request, because it carries the
|
|
72
|
+
* token: every failure is the contract's one value-free message.
|
|
73
|
+
*/
|
|
74
|
+
export declare const snapshotCorestoreControlTokenSetRequest: (valueArg: unknown) => ICorestoreControlTokenSetRequest;
|
|
75
|
+
export declare const snapshotCorestoreControlTokenSetReceipt: (valueArg: unknown) => ICorestoreControlTokenSetReceipt;
|
|
76
|
+
export declare const snapshotCorestoreControlTokenSetResult: (valueArg: unknown) => ICorestoreControlTokenSetResult;
|
|
77
|
+
/**
|
|
78
|
+
* Structural copy of a state read. No token stored means no receipt. A stored token's receipts are
|
|
79
|
+
* contiguous and end at its revision, and they start at revision 1 -- or at 2, because only a token
|
|
80
|
+
* stored before receipts existed reaches revision 1 without one -- unless the read is a full window
|
|
81
|
+
* of `corestoreControlTokenMaximumReceipts`, whose oldest receipt may name any later revision.
|
|
82
|
+
*/
|
|
83
|
+
export declare const snapshotCorestoreControlTokenStateRead: (valueArg: unknown) => ICorestoreControlTokenStateRead;
|
|
84
|
+
/**
|
|
85
|
+
* Joins a set answer to the request it answers. The answered state is the one the request
|
|
86
|
+
* produces -- revision 1 when no token was stored, the expected revision plus one otherwise -- and
|
|
87
|
+
* the receipt is an administrator's receipt for exactly that revision. Content join only: whether
|
|
88
|
+
* the token was stored is Cloudly's to prove, and the answer never carries it.
|
|
89
|
+
*/
|
|
90
|
+
export declare const bindCorestoreControlTokenSet: (resultArg: unknown, requestArg: unknown) => ICorestoreControlTokenSetResult;
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { isCorestoreControlToken } from '../runtime.corestore.js';
|
|
2
|
+
import { captureNetwork, networkCounter, networkId, networkList, networkRecord, requireNetwork, } from '../private/networkcontract.js';
|
|
3
|
+
/** Every reason Cloudly answers instead of storing a Corestore control token. */
|
|
4
|
+
export const corestoreControlTokenSetRefusals = Object.freeze([
|
|
5
|
+
/** The token is outside the contract: its length, encoding or whitespace (`isCorestoreControlToken`). */
|
|
6
|
+
'token-invalid',
|
|
7
|
+
/** `expected` said absent, and a token is stored. */
|
|
8
|
+
'token-present',
|
|
9
|
+
/** `expected` named a revision, and no token is stored. */
|
|
10
|
+
'token-absent',
|
|
11
|
+
/** `expected` named a revision, and the stored token is at another one. */
|
|
12
|
+
'token-revision-mismatch',
|
|
13
|
+
/** A Corestore provider config is missing or disabled, so there is nothing to store it under. */
|
|
14
|
+
'provider-unavailable',
|
|
15
|
+
]);
|
|
16
|
+
/** The actor a receipt names when the in-container command stored the token. */
|
|
17
|
+
export const corestoreControlTokenContainerCliActorId = 'operator:secrets-cli';
|
|
18
|
+
/** The most receipts one state read answers: the latest ones, once a token has been set more often. */
|
|
19
|
+
export const corestoreControlTokenMaximumReceipts = 4096;
|
|
20
|
+
const fail = () => { throw new Error('Corestore control token contract rejected.'); };
|
|
21
|
+
const safe = (operationArg) => {
|
|
22
|
+
try {
|
|
23
|
+
return operationArg();
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
return fail();
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
const readState = (valueArg) => {
|
|
30
|
+
const value = networkRecord(valueArg, ['state'], ['revision']);
|
|
31
|
+
if (value.state === 'absent') {
|
|
32
|
+
networkRecord(value, ['state']);
|
|
33
|
+
return { state: 'absent' };
|
|
34
|
+
}
|
|
35
|
+
requireNetwork(value.state === 'present');
|
|
36
|
+
return { state: 'present', revision: networkCounter(networkRecord(value, ['state', 'revision']).revision) };
|
|
37
|
+
};
|
|
38
|
+
export const snapshotCorestoreControlTokenState = (valueArg) => safe(() => readState(captureNetwork(valueArg)));
|
|
39
|
+
/**
|
|
40
|
+
* Structural copy of a set request. A refusal never quotes the request, because it carries the
|
|
41
|
+
* token: every failure is the contract's one value-free message.
|
|
42
|
+
*/
|
|
43
|
+
export const snapshotCorestoreControlTokenSetRequest = (valueArg) => safe(() => {
|
|
44
|
+
const value = networkRecord(captureNetwork(valueArg), ['token', 'expected']);
|
|
45
|
+
requireNetwork(isCorestoreControlToken(value.token));
|
|
46
|
+
return { token: value.token, expected: readState(value.expected) };
|
|
47
|
+
});
|
|
48
|
+
const readReceipt = (valueArg) => {
|
|
49
|
+
const value = networkRecord(valueArg, ['id', 'revision', 'via', 'actorId', 'setAt']);
|
|
50
|
+
requireNetwork(value.via === 'admin-request' || value.via === 'container-cli');
|
|
51
|
+
const actorId = networkId(value.actorId);
|
|
52
|
+
requireNetwork(value.via === 'admin-request'
|
|
53
|
+
? actorId !== corestoreControlTokenContainerCliActorId
|
|
54
|
+
: actorId === corestoreControlTokenContainerCliActorId);
|
|
55
|
+
return {
|
|
56
|
+
id: networkId(value.id),
|
|
57
|
+
revision: networkCounter(value.revision),
|
|
58
|
+
via: value.via,
|
|
59
|
+
actorId,
|
|
60
|
+
setAt: networkCounter(value.setAt),
|
|
61
|
+
};
|
|
62
|
+
};
|
|
63
|
+
export const snapshotCorestoreControlTokenSetReceipt = (valueArg) => safe(() => readReceipt(captureNetwork(valueArg)));
|
|
64
|
+
export const snapshotCorestoreControlTokenSetResult = (valueArg) => safe(() => {
|
|
65
|
+
const value = networkRecord(captureNetwork(valueArg), ['state', 'receipt']);
|
|
66
|
+
const state = readState(value.state);
|
|
67
|
+
requireNetwork(state.state === 'present');
|
|
68
|
+
return { state, receipt: readReceipt(value.receipt) };
|
|
69
|
+
});
|
|
70
|
+
/**
|
|
71
|
+
* Structural copy of a state read. No token stored means no receipt. A stored token's receipts are
|
|
72
|
+
* contiguous and end at its revision, and they start at revision 1 -- or at 2, because only a token
|
|
73
|
+
* stored before receipts existed reaches revision 1 without one -- unless the read is a full window
|
|
74
|
+
* of `corestoreControlTokenMaximumReceipts`, whose oldest receipt may name any later revision.
|
|
75
|
+
*/
|
|
76
|
+
export const snapshotCorestoreControlTokenStateRead = (valueArg) => safe(() => {
|
|
77
|
+
const value = networkRecord(captureNetwork(valueArg), ['state', 'receipts']);
|
|
78
|
+
const state = readState(value.state);
|
|
79
|
+
const receipts = networkList(value.receipts, corestoreControlTokenMaximumReceipts, readReceipt);
|
|
80
|
+
if (state.state === 'absent') {
|
|
81
|
+
requireNetwork(receipts.length === 0);
|
|
82
|
+
return { state, receipts };
|
|
83
|
+
}
|
|
84
|
+
const first = state.revision - receipts.length + 1;
|
|
85
|
+
requireNetwork(first >= 1
|
|
86
|
+
&& (first <= 2 || receipts.length === corestoreControlTokenMaximumReceipts)
|
|
87
|
+
&& receipts.every((receipt, index) => receipt.revision === first + index));
|
|
88
|
+
return { state, receipts };
|
|
89
|
+
});
|
|
90
|
+
/**
|
|
91
|
+
* Joins a set answer to the request it answers. The answered state is the one the request
|
|
92
|
+
* produces -- revision 1 when no token was stored, the expected revision plus one otherwise -- and
|
|
93
|
+
* the receipt is an administrator's receipt for exactly that revision. Content join only: whether
|
|
94
|
+
* the token was stored is Cloudly's to prove, and the answer never carries it.
|
|
95
|
+
*/
|
|
96
|
+
export const bindCorestoreControlTokenSet = (resultArg, requestArg) => safe(() => {
|
|
97
|
+
const request = snapshotCorestoreControlTokenSetRequest(requestArg);
|
|
98
|
+
const result = snapshotCorestoreControlTokenSetResult(resultArg);
|
|
99
|
+
const produced = request.expected.state === 'absent' ? 1 : request.expected.revision + 1;
|
|
100
|
+
requireNetwork(Number.isSafeInteger(produced)
|
|
101
|
+
&& result.state.revision === produced
|
|
102
|
+
&& result.receipt.revision === produced
|
|
103
|
+
&& result.receipt.via === 'admin-request');
|
|
104
|
+
return result;
|
|
105
|
+
});
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29yZXN0b3JlY29udHJvbHRva2VuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvZGF0YS9jb3Jlc3RvcmVjb250cm9sdG9rZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEUsT0FBTyxFQUNMLGNBQWMsRUFDZCxjQUFjLEVBQ2QsU0FBUyxFQUNULFdBQVcsRUFDWCxhQUFhLEVBQ2IsY0FBYyxHQUNmLE1BQU0sK0JBQStCLENBQUM7QUErRHZDLGlGQUFpRjtBQUNqRixNQUFNLENBQUMsTUFBTSxnQ0FBZ0MsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQzVELHlHQUF5RztJQUN6RyxlQUFlO0lBQ2YscURBQXFEO0lBQ3JELGVBQWU7SUFDZiwyREFBMkQ7SUFDM0QsY0FBYztJQUNkLDJFQUEyRTtJQUMzRSx5QkFBeUI7SUFDekIsaUdBQWlHO0lBQ2pHLHNCQUFzQjtDQUNkLENBQUMsQ0FBQztBQUlaLGdGQUFnRjtBQUNoRixNQUFNLENBQUMsTUFBTSx3Q0FBd0MsR0FBRyxzQkFBK0IsQ0FBQztBQUV4Rix1R0FBdUc7QUFDdkcsTUFBTSxDQUFDLE1BQU0sb0NBQW9DLEdBQUcsSUFBSSxDQUFDO0FBRXpELE1BQU0sSUFBSSxHQUFHLEdBQVUsRUFBRSxHQUFHLE1BQU0sSUFBSSxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUM3RixNQUFNLElBQUksR0FBRyxDQUFJLFlBQXFCLEVBQUssRUFBRTtJQUMzQyxJQUFJLENBQUM7UUFBQyxPQUFPLFlBQVksRUFBRSxDQUFDO0lBQUMsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7SUFBQyxDQUFDO0FBQ3pELENBQUMsQ0FBQztBQUVGLE1BQU0sU0FBUyxHQUFHLENBQUMsUUFBaUIsRUFBK0IsRUFBRTtJQUNuRSxNQUFNLEtBQUssR0FB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
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export * from './clusteringressdesignation.js';
|
|
|
7
7
|
export * from './clusterrelaycredential.js';
|
|
8
8
|
export * from './config.js';
|
|
9
9
|
export * from './corestore.js';
|
|
10
|
+
export * from './corestorecontroltoken.js';
|
|
10
11
|
export * from './corestorelegacyadoption.js';
|
|
11
12
|
export * from './coremail.js';
|
|
12
13
|
export * from './coremail.runtime.js';
|
|
@@ -38,6 +39,7 @@ export * from './networkaddressplan.js';
|
|
|
38
39
|
export * from './networkauthority.js';
|
|
39
40
|
export * from './networkcredential.js';
|
|
40
41
|
export * from './networkdelivery.js';
|
|
42
|
+
export * from './networkegressretirement.js';
|
|
41
43
|
export * from './networklease.js';
|
|
42
44
|
export * from './networknode.js';
|
|
43
45
|
export * from './networkprojection.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -7,6 +7,7 @@ export * from './clusteringressdesignation.js';
|
|
|
7
7
|
export * from './clusterrelaycredential.js';
|
|
8
8
|
export * from './config.js';
|
|
9
9
|
export * from './corestore.js';
|
|
10
|
+
export * from './corestorecontroltoken.js';
|
|
10
11
|
export * from './corestorelegacyadoption.js';
|
|
11
12
|
export * from './coremail.js';
|
|
12
13
|
export * from './coremail.runtime.js';
|
|
@@ -38,6 +39,7 @@ export * from './networkaddressplan.js';
|
|
|
38
39
|
export * from './networkauthority.js';
|
|
39
40
|
export * from './networkcredential.js';
|
|
40
41
|
export * from './networkdelivery.js';
|
|
42
|
+
export * from './networkegressretirement.js';
|
|
41
43
|
export * from './networklease.js';
|
|
42
44
|
export * from './networknode.js';
|
|
43
45
|
export * from './networkprojection.js';
|
|
@@ -77,4 +79,4 @@ export * from './traffic.js';
|
|
|
77
79
|
export * from './user.js';
|
|
78
80
|
export * from './version.js';
|
|
79
81
|
export * from './webpush.js';
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyx3QkFBd0IsQ0FBQztBQUd2QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUc5RCxPQUFPLEVBQUUscUNBQXFDLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNwRixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGtDQUFrQyxDQUFDO0FBQ2pELGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUMifQ==
|