@serve.zone/interfaces 32.2.0 → 32.4.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 +69 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/cluster.d.ts +30 -0
- package/dist_ts/data/cluster.js +46 -2
- package/dist_ts/data/clusternode.d.ts +21 -0
- package/dist_ts/data/clusternode.js +345 -11
- package/dist_ts/data/clustervpn.d.ts +135 -0
- package/dist_ts/data/clustervpn.js +147 -0
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/networkaddressplan.d.ts +54 -11
- package/dist_ts/data/networkaddressplan.js +67 -23
- package/dist_ts/data/networkcredential.d.ts +13 -4
- package/dist_ts/data/networkcredential.js +41 -23
- package/dist_ts/data/runtimeassignment.d.ts +23 -0
- package/dist_ts/data/runtimeassignment.js +42 -7
- package/dist_ts/platform/storage.d.ts +19 -0
- package/dist_ts/platform/storage.js +23 -3
- package/dist_ts/private/networkcontract.d.ts +6 -0
- package/dist_ts/private/networkcontract.js +12 -1
- package/dist_ts/requests/cluster.d.ts +27 -0
- package/dist_ts/requests/cluster.js +1 -1
- package/package.json +1 -1
- package/readme.md +139 -21
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/cluster.ts +76 -1
- package/ts/data/clusternode.ts +457 -10
- package/ts/data/clustervpn.ts +248 -0
- package/ts/data/index.ts +1 -0
- package/ts/data/networkaddressplan.ts +103 -27
- package/ts/data/networkcredential.ts +52 -24
- package/ts/data/runtimeassignment.ts +58 -5
- package/ts/platform/storage.ts +27 -5
- package/ts/private/networkcontract.ts +11 -0
- package/ts/requests/cluster.ts +35 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { IRuntimeAuthorityReference } from './runtimeassignment.js';
|
|
2
|
+
import { type TRuntimeNetworkVpnTransport } from './networkaddressplan.js';
|
|
2
3
|
import { type IRuntimeSessionBinding } from './runtimesession.js';
|
|
3
4
|
export interface IGetRuntimeManagedVpnCredentialRequest {
|
|
4
5
|
session: IRuntimeSessionBinding;
|
|
@@ -8,12 +9,20 @@ export interface IGetRuntimeManagedVpnCredentialRequest {
|
|
|
8
9
|
* persist, hash, log, or include it in a signed network projection. The native
|
|
9
10
|
* Noise owner validates and uses the keys; these shapes confer no TUN readiness. */
|
|
10
11
|
export interface IGetRuntimeManagedVpnCredentialResponse extends IGetRuntimeManagedVpnCredentialRequest {
|
|
11
|
-
transport:
|
|
12
|
-
|
|
12
|
+
transport: TRuntimeNetworkVpnTransport;
|
|
13
|
+
/** The cluster hub endpoint this node dials, named by the id its signed projection selected. */
|
|
14
|
+
hub: {
|
|
13
15
|
id: string;
|
|
14
16
|
address: string;
|
|
15
17
|
port: number;
|
|
16
18
|
};
|
|
19
|
+
/**
|
|
20
|
+
* The TLS name the hub's WebSocket transport is dialled under, present exactly when `transport`
|
|
21
|
+
* is `websocket` and absent otherwise: QUIC is dialled on the address alone. It is the hub
|
|
22
|
+
* relay's own origin hostname, which the node cross-checks against the relay origin it stores,
|
|
23
|
+
* so a name the node does not already trust ends the handshake before any native effect.
|
|
24
|
+
*/
|
|
25
|
+
serverName?: string;
|
|
17
26
|
authorityId: string;
|
|
18
27
|
serverPublicKey: string;
|
|
19
28
|
clientPublicKey: string;
|
|
@@ -29,8 +38,8 @@ export declare const snapshotGetRuntimeManagedVpnCredentialResponse: (value: unk
|
|
|
29
38
|
/** Content binding only. The caller must resolve the exact current projection
|
|
30
39
|
* and authenticate/fence the current physical peer before and after native work. */
|
|
31
40
|
export declare const bindGetRuntimeManagedVpnCredentialRequest: (value: unknown, projectionValue: unknown, trustedSessionValue: unknown) => Promise<IGetRuntimeManagedVpnCredentialRequest>;
|
|
32
|
-
/** Bind the secret response to the original request and exact selected router
|
|
33
|
-
*
|
|
41
|
+
/** Bind the secret response to the original request and the exact selected router
|
|
42
|
+
* endpoint of the credential's transport, inside the projection's effective DNS window. renewalValue is the
|
|
34
43
|
* bare lease renewal the caller already verified and admitted for this exact
|
|
35
44
|
* projection, or null; this helper verifies no signature. Time is caller-qualified;
|
|
36
45
|
* this helper does not sample a clock, authenticate a transport, admit policy or
|
|
@@ -1,28 +1,44 @@
|
|
|
1
|
+
import { runtimeNetworkAddressPlanContract } from './networkaddressplan.js';
|
|
1
2
|
import { snapshotRuntimeSessionBinding } from './runtimesession.js';
|
|
2
3
|
import { validateRuntimeNetworkProjection } from './networkprojection.js';
|
|
3
4
|
import { snapshotRuntimeNetworkDnsLeaseRenewal, validateRuntimeNetworkDnsLeaseRenewal } from './networklease.js';
|
|
4
|
-
import { captureNetwork, failNetwork, networkCounter, networkEffectiveDnsWindow, networkEqual, networkId, networkIpv4, networkRecord, networkReference, networkReferenceOf, networkSafe, networkSameScope, requireNetwork } from '../private/networkcontract.js';
|
|
5
|
-
/** Canonical 32-byte key encoding only. Cryptographic key agreement and pair
|
|
6
|
-
* validation belong to the native Noise implementation, not this JSON parser. */
|
|
7
|
-
const key = (value) => {
|
|
8
|
-
requireNetwork(typeof value === 'string' && /^[A-Za-z0-9+/]{43}=$/.test(value));
|
|
9
|
-
const decoded = atob(value);
|
|
10
|
-
requireNetwork(decoded.length === 32 && btoa(decoded) === value && [...decoded].some(byte => byte.charCodeAt(0) !== 0));
|
|
11
|
-
return value;
|
|
12
|
-
};
|
|
5
|
+
import { captureNetwork, failNetwork, networkCounter, networkEffectiveDnsWindow, networkEqual, networkId, networkIpv4, networkNoiseKey, networkRecord, networkReference, networkReferenceOf, networkSafe, networkSameScope, requireNetwork } from '../private/networkcontract.js';
|
|
13
6
|
export const snapshotGetRuntimeManagedVpnCredentialRequest = (value) => networkSafe(() => {
|
|
14
7
|
const item = networkRecord(captureNetwork(value), ['session', 'projection']);
|
|
15
8
|
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection) };
|
|
16
9
|
});
|
|
10
|
+
/**
|
|
11
|
+
* The TLS name a WebSocket hub is dialled under: a lower-case domain name of at least two labels,
|
|
12
|
+
* which is what a relay origin's hostname is and what a certificate can be issued for. An address
|
|
13
|
+
* literal is not one, so a node can never be sent to a name nothing vouches for.
|
|
14
|
+
*/
|
|
15
|
+
const serverName = (value) => {
|
|
16
|
+
requireNetwork(typeof value === 'string' && value.length <= 253);
|
|
17
|
+
const labels = value.split('.');
|
|
18
|
+
// The last label starts with a letter, which is what makes this a name and not an address
|
|
19
|
+
// literal: a hub reached by address is reached over QUIC, which needs no name at all.
|
|
20
|
+
requireNetwork(labels.length >= 2 && labels.every(label => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label))
|
|
21
|
+
&& /^[a-z]/.test(labels[labels.length - 1]));
|
|
22
|
+
return value;
|
|
23
|
+
};
|
|
24
|
+
const transportOf = (value) => {
|
|
25
|
+
const row = runtimeNetworkAddressPlanContract.hubTransports.find(candidate => candidate.transport === value);
|
|
26
|
+
requireNetwork(row);
|
|
27
|
+
return row.transport;
|
|
28
|
+
};
|
|
17
29
|
export const snapshotGetRuntimeManagedVpnCredentialResponse = (value) => networkSafe(() => {
|
|
18
|
-
const item = networkRecord(captureNetwork(value), ['session', 'projection', 'transport', '
|
|
19
|
-
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']);
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
30
|
+
const item = networkRecord(captureNetwork(value), ['session', 'projection', 'transport', 'hub', 'authorityId',
|
|
31
|
+
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt'], ['serverName']);
|
|
32
|
+
const hub = networkRecord(item.hub, ['id', 'address', 'port']), transport = transportOf(item.transport);
|
|
33
|
+
// A name belongs to the one transport that is dialled by name; stating it for QUIC would name a
|
|
34
|
+
// trust the node never checks, and omitting it for WebSocket leaves the TLS identity unstated.
|
|
35
|
+
requireNetwork(Object.hasOwn(item, 'serverName') === (transport === 'websocket'));
|
|
36
|
+
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection), transport,
|
|
37
|
+
hub: { id: networkId(hub.id), address: networkIpv4(hub.address), port: networkCounter(hub.port, 65535) },
|
|
38
|
+
...(transport === 'websocket' ? { serverName: serverName(item.serverName) } : {}),
|
|
39
|
+
authorityId: networkId(item.authorityId), serverPublicKey: networkNoiseKey(item.serverPublicKey),
|
|
40
|
+
clientPublicKey: networkNoiseKey(item.clientPublicKey), clientPrivateKey: networkNoiseKey(item.clientPrivateKey),
|
|
41
|
+
expiresAt: networkCounter(item.expiresAt) };
|
|
26
42
|
});
|
|
27
43
|
const bindRequest = (request, projection, trusted) => {
|
|
28
44
|
requireNetwork(networkEqual(request.session, trusted) && networkEqual(request.projection, networkReferenceOf(projection))
|
|
@@ -42,8 +58,8 @@ export const bindGetRuntimeManagedVpnCredentialRequest = async (value, projectio
|
|
|
42
58
|
return failNetwork();
|
|
43
59
|
}
|
|
44
60
|
};
|
|
45
|
-
/** Bind the secret response to the original request and exact selected router
|
|
46
|
-
*
|
|
61
|
+
/** Bind the secret response to the original request and the exact selected router
|
|
62
|
+
* endpoint of the credential's transport, inside the projection's effective DNS window. renewalValue is the
|
|
47
63
|
* bare lease renewal the caller already verified and admitted for this exact
|
|
48
64
|
* projection, or null; this helper verifies no signature. Time is caller-qualified;
|
|
49
65
|
* this helper does not sample a clock, authenticate a transport, admit policy or
|
|
@@ -59,9 +75,11 @@ export const bindGetRuntimeManagedVpnCredentialResponse = async (value, requestV
|
|
|
59
75
|
const window = networkEffectiveDnsWindow(projection, renewal);
|
|
60
76
|
bindRequest(request, projection, trusted);
|
|
61
77
|
requireNetwork(networkEqual(response.session, request.session) && networkEqual(response.projection, request.projection));
|
|
62
|
-
requireNetwork(projection.router?.platformEndpointIds.includes(response.
|
|
63
|
-
const endpoint = projection.protectedAuthority.platformEndpoints.find(item => item.id === response.
|
|
64
|
-
|
|
78
|
+
requireNetwork(projection.router?.platformEndpointIds.includes(response.hub.id));
|
|
79
|
+
const endpoint = projection.protectedAuthority.platformEndpoints.find(item => item.id === response.hub.id);
|
|
80
|
+
const expected = runtimeNetworkAddressPlanContract.hubTransports.find(row => row.transport === response.transport);
|
|
81
|
+
requireNetwork(endpoint && expected && endpoint.protocol === expected.protocol
|
|
82
|
+
&& endpoint.address === response.hub.address && endpoint.port === response.hub.port);
|
|
65
83
|
requireNetwork(window.notBefore <= now && now < response.expiresAt && response.expiresAt <= window.expiresAt);
|
|
66
84
|
return response;
|
|
67
85
|
}
|
|
@@ -69,4 +87,4 @@ export const bindGetRuntimeManagedVpnCredentialResponse = async (value, requestV
|
|
|
69
87
|
return failNetwork();
|
|
70
88
|
}
|
|
71
89
|
};
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya2NyZWRlbnRpYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL25ldHdvcmtjcmVkZW50aWFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxpQ0FBaUMsRUFBb0MsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RyxPQUFPLEVBQUUsNkJBQTZCLEVBQStCLE1BQU0scUJBQXFCLENBQUM7QUFDakcsT0FBTyxFQUFFLGdDQUFnQyxFQUFrQyxNQUFNLHdCQUF3QixDQUFDO0FBQzFHLE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pILE9BQU8sRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSx5QkFBeUIsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFDbkgsZUFBZSxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQ25HLGNBQWMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBZ0N4RCxNQUFNLENBQUMsTUFBTSw2Q0FBNkMsR0FBRyxDQUFDLEtBQWMsRUFBMEMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7SUFDeEksTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQzdFLE9BQU8sRUFBRSxPQUFPLEVBQUUsNkJBQTZCLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztBQUNqSCxDQUFDLENBQUMsQ0FBQztBQUVIOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsR0FBRyxDQUFDLEtBQWMsRUFBVSxFQUFFO0lBQzVDLGNBQWMsQ0FBQyxPQUFPLEtBQUssS0FBSyxR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QUMsR0FBRyxDQUFDLFNBQVMsS0FBSyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbkgsY0FBYyxDQUFDLFFBQVEsSUFBSSxRQUFRLElBQUksUUFBUSxDQUFDLFFBQVEsS0FBSyxRQUFRLENBQUMsUUFBUTtlQUN6RSxRQUFRLENBQUMsT0FBTyxLQUFLLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxJQUFJLFFBQVEsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RixjQUFjLENBQUMsTUFBTSxDQUFDLFNBQVMsSUFBSSxHQUFHLElBQUksR0FBRyxHQUFHLFFBQVEsQ0FBQyxTQUFTLElBQUksUUFBUSxDQUFDLFNBQVMsSUFBSSxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUcsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUFDLE9BQU8sV0FBVyxFQUFFLENBQUM7SUFBQyxDQUFDO0FBQ25DLENBQUMsQ0FBQyJ9
|
|
@@ -41,7 +41,20 @@ export interface IRuntimeAssignment extends IRuntimeAssignmentScope {
|
|
|
41
41
|
/** No automatic relocation or expiry-based claim of a stopped writer. */
|
|
42
42
|
offlinePolicy: 'continue-node-bound';
|
|
43
43
|
workload: {
|
|
44
|
+
/**
|
|
45
|
+
* The registry that published this image, which is the publication identity the image release
|
|
46
|
+
* is bound to. It is never rewritten: only `pullEndpoint` decides where the bytes are fetched.
|
|
47
|
+
*/
|
|
44
48
|
registryHost: string;
|
|
49
|
+
/**
|
|
50
|
+
* Where this node fetches the image instead of `registryHost`, as `host[:port]`.
|
|
51
|
+
*
|
|
52
|
+
* A cluster whose relay forwards the registry states the relay's own origin here, so a node
|
|
53
|
+
* pulls inside its cluster and nothing cluster-side dials the control plane. Absent when the
|
|
54
|
+
* node pulls from the publishing registry itself. The reference stays digest-pinned either
|
|
55
|
+
* way, so the endpoint decides reachability and never content.
|
|
56
|
+
*/
|
|
57
|
+
pullEndpoint?: string;
|
|
45
58
|
repository: string;
|
|
46
59
|
imageDigest: TSha256Digest;
|
|
47
60
|
platform: TImmutableContainerPlatform;
|
|
@@ -70,6 +83,16 @@ export type TRuntimeWorkloadAuthority = (typeof runtimeWorkloadAuthorities)[numb
|
|
|
70
83
|
* `TypeError` out of a member read.
|
|
71
84
|
*/
|
|
72
85
|
export declare const requiredWorkloadAuthorities: (workloadArg: IRuntimeAssignment["workload"]) => TRuntimeWorkloadAuthority[];
|
|
86
|
+
/**
|
|
87
|
+
* The digest-pinned image reference a node pulls this workload by.
|
|
88
|
+
*
|
|
89
|
+
* One function decides where the bytes come from: the stated `pullEndpoint`, else the publishing
|
|
90
|
+
* `registryHost`. The digest is the same either way, so a node that pulls through its cluster's
|
|
91
|
+
* relay fetches exactly the content the publishing registry named, and a controller and a node can
|
|
92
|
+
* never disagree about the reference. The workload is read as a wire value, so one whose members
|
|
93
|
+
* this contract refuses is refused here rather than by a member read.
|
|
94
|
+
*/
|
|
95
|
+
export declare const buildRuntimeAssignmentImageReference: (workloadArg: IRuntimeAssignment["workload"]) => string;
|
|
73
96
|
/** True when a value is exactly a canonical authority list drawn from the authority vocabulary. */
|
|
74
97
|
export declare const isResolvedWorkloadAuthorities: (valueArg: unknown) => valueArg is TRuntimeWorkloadAuthority[];
|
|
75
98
|
export type TRuntimeAssignmentDecision = {
|
|
@@ -22,13 +22,34 @@ const workloadAuthorityDemands = Object.freeze({
|
|
|
22
22
|
* `TypeError` out of a member read.
|
|
23
23
|
*/
|
|
24
24
|
export const requiredWorkloadAuthorities = (workloadArg) => {
|
|
25
|
-
if (!isExactRecord(workloadArg, workloadKeys) || !Array.isArray(workloadArg.storage)) {
|
|
25
|
+
if (!isExactRecord(workloadArg, workloadKeys, optionalWorkloadKeys) || !Array.isArray(workloadArg.storage)) {
|
|
26
26
|
fail(workloadSchemaMessage);
|
|
27
27
|
}
|
|
28
28
|
return runtimeWorkloadAuthorities
|
|
29
29
|
.filter((authorityArg) => workloadAuthorityDemands[authorityArg](workloadArg))
|
|
30
30
|
.sort(compareWireTokens);
|
|
31
31
|
};
|
|
32
|
+
/**
|
|
33
|
+
* The digest-pinned image reference a node pulls this workload by.
|
|
34
|
+
*
|
|
35
|
+
* One function decides where the bytes come from: the stated `pullEndpoint`, else the publishing
|
|
36
|
+
* `registryHost`. The digest is the same either way, so a node that pulls through its cluster's
|
|
37
|
+
* relay fetches exactly the content the publishing registry named, and a controller and a node can
|
|
38
|
+
* never disagree about the reference. The workload is read as a wire value, so one whose members
|
|
39
|
+
* this contract refuses is refused here rather than by a member read.
|
|
40
|
+
*/
|
|
41
|
+
export const buildRuntimeAssignmentImageReference = (workloadArg) => {
|
|
42
|
+
if (!isExactRecord(workloadArg, workloadKeys, optionalWorkloadKeys)) {
|
|
43
|
+
fail(workloadSchemaMessage);
|
|
44
|
+
}
|
|
45
|
+
const endpoint = Object.hasOwn(workloadArg, 'pullEndpoint')
|
|
46
|
+
? workloadArg.pullEndpoint : workloadArg.registryHost;
|
|
47
|
+
if (typeof endpoint !== 'string' || typeof workloadArg.repository !== 'string'
|
|
48
|
+
|| !isDigest(workloadArg.imageDigest)) {
|
|
49
|
+
fail(workloadSchemaMessage);
|
|
50
|
+
}
|
|
51
|
+
return buildDigestPinnedImageReference(endpoint, workloadArg.repository, workloadArg.imageDigest);
|
|
52
|
+
};
|
|
32
53
|
/** True when a value is exactly a canonical authority list drawn from the authority vocabulary. */
|
|
33
54
|
export const isResolvedWorkloadAuthorities = (valueArg) => isCanonicalTokenList(valueArg, runtimeWorkloadAuthorities);
|
|
34
55
|
export const runtimeAssignmentContract = Object.freeze({
|
|
@@ -42,17 +63,22 @@ const fail = (messageArg) => { throw new Error(messageArg); };
|
|
|
42
63
|
const isIdentifier = (valueArg) => typeof valueArg === 'string' && /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/.test(valueArg);
|
|
43
64
|
const isPositiveInteger = (valueArg) => typeof valueArg === 'number' && Number.isSafeInteger(valueArg) && valueArg > 0;
|
|
44
65
|
const isDigest = (valueArg) => typeof valueArg === 'string' && isSha256Digest(valueArg);
|
|
45
|
-
/**
|
|
46
|
-
|
|
66
|
+
/**
|
|
67
|
+
* Reject accessors before reading any fields; do not run input-owned code.
|
|
68
|
+
*
|
|
69
|
+
* Absence stays absence: a stated optional key is read, an omitted one is not defaulted, so a
|
|
70
|
+
* controller that stated nothing is distinguishable from one that stated a value.
|
|
71
|
+
*/
|
|
72
|
+
const isExactRecord = (valueArg, keysArg, optionalKeysArg = []) => {
|
|
47
73
|
if (!valueArg || typeof valueArg !== 'object' || Array.isArray(valueArg))
|
|
48
74
|
return false;
|
|
49
75
|
const prototype = Object.getPrototypeOf(valueArg);
|
|
50
76
|
if (prototype !== Object.prototype && prototype !== null)
|
|
51
77
|
return false;
|
|
52
78
|
const keys = Reflect.ownKeys(valueArg);
|
|
53
|
-
return
|
|
79
|
+
return keysArg.every((keyArg) => keys.includes(keyArg)) && keys.every((keyArg) => {
|
|
54
80
|
const descriptor = Object.getOwnPropertyDescriptor(valueArg, keyArg);
|
|
55
|
-
return typeof keyArg === 'string' && keysArg.includes(keyArg)
|
|
81
|
+
return typeof keyArg === 'string' && (keysArg.includes(keyArg) || optionalKeysArg.includes(keyArg))
|
|
56
82
|
&& descriptor?.enumerable === true && Object.hasOwn(descriptor, 'value');
|
|
57
83
|
});
|
|
58
84
|
};
|
|
@@ -67,6 +93,8 @@ const isAssignmentReference = (valueArg) => isExactRecord(valueArg, ['assignment
|
|
|
67
93
|
/** The workload's exact members, read by the authority vocabulary and by the snapshot alike. */
|
|
68
94
|
const workloadKeys = ['registryHost', 'repository', 'imageDigest', 'platform',
|
|
69
95
|
'config', 'network', 'secrets', 'storage'];
|
|
96
|
+
/** Stated only by a controller that sends the node somewhere else for the image bytes. */
|
|
97
|
+
const optionalWorkloadKeys = ['pullEndpoint'];
|
|
70
98
|
const workloadSchemaMessage = 'runtime assignment workload must use exact immutable references';
|
|
71
99
|
const assignmentKeys = [
|
|
72
100
|
'controller', 'organizationId', 'nodeId', 'runtimeNamespace',
|
|
@@ -96,8 +124,10 @@ const assertAssignment = (valueArg) => {
|
|
|
96
124
|
fail('runtime assignment must bind its exact preceding generation');
|
|
97
125
|
}
|
|
98
126
|
const workload = valueArg.workload;
|
|
99
|
-
if (!isExactRecord(workload, workloadKeys)
|
|
127
|
+
if (!isExactRecord(workload, workloadKeys, optionalWorkloadKeys)
|
|
100
128
|
|| typeof workload.registryHost !== 'string' || workload.registryHost.length > 253
|
|
129
|
+
|| (Object.hasOwn(workload, 'pullEndpoint')
|
|
130
|
+
&& (typeof workload.pullEndpoint !== 'string' || workload.pullEndpoint.length > 253))
|
|
101
131
|
|| typeof workload.repository !== 'string' || workload.repository.length > 255
|
|
102
132
|
|| !isDigest(workload.imageDigest)
|
|
103
133
|
|| !['linux/amd64', 'linux/arm64'].includes(workload.platform)
|
|
@@ -109,6 +139,11 @@ const assertAssignment = (valueArg) => {
|
|
|
109
139
|
fail(workloadSchemaMessage);
|
|
110
140
|
}
|
|
111
141
|
buildDigestPinnedImageReference(workload.registryHost, workload.repository, workload.imageDigest);
|
|
142
|
+
// The pull endpoint is an OCI registry host like the publishing one, so the same reference the
|
|
143
|
+
// node builds proves it: an endpoint no reference can name is refused where it is written.
|
|
144
|
+
if (Object.hasOwn(workload, 'pullEndpoint')) {
|
|
145
|
+
buildDigestPinnedImageReference(workload.pullEndpoint, workload.repository, workload.imageDigest);
|
|
146
|
+
}
|
|
112
147
|
let previousId = '';
|
|
113
148
|
for (let index = 0; index < workload.storage.length; index++) {
|
|
114
149
|
const descriptor = Object.getOwnPropertyDescriptor(workload.storage, String(index));
|
|
@@ -310,4 +345,4 @@ export const evaluateRuntimeAssignmentObservation = async (incomingArg, accepted
|
|
|
310
345
|
return { status: 'reject', reason: 'invalid' };
|
|
311
346
|
}
|
|
312
347
|
};
|
|
313
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimeassignment.js","sourceRoot":"","sources":["../../ts/data/runtimeassignment.ts"],"names":[],"mappings":"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"}
|
|
348
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimeassignment.js","sourceRoot":"","sources":["../../ts/data/runtimeassignment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TAppStoreStorageRequest } from '../appstore/types.js';
|
|
1
2
|
import type { TSecretManagementScope } from '../data/secret.js';
|
|
2
3
|
/**
|
|
3
4
|
* Backend-neutral storage vocabulary shared by App Store manifests, control
|
|
@@ -187,6 +188,24 @@ export type TResolvedStorageBinding = IResolvedFilesystemStorageBinding | IResol
|
|
|
187
188
|
export declare class StorageContractError extends Error {
|
|
188
189
|
constructor(reasonArg: string);
|
|
189
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* The one judgement of what a storage request is: the request read against its exact schema and
|
|
193
|
+
* returned in its contract shape — required members present, optional members carried only when
|
|
194
|
+
* the request declares them, and every value within the bounds an adapter can fulfil.
|
|
195
|
+
*
|
|
196
|
+
* A control plane that admits requests, a fulfillment adapter that provisions them, and an App
|
|
197
|
+
* Store front end that assembles them all have to agree on the same acceptance rules; a second
|
|
198
|
+
* copy of them anywhere is a second answer to which requests exist, and the digest one side issues
|
|
199
|
+
* would name a request the other never accepted. `canonicalizeStorageRequest` and
|
|
200
|
+
* `createStorageRequestSha256` are derived from this function rather than the other way round, so
|
|
201
|
+
* a consumer that needs the judged request itself does not have to re-parse its own canonical
|
|
202
|
+
* bytes.
|
|
203
|
+
*
|
|
204
|
+
* The returned request is a fresh value; the input is never read again after normalization and
|
|
205
|
+
* never mutated. Anything that is not a storage request is refused with `StorageContractError`,
|
|
206
|
+
* whose message names the failing field so a consumer can map it to its own status vocabulary.
|
|
207
|
+
*/
|
|
208
|
+
export declare const normalizeStorageRequest: (valueArg: unknown) => TAppStoreStorageRequest;
|
|
190
209
|
/**
|
|
191
210
|
* The exact bytes a storage request's digest is taken over: the request normalized to its contract
|
|
192
211
|
* shape, written as strict canonical JSON — keys in UTF-16 code-unit order, no whitespace, no
|
|
@@ -16,7 +16,27 @@ export class StorageContractError extends Error {
|
|
|
16
16
|
const fail = (reasonArg) => {
|
|
17
17
|
throw new StorageContractError(reasonArg);
|
|
18
18
|
};
|
|
19
|
-
const { normalizeStorageRequest } = createStorageContractReaders(fail);
|
|
19
|
+
const { normalizeStorageRequest: readStorageRequest } = createStorageContractReaders(fail);
|
|
20
|
+
/**
|
|
21
|
+
* The one judgement of what a storage request is: the request read against its exact schema and
|
|
22
|
+
* returned in its contract shape — required members present, optional members carried only when
|
|
23
|
+
* the request declares them, and every value within the bounds an adapter can fulfil.
|
|
24
|
+
*
|
|
25
|
+
* A control plane that admits requests, a fulfillment adapter that provisions them, and an App
|
|
26
|
+
* Store front end that assembles them all have to agree on the same acceptance rules; a second
|
|
27
|
+
* copy of them anywhere is a second answer to which requests exist, and the digest one side issues
|
|
28
|
+
* would name a request the other never accepted. `canonicalizeStorageRequest` and
|
|
29
|
+
* `createStorageRequestSha256` are derived from this function rather than the other way round, so
|
|
30
|
+
* a consumer that needs the judged request itself does not have to re-parse its own canonical
|
|
31
|
+
* bytes.
|
|
32
|
+
*
|
|
33
|
+
* The returned request is a fresh value; the input is never read again after normalization and
|
|
34
|
+
* never mutated. Anything that is not a storage request is refused with `StorageContractError`,
|
|
35
|
+
* whose message names the failing field so a consumer can map it to its own status vocabulary.
|
|
36
|
+
*/
|
|
37
|
+
export const normalizeStorageRequest = (valueArg) => {
|
|
38
|
+
return readStorageRequest(valueArg, 'storage request');
|
|
39
|
+
};
|
|
20
40
|
/**
|
|
21
41
|
* The exact bytes a storage request's digest is taken over: the request normalized to its contract
|
|
22
42
|
* shape, written as strict canonical JSON — keys in UTF-16 code-unit order, no whitespace, no
|
|
@@ -26,7 +46,7 @@ const { normalizeStorageRequest } = createStorageContractReaders(fail);
|
|
|
26
46
|
* unjudged body would name a request no adapter could fulfil.
|
|
27
47
|
*/
|
|
28
48
|
export const canonicalizeStorageRequest = (valueArg) => {
|
|
29
|
-
return canonicalizeStrictJson(normalizeStorageRequest(valueArg
|
|
49
|
+
return canonicalizeStrictJson(normalizeStorageRequest(valueArg), fail);
|
|
30
50
|
};
|
|
31
51
|
/**
|
|
32
52
|
* The storage request digest: bare lowercase hex SHA-256 over the canonical request, with no
|
|
@@ -41,4 +61,4 @@ export const createStorageRequestSha256 = async (valueArg) => {
|
|
|
41
61
|
return createCanonicalJsonSha256Hex(canonicalizeStorageRequest(valueArg), fail);
|
|
42
62
|
};
|
|
43
63
|
export { storageRequestCanonicalDigestGoldenVectors, } from './storage.golden.js';
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsYXRmb3JtL3N0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUNMLHNCQUFzQixFQUN0Qiw0QkFBNEIsR0FDN0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNyQyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQVE3RTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxnQ0FBZ0MsR0FBRztJQUM5QyxhQUFhLEVBQUUsZUFBZTtDQUN0QixDQUFDO0FBaU9YLE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxLQUFLO0lBQzdDLFlBQW1CLFNBQWlCO1FBQ2xDLEtBQUssQ0FBQywyQkFBMkIsU0FBUyxFQUFFLENBQUMsQ0FBQztRQUM5QyxJQUFJLENBQUMsSUFBSSxHQUFHLHNCQUFzQixDQUFDO0lBQ3JDLENBQUM7Q0FDRjtBQUVELE1BQU0sSUFBSSxHQUFHLENBQUMsU0FBaUIsRUFBUyxFQUFFO0lBQ3hDLE1BQU0sSUFBSSxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUM7QUFFRixNQUFNLEVBQUUsdUJBQXVCLEVBQUUsa0JBQWtCLEVBQUUsR0FDbkQsNEJBQTRCLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFckM7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUNyQyxRQUFpQixFQUNRLEVBQUU7SUFDM0IsT0FBTyxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUN6RCxDQUFDLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxRQUFpQixFQUFVLEVBQUU7SUFDdEUsT0FBTyxzQkFBc0IsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUN6RSxDQUFDLENBQUM7QUFFRjs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLEtBQUssRUFDN0MsUUFBaUIsRUFDQSxFQUFFO0lBQ25CLE9BQU8sNEJBQTRCLENBQUMsMEJBQTBCLENBQUMsUUFBUSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDbEYsQ0FBQyxDQUFDO0FBRUYsT0FBTyxFQUNMLDBDQUEwQyxHQUUzQyxNQUFNLHFCQUFxQixDQUFDIn0=
|
|
@@ -17,6 +17,12 @@ export declare const networkCounter: (value: unknown, maximum?: number) => numbe
|
|
|
17
17
|
export declare const networkDigest: (value: unknown) => TSha256Digest;
|
|
18
18
|
/** One encoding for every Ed25519 signature this contract carries: lowercase hex, 64 bytes. */
|
|
19
19
|
export declare const networkSignature: (value: unknown) => string;
|
|
20
|
+
/**
|
|
21
|
+
* One encoding for every Noise key this contract carries — the managed VPN credential's, a relay's
|
|
22
|
+
* hub advertisement and a cluster's VPN network: canonical 32-byte base64, never the all-zero key.
|
|
23
|
+
* Key agreement and key-pair validation belong to the native Noise implementation, not to a reader.
|
|
24
|
+
*/
|
|
25
|
+
export declare const networkNoiseKey: (value: unknown) => string;
|
|
20
26
|
export declare const networkController: (value: unknown) => IRuntimeController;
|
|
21
27
|
export declare const networkScope: (item: Record<string, unknown>) => IRuntimeNetworkNodeScope;
|
|
22
28
|
export declare const networkSameScope: (left: IRuntimeNetworkNodeScope, right: IRuntimeNetworkNodeScope) => boolean;
|
|
@@ -101,6 +101,17 @@ export const networkSignature = (value) => {
|
|
|
101
101
|
requireNetwork(typeof value === 'string' && /^[a-f0-9]{128}$/.test(value));
|
|
102
102
|
return value;
|
|
103
103
|
};
|
|
104
|
+
/**
|
|
105
|
+
* One encoding for every Noise key this contract carries — the managed VPN credential's, a relay's
|
|
106
|
+
* hub advertisement and a cluster's VPN network: canonical 32-byte base64, never the all-zero key.
|
|
107
|
+
* Key agreement and key-pair validation belong to the native Noise implementation, not to a reader.
|
|
108
|
+
*/
|
|
109
|
+
export const networkNoiseKey = (value) => {
|
|
110
|
+
requireNetwork(typeof value === 'string' && /^[A-Za-z0-9+/]{43}=$/.test(value));
|
|
111
|
+
const decoded = atob(value);
|
|
112
|
+
requireNetwork(decoded.length === 32 && btoa(decoded) === value && [...decoded].some(byte => byte.charCodeAt(0) !== 0));
|
|
113
|
+
return value;
|
|
114
|
+
};
|
|
104
115
|
export const networkController = (value) => {
|
|
105
116
|
const item = networkRecord(value, ['kind', 'id', 'epoch']);
|
|
106
117
|
requireNetwork(item.kind === 'cloudly' || item.kind === 'onebox');
|
|
@@ -179,4 +190,4 @@ export const networkOverlaps = (left, right) => {
|
|
|
179
190
|
const [a, b] = networkPrefixBounds(left), [c, d] = networkPrefixBounds(right);
|
|
180
191
|
return a <= d && c <= b;
|
|
181
192
|
};
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkcontract.js","sourceRoot":"","sources":["../../ts/private/networkcontract.ts"],"names":[],"mappings":"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"}
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkcontract.js","sourceRoot":"","sources":["../../ts/private/networkcontract.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as userInterfaces from '../data/user.js';
|
|
2
2
|
import * as clusterInterfaces from '../data/cluster.js';
|
|
3
|
+
import type * as clusterVpnInterfaces from '../data/clustervpn.js';
|
|
3
4
|
import type { IClusterRuntime, TClusterRuntimeBlocker } from '../data/clusterruntime.js';
|
|
4
5
|
import type { IServiceRuntimeAssignmentView } from '../data/serviceruntime.js';
|
|
5
6
|
import type * as leaseInterfaces from '../data/networklease.js';
|
|
@@ -130,6 +131,32 @@ export interface IReq_Cloudly_Relay_HoldRuntimeNetworkDnsLeaseRenewals extends p
|
|
|
130
131
|
request: leaseInterfaces.IHoldRuntimeNetworkDnsLeaseRenewalsRequest;
|
|
131
132
|
response: leaseInterfaces.IHoldRuntimeNetworkDnsLeaseRenewalsResponse;
|
|
132
133
|
}
|
|
134
|
+
/**
|
|
135
|
+
* Cloudly pushes one cluster's complete managed VPN to that cluster's relay.
|
|
136
|
+
*
|
|
137
|
+
* The relay is its cluster's own hub: it runs the managed VPN server every node of the cluster
|
|
138
|
+
* dials, so this is the whole authority that hub serves, never a patch. It rides the relay's
|
|
139
|
+
* already registered session, which is why no cluster is named — the socket names it. The relay
|
|
140
|
+
* answers with what its hub applied, and refuses a network for another authority or a revision it
|
|
141
|
+
* has passed with one of `data.applyClusterVpnNetworkRefusals`.
|
|
142
|
+
*/
|
|
143
|
+
export interface IReq_Cloudly_Relay_ApplyClusterVpnNetwork extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_Relay_ApplyClusterVpnNetwork> {
|
|
144
|
+
method: 'applyClusterVpnNetwork';
|
|
145
|
+
request: clusterVpnInterfaces.IApplyClusterVpnNetworkRequest;
|
|
146
|
+
response: clusterVpnInterfaces.IApplyClusterVpnNetworkResponse;
|
|
147
|
+
}
|
|
148
|
+
/**
|
|
149
|
+
* The relay asks Cloudly for its cluster's current managed VPN.
|
|
150
|
+
*
|
|
151
|
+
* A hub daemon starts empty and its lifetime is the relay's own, invisible to Cloudly, so a relay
|
|
152
|
+
* that just bound its hub pulls the current network instead of waiting for the next push. The
|
|
153
|
+
* answer is `null` while the cluster has none.
|
|
154
|
+
*/
|
|
155
|
+
export interface IReq_Relay_Cloudly_GetClusterVpnNetwork extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Relay_Cloudly_GetClusterVpnNetwork> {
|
|
156
|
+
method: 'getClusterVpnNetwork';
|
|
157
|
+
request: clusterVpnInterfaces.TGetClusterVpnNetworkRequest;
|
|
158
|
+
response: clusterVpnInterfaces.IGetClusterVpnNetworkResponse;
|
|
159
|
+
}
|
|
133
160
|
/**
|
|
134
161
|
* deletes a cluster
|
|
135
162
|
*/
|