@serve.zone/interfaces 32.3.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 +46 -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/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/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 +104 -21
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/cluster.ts +76 -1
- 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/private/networkcontract.ts +11 -0
- package/ts/requests/cluster.ts +35 -0
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { IRuntimeNetworkProtectedAuthority } from './networkauthority.js';
|
|
2
|
-
import type { IGetRuntimeManagedVpnCredentialResponse } from './networkcredential.js';
|
|
3
2
|
/**
|
|
4
3
|
* The address space an administrator gives the runtime network, and the one input the protected
|
|
5
4
|
* authority is composed from. Cloudly keeps a single plan; pools and prefixes only grow, and the
|
|
@@ -13,15 +12,34 @@ export interface IRuntimeNetworkAddressPlan {
|
|
|
13
12
|
prefixes: string[];
|
|
14
13
|
pools: IRuntimeNetworkProtectedAuthority['pools'];
|
|
15
14
|
resolvers: IRuntimeNetworkProtectedAuthority['resolvers'];
|
|
16
|
-
/** Without the
|
|
15
|
+
/** Without the cluster hubs, which the composed authority adds from the hubs it is given. */
|
|
17
16
|
platformEndpoints: IRuntimeNetworkProtectedAuthority['platformEndpoints'];
|
|
18
17
|
vpn: {
|
|
19
18
|
/** The private prefix VPN control addresses are allocated from. */
|
|
20
19
|
controlPrefix: string;
|
|
21
|
-
/**
|
|
22
|
-
|
|
20
|
+
/**
|
|
21
|
+
* The protected prefix every cluster hub binds inside.
|
|
22
|
+
*
|
|
23
|
+
* The endpoints themselves are no administrator's input: a cluster's relay reports the one it
|
|
24
|
+
* bound and the composition turns it into platform endpoints, so this prefix is what an
|
|
25
|
+
* administrator reserves for them.
|
|
26
|
+
*/
|
|
27
|
+
hubPrefix: string;
|
|
23
28
|
};
|
|
24
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* One cluster's managed VPN hub, as the cluster's relay bound it.
|
|
32
|
+
*
|
|
33
|
+
* The hub is its cluster's own packet relay, so `clusterId` names both the hub and the authority
|
|
34
|
+
* that may select it, and `address` is an underlay address inside the plan's `vpn.hubPrefix`. A hub
|
|
35
|
+
* offers at least one transport; the port of a transport it did not bind is `null`.
|
|
36
|
+
*/
|
|
37
|
+
export interface IRuntimeNetworkVpnHub {
|
|
38
|
+
clusterId: string;
|
|
39
|
+
address: string;
|
|
40
|
+
quicPort: number | null;
|
|
41
|
+
websocketPort: number | null;
|
|
42
|
+
}
|
|
25
43
|
/** What an administrator writes; Cloudly supplies the id and the revision. */
|
|
26
44
|
export type TRuntimeNetworkAddressPlanWritableData = Omit<IRuntimeNetworkAddressPlan, 'id' | 'revision'>;
|
|
27
45
|
/** What a protection producer fixes around a plan: the authority's identity, revision chain and egress. */
|
|
@@ -54,20 +72,45 @@ export declare const runtimeNetworkAddressPlanContract: Readonly<{
|
|
|
54
72
|
* is stated: the private-range rule already keeps the control prefix at /8 or longer.
|
|
55
73
|
*/
|
|
56
74
|
readonly maximumControlPrefixLength: 30;
|
|
57
|
-
|
|
75
|
+
/**
|
|
76
|
+
* Every transport a hub may offer, in the order a node prefers them.
|
|
77
|
+
*
|
|
78
|
+
* One row states all three facts that belong together: the transport a credential names, the
|
|
79
|
+
* suffix its platform endpoint id carries, and the protocol the endpoint is composed with. A hub
|
|
80
|
+
* that bound both transports therefore contributes exactly two endpoints of one address.
|
|
81
|
+
*/
|
|
82
|
+
readonly hubTransports: readonly (Readonly<{
|
|
83
|
+
transport: "quic";
|
|
84
|
+
endpointSuffix: "quic";
|
|
85
|
+
protocol: "udp";
|
|
86
|
+
}> | Readonly<{
|
|
87
|
+
transport: "websocket";
|
|
88
|
+
endpointSuffix: "ws";
|
|
89
|
+
protocol: "tcp";
|
|
90
|
+
}>)[];
|
|
58
91
|
}>;
|
|
92
|
+
/** How a node reaches its cluster's hub, read off the one table that states the transports. */
|
|
93
|
+
export type TRuntimeNetworkVpnTransport = typeof runtimeNetworkAddressPlanContract.hubTransports[number]['transport'];
|
|
94
|
+
/**
|
|
95
|
+
* The platform endpoints one hub contributes to a protected authority: one per transport it bound,
|
|
96
|
+
* in id order. Every reader derives the same ids from this one function — the composition that seals
|
|
97
|
+
* the authority, and the router selection that names which of them a node may dial.
|
|
98
|
+
*/
|
|
99
|
+
export declare const runtimeNetworkVpnHubEndpoints: (hubValue: unknown) => IRuntimeNetworkProtectedAuthority["platformEndpoints"];
|
|
59
100
|
/**
|
|
60
|
-
* Structural snapshot for exact persistence and for a plan write.
|
|
61
|
-
*
|
|
62
|
-
*
|
|
101
|
+
* Structural snapshot for exact persistence and for a plan write. The plan's own sets pass the
|
|
102
|
+
* protected authority's own validator, so no plan can describe an authority that contract refuses,
|
|
103
|
+
* and both VPN prefixes are reserved inside the protected space the plan states.
|
|
63
104
|
*/
|
|
64
105
|
export declare const snapshotRuntimeNetworkAddressPlan: (value: unknown) => IRuntimeNetworkAddressPlan;
|
|
65
106
|
/**
|
|
66
107
|
* The protected authority a plan describes inside a producer's frame, digest included: the plan's
|
|
67
|
-
* sets
|
|
68
|
-
*
|
|
108
|
+
* sets plus the endpoints of every cluster hub it is given, each bound inside `vpn.hubPrefix`. One
|
|
109
|
+
* cluster contributes one hub, so `hubs` never names a cluster twice. All inputs are read before the
|
|
110
|
+
* digest is computed; an empty `hubs` composes the authority of a runtime network whose clusters
|
|
111
|
+
* have not registered a hub yet.
|
|
69
112
|
*/
|
|
70
|
-
export declare const composeRuntimeNetworkProtectedAuthority: (planValue: unknown, frameValue: unknown) => Promise<IRuntimeNetworkProtectedAuthority>;
|
|
113
|
+
export declare const composeRuntimeNetworkProtectedAuthority: (planValue: unknown, frameValue: unknown, hubsValue: unknown) => Promise<IRuntimeNetworkProtectedAuthority>;
|
|
71
114
|
/**
|
|
72
115
|
* The pure decision for replacing `previousValue`, the stored plan or null, with `nextValue` at the
|
|
73
116
|
* following revision. Leases and the managed VPN outlive a plan revision, so every pool stays exactly
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { computeRuntimeNetworkProtectedAuthorityDigest, snapshotRuntimeNetworkProtectedAuthority } from './networkauthority.js';
|
|
2
|
-
import { captureNetwork, failNetwork, networkContains, networkCounter, networkEqual, networkId, networkIpv4, networkOverlaps, networkPrefixBounds, networkPrivatePrefix, networkRecord, networkSafe, requireNetwork } from '../private/networkcontract.js';
|
|
1
|
+
import { computeRuntimeNetworkProtectedAuthorityDigest, runtimeNetworkAuthorityContract, snapshotRuntimeNetworkProtectedAuthority } from './networkauthority.js';
|
|
2
|
+
import { captureNetwork, failNetwork, networkContains, networkCounter, networkEqual, networkId, networkIpv4, networkList, networkOverlaps, networkPrefix, networkPrefixBounds, networkPrivatePrefix, networkRecord, networkSafe, requireNetwork } from '../private/networkcontract.js';
|
|
3
3
|
export const runtimeNetworkAddressPlanContract = Object.freeze({
|
|
4
4
|
id: 'address-plan',
|
|
5
5
|
/**
|
|
@@ -7,7 +7,42 @@ export const runtimeNetworkAddressPlanContract = Object.freeze({
|
|
|
7
7
|
* is stated: the private-range rule already keeps the control prefix at /8 or longer.
|
|
8
8
|
*/
|
|
9
9
|
maximumControlPrefixLength: 30,
|
|
10
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Every transport a hub may offer, in the order a node prefers them.
|
|
12
|
+
*
|
|
13
|
+
* One row states all three facts that belong together: the transport a credential names, the
|
|
14
|
+
* suffix its platform endpoint id carries, and the protocol the endpoint is composed with. A hub
|
|
15
|
+
* that bound both transports therefore contributes exactly two endpoints of one address.
|
|
16
|
+
*/
|
|
17
|
+
hubTransports: Object.freeze([
|
|
18
|
+
Object.freeze({ transport: 'quic', endpointSuffix: 'quic', protocol: 'udp' }),
|
|
19
|
+
Object.freeze({ transport: 'websocket', endpointSuffix: 'ws', protocol: 'tcp' }),
|
|
20
|
+
]),
|
|
21
|
+
});
|
|
22
|
+
/** The port a hub bound for one transport, or null when it did not bind that transport. */
|
|
23
|
+
const hubPort = (hub, transport) => transport === 'quic' ? hub.quicPort : hub.websocketPort;
|
|
24
|
+
const byEndpointId = (left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
|
|
25
|
+
const hubOf = (value) => {
|
|
26
|
+
const item = networkRecord(value, ['clusterId', 'address', 'quicPort', 'websocketPort']);
|
|
27
|
+
const port = (value) => value === null ? null : networkCounter(value, 65535);
|
|
28
|
+
const hub = { clusterId: networkId(item.clusterId), address: networkIpv4(item.address),
|
|
29
|
+
quicPort: port(item.quicPort), websocketPort: port(item.websocketPort) };
|
|
30
|
+
// A hub that bound no transport is not reachable, so it is not a hub a node could be sent to.
|
|
31
|
+
requireNetwork(runtimeNetworkAddressPlanContract.hubTransports.some(row => hubPort(hub, row.transport) !== null));
|
|
32
|
+
return hub;
|
|
33
|
+
};
|
|
34
|
+
/**
|
|
35
|
+
* The platform endpoints one hub contributes to a protected authority: one per transport it bound,
|
|
36
|
+
* in id order. Every reader derives the same ids from this one function — the composition that seals
|
|
37
|
+
* the authority, and the router selection that names which of them a node may dial.
|
|
38
|
+
*/
|
|
39
|
+
export const runtimeNetworkVpnHubEndpoints = (hubValue) => networkSafe(() => {
|
|
40
|
+
const hub = hubOf(captureNetwork(hubValue));
|
|
41
|
+
return runtimeNetworkAddressPlanContract.hubTransports
|
|
42
|
+
.filter(row => hubPort(hub, row.transport) !== null)
|
|
43
|
+
.map(row => ({ id: `${hub.clusterId}:${row.endpointSuffix}`, address: hub.address,
|
|
44
|
+
protocol: row.protocol, port: hubPort(hub, row.transport) }))
|
|
45
|
+
.sort(byEndpointId);
|
|
11
46
|
});
|
|
12
47
|
/**
|
|
13
48
|
* The structural authority validator reads a frame's shape and nothing else, and a plan fixes none of
|
|
@@ -23,28 +58,32 @@ const unsealedDigest = `sha256:${'0'.repeat(64)}`;
|
|
|
23
58
|
const authorityOf = (sets, frame) => snapshotRuntimeNetworkProtectedAuthority({ id: frame.id,
|
|
24
59
|
generation: frame.generation, controller: frame.controller, previous: frame.previous, egressAuthorities: frame.egressAuthorities,
|
|
25
60
|
prefixes: sets.prefixes, pools: sets.pools, resolvers: sets.resolvers, platformEndpoints: sets.platformEndpoints, digest: unsealedDigest });
|
|
26
|
-
const
|
|
61
|
+
const setsWithHubs = (plan, hubs) => ({
|
|
27
62
|
prefixes: plan.prefixes, pools: plan.pools, resolvers: plan.resolvers,
|
|
28
|
-
platformEndpoints: [...plan.platformEndpoints,
|
|
29
|
-
.sort((left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0),
|
|
63
|
+
platformEndpoints: [...plan.platformEndpoints, ...hubs.flatMap(runtimeNetworkVpnHubEndpoints)].sort(byEndpointId),
|
|
30
64
|
});
|
|
31
65
|
const vpnOf = (value) => {
|
|
32
|
-
const item = networkRecord(value, ['controlPrefix', '
|
|
33
|
-
const relay = networkRecord(item.relay, ['id', 'address', 'port']);
|
|
66
|
+
const item = networkRecord(value, ['controlPrefix', 'hubPrefix']);
|
|
34
67
|
const controlPrefix = networkPrivatePrefix(item.controlPrefix);
|
|
35
68
|
requireNetwork(Number(controlPrefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
36
|
-
return { controlPrefix,
|
|
69
|
+
return { controlPrefix, hubPrefix: networkPrefix(item.hubPrefix) };
|
|
37
70
|
};
|
|
38
|
-
/**
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
71
|
+
/**
|
|
72
|
+
* Both VPN prefixes are protected, they hold none of the plan's own pools, resolvers or platform
|
|
73
|
+
* endpoints, and they do not overlap each other: control addresses live inside the tunnel and hub
|
|
74
|
+
* endpoints on the underlay, so one prefix can never contain the other's addresses.
|
|
75
|
+
*/
|
|
76
|
+
const requireVpnProtected = (authority, vpn) => {
|
|
77
|
+
const endpoints = [...authority.resolvers, ...authority.platformEndpoints];
|
|
78
|
+
requireNetwork([vpn.controlPrefix, vpn.hubPrefix].every(prefix => authority.prefixes.some(range => networkContains(range, prefix))
|
|
79
|
+
&& authority.pools.every(pool => !networkOverlaps(pool.prefix, prefix))
|
|
80
|
+
&& endpoints.every(endpoint => !networkContains(prefix, `${endpoint.address}/32`)))
|
|
81
|
+
&& !networkOverlaps(vpn.controlPrefix, vpn.hubPrefix));
|
|
43
82
|
};
|
|
44
83
|
/**
|
|
45
|
-
* Structural snapshot for exact persistence and for a plan write.
|
|
46
|
-
*
|
|
47
|
-
*
|
|
84
|
+
* Structural snapshot for exact persistence and for a plan write. The plan's own sets pass the
|
|
85
|
+
* protected authority's own validator, so no plan can describe an authority that contract refuses,
|
|
86
|
+
* and both VPN prefixes are reserved inside the protected space the plan states.
|
|
48
87
|
*/
|
|
49
88
|
export const snapshotRuntimeNetworkAddressPlan = (value) => networkSafe(() => {
|
|
50
89
|
const item = networkRecord(captureNetwork(value), ['id', 'revision', 'prefixes', 'pools', 'resolvers', 'platformEndpoints', 'vpn']);
|
|
@@ -53,19 +92,24 @@ export const snapshotRuntimeNetworkAddressPlan = (value) => networkSafe(() => {
|
|
|
53
92
|
platformEndpoints: item.platformEndpoints }, validationFrame);
|
|
54
93
|
const plan = { id: runtimeNetworkAddressPlanContract.id, revision: networkCounter(item.revision),
|
|
55
94
|
prefixes: own.prefixes, pools: own.pools, resolvers: own.resolvers, platformEndpoints: own.platformEndpoints, vpn: vpnOf(item.vpn) };
|
|
56
|
-
requireVpnProtected(
|
|
95
|
+
requireVpnProtected(own, plan.vpn);
|
|
57
96
|
return plan;
|
|
58
97
|
});
|
|
59
98
|
/**
|
|
60
99
|
* The protected authority a plan describes inside a producer's frame, digest included: the plan's
|
|
61
|
-
* sets
|
|
62
|
-
*
|
|
100
|
+
* sets plus the endpoints of every cluster hub it is given, each bound inside `vpn.hubPrefix`. One
|
|
101
|
+
* cluster contributes one hub, so `hubs` never names a cluster twice. All inputs are read before the
|
|
102
|
+
* digest is computed; an empty `hubs` composes the authority of a runtime network whose clusters
|
|
103
|
+
* have not registered a hub yet.
|
|
63
104
|
*/
|
|
64
|
-
export const composeRuntimeNetworkProtectedAuthority = async (planValue, frameValue) => {
|
|
105
|
+
export const composeRuntimeNetworkProtectedAuthority = async (planValue, frameValue, hubsValue) => {
|
|
65
106
|
try {
|
|
66
107
|
const plan = snapshotRuntimeNetworkAddressPlan(planValue);
|
|
67
108
|
const frame = networkRecord(captureNetwork(frameValue), ['id', 'generation', 'controller', 'previous', 'egressAuthorities']);
|
|
68
|
-
const
|
|
109
|
+
const hubs = networkList(captureNetwork(hubsValue), runtimeNetworkAuthorityContract.maximumPlatformEndpoints, hubOf);
|
|
110
|
+
requireNetwork(new Set(hubs.map(hub => hub.clusterId)).size === hubs.length
|
|
111
|
+
&& hubs.every(hub => networkContains(plan.vpn.hubPrefix, `${hub.address}/32`)));
|
|
112
|
+
const authority = authorityOf(setsWithHubs(plan, hubs), frame);
|
|
69
113
|
return { ...authority, digest: await computeRuntimeNetworkProtectedAuthorityDigest(authority) };
|
|
70
114
|
}
|
|
71
115
|
catch {
|
|
@@ -111,4 +155,4 @@ export const admitRuntimeNetworkAddressPlanChange = (previousValue, nextValue) =
|
|
|
111
155
|
return { status: 'accepted', removed: { resolverIds: idsOf(removedOrChanged(previous.resolvers, next.resolvers)),
|
|
112
156
|
platformEndpointIds: idsOf(removedOrChanged(previous.platformEndpoints, next.platformEndpoints)) } };
|
|
113
157
|
});
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
158
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 = {
|