@serve.zone/interfaces 32.5.0 → 32.6.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 +38 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/cluster.d.ts +4 -5
- package/dist_ts/data/cluster.js +4 -13
- package/dist_ts/data/clustervpn.d.ts +11 -0
- package/dist_ts/data/clustervpn.js +18 -7
- package/dist_ts/data/networkaddressplan.d.ts +21 -15
- package/dist_ts/data/networkaddressplan.js +27 -20
- package/dist_ts/data/networkcredential.d.ts +0 -7
- package/dist_ts/data/networkcredential.js +5 -22
- package/package.json +1 -1
- package/readme.md +32 -24
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/cluster.ts +7 -20
- package/ts/data/clustervpn.ts +27 -8
- package/ts/data/networkaddressplan.ts +32 -25
- package/ts/data/networkcredential.ts +4 -29
package/changelog.md
CHANGED
|
@@ -1,5 +1,43 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-19 - 32.6.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- `data.IClusterVpnNetwork` now carries `controlPrefix`, the subnet the cluster's hub serves its
|
|
8
|
+
control plane on. A managed hub fixes that subnet when it binds and admits a member's control
|
|
9
|
+
address only inside it, and no other Cloudly-to-relay carrier hands a relay the address plan, so
|
|
10
|
+
a relay could name the authority its hub is bound to but not the subnet it has to bind — leaving
|
|
11
|
+
it to infer one from the members it was sent or to keep a copy of Cloudly's plan, both of which
|
|
12
|
+
make a hub disagree with the plan it serves. `snapshotClusterVpnNetwork` reads the member with
|
|
13
|
+
the new `data.runtimeNetworkVpnControlPrefix(value)` — a canonical private prefix no longer than
|
|
14
|
+
`runtimeNetworkAddressPlanContract.maximumControlPrefixLength`, the same reader the address plan
|
|
15
|
+
uses for `vpn.controlPrefix` — and additionally requires every `node.controlAddress` to lie
|
|
16
|
+
inside it and every `workloadPrefixes[].cidr` to stay clear of it, the two rules the hub enforces
|
|
17
|
+
anyway. A network that the hub could only refuse is now refused while Cloudly compiles it. No
|
|
18
|
+
refusal name was added: `admitRuntimeNetworkAddressPlanChange` refuses every VPN change with
|
|
19
|
+
`plan-vpn-immutable`, so one runtime network's control prefix never moves, and a network naming
|
|
20
|
+
another prefix is another authority, which `vpn-network-authority-foreign` already decides.
|
|
21
|
+
A stored network without the member is refused by the closed record, exactly like any other
|
|
22
|
+
missing member; Cloudly compiles the prefix from the record that already holds it. A pushed
|
|
23
|
+
network that keeps its authority but names another control prefix is refused as
|
|
24
|
+
`vpn-network-authority-foreign` too: the hub is bound to one subnet for its lifetime.
|
|
25
|
+
- This minor removes rather than deprecates the WebSocket half of the hub contract. The managed VPN hub is QUIC-only, and the contract now states only what a hub can serve. A
|
|
26
|
+
smartvpn managed hub accepts plain streams on its WebSocket listener and consumes its TLS
|
|
27
|
+
material on the QUIC listener alone, so a `wss://` managed session ends in a TLS handshake EOF
|
|
28
|
+
and the TLS name such a session would be dialled under is unsatisfiable. Removed, under the
|
|
29
|
+
one-common-major rule and with no shipped consumer of the 32.4.0 hub shapes:
|
|
30
|
+
`runtimeNetworkAddressPlanContract.hubTransports` loses its `websocket` row, so
|
|
31
|
+
`TRuntimeNetworkVpnTransport` (kept, and the place a second transport returns once smartvpn
|
|
32
|
+
serves one) is `'quic'` alone and `runtimeNetworkVpnHubEndpoints(hub)` yields the QUIC endpoint
|
|
33
|
+
only; `IRuntimeNetworkVpnHub` and `IClusterRelayVpnHub` lose `websocketPort` and state a bound
|
|
34
|
+
`quicPort: number` instead of a nullable port per transport, so `validateClusterRelayVpnHub` no
|
|
35
|
+
longer answers `must bind at least one of quicPort and websocketPort` and refuses a null or
|
|
36
|
+
absent `quicPort` by that member's own name; and
|
|
37
|
+
`IGetRuntimeManagedVpnCredentialResponse.serverName` is gone, with the "present exactly when the
|
|
38
|
+
transport is websocket" rule it carried. One hub now costs one of an authority's 64 platform
|
|
39
|
+
endpoints, so 64 clusters fit one authority where 32 did.
|
|
40
|
+
|
|
3
41
|
## 2026-09-19 - 32.5.0
|
|
4
42
|
|
|
5
43
|
### Fixes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.6.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -54,17 +54,16 @@ export interface IClusterRelay {
|
|
|
54
54
|
* The relay is its cluster's packet relay: every node of the cluster dials this hub and no
|
|
55
55
|
* inter-node packet leaves the cluster. It reports what it bound, exactly like `listenAddress` and
|
|
56
56
|
* `listenPort`, and Cloudly composes the platform endpoints from it — a relay names no endpoint id
|
|
57
|
-
*
|
|
57
|
+
* of its own. `publicKey` is the hub's Noise public key in the one canonical
|
|
58
58
|
* 32-byte base64 encoding every Noise key of this contract is read with; it is public material and
|
|
59
|
-
* authenticates nothing by itself.
|
|
60
|
-
*
|
|
59
|
+
* authenticates nothing by itself. `quicPort` is the port it bound for the one transport a managed
|
|
60
|
+
* hub serves, so a relay that advertises a hub advertises a reachable one.
|
|
61
61
|
*/
|
|
62
62
|
export interface IClusterRelayVpnHub {
|
|
63
63
|
publicKey: string;
|
|
64
64
|
/** The address the hub bound, as an IPv4 literal inside the address plan's `vpn.hubPrefix`. */
|
|
65
65
|
address: string;
|
|
66
|
-
quicPort: number
|
|
67
|
-
websocketPort: number | null;
|
|
66
|
+
quicPort: number;
|
|
68
67
|
}
|
|
69
68
|
/**
|
|
70
69
|
* What a cluster relay tells Cloudly about itself once its socket is authenticated.
|
package/dist_ts/data/cluster.js
CHANGED
|
@@ -112,10 +112,6 @@ const validateClusterRelayVpnKey = (valueArg, pathArg) => {
|
|
|
112
112
|
return [`${pathArg} must be a canonical 32-byte base64 public key`];
|
|
113
113
|
}
|
|
114
114
|
};
|
|
115
|
-
/** A port the hub bound, or `null` for a transport it did not bind. */
|
|
116
|
-
const validateClusterRelayHubPort = (valueArg, pathArg) => (valueArg === null || validateClusterRelayListenPort(valueArg, pathArg).length === 0
|
|
117
|
-
? []
|
|
118
|
-
: [`${pathArg} must be null or an integer from 1 to 65535`]);
|
|
119
115
|
/**
|
|
120
116
|
* Validates one hub advertisement and names every reason it is refused.
|
|
121
117
|
*
|
|
@@ -124,19 +120,14 @@ const validateClusterRelayHubPort = (valueArg, pathArg) => (valueArg === null ||
|
|
|
124
120
|
*/
|
|
125
121
|
export const validateClusterRelayVpnHub = (valueArg, pathArg = 'cluster relay vpn hub') => {
|
|
126
122
|
if (!isRecord(valueArg)
|
|
127
|
-
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort'
|
|
123
|
+
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort'])) {
|
|
128
124
|
return [`${pathArg} must use its exact schema`];
|
|
129
125
|
}
|
|
130
|
-
|
|
126
|
+
return [
|
|
131
127
|
...validateClusterRelayVpnKey(valueArg.publicKey, `${pathArg} publicKey`),
|
|
132
128
|
...validateClusterRelayListenAddress(valueArg.address, `${pathArg} address`),
|
|
133
|
-
...
|
|
134
|
-
...validateClusterRelayHubPort(valueArg.websocketPort, `${pathArg} websocketPort`),
|
|
129
|
+
...validateClusterRelayListenPort(valueArg.quicPort, `${pathArg} quicPort`),
|
|
135
130
|
];
|
|
136
|
-
if (valueArg.quicPort === null && valueArg.websocketPort === null) {
|
|
137
|
-
errors.push(`${pathArg} must bind at least one of quicPort and websocketPort`);
|
|
138
|
-
}
|
|
139
|
-
return errors;
|
|
140
131
|
};
|
|
141
132
|
const validateClusterRelayEndpoint = (valueArg, pathArg) => {
|
|
142
133
|
if (!isRecord(valueArg)
|
|
@@ -215,4 +206,4 @@ export const clusterRelayCertificateDomainName = (relayArg) => {
|
|
|
215
206
|
}
|
|
216
207
|
return new URL(relayArg.origin).hostname;
|
|
217
208
|
};
|
|
218
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../ts/data/cluster.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,9 +33,16 @@ export interface IClusterVpnNetworkGrant {
|
|
|
33
33
|
* a grant that is missing is withdrawn. `revision` is Cloudly's own counter for this authority and
|
|
34
34
|
* only ever rises; `authorityId` names the authority the hub is bound to, so a network compiled for
|
|
35
35
|
* another cluster is refused rather than applied.
|
|
36
|
+
*
|
|
37
|
+
* `controlPrefix` is the subnet the hub's control plane serves: the address plan's
|
|
38
|
+
* `vpn.controlPrefix`, which the plan contract never lets change, stated here because a hub fixes
|
|
39
|
+
* its control subnet when it binds and no other carrier hands a relay the plan. Without it a relay
|
|
40
|
+
* could only infer a subnet from the members it was sent, which is how a hub comes to disagree with
|
|
41
|
+
* the plan it serves.
|
|
36
42
|
*/
|
|
37
43
|
export interface IClusterVpnNetwork {
|
|
38
44
|
authorityId: string;
|
|
45
|
+
controlPrefix: string;
|
|
39
46
|
revision: number;
|
|
40
47
|
nodes: IClusterVpnNetworkNode[];
|
|
41
48
|
grants: IClusterVpnNetworkGrant[];
|
|
@@ -107,6 +114,10 @@ export declare const clusterVpnWorkloadPolicyDomain: (digestValue: unknown) => s
|
|
|
107
114
|
* workload domain this network itself carries, on two different nodes. That last rule is what a
|
|
108
115
|
* per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be expressed
|
|
109
116
|
* here at all, which is why Cloudly refuses it by name while it compiles instead of pushing it.
|
|
117
|
+
*
|
|
118
|
+
* Every control address lies inside `controlPrefix` and no workload prefix meets it — the two rules
|
|
119
|
+
* a hub enforces against the subnet it bound. Checking them while the network is compiled turns a
|
|
120
|
+
* push the hub could only refuse into a network Cloudly never states.
|
|
110
121
|
*/
|
|
111
122
|
export declare const snapshotClusterVpnNetwork: (value: unknown) => IClusterVpnNetwork;
|
|
112
123
|
export type TClusterVpnNetworkAdmission = {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { runtimeNetworkVpnControlPrefix } from './networkaddressplan.js';
|
|
2
|
+
import { captureNetwork, failNetwork, networkCanonical, networkContains, networkCounter, networkEqual, networkId, networkIpv4, networkList, networkNodeId, networkNoiseKey, networkOverlaps, networkPrivatePrefix, networkRecord, networkSafe, networkSorted, requireNetwork } from '../private/networkcontract.js';
|
|
2
3
|
export const clusterVpnNetworkContract = Object.freeze({
|
|
3
4
|
/** The policy domain of a node's control address; the hub relays no grant between control domains. */
|
|
4
5
|
controlPolicyDomainPrefix: 'control:',
|
|
@@ -74,21 +75,28 @@ const grantKey = (grant) => `${grant.sourceDomain}\0${grant.destinationDomain}`;
|
|
|
74
75
|
* workload domain this network itself carries, on two different nodes. That last rule is what a
|
|
75
76
|
* per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be expressed
|
|
76
77
|
* here at all, which is why Cloudly refuses it by name while it compiles instead of pushing it.
|
|
78
|
+
*
|
|
79
|
+
* Every control address lies inside `controlPrefix` and no workload prefix meets it — the two rules
|
|
80
|
+
* a hub enforces against the subnet it bound. Checking them while the network is compiled turns a
|
|
81
|
+
* push the hub could only refuse into a network Cloudly never states.
|
|
77
82
|
*/
|
|
78
83
|
export const snapshotClusterVpnNetwork = (value) => networkSafe(() => {
|
|
79
84
|
const captured = captureNetwork(value);
|
|
80
85
|
requireNetwork(new TextEncoder().encode(networkCanonical(captured)).length <= clusterVpnNetworkContract.maximumCanonicalBytes);
|
|
81
|
-
const item = networkRecord(captured, ['authorityId', 'revision', 'nodes', 'grants']);
|
|
86
|
+
const item = networkRecord(captured, ['authorityId', 'controlPrefix', 'revision', 'nodes', 'grants']);
|
|
87
|
+
const controlPrefix = runtimeNetworkVpnControlPrefix(item.controlPrefix);
|
|
82
88
|
const nodes = networkSorted(networkList(item.nodes, clusterVpnNetworkContract.maximumNodes, nodeOf), node => node.nodeId);
|
|
83
89
|
const grants = networkSorted(networkList(item.grants, clusterVpnNetworkContract.maximumGrants, grantOf), grantKey);
|
|
84
90
|
const domainOwners = new Map();
|
|
85
91
|
const addresses = new Set(), keys = new Set(), cidrs = new Set();
|
|
86
92
|
for (const node of nodes) {
|
|
87
|
-
requireNetwork(!keys.has(node.publicKey) && !addresses.has(node.controlAddress)
|
|
93
|
+
requireNetwork(!keys.has(node.publicKey) && !addresses.has(node.controlAddress)
|
|
94
|
+
&& networkContains(controlPrefix, `${node.controlAddress}/32`));
|
|
88
95
|
keys.add(node.publicKey);
|
|
89
96
|
addresses.add(node.controlAddress);
|
|
90
97
|
for (const prefix of node.workloadPrefixes) {
|
|
91
|
-
requireNetwork(!cidrs.has(prefix.cidr) && !domainOwners.has(prefix.policyDomain)
|
|
98
|
+
requireNetwork(!cidrs.has(prefix.cidr) && !domainOwners.has(prefix.policyDomain)
|
|
99
|
+
&& !networkOverlaps(controlPrefix, prefix.cidr));
|
|
92
100
|
cidrs.add(prefix.cidr);
|
|
93
101
|
domainOwners.set(prefix.policyDomain, node.nodeId);
|
|
94
102
|
}
|
|
@@ -97,7 +105,7 @@ export const snapshotClusterVpnNetwork = (value) => networkSafe(() => {
|
|
|
97
105
|
const source = domainOwners.get(grant.sourceDomain), destination = domainOwners.get(grant.destinationDomain);
|
|
98
106
|
requireNetwork(source && destination && source !== destination);
|
|
99
107
|
}
|
|
100
|
-
return { authorityId: networkId(item.authorityId), revision: networkCounter(item.revision), nodes, grants };
|
|
108
|
+
return { authorityId: networkId(item.authorityId), controlPrefix, revision: networkCounter(item.revision), nodes, grants };
|
|
101
109
|
});
|
|
102
110
|
/**
|
|
103
111
|
* The pure decision a relay makes about a pushed network against the one its hub holds, or null
|
|
@@ -110,8 +118,11 @@ export const admitClusterVpnNetwork = (heldValue, nextValue) => networkSafe(() =
|
|
|
110
118
|
if (heldValue === null)
|
|
111
119
|
return { status: 'accepted' };
|
|
112
120
|
const held = snapshotClusterVpnNetwork(heldValue);
|
|
113
|
-
|
|
121
|
+
// A hub binds one control subnet for its lifetime, so a network that moves the prefix under the
|
|
122
|
+
// same authority is as foreign to this hub as one that names another authority.
|
|
123
|
+
if (held.authorityId !== next.authorityId || held.controlPrefix !== next.controlPrefix) {
|
|
114
124
|
return { status: 'refused', reason: 'vpn-network-authority-foreign' };
|
|
125
|
+
}
|
|
115
126
|
if (next.revision > held.revision)
|
|
116
127
|
return { status: 'accepted' };
|
|
117
128
|
return networkEqual(held, next) ? { status: 'replay' } : { status: 'refused', reason: 'vpn-network-revision-stale' };
|
|
@@ -144,4 +155,4 @@ export const snapshotGetClusterVpnNetworkResponse = (value) => networkSafe(() =>
|
|
|
144
155
|
const item = networkRecord(captureNetwork(value), ['network']);
|
|
145
156
|
return { network: item.network === null ? null : snapshotClusterVpnNetwork(item.network) };
|
|
146
157
|
});
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
158
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clustervpn.js","sourceRoot":"","sources":["../../ts/data/clustervpn.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,14 +31,13 @@ export interface IRuntimeNetworkAddressPlan {
|
|
|
31
31
|
* One cluster's managed VPN hub, as the cluster's relay bound it.
|
|
32
32
|
*
|
|
33
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`.
|
|
35
|
-
*
|
|
34
|
+
* that may select it, and `address` is an underlay address inside the plan's `vpn.hubPrefix`.
|
|
35
|
+
* `quicPort` is the port it bound for the one transport a managed hub serves.
|
|
36
36
|
*/
|
|
37
37
|
export interface IRuntimeNetworkVpnHub {
|
|
38
38
|
clusterId: string;
|
|
39
39
|
address: string;
|
|
40
|
-
quicPort: number
|
|
41
|
-
websocketPort: number | null;
|
|
40
|
+
quicPort: number;
|
|
42
41
|
}
|
|
43
42
|
/** What an administrator writes; Cloudly supplies the id and the revision. */
|
|
44
43
|
export type TRuntimeNetworkAddressPlanWritableData = Omit<IRuntimeNetworkAddressPlan, 'id' | 'revision'>;
|
|
@@ -73,28 +72,35 @@ export declare const runtimeNetworkAddressPlanContract: Readonly<{
|
|
|
73
72
|
*/
|
|
74
73
|
readonly maximumControlPrefixLength: 30;
|
|
75
74
|
/**
|
|
76
|
-
* Every transport a hub
|
|
75
|
+
* Every transport a managed hub serves, in the order a node prefers them.
|
|
77
76
|
*
|
|
78
77
|
* One row states all three facts that belong together: the transport a credential names, the
|
|
79
78
|
* suffix its platform endpoint id carries, and the protocol the endpoint is composed with. A hub
|
|
80
|
-
*
|
|
79
|
+
* contributes one endpoint of its address per row, so a transport added here is added once for
|
|
80
|
+
* the id derivation, the composition and the credential binder alike.
|
|
81
|
+
*
|
|
82
|
+
* QUIC is the one row: a managed hub terminates TLS on its QUIC listener alone, so no other
|
|
83
|
+
* transport of it can be dialled over a protected connection.
|
|
81
84
|
*/
|
|
82
|
-
readonly hubTransports: readonly
|
|
85
|
+
readonly hubTransports: readonly Readonly<{
|
|
83
86
|
transport: "quic";
|
|
84
87
|
endpointSuffix: "quic";
|
|
85
88
|
protocol: "udp";
|
|
86
|
-
}>
|
|
87
|
-
transport: "websocket";
|
|
88
|
-
endpointSuffix: "ws";
|
|
89
|
-
protocol: "tcp";
|
|
90
|
-
}>)[];
|
|
89
|
+
}>[];
|
|
91
90
|
}>;
|
|
91
|
+
/**
|
|
92
|
+
* The one reader for a managed VPN control prefix: a canonical private prefix no longer than
|
|
93
|
+
* `maximumControlPrefixLength`. The plan states it for the whole runtime network and a cluster's
|
|
94
|
+
* network repeats it for the hub that binds it, so both read it here and neither can admit a
|
|
95
|
+
* subnet the other would refuse.
|
|
96
|
+
*/
|
|
97
|
+
export declare const runtimeNetworkVpnControlPrefix: (value: unknown) => string;
|
|
92
98
|
/** How a node reaches its cluster's hub, read off the one table that states the transports. */
|
|
93
99
|
export type TRuntimeNetworkVpnTransport = typeof runtimeNetworkAddressPlanContract.hubTransports[number]['transport'];
|
|
94
100
|
/**
|
|
95
|
-
* The platform endpoints one hub contributes to a protected authority: one per transport
|
|
96
|
-
* in id order. Every reader derives the same ids from this one function — the composition
|
|
97
|
-
* the authority, and the router selection that names which of them a node may dial.
|
|
101
|
+
* The platform endpoints one hub contributes to a protected authority: one per transport a managed
|
|
102
|
+
* hub serves, in id order. Every reader derives the same ids from this one function — the composition
|
|
103
|
+
* that seals the authority, and the router selection that names which of them a node may dial.
|
|
98
104
|
*/
|
|
99
105
|
export declare const runtimeNetworkVpnHubEndpoints: (hubValue: unknown) => IRuntimeNetworkProtectedAuthority["platformEndpoints"];
|
|
100
106
|
/**
|
|
@@ -8,38 +8,47 @@ export const runtimeNetworkAddressPlanContract = Object.freeze({
|
|
|
8
8
|
*/
|
|
9
9
|
maximumControlPrefixLength: 30,
|
|
10
10
|
/**
|
|
11
|
-
* Every transport a hub
|
|
11
|
+
* Every transport a managed hub serves, in the order a node prefers them.
|
|
12
12
|
*
|
|
13
13
|
* One row states all three facts that belong together: the transport a credential names, the
|
|
14
14
|
* suffix its platform endpoint id carries, and the protocol the endpoint is composed with. A hub
|
|
15
|
-
*
|
|
15
|
+
* contributes one endpoint of its address per row, so a transport added here is added once for
|
|
16
|
+
* the id derivation, the composition and the credential binder alike.
|
|
17
|
+
*
|
|
18
|
+
* QUIC is the one row: a managed hub terminates TLS on its QUIC listener alone, so no other
|
|
19
|
+
* transport of it can be dialled over a protected connection.
|
|
16
20
|
*/
|
|
17
21
|
hubTransports: Object.freeze([
|
|
18
22
|
Object.freeze({ transport: 'quic', endpointSuffix: 'quic', protocol: 'udp' }),
|
|
19
|
-
Object.freeze({ transport: 'websocket', endpointSuffix: 'ws', protocol: 'tcp' }),
|
|
20
23
|
]),
|
|
21
24
|
});
|
|
22
|
-
/**
|
|
23
|
-
|
|
25
|
+
/**
|
|
26
|
+
* The one reader for a managed VPN control prefix: a canonical private prefix no longer than
|
|
27
|
+
* `maximumControlPrefixLength`. The plan states it for the whole runtime network and a cluster's
|
|
28
|
+
* network repeats it for the hub that binds it, so both read it here and neither can admit a
|
|
29
|
+
* subnet the other would refuse.
|
|
30
|
+
*/
|
|
31
|
+
export const runtimeNetworkVpnControlPrefix = (value) => networkSafe(() => {
|
|
32
|
+
const prefix = networkPrivatePrefix(value);
|
|
33
|
+
requireNetwork(Number(prefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
34
|
+
return prefix;
|
|
35
|
+
});
|
|
36
|
+
/** The port a hub bound for one transport; one entry per row of the transport table. */
|
|
37
|
+
const hubPort = (hub, transport) => ({ quic: hub.quicPort })[transport];
|
|
24
38
|
const byEndpointId = (left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
|
|
25
39
|
const hubOf = (value) => {
|
|
26
|
-
const item = networkRecord(value, ['clusterId', 'address', 'quicPort'
|
|
27
|
-
|
|
28
|
-
|
|
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;
|
|
40
|
+
const item = networkRecord(value, ['clusterId', 'address', 'quicPort']);
|
|
41
|
+
return { clusterId: networkId(item.clusterId), address: networkIpv4(item.address),
|
|
42
|
+
quicPort: networkCounter(item.quicPort, 65535) };
|
|
33
43
|
};
|
|
34
44
|
/**
|
|
35
|
-
* The platform endpoints one hub contributes to a protected authority: one per transport
|
|
36
|
-
* in id order. Every reader derives the same ids from this one function — the composition
|
|
37
|
-
* the authority, and the router selection that names which of them a node may dial.
|
|
45
|
+
* The platform endpoints one hub contributes to a protected authority: one per transport a managed
|
|
46
|
+
* hub serves, in id order. Every reader derives the same ids from this one function — the composition
|
|
47
|
+
* that seals the authority, and the router selection that names which of them a node may dial.
|
|
38
48
|
*/
|
|
39
49
|
export const runtimeNetworkVpnHubEndpoints = (hubValue) => networkSafe(() => {
|
|
40
50
|
const hub = hubOf(captureNetwork(hubValue));
|
|
41
51
|
return runtimeNetworkAddressPlanContract.hubTransports
|
|
42
|
-
.filter(row => hubPort(hub, row.transport) !== null)
|
|
43
52
|
.map(row => ({ id: `${hub.clusterId}:${row.endpointSuffix}`, address: hub.address,
|
|
44
53
|
protocol: row.protocol, port: hubPort(hub, row.transport) }))
|
|
45
54
|
.sort(byEndpointId);
|
|
@@ -64,9 +73,7 @@ const setsWithHubs = (plan, hubs) => ({
|
|
|
64
73
|
});
|
|
65
74
|
const vpnOf = (value) => {
|
|
66
75
|
const item = networkRecord(value, ['controlPrefix', 'hubPrefix']);
|
|
67
|
-
|
|
68
|
-
requireNetwork(Number(controlPrefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
69
|
-
return { controlPrefix, hubPrefix: networkPrefix(item.hubPrefix) };
|
|
76
|
+
return { controlPrefix: runtimeNetworkVpnControlPrefix(item.controlPrefix), hubPrefix: networkPrefix(item.hubPrefix) };
|
|
70
77
|
};
|
|
71
78
|
/**
|
|
72
79
|
* Both VPN prefixes are protected, they hold none of the plan's own pools, resolvers or platform
|
|
@@ -155,4 +162,4 @@ export const admitRuntimeNetworkAddressPlanChange = (previousValue, nextValue) =
|
|
|
155
162
|
return { status: 'accepted', removed: { resolverIds: idsOf(removedOrChanged(previous.resolvers, next.resolvers)),
|
|
156
163
|
platformEndpointIds: idsOf(removedOrChanged(previous.platformEndpoints, next.platformEndpoints)) } };
|
|
157
164
|
});
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,6 @@ export interface IGetRuntimeManagedVpnCredentialResponse extends IGetRuntimeMana
|
|
|
16
16
|
address: string;
|
|
17
17
|
port: number;
|
|
18
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;
|
|
26
19
|
authorityId: string;
|
|
27
20
|
serverPublicKey: string;
|
|
28
21
|
clientPublicKey: string;
|
|
@@ -7,20 +7,6 @@ export const snapshotGetRuntimeManagedVpnCredentialRequest = (value) => networkS
|
|
|
7
7
|
const item = networkRecord(captureNetwork(value), ['session', 'projection']);
|
|
8
8
|
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection) };
|
|
9
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
10
|
const transportOf = (value) => {
|
|
25
11
|
const row = runtimeNetworkAddressPlanContract.hubTransports.find(candidate => candidate.transport === value);
|
|
26
12
|
requireNetwork(row);
|
|
@@ -28,14 +14,11 @@ const transportOf = (value) => {
|
|
|
28
14
|
};
|
|
29
15
|
export const snapshotGetRuntimeManagedVpnCredentialResponse = (value) => networkSafe(() => {
|
|
30
16
|
const item = networkRecord(captureNetwork(value), ['session', 'projection', 'transport', 'hub', 'authorityId',
|
|
31
|
-
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']
|
|
32
|
-
const hub = networkRecord(item.hub, ['id', 'address', 'port'])
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
requireNetwork(Object.hasOwn(item, 'serverName') === (transport === 'websocket'));
|
|
36
|
-
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection), transport,
|
|
17
|
+
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']);
|
|
18
|
+
const hub = networkRecord(item.hub, ['id', 'address', 'port']);
|
|
19
|
+
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection),
|
|
20
|
+
transport: transportOf(item.transport),
|
|
37
21
|
hub: { id: networkId(hub.id), address: networkIpv4(hub.address), port: networkCounter(hub.port, 65535) },
|
|
38
|
-
...(transport === 'websocket' ? { serverName: serverName(item.serverName) } : {}),
|
|
39
22
|
authorityId: networkId(item.authorityId), serverPublicKey: networkNoiseKey(item.serverPublicKey),
|
|
40
23
|
clientPublicKey: networkNoiseKey(item.clientPublicKey), clientPrivateKey: networkNoiseKey(item.clientPrivateKey),
|
|
41
24
|
expiresAt: networkCounter(item.expiresAt) };
|
|
@@ -87,4 +70,4 @@ export const bindGetRuntimeManagedVpnCredentialResponse = async (value, requestV
|
|
|
87
70
|
return failNetwork();
|
|
88
71
|
}
|
|
89
72
|
};
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya2NyZWRlbnRpYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL25ldHdvcmtjcmVkZW50aWFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxpQ0FBaUMsRUFBb0MsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RyxPQUFPLEVBQUUsNkJBQTZCLEVBQStCLE1BQU0scUJBQXFCLENBQUM7QUFDakcsT0FBTyxFQUFFLGdDQUFnQyxFQUFrQyxNQUFNLHdCQUF3QixDQUFDO0FBQzFHLE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pILE9BQU8sRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSx5QkFBeUIsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFDbkgsZUFBZSxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQ25HLGNBQWMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBeUJ4RCxNQUFNLENBQUMsTUFBTSw2Q0FBNkMsR0FBRyxDQUFDLEtBQWMsRUFBMEMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7SUFDeEksTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQzdFLE9BQU8sRUFBRSxPQUFPLEVBQUUsNkJBQTZCLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztBQUNqSCxDQUFDLENBQUMsQ0FBQztBQUVILE1BQU0sV0FBVyxHQUFHLENBQUMsS0FBYyxFQUErQixFQUFFO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLGlDQUFpQyxDQUFDLGFBQWEsQ0FBQyxJ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
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -519,11 +519,10 @@ uses `IGetRuntimeManagedVpnCredentialRequest` and
|
|
|
519
519
|
`IGetRuntimeManagedVpnCredentialResponse`. Its request carries the exact current
|
|
520
520
|
session and signed projection reference. The secret response repeats those
|
|
521
521
|
bindings and supplies the `hub` tuple the node dials, the `transport` it dials it
|
|
522
|
-
over (`quic
|
|
523
|
-
key, the client keypair and the expiry in Unix
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
`quic`, which is dialled on the address alone. The hub is the node's own cluster's
|
|
522
|
+
over (`quic`, the one transport a managed hub serves), the managed authority ID,
|
|
523
|
+
the Noise server public key, the client keypair and the expiry in Unix
|
|
524
|
+
milliseconds. The response states no TLS name: QUIC is dialled on the address
|
|
525
|
+
alone. The hub is the node's own cluster's
|
|
527
526
|
relay (see [Cluster VPN Hub And Network](#cluster-vpn-hub-and-network)). Keep the
|
|
528
527
|
response process-local; never persist, hash, log or embed it in a signed projection.
|
|
529
528
|
|
|
@@ -534,7 +533,7 @@ validates the complete projection digest and binds node, controller, namespace,
|
|
|
534
533
|
physical-session identity and projection reference. The response binder takes
|
|
535
534
|
`(response, request, projection, trustedSession, now, renewal = null)` and additionally requires the
|
|
536
535
|
hub's exact tuple to be selected in `router.platformEndpointIds`, carrying the protocol of the
|
|
537
|
-
credential's transport — `udp` for `quic
|
|
536
|
+
credential's transport — `udp` for `quic`, as
|
|
538
537
|
`runtimeNetworkAddressPlanContract.hubTransports` states. A relay therefore cannot name itself: the
|
|
539
538
|
endpoint has to be one the node's **signed** projection already selected.
|
|
540
539
|
Expiry must be after the caller-qualified time and no later than the referenced
|
|
@@ -702,12 +701,15 @@ other — control addresses live inside the tunnel, hub endpoints on the underla
|
|
|
702
701
|
additionally a private prefix no longer than /30
|
|
703
702
|
(`runtimeNetworkAddressPlanContract.maximumControlPrefixLength`); no minimum length is stated,
|
|
704
703
|
because the private-range rule already keeps it at /8 or longer.
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
`
|
|
709
|
-
|
|
710
|
-
`
|
|
704
|
+
`data.runtimeNetworkVpnControlPrefix(value)` is that reader on its own, exported because a
|
|
705
|
+
cluster's VPN network repeats the prefix its hub binds and has to read it exactly as the plan does.
|
|
706
|
+
|
|
707
|
+
`data.IRuntimeNetworkVpnHub { clusterId, address, quicPort }` is one cluster's hub as its relay
|
|
708
|
+
bound it. `runtimeNetworkVpnHubEndpoints(hub)` is the one derivation of what it contributes:
|
|
709
|
+
`<clusterId>:quic` on `udp`, one endpoint per row of
|
|
710
|
+
`runtimeNetworkAddressPlanContract.hubTransports`. That table has one row, because a managed hub
|
|
711
|
+
terminates TLS on its QUIC listener alone and no other transport of it can be dialled over a
|
|
712
|
+
protected connection. Every reader calls the derivation — the composition
|
|
711
713
|
that seals the authority and the router selection that names which endpoint a node may dial — so
|
|
712
714
|
two readers can never derive two ids for one hub.
|
|
713
715
|
`composeRuntimeNetworkProtectedAuthority(plan, frame, hubs)` is the composition itself: the producer
|
|
@@ -716,7 +718,7 @@ previous reference and egress authorities) and the hubs of the clusters that reg
|
|
|
716
718
|
receives the complete authority with its digest, so the validator and the protection producer can
|
|
717
719
|
never compose differently. Each hub's address must sit inside `vpn.hubPrefix` and one cluster is
|
|
718
720
|
named once; an empty `hubs` composes the authority of a runtime network whose clusters have no hub
|
|
719
|
-
yet. One hub costs
|
|
721
|
+
yet. One hub costs one of the authority's 64 platform endpoints, so 64 clusters fit one
|
|
720
722
|
authority.
|
|
721
723
|
|
|
722
724
|
`admitRuntimeNetworkAddressPlanChange(previous | null, next)` is the pure decision for a plan write at
|
|
@@ -1737,27 +1739,33 @@ Cloudly keeps every authority — it compiles the network and issues each node's
|
|
|
1737
1739
|
carries no packet.
|
|
1738
1740
|
|
|
1739
1741
|
A relay that bound a hub says so in its registration, in `relay.vpnHub`:
|
|
1740
|
-
`data.IClusterRelayVpnHub { publicKey, address, quicPort
|
|
1742
|
+
`data.IClusterRelayVpnHub { publicKey, address, quicPort }`. It reports what it
|
|
1741
1743
|
bound, exactly like `listenAddress` and `listenPort`: `address` is an IPv4 literal inside the
|
|
1742
|
-
address plan's `vpn.hubPrefix
|
|
1743
|
-
|
|
1744
|
+
address plan's `vpn.hubPrefix` and `quicPort` is the port it bound for the one transport a managed
|
|
1745
|
+
hub serves. `publicKey` is the hub's Noise public key in the one canonical 32-byte base64 encoding
|
|
1744
1746
|
every Noise key of this contract is read with — this advertisement, the managed VPN credential's
|
|
1745
|
-
keys and a cluster network's nodes all pass the same reader. A relay names no endpoint id
|
|
1746
|
-
|
|
1747
|
-
[Runtime Network Address Plan](#runtime-network-address-plan))
|
|
1748
|
-
origin it published for that relay. The member is optional — a relay that serves no hub registers
|
|
1747
|
+
keys and a cluster network's nodes all pass the same reader. A relay names no endpoint id of its
|
|
1748
|
+
own: Cloudly composes the endpoints with `runtimeNetworkVpnHubEndpoints` (see
|
|
1749
|
+
[Runtime Network Address Plan](#runtime-network-address-plan)). The member is optional — a relay that serves no hub registers
|
|
1749
1750
|
exactly as before, and Cloudly selects no hub for that cluster, stating `relay-vpn-hub-absent`.
|
|
1750
1751
|
`validateClusterRelayVpnHub(value, path?)` returns one named reason per violation.
|
|
1751
1752
|
|
|
1752
|
-
`data.IClusterVpnNetwork { authorityId, revision, nodes, grants }` is the whole
|
|
1753
|
-
cluster. It is never a patch: a node or a grant the network does not carry is
|
|
1754
|
-
membership is presence, so there is no enabled flag.
|
|
1753
|
+
`data.IClusterVpnNetwork { authorityId, controlPrefix, revision, nodes, grants }` is the whole
|
|
1754
|
+
managed VPN of one cluster. It is never a patch: a node or a grant the network does not carry is
|
|
1755
|
+
withdrawn, and membership is presence, so there is no enabled flag. `controlPrefix` is the subnet
|
|
1756
|
+
the cluster's hub serves its control plane on — the address plan's `vpn.controlPrefix`, read by the
|
|
1757
|
+
same `runtimeNetworkVpnControlPrefix` reader. A hub fixes that subnet when it binds and no other
|
|
1758
|
+
carrier hands a relay the address plan, so the network it is pushed states it; the plan contract
|
|
1759
|
+
never lets it change, which is why a network that moves the prefix under the same authority is
|
|
1760
|
+
refused as `vpn-network-authority-foreign` rather than by a name of its own. Each node states `{ nodeId, publicKey,
|
|
1755
1761
|
controlAddress, expiresAt, workloadPrefixes }`, where `expiresAt` is that node's credential expiry
|
|
1756
1762
|
in Unix milliseconds and each prefix is `{ cidr, policyDomain }`. Each grant is one directed
|
|
1757
1763
|
`{ sourceDomain, destinationDomain }` pair. `clusterVpnControlPolicyDomain(address)` and
|
|
1758
1764
|
`clusterVpnWorkloadPolicyDomain(leaseDigest)` state the domain names once for both sides.
|
|
1759
1765
|
|
|
1760
|
-
`snapshotClusterVpnNetwork` requires sorted, unique members, prefixes and grants,
|
|
1766
|
+
`snapshotClusterVpnNetwork` requires sorted, unique members, prefixes and grants, requires every
|
|
1767
|
+
control address to lie inside `controlPrefix` and every workload prefix to stay clear of it — the
|
|
1768
|
+
two rules the hub enforces against the subnet it bound — and requires
|
|
1761
1769
|
every grant to join two workload domains the network itself carries, on two different nodes. That
|
|
1762
1770
|
is what a per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be
|
|
1763
1771
|
expressed at all, which is why Cloudly refuses it while it compiles, by name, with
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/data/cluster.ts
CHANGED
|
@@ -70,17 +70,16 @@ export interface IClusterRelay {
|
|
|
70
70
|
* The relay is its cluster's packet relay: every node of the cluster dials this hub and no
|
|
71
71
|
* inter-node packet leaves the cluster. It reports what it bound, exactly like `listenAddress` and
|
|
72
72
|
* `listenPort`, and Cloudly composes the platform endpoints from it — a relay names no endpoint id
|
|
73
|
-
*
|
|
73
|
+
* of its own. `publicKey` is the hub's Noise public key in the one canonical
|
|
74
74
|
* 32-byte base64 encoding every Noise key of this contract is read with; it is public material and
|
|
75
|
-
* authenticates nothing by itself.
|
|
76
|
-
*
|
|
75
|
+
* authenticates nothing by itself. `quicPort` is the port it bound for the one transport a managed
|
|
76
|
+
* hub serves, so a relay that advertises a hub advertises a reachable one.
|
|
77
77
|
*/
|
|
78
78
|
export interface IClusterRelayVpnHub {
|
|
79
79
|
publicKey: string;
|
|
80
80
|
/** The address the hub bound, as an IPv4 literal inside the address plan's `vpn.hubPrefix`. */
|
|
81
81
|
address: string;
|
|
82
|
-
quicPort: number
|
|
83
|
-
websocketPort: number | null;
|
|
82
|
+
quicPort: number;
|
|
84
83
|
}
|
|
85
84
|
|
|
86
85
|
/**
|
|
@@ -274,13 +273,6 @@ const validateClusterRelayVpnKey = (valueArg: unknown, pathArg: string): string[
|
|
|
274
273
|
}
|
|
275
274
|
};
|
|
276
275
|
|
|
277
|
-
/** A port the hub bound, or `null` for a transport it did not bind. */
|
|
278
|
-
const validateClusterRelayHubPort = (valueArg: unknown, pathArg: string): string[] => (
|
|
279
|
-
valueArg === null || validateClusterRelayListenPort(valueArg, pathArg).length === 0
|
|
280
|
-
? []
|
|
281
|
-
: [`${pathArg} must be null or an integer from 1 to 65535`]
|
|
282
|
-
);
|
|
283
|
-
|
|
284
276
|
/**
|
|
285
277
|
* Validates one hub advertisement and names every reason it is refused.
|
|
286
278
|
*
|
|
@@ -292,19 +284,14 @@ export const validateClusterRelayVpnHub = (
|
|
|
292
284
|
pathArg = 'cluster relay vpn hub',
|
|
293
285
|
): string[] => {
|
|
294
286
|
if (!isRecord(valueArg)
|
|
295
|
-
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort'
|
|
287
|
+
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort'])) {
|
|
296
288
|
return [`${pathArg} must use its exact schema`];
|
|
297
289
|
}
|
|
298
|
-
|
|
290
|
+
return [
|
|
299
291
|
...validateClusterRelayVpnKey(valueArg.publicKey, `${pathArg} publicKey`),
|
|
300
292
|
...validateClusterRelayListenAddress(valueArg.address, `${pathArg} address`),
|
|
301
|
-
...
|
|
302
|
-
...validateClusterRelayHubPort(valueArg.websocketPort, `${pathArg} websocketPort`),
|
|
293
|
+
...validateClusterRelayListenPort(valueArg.quicPort, `${pathArg} quicPort`),
|
|
303
294
|
];
|
|
304
|
-
if (valueArg.quicPort === null && valueArg.websocketPort === null) {
|
|
305
|
-
errors.push(`${pathArg} must bind at least one of quicPort and websocketPort`);
|
|
306
|
-
}
|
|
307
|
-
return errors;
|
|
308
295
|
};
|
|
309
296
|
|
|
310
297
|
const validateClusterRelayEndpoint = (valueArg: unknown, pathArg: string): string[] => {
|
package/ts/data/clustervpn.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import { runtimeNetworkVpnControlPrefix } from './networkaddressplan.js';
|
|
2
|
+
import { captureNetwork, failNetwork, networkCanonical, networkContains, networkCounter, networkEqual, networkId, networkIpv4,
|
|
3
|
+
networkList, networkNodeId, networkNoiseKey, networkOverlaps, networkPrivatePrefix, networkRecord, networkSafe,
|
|
4
|
+
networkSorted, requireNetwork } from '../private/networkcontract.js';
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* One workload prefix a node owns inside its cluster's managed VPN, and the policy domain that
|
|
@@ -40,9 +41,16 @@ export interface IClusterVpnNetworkGrant {
|
|
|
40
41
|
* a grant that is missing is withdrawn. `revision` is Cloudly's own counter for this authority and
|
|
41
42
|
* only ever rises; `authorityId` names the authority the hub is bound to, so a network compiled for
|
|
42
43
|
* another cluster is refused rather than applied.
|
|
44
|
+
*
|
|
45
|
+
* `controlPrefix` is the subnet the hub's control plane serves: the address plan's
|
|
46
|
+
* `vpn.controlPrefix`, which the plan contract never lets change, stated here because a hub fixes
|
|
47
|
+
* its control subnet when it binds and no other carrier hands a relay the plan. Without it a relay
|
|
48
|
+
* could only infer a subnet from the members it was sent, which is how a hub comes to disagree with
|
|
49
|
+
* the plan it serves.
|
|
43
50
|
*/
|
|
44
51
|
export interface IClusterVpnNetwork {
|
|
45
52
|
authorityId: string;
|
|
53
|
+
controlPrefix: string;
|
|
46
54
|
revision: number;
|
|
47
55
|
nodes: IClusterVpnNetworkNode[];
|
|
48
56
|
grants: IClusterVpnNetworkGrant[];
|
|
@@ -168,20 +176,27 @@ const grantKey = (grant: IClusterVpnNetworkGrant): string => `${grant.sourceDoma
|
|
|
168
176
|
* workload domain this network itself carries, on two different nodes. That last rule is what a
|
|
169
177
|
* per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be expressed
|
|
170
178
|
* here at all, which is why Cloudly refuses it by name while it compiles instead of pushing it.
|
|
179
|
+
*
|
|
180
|
+
* Every control address lies inside `controlPrefix` and no workload prefix meets it — the two rules
|
|
181
|
+
* a hub enforces against the subnet it bound. Checking them while the network is compiled turns a
|
|
182
|
+
* push the hub could only refuse into a network Cloudly never states.
|
|
171
183
|
*/
|
|
172
184
|
export const snapshotClusterVpnNetwork = (value: unknown): IClusterVpnNetwork => networkSafe(() => {
|
|
173
185
|
const captured = captureNetwork(value);
|
|
174
186
|
requireNetwork(new TextEncoder().encode(networkCanonical(captured)).length <= clusterVpnNetworkContract.maximumCanonicalBytes);
|
|
175
|
-
const item = networkRecord(captured, ['authorityId', 'revision', 'nodes', 'grants']);
|
|
187
|
+
const item = networkRecord(captured, ['authorityId', 'controlPrefix', 'revision', 'nodes', 'grants']);
|
|
188
|
+
const controlPrefix = runtimeNetworkVpnControlPrefix(item.controlPrefix);
|
|
176
189
|
const nodes = networkSorted(networkList(item.nodes, clusterVpnNetworkContract.maximumNodes, nodeOf), node => node.nodeId);
|
|
177
190
|
const grants = networkSorted(networkList(item.grants, clusterVpnNetworkContract.maximumGrants, grantOf), grantKey);
|
|
178
191
|
const domainOwners = new Map<string, string>();
|
|
179
192
|
const addresses = new Set<string>(), keys = new Set<string>(), cidrs = new Set<string>();
|
|
180
193
|
for (const node of nodes) {
|
|
181
|
-
requireNetwork(!keys.has(node.publicKey) && !addresses.has(node.controlAddress)
|
|
194
|
+
requireNetwork(!keys.has(node.publicKey) && !addresses.has(node.controlAddress)
|
|
195
|
+
&& networkContains(controlPrefix, `${node.controlAddress}/32`));
|
|
182
196
|
keys.add(node.publicKey); addresses.add(node.controlAddress);
|
|
183
197
|
for (const prefix of node.workloadPrefixes) {
|
|
184
|
-
requireNetwork(!cidrs.has(prefix.cidr) && !domainOwners.has(prefix.policyDomain)
|
|
198
|
+
requireNetwork(!cidrs.has(prefix.cidr) && !domainOwners.has(prefix.policyDomain)
|
|
199
|
+
&& !networkOverlaps(controlPrefix, prefix.cidr));
|
|
185
200
|
cidrs.add(prefix.cidr); domainOwners.set(prefix.policyDomain, node.nodeId);
|
|
186
201
|
}
|
|
187
202
|
}
|
|
@@ -189,7 +204,7 @@ export const snapshotClusterVpnNetwork = (value: unknown): IClusterVpnNetwork =>
|
|
|
189
204
|
const source = domainOwners.get(grant.sourceDomain), destination = domainOwners.get(grant.destinationDomain);
|
|
190
205
|
requireNetwork(source && destination && source !== destination);
|
|
191
206
|
}
|
|
192
|
-
return { authorityId: networkId(item.authorityId), revision: networkCounter(item.revision), nodes, grants };
|
|
207
|
+
return { authorityId: networkId(item.authorityId), controlPrefix, revision: networkCounter(item.revision), nodes, grants };
|
|
193
208
|
});
|
|
194
209
|
|
|
195
210
|
export type TClusterVpnNetworkAdmission =
|
|
@@ -208,7 +223,11 @@ export const admitClusterVpnNetwork = (heldValue: unknown | null, nextValue: unk
|
|
|
208
223
|
const next = snapshotClusterVpnNetwork(nextValue);
|
|
209
224
|
if (heldValue === null) return { status: 'accepted' };
|
|
210
225
|
const held = snapshotClusterVpnNetwork(heldValue);
|
|
211
|
-
|
|
226
|
+
// A hub binds one control subnet for its lifetime, so a network that moves the prefix under the
|
|
227
|
+
// same authority is as foreign to this hub as one that names another authority.
|
|
228
|
+
if (held.authorityId !== next.authorityId || held.controlPrefix !== next.controlPrefix) {
|
|
229
|
+
return { status: 'refused', reason: 'vpn-network-authority-foreign' };
|
|
230
|
+
}
|
|
212
231
|
if (next.revision > held.revision) return { status: 'accepted' };
|
|
213
232
|
return networkEqual(held, next) ? { status: 'replay' } : { status: 'refused', reason: 'vpn-network-revision-stale' };
|
|
214
233
|
});
|
|
@@ -39,14 +39,13 @@ export interface IRuntimeNetworkAddressPlan {
|
|
|
39
39
|
* One cluster's managed VPN hub, as the cluster's relay bound it.
|
|
40
40
|
*
|
|
41
41
|
* The hub is its cluster's own packet relay, so `clusterId` names both the hub and the authority
|
|
42
|
-
* that may select it, and `address` is an underlay address inside the plan's `vpn.hubPrefix`.
|
|
43
|
-
*
|
|
42
|
+
* that may select it, and `address` is an underlay address inside the plan's `vpn.hubPrefix`.
|
|
43
|
+
* `quicPort` is the port it bound for the one transport a managed hub serves.
|
|
44
44
|
*/
|
|
45
45
|
export interface IRuntimeNetworkVpnHub {
|
|
46
46
|
clusterId: string;
|
|
47
47
|
address: string;
|
|
48
|
-
quicPort: number
|
|
49
|
-
websocketPort: number | null;
|
|
48
|
+
quicPort: number;
|
|
50
49
|
}
|
|
51
50
|
|
|
52
51
|
/** What an administrator writes; Cloudly supplies the id and the revision. */
|
|
@@ -80,50 +79,60 @@ export const runtimeNetworkAddressPlanContract = Object.freeze({
|
|
|
80
79
|
*/
|
|
81
80
|
maximumControlPrefixLength: 30,
|
|
82
81
|
/**
|
|
83
|
-
* Every transport a hub
|
|
82
|
+
* Every transport a managed hub serves, in the order a node prefers them.
|
|
84
83
|
*
|
|
85
84
|
* One row states all three facts that belong together: the transport a credential names, the
|
|
86
85
|
* suffix its platform endpoint id carries, and the protocol the endpoint is composed with. A hub
|
|
87
|
-
*
|
|
86
|
+
* contributes one endpoint of its address per row, so a transport added here is added once for
|
|
87
|
+
* the id derivation, the composition and the credential binder alike.
|
|
88
|
+
*
|
|
89
|
+
* QUIC is the one row: a managed hub terminates TLS on its QUIC listener alone, so no other
|
|
90
|
+
* transport of it can be dialled over a protected connection.
|
|
88
91
|
*/
|
|
89
92
|
hubTransports: Object.freeze([
|
|
90
93
|
Object.freeze({ transport: 'quic', endpointSuffix: 'quic', protocol: 'udp' }),
|
|
91
|
-
Object.freeze({ transport: 'websocket', endpointSuffix: 'ws', protocol: 'tcp' }),
|
|
92
94
|
]),
|
|
93
95
|
} as const);
|
|
94
96
|
|
|
97
|
+
/**
|
|
98
|
+
* The one reader for a managed VPN control prefix: a canonical private prefix no longer than
|
|
99
|
+
* `maximumControlPrefixLength`. The plan states it for the whole runtime network and a cluster's
|
|
100
|
+
* network repeats it for the hub that binds it, so both read it here and neither can admit a
|
|
101
|
+
* subnet the other would refuse.
|
|
102
|
+
*/
|
|
103
|
+
export const runtimeNetworkVpnControlPrefix = (value: unknown): string => networkSafe(() => {
|
|
104
|
+
const prefix = networkPrivatePrefix(value);
|
|
105
|
+
requireNetwork(Number(prefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
106
|
+
return prefix;
|
|
107
|
+
});
|
|
108
|
+
|
|
95
109
|
/** How a node reaches its cluster's hub, read off the one table that states the transports. */
|
|
96
110
|
export type TRuntimeNetworkVpnTransport = typeof runtimeNetworkAddressPlanContract.hubTransports[number]['transport'];
|
|
97
111
|
|
|
98
|
-
/** The port a hub bound for one transport
|
|
99
|
-
const hubPort = (hub: IRuntimeNetworkVpnHub, transport: TRuntimeNetworkVpnTransport): number
|
|
100
|
-
|
|
112
|
+
/** The port a hub bound for one transport; one entry per row of the transport table. */
|
|
113
|
+
const hubPort = (hub: IRuntimeNetworkVpnHub, transport: TRuntimeNetworkVpnTransport): number =>
|
|
114
|
+
({ quic: hub.quicPort })[transport];
|
|
101
115
|
|
|
102
116
|
const byEndpointId = <T extends { id: string }>(left: T, right: T): number =>
|
|
103
117
|
left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
|
|
104
118
|
|
|
105
119
|
const hubOf = (value: unknown): IRuntimeNetworkVpnHub => {
|
|
106
|
-
const item = networkRecord(value, ['clusterId', 'address', 'quicPort'
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
quicPort: port(item.quicPort), websocketPort: port(item.websocketPort) };
|
|
110
|
-
// A hub that bound no transport is not reachable, so it is not a hub a node could be sent to.
|
|
111
|
-
requireNetwork(runtimeNetworkAddressPlanContract.hubTransports.some(row => hubPort(hub, row.transport) !== null));
|
|
112
|
-
return hub;
|
|
120
|
+
const item = networkRecord(value, ['clusterId', 'address', 'quicPort']);
|
|
121
|
+
return { clusterId: networkId(item.clusterId), address: networkIpv4(item.address),
|
|
122
|
+
quicPort: networkCounter(item.quicPort, 65535) };
|
|
113
123
|
};
|
|
114
124
|
|
|
115
125
|
/**
|
|
116
|
-
* The platform endpoints one hub contributes to a protected authority: one per transport
|
|
117
|
-
* in id order. Every reader derives the same ids from this one function — the composition
|
|
118
|
-
* the authority, and the router selection that names which of them a node may dial.
|
|
126
|
+
* The platform endpoints one hub contributes to a protected authority: one per transport a managed
|
|
127
|
+
* hub serves, in id order. Every reader derives the same ids from this one function — the composition
|
|
128
|
+
* that seals the authority, and the router selection that names which of them a node may dial.
|
|
119
129
|
*/
|
|
120
130
|
export const runtimeNetworkVpnHubEndpoints = (hubValue: unknown): IRuntimeNetworkProtectedAuthority['platformEndpoints'] =>
|
|
121
131
|
networkSafe(() => {
|
|
122
132
|
const hub = hubOf(captureNetwork(hubValue));
|
|
123
133
|
return runtimeNetworkAddressPlanContract.hubTransports
|
|
124
|
-
.filter(row => hubPort(hub, row.transport) !== null)
|
|
125
134
|
.map(row => ({ id: `${hub.clusterId}:${row.endpointSuffix}`, address: hub.address,
|
|
126
|
-
protocol: row.protocol, port: hubPort(hub, row.transport)
|
|
135
|
+
protocol: row.protocol, port: hubPort(hub, row.transport) }))
|
|
127
136
|
.sort(byEndpointId);
|
|
128
137
|
});
|
|
129
138
|
|
|
@@ -154,9 +163,7 @@ const setsWithHubs = (plan: IRuntimeNetworkAddressPlan, hubs: IRuntimeNetworkVpn
|
|
|
154
163
|
|
|
155
164
|
const vpnOf = (value: unknown): IRuntimeNetworkAddressPlan['vpn'] => {
|
|
156
165
|
const item = networkRecord(value, ['controlPrefix', 'hubPrefix']);
|
|
157
|
-
|
|
158
|
-
requireNetwork(Number(controlPrefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
159
|
-
return { controlPrefix, hubPrefix: networkPrefix(item.hubPrefix) };
|
|
166
|
+
return { controlPrefix: runtimeNetworkVpnControlPrefix(item.controlPrefix), hubPrefix: networkPrefix(item.hubPrefix) };
|
|
160
167
|
};
|
|
161
168
|
|
|
162
169
|
/**
|
|
@@ -19,13 +19,6 @@ export interface IGetRuntimeManagedVpnCredentialResponse extends IGetRuntimeMana
|
|
|
19
19
|
transport: TRuntimeNetworkVpnTransport;
|
|
20
20
|
/** The cluster hub endpoint this node dials, named by the id its signed projection selected. */
|
|
21
21
|
hub: { id: string; address: string; port: number };
|
|
22
|
-
/**
|
|
23
|
-
* The TLS name the hub's WebSocket transport is dialled under, present exactly when `transport`
|
|
24
|
-
* is `websocket` and absent otherwise: QUIC is dialled on the address alone. It is the hub
|
|
25
|
-
* relay's own origin hostname, which the node cross-checks against the relay origin it stores,
|
|
26
|
-
* so a name the node does not already trust ends the handshake before any native effect.
|
|
27
|
-
*/
|
|
28
|
-
serverName?: string;
|
|
29
22
|
authorityId: string;
|
|
30
23
|
serverPublicKey: string;
|
|
31
24
|
clientPublicKey: string;
|
|
@@ -42,21 +35,6 @@ export const snapshotGetRuntimeManagedVpnCredentialRequest = (value: unknown): I
|
|
|
42
35
|
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection) };
|
|
43
36
|
});
|
|
44
37
|
|
|
45
|
-
/**
|
|
46
|
-
* The TLS name a WebSocket hub is dialled under: a lower-case domain name of at least two labels,
|
|
47
|
-
* which is what a relay origin's hostname is and what a certificate can be issued for. An address
|
|
48
|
-
* literal is not one, so a node can never be sent to a name nothing vouches for.
|
|
49
|
-
*/
|
|
50
|
-
const serverName = (value: unknown): string => {
|
|
51
|
-
requireNetwork(typeof value === 'string' && value.length <= 253);
|
|
52
|
-
const labels = (value as string).split('.');
|
|
53
|
-
// The last label starts with a letter, which is what makes this a name and not an address
|
|
54
|
-
// literal: a hub reached by address is reached over QUIC, which needs no name at all.
|
|
55
|
-
requireNetwork(labels.length >= 2 && labels.every(label => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label))
|
|
56
|
-
&& /^[a-z]/.test(labels[labels.length - 1]));
|
|
57
|
-
return value as string;
|
|
58
|
-
};
|
|
59
|
-
|
|
60
38
|
const transportOf = (value: unknown): TRuntimeNetworkVpnTransport => {
|
|
61
39
|
const row = runtimeNetworkAddressPlanContract.hubTransports.find(candidate => candidate.transport === value);
|
|
62
40
|
requireNetwork(row); return row.transport;
|
|
@@ -64,14 +42,11 @@ const transportOf = (value: unknown): TRuntimeNetworkVpnTransport => {
|
|
|
64
42
|
|
|
65
43
|
export const snapshotGetRuntimeManagedVpnCredentialResponse = (value: unknown): IGetRuntimeManagedVpnCredentialResponse => networkSafe(() => {
|
|
66
44
|
const item = networkRecord(captureNetwork(value), ['session', 'projection', 'transport', 'hub', 'authorityId',
|
|
67
|
-
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']
|
|
68
|
-
const hub = networkRecord(item.hub, ['id', 'address', 'port'])
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
requireNetwork(Object.hasOwn(item, 'serverName') === (transport === 'websocket'));
|
|
72
|
-
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection), transport,
|
|
45
|
+
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']);
|
|
46
|
+
const hub = networkRecord(item.hub, ['id', 'address', 'port']);
|
|
47
|
+
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection),
|
|
48
|
+
transport: transportOf(item.transport),
|
|
73
49
|
hub: { id: networkId(hub.id), address: networkIpv4(hub.address), port: networkCounter(hub.port, 65535) },
|
|
74
|
-
...(transport === 'websocket' ? { serverName: serverName(item.serverName) } : {}),
|
|
75
50
|
authorityId: networkId(item.authorityId), serverPublicKey: networkNoiseKey(item.serverPublicKey),
|
|
76
51
|
clientPublicKey: networkNoiseKey(item.clientPublicKey), clientPrivateKey: networkNoiseKey(item.clientPrivateKey),
|
|
77
52
|
expiresAt: networkCounter(item.expiresAt) };
|