@serve.zone/interfaces 32.5.0 → 32.7.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 +80 -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 +18 -1
- package/dist_ts/data/clustervpn.js +23 -7
- package/dist_ts/data/deploymentpreflight.d.ts +21 -0
- package/dist_ts/data/deploymentpreflight.js +19 -1
- package/dist_ts/data/networkaddressplan.d.ts +21 -15
- package/dist_ts/data/networkaddressplan.js +27 -20
- package/dist_ts/data/networkcredential.d.ts +1 -7
- package/dist_ts/data/networkcredential.js +7 -24
- package/dist_ts/private/networkcontract.d.ts +16 -0
- package/dist_ts/private/networkcontract.js +21 -1
- package/dist_ts/requests/service.d.ts +13 -0
- package/package.json +1 -1
- package/readme.md +58 -25
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/cluster.ts +7 -20
- package/ts/data/clustervpn.ts +34 -9
- package/ts/data/deploymentpreflight.ts +38 -0
- package/ts/data/networkaddressplan.ts +32 -25
- package/ts/data/networkcredential.ts +9 -33
- package/ts/private/networkcontract.ts +20 -0
- package/ts/requests/service.ts +13 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,85 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-19 - 32.7.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- The two read-only deployment carriers that open a flow now carry an optional protocol offer:
|
|
8
|
+
`data.IDeploymentPreflightRequestData.protocol` (`getDeploymentPreflight`, which opens a
|
|
9
|
+
deployment) and `requests.service.IRequest_Any_Cloudly_GetServiceById['request'].protocol`
|
|
10
|
+
(which opens an adoption), both `protocol.IProtocolOffer`. tsdeploy states its offer on exactly
|
|
11
|
+
these two and on no mutating deployment carrier, because Cloudly derives
|
|
12
|
+
`reserveServiceDeployment`'s `requestDigest` from the whole request body — an offer inside one of
|
|
13
|
+
those would bind a durable operation's identity to whichever interfaces release the deployer had
|
|
14
|
+
installed, and an in-flight deployment would stop being resumable across a deployer upgrade.
|
|
15
|
+
Naming developer-machine skew on the opening read refuses it before anything is reserved and
|
|
16
|
+
costs nothing durable. The member is optional: a peer of this release states nothing by offering
|
|
17
|
+
and an older deployer sends none, so absence stays a valid request. A stated offer is exact-key
|
|
18
|
+
like every other offer in this package — `validateDeploymentPreflightRequest` judges it with
|
|
19
|
+
`protocol.validateProtocolOfferOn`, the naming twin of the `protocol.readProtocolOffer` a server
|
|
20
|
+
negotiates from, so a body cannot pass the validator carrying an offer the server's own read
|
|
21
|
+
would refuse; a malformed or accessor-backed offer is one `INVALID_REQUEST` blocker naming
|
|
22
|
+
`deployment preflight protocol offer` and its reasons, and is never invoked. No new blocker code:
|
|
23
|
+
whether two peers can serve one session is `protocol.negotiateProtocol`'s decision, answered as
|
|
24
|
+
an `IProtocolRefusal`, never as a preflight blocker. **Cloudly's side is a separate slice:** its
|
|
25
|
+
service and deployment managers still have to read the offer before they validate either body,
|
|
26
|
+
negotiate it against the `cloudlyClient` minimum with `admitTypedSessionProtocol`, and answer a
|
|
27
|
+
refusal as a `TypedResponseError` carrying the `IProtocolRefusal` in `errorData` (HTTP 422
|
|
28
|
+
`protocol.protocolRefusalHttpStatus` on a route without a typed error). Until it does, a stated
|
|
29
|
+
offer is carried and validated but not negotiated.
|
|
30
|
+
- The managed VPN authority id is bounded where the hub daemon bounds it:
|
|
31
|
+
`clusterVpnNetworkContract.maximumAuthorityIdBytes` is 128 UTF-8 bytes, down from the generic
|
|
32
|
+
200-character identifier bound, and every contract that admits the id reads that one constant —
|
|
33
|
+
`snapshotClusterVpnNetwork` (and therefore `admitClusterVpnNetwork`, which snapshots both the
|
|
34
|
+
held and the pushed network) and `snapshotGetRuntimeManagedVpnCredentialResponse`. SmartVPN's
|
|
35
|
+
managed registry refuses an authority id above 128 bytes, so an id between the two bounds passed
|
|
36
|
+
every contract on the way and was then refused by the daemon at apply time, on the far side of a
|
|
37
|
+
push, as a hub reporting `state: 'failed'`. It is now refused where Cloudly compiles the network,
|
|
38
|
+
on its own stack, before anything is pushed. Bytes rather than code
|
|
39
|
+
points, because that is what the daemon counts; the identifier grammar admits ASCII alone, so the
|
|
40
|
+
two coincide for every id that gets this far. No production impact: Cloudly mints the id as
|
|
41
|
+
`networkVpnId`, a sha256 hex digest of exactly 64 characters, so no minted id has ever been
|
|
42
|
+
within a factor of two of the new bound. A longer id is now refused where the network is compiled
|
|
43
|
+
instead of where it is applied.
|
|
44
|
+
|
|
45
|
+
## 2026-09-19 - 32.6.0
|
|
46
|
+
|
|
47
|
+
### Features
|
|
48
|
+
|
|
49
|
+
- `data.IClusterVpnNetwork` now carries `controlPrefix`, the subnet the cluster's hub serves its
|
|
50
|
+
control plane on. A managed hub fixes that subnet when it binds and admits a member's control
|
|
51
|
+
address only inside it, and no other Cloudly-to-relay carrier hands a relay the address plan, so
|
|
52
|
+
a relay could name the authority its hub is bound to but not the subnet it has to bind — leaving
|
|
53
|
+
it to infer one from the members it was sent or to keep a copy of Cloudly's plan, both of which
|
|
54
|
+
make a hub disagree with the plan it serves. `snapshotClusterVpnNetwork` reads the member with
|
|
55
|
+
the new `data.runtimeNetworkVpnControlPrefix(value)` — a canonical private prefix no longer than
|
|
56
|
+
`runtimeNetworkAddressPlanContract.maximumControlPrefixLength`, the same reader the address plan
|
|
57
|
+
uses for `vpn.controlPrefix` — and additionally requires every `node.controlAddress` to lie
|
|
58
|
+
inside it and every `workloadPrefixes[].cidr` to stay clear of it, the two rules the hub enforces
|
|
59
|
+
anyway. A network that the hub could only refuse is now refused while Cloudly compiles it. No
|
|
60
|
+
refusal name was added: `admitRuntimeNetworkAddressPlanChange` refuses every VPN change with
|
|
61
|
+
`plan-vpn-immutable`, so one runtime network's control prefix never moves, and a network naming
|
|
62
|
+
another prefix is another authority, which `vpn-network-authority-foreign` already decides.
|
|
63
|
+
A stored network without the member is refused by the closed record, exactly like any other
|
|
64
|
+
missing member; Cloudly compiles the prefix from the record that already holds it. A pushed
|
|
65
|
+
network that keeps its authority but names another control prefix is refused as
|
|
66
|
+
`vpn-network-authority-foreign` too: the hub is bound to one subnet for its lifetime.
|
|
67
|
+
- 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
|
|
68
|
+
smartvpn managed hub accepts plain streams on its WebSocket listener and consumes its TLS
|
|
69
|
+
material on the QUIC listener alone, so a `wss://` managed session ends in a TLS handshake EOF
|
|
70
|
+
and the TLS name such a session would be dialled under is unsatisfiable. Removed, under the
|
|
71
|
+
one-common-major rule and with no shipped consumer of the 32.4.0 hub shapes:
|
|
72
|
+
`runtimeNetworkAddressPlanContract.hubTransports` loses its `websocket` row, so
|
|
73
|
+
`TRuntimeNetworkVpnTransport` (kept, and the place a second transport returns once smartvpn
|
|
74
|
+
serves one) is `'quic'` alone and `runtimeNetworkVpnHubEndpoints(hub)` yields the QUIC endpoint
|
|
75
|
+
only; `IRuntimeNetworkVpnHub` and `IClusterRelayVpnHub` lose `websocketPort` and state a bound
|
|
76
|
+
`quicPort: number` instead of a nullable port per transport, so `validateClusterRelayVpnHub` no
|
|
77
|
+
longer answers `must bind at least one of quicPort and websocketPort` and refuses a null or
|
|
78
|
+
absent `quicPort` by that member's own name; and
|
|
79
|
+
`IGetRuntimeManagedVpnCredentialResponse.serverName` is gone, with the "present exactly when the
|
|
80
|
+
transport is websocket" rule it carried. One hub now costs one of an authority's 64 platform
|
|
81
|
+
endpoints, so 64 clusters fit one authority where 32 did.
|
|
82
|
+
|
|
3
83
|
## 2026-09-19 - 32.5.0
|
|
4
84
|
|
|
5
85
|
### Fixes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.7.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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"}
|
|
@@ -32,10 +32,18 @@ export interface IClusterVpnNetworkGrant {
|
|
|
32
32
|
* Complete, never a patch: a relay applies it as the whole authority its hub serves, so a member or
|
|
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
|
-
* another cluster is refused rather than applied.
|
|
35
|
+
* another cluster is refused rather than applied. It is bounded by
|
|
36
|
+
* `clusterVpnNetworkContract.maximumAuthorityIdBytes`, the same bound the hub daemon holds.
|
|
37
|
+
*
|
|
38
|
+
* `controlPrefix` is the subnet the hub's control plane serves: the address plan's
|
|
39
|
+
* `vpn.controlPrefix`, which the plan contract never lets change, stated here because a hub fixes
|
|
40
|
+
* its control subnet when it binds and no other carrier hands a relay the plan. Without it a relay
|
|
41
|
+
* could only infer a subnet from the members it was sent, which is how a hub comes to disagree with
|
|
42
|
+
* the plan it serves.
|
|
36
43
|
*/
|
|
37
44
|
export interface IClusterVpnNetwork {
|
|
38
45
|
authorityId: string;
|
|
46
|
+
controlPrefix: string;
|
|
39
47
|
revision: number;
|
|
40
48
|
nodes: IClusterVpnNetworkNode[];
|
|
41
49
|
grants: IClusterVpnNetworkGrant[];
|
|
@@ -49,6 +57,11 @@ export declare const clusterVpnNetworkContract: Readonly<{
|
|
|
49
57
|
/** Per node; one workload lease the node's signed projection carries. */
|
|
50
58
|
readonly maximumWorkloadPrefixes: 128;
|
|
51
59
|
readonly maximumGrants: 4096;
|
|
60
|
+
/**
|
|
61
|
+
* UTF-8 bytes, matching what the hub daemon admits for the authority it binds: an id above this
|
|
62
|
+
* is refused where the network is compiled rather than by the daemon at apply time.
|
|
63
|
+
*/
|
|
64
|
+
readonly maximumAuthorityIdBytes: 128;
|
|
52
65
|
readonly maximumCanonicalBytes: 917504;
|
|
53
66
|
readonly completeness: "whole-authority-never-a-patch";
|
|
54
67
|
readonly membership: "presence-only-an-absent-node-is-withdrawn";
|
|
@@ -107,6 +120,10 @@ export declare const clusterVpnWorkloadPolicyDomain: (digestValue: unknown) => s
|
|
|
107
120
|
* workload domain this network itself carries, on two different nodes. That last rule is what a
|
|
108
121
|
* per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be expressed
|
|
109
122
|
* here at all, which is why Cloudly refuses it by name while it compiles instead of pushing it.
|
|
123
|
+
*
|
|
124
|
+
* Every control address lies inside `controlPrefix` and no workload prefix meets it — the two rules
|
|
125
|
+
* a hub enforces against the subnet it bound. Checking them while the network is compiled turns a
|
|
126
|
+
* push the hub could only refuse into a network Cloudly never states.
|
|
110
127
|
*/
|
|
111
128
|
export declare const snapshotClusterVpnNetwork: (value: unknown) => IClusterVpnNetwork;
|
|
112
129
|
export type TClusterVpnNetworkAdmission = {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { runtimeNetworkVpnControlPrefix } from './networkaddressplan.js';
|
|
2
|
+
import { captureNetwork, failNetwork, networkAuthorityId, networkCanonical, networkContains, networkCounter, networkEqual, networkIpv4, networkList, networkMaximumAuthorityIdBytes, 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:',
|
|
@@ -8,6 +9,11 @@ export const clusterVpnNetworkContract = Object.freeze({
|
|
|
8
9
|
/** Per node; one workload lease the node's signed projection carries. */
|
|
9
10
|
maximumWorkloadPrefixes: 128,
|
|
10
11
|
maximumGrants: 4096,
|
|
12
|
+
/**
|
|
13
|
+
* UTF-8 bytes, matching what the hub daemon admits for the authority it binds: an id above this
|
|
14
|
+
* is refused where the network is compiled rather than by the daemon at apply time.
|
|
15
|
+
*/
|
|
16
|
+
maximumAuthorityIdBytes: networkMaximumAuthorityIdBytes,
|
|
11
17
|
maximumCanonicalBytes: 917_504,
|
|
12
18
|
completeness: 'whole-authority-never-a-patch',
|
|
13
19
|
membership: 'presence-only-an-absent-node-is-withdrawn',
|
|
@@ -74,21 +80,28 @@ const grantKey = (grant) => `${grant.sourceDomain}\0${grant.destinationDomain}`;
|
|
|
74
80
|
* workload domain this network itself carries, on two different nodes. That last rule is what a
|
|
75
81
|
* per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be expressed
|
|
76
82
|
* here at all, which is why Cloudly refuses it by name while it compiles instead of pushing it.
|
|
83
|
+
*
|
|
84
|
+
* Every control address lies inside `controlPrefix` and no workload prefix meets it — the two rules
|
|
85
|
+
* a hub enforces against the subnet it bound. Checking them while the network is compiled turns a
|
|
86
|
+
* push the hub could only refuse into a network Cloudly never states.
|
|
77
87
|
*/
|
|
78
88
|
export const snapshotClusterVpnNetwork = (value) => networkSafe(() => {
|
|
79
89
|
const captured = captureNetwork(value);
|
|
80
90
|
requireNetwork(new TextEncoder().encode(networkCanonical(captured)).length <= clusterVpnNetworkContract.maximumCanonicalBytes);
|
|
81
|
-
const item = networkRecord(captured, ['authorityId', 'revision', 'nodes', 'grants']);
|
|
91
|
+
const item = networkRecord(captured, ['authorityId', 'controlPrefix', 'revision', 'nodes', 'grants']);
|
|
92
|
+
const controlPrefix = runtimeNetworkVpnControlPrefix(item.controlPrefix);
|
|
82
93
|
const nodes = networkSorted(networkList(item.nodes, clusterVpnNetworkContract.maximumNodes, nodeOf), node => node.nodeId);
|
|
83
94
|
const grants = networkSorted(networkList(item.grants, clusterVpnNetworkContract.maximumGrants, grantOf), grantKey);
|
|
84
95
|
const domainOwners = new Map();
|
|
85
96
|
const addresses = new Set(), keys = new Set(), cidrs = new Set();
|
|
86
97
|
for (const node of nodes) {
|
|
87
|
-
requireNetwork(!keys.has(node.publicKey) && !addresses.has(node.controlAddress)
|
|
98
|
+
requireNetwork(!keys.has(node.publicKey) && !addresses.has(node.controlAddress)
|
|
99
|
+
&& networkContains(controlPrefix, `${node.controlAddress}/32`));
|
|
88
100
|
keys.add(node.publicKey);
|
|
89
101
|
addresses.add(node.controlAddress);
|
|
90
102
|
for (const prefix of node.workloadPrefixes) {
|
|
91
|
-
requireNetwork(!cidrs.has(prefix.cidr) && !domainOwners.has(prefix.policyDomain)
|
|
103
|
+
requireNetwork(!cidrs.has(prefix.cidr) && !domainOwners.has(prefix.policyDomain)
|
|
104
|
+
&& !networkOverlaps(controlPrefix, prefix.cidr));
|
|
92
105
|
cidrs.add(prefix.cidr);
|
|
93
106
|
domainOwners.set(prefix.policyDomain, node.nodeId);
|
|
94
107
|
}
|
|
@@ -97,7 +110,7 @@ export const snapshotClusterVpnNetwork = (value) => networkSafe(() => {
|
|
|
97
110
|
const source = domainOwners.get(grant.sourceDomain), destination = domainOwners.get(grant.destinationDomain);
|
|
98
111
|
requireNetwork(source && destination && source !== destination);
|
|
99
112
|
}
|
|
100
|
-
return { authorityId:
|
|
113
|
+
return { authorityId: networkAuthorityId(item.authorityId), controlPrefix, revision: networkCounter(item.revision), nodes, grants };
|
|
101
114
|
});
|
|
102
115
|
/**
|
|
103
116
|
* The pure decision a relay makes about a pushed network against the one its hub holds, or null
|
|
@@ -110,8 +123,11 @@ export const admitClusterVpnNetwork = (heldValue, nextValue) => networkSafe(() =
|
|
|
110
123
|
if (heldValue === null)
|
|
111
124
|
return { status: 'accepted' };
|
|
112
125
|
const held = snapshotClusterVpnNetwork(heldValue);
|
|
113
|
-
|
|
126
|
+
// A hub binds one control subnet for its lifetime, so a network that moves the prefix under the
|
|
127
|
+
// same authority is as foreign to this hub as one that names another authority.
|
|
128
|
+
if (held.authorityId !== next.authorityId || held.controlPrefix !== next.controlPrefix) {
|
|
114
129
|
return { status: 'refused', reason: 'vpn-network-authority-foreign' };
|
|
130
|
+
}
|
|
115
131
|
if (next.revision > held.revision)
|
|
116
132
|
return { status: 'accepted' };
|
|
117
133
|
return networkEqual(held, next) ? { status: 'replay' } : { status: 'refused', reason: 'vpn-network-revision-stale' };
|
|
@@ -144,4 +160,4 @@ export const snapshotGetClusterVpnNetworkResponse = (value) => networkSafe(() =>
|
|
|
144
160
|
const item = networkRecord(captureNetwork(value), ['network']);
|
|
145
161
|
return { network: item.network === null ? null : snapshotClusterVpnNetwork(item.network) };
|
|
146
162
|
});
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
163
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clustervpn.js","sourceRoot":"","sources":["../../ts/data/clustervpn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EACvH,WAAW,EAAE,WAAW,EAAE,8BAA8B,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EACzG,oBAAoB,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAwDzH,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,sGAAsG;IACtG,yBAAyB,EAAE,UAAU;IACrC,6EAA6E;IAC7E,0BAA0B,EAAE,WAAW;IACvC,YAAY,EAAE,GAAG;IACjB,yEAAyE;IACzE,uBAAuB,EAAE,GAAG;IAC5B,aAAa,EAAE,IAAI;IACnB;;;OAGG;IACH,uBAAuB,EAAE,8BAA8B;IACvD,qBAAqB,EAAE,OAAO;IAC9B,YAAY,EAAE,+BAA+B;IAC7C,UAAU,EAAE,2CAA2C;CAC/C,CAAC,CAAC;AAEZ;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1D,uFAAuF;IACvF,+BAA+B;IAC/B,0FAA0F;IAC1F,4BAA4B;CACpB,CAAC,CAAC;AAKZ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9D,kFAAkF;IAClF,sBAAsB;IACtB,4FAA4F;IAC5F,iCAAiC;CACzB,CAAC,CAAC;AAgCZ,oGAAoG;AACpG,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,YAAqB,EAAU,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAC/F,GAAG,yBAAyB,CAAC,yBAAyB,GAAG,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAExF,mFAAmF;AACnF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,WAAoB,EAAU,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IAC/F,cAAc,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7F,OAAO,GAAG,yBAAyB,CAAC,0BAA0B,GAAI,WAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACtG,CAAC,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAAC,KAAc,EAAU,EAAE;IACtD,cAAc,CAAC,OAAO,KAAK,KAAK,QAAQ;WACnC,KAAK,CAAC,UAAU,CAAC,yBAAyB,CAAC,0BAA0B,CAAC;WACtE,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtG,OAAO,KAAe,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,KAAc,EAA4B,EAAE;IAC5D,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5D,OAAO,EAAE,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;AAC1G,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,KAAc,EAA0B,EAAE;IACxD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC9G,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC;QACvI,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;QACzC,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,uBAAuB,EAAE,QAAQ,CAAC,EAC7H,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAA2B,EAAE;IAC1D,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACzE,OAAO,EAAE,YAAY,EAAE,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,iBAAiB,EAAE,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;AACpI,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,KAA8B,EAAU,EAAE,CAAC,GAAG,KAAK,CAAC,YAAY,KAAK,KAAK,CAAC,iBAAiB,EAAE,CAAC;AAEjH;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAc,EAAsB,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IAChG,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,cAAc,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,yBAAyB,CAAC,qBAAqB,CAAC,CAAC;IAC/H,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtG,MAAM,aAAa,GAAG,8BAA8B,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,yBAAyB,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1H,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,yBAAyB,CAAC,aAAa,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;IACnH,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,EAAE,IAAI,GAAG,IAAI,GAAG,EAAU,EAAE,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IACzF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;eAC1E,eAAe,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7D,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3C,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;mBAC3E,CAAC,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACnD,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7G,cAAc,CAAC,MAAM,IAAI,WAAW,IAAI,MAAM,KAAK,WAAW,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACtI,CAAC,CAAC,CAAC;AAOH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,SAAyB,EAAE,SAAkB,EAA+B,EAAE,CACnH,WAAW,CAAC,GAAG,EAAE;IACf,MAAM,IAAI,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAClD,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAClD,gGAAgG;IAChG,gFAAgF;IAChF,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;QACvF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC;IACxE,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IACjE,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC;AACvH,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,qCAAqC,GAAG,CAAC,KAAc,EAAkC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IACxH,MAAM,IAAI,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,OAAO,EAAE,OAAO,EAAE,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAAC,KAAc,EAAmC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IAC1H,MAAM,IAAI,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IAChF,cAAc,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC;IAC9F,OAAO,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;AAC7H,CAAC,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,KAAc,EAAE,gBAAyB,EAAmC,EAAE,CAC/H,WAAW,CAAC,GAAG,EAAE;IACf,MAAM,QAAQ,GAAG,sCAAsC,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,qCAAqC,CAAC,gBAAgB,CAAC,CAAC;IACrE,cAAc,CAAC,QAAQ,CAAC,eAAe,KAAK,IAAI,IAAI,QAAQ,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvG,cAAc,CAAC,QAAQ,CAAC,KAAK,KAAK,MAAM,IAAI,QAAQ,CAAC,eAAe,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChG,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,KAAc,EAAgC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IACpH,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAAC,KAAc,EAAiC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IACtH,MAAM,IAAI,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;AAC7F,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { TImmutableContainerPlatform, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
|
|
2
2
|
import type { TServiceDeploymentCapability } from './user.js';
|
|
3
|
+
import { type IProtocolOffer } from '../protocol.js';
|
|
3
4
|
import type { IDeploymentRouteRequest, IServiceDeploymentOperation, TDeploymentOperationMode, TDeploymentOperationPhase } from './deploymentoperation.js';
|
|
4
5
|
export type TDeploymentPreflightDecision = 'GO' | 'NO-GO';
|
|
5
6
|
export type TDeploymentPreflightBlockerCode = 'INVALID_REQUEST' | 'AUTHORIZATION_MISSING' | 'ORGANIZATION_SCOPE_MISSING' | 'SERVICE_OWNERSHIP_MISMATCH' | 'DEPLOYMENT_OPERATION_NOT_FOUND' | 'DEPLOYMENT_OPERATION_CONFLICT' | 'DEPLOY_ON_PUSH_MUST_BE_DISABLED' | 'REGISTRY_AUTHENTICATION_UNAVAILABLE' | 'REGISTRY_REPOSITORY_MISMATCH' | 'REGISTRY_TAG_CONFLICT' | 'SOURCE_REVISION_INVALID' | 'SOURCE_WORKTREE_DIRTY' | 'VERSION_NOT_RESERVED' | 'VERSION_COLLISION' | 'NAMESPACE_NOT_RESERVED' | 'NAMESPACE_COLLISION' | 'NAMESPACE_NOT_PROVEN_BLANK' | 'CONFIGURATION_DIGEST_INVALID' | 'INTENT_DIGEST_INVALID' | 'PROPOSED_CONFIGURATION_INCOMPLETE' | 'CURRENT_REFERENCE_MUTABLE' | 'CURRENT_RUNTIME_DIGEST_MISSING' | 'OCI_INDEX_DIGEST_REQUIRED' | 'OCI_INDEX_NOT_FOUND' | 'OCI_INDEX_MEDIA_TYPE_REQUIRED' | 'OCI_PLATFORM_MISSING' | 'OCI_PLATFORM_MANIFEST_MISSING' | 'IMMUTABLE_RELEASE_TAG_REQUIRED' | 'IMMUTABLE_RELEASE_TAG_NOT_RESERVED' | 'RELEASE_EVIDENCE_MISSING' | 'RELEASE_EVIDENCE_INVALID' | 'RELEASE_EVIDENCE_AMBIGUOUS' | 'RELEASE_NOT_AUTHORIZED' | 'GREENFIELD_EXECUTION_UNAVAILABLE' | 'ROUTE_PROMOTION_FENCE_UNAVAILABLE' | 'POST_DEPLOYMENT_VERIFICATION_UNAVAILABLE' | 'WOULD_REPLACE_EXISTING_STATE' | 'PLATFORM_CAPABILITY_UNAVAILABLE' | 'CORESTORE_INVENTORY_UNAVAILABLE' | 'RUNTIME_ATTESTATION_MISMATCH' | 'ROLLOUT_ACTIVE_CONFLICT' | 'ROLLOUT_NOT_SUCCEEDED' | 'ROUTE_UNAVAILABLE' | 'ROUTE_VERIFICATION_FAILED' | 'TLS_VERIFICATION_FAILED';
|
|
@@ -113,6 +114,26 @@ export interface IDeploymentPreflightRequestData {
|
|
|
113
114
|
routes?: IDeploymentRouteRequest[];
|
|
114
115
|
/** Legacy v14 discriminator. Equivalent to mode: 'greenfield'. */
|
|
115
116
|
greenfield?: true;
|
|
117
|
+
/**
|
|
118
|
+
* The deploying build's protocol offer, read and negotiated before this request is validated.
|
|
119
|
+
*
|
|
120
|
+
* This is the one request that opens a deployment, which is why the offer rides here and on no
|
|
121
|
+
* mutating deployment carrier: Cloudly derives `reserveServiceDeployment`'s `requestDigest` from
|
|
122
|
+
* the whole request body, so an offer inside one of those would bind an operation's identity to
|
|
123
|
+
* the interfaces release the deployer happened to have installed, and an in-flight deployment
|
|
124
|
+
* would stop being resumable across a deployer upgrade. Naming the skew on the read that opens
|
|
125
|
+
* the flow costs nothing durable and refuses it before anything is reserved.
|
|
126
|
+
*
|
|
127
|
+
* Optional, because a peer that speaks this release states nothing by offering and older
|
|
128
|
+
* deployers send none: absence is a valid request, not a refusal. A member stated as `undefined`
|
|
129
|
+
* is absent too, like every other optional member of this shape, so a caller that spreads an
|
|
130
|
+
* offer it may not hold states no offer rather than a malformed one. When an offer is stated it
|
|
131
|
+
* is exact-key, exactly like every other offer in this package —
|
|
132
|
+
* `validateDeploymentPreflightRequest` judges it with the same reader
|
|
133
|
+
* `protocol.readProtocolOffer` negotiates from, so a body cannot pass this validator with an
|
|
134
|
+
* offer the server's own read would refuse.
|
|
135
|
+
*/
|
|
136
|
+
protocol?: IProtocolOffer;
|
|
116
137
|
}
|
|
117
138
|
export interface IDeploymentPreflightReport {
|
|
118
139
|
decision: TDeploymentPreflightDecision;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
2
|
+
import { validateProtocolOfferOn } from '../protocol.js';
|
|
2
3
|
import { canonicalizeDeploymentHostname, getDeploymentRouteVerificationHostname, normalizeDeploymentReadinessPath, validateDeploymentProposedConfiguration, } from './deploymentoperation.js';
|
|
3
4
|
const fullGitRevisionRegex = /^[a-f0-9]{40}$/;
|
|
4
5
|
const semanticVersionRegex = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-(?:0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
|
|
@@ -128,6 +129,23 @@ export const validateDeploymentPreflightRequest = (requestArg) => {
|
|
|
128
129
|
|| routeArg.expectedStatusCodes.some((statusArg) => (!Number.isSafeInteger(statusArg) || statusArg < 200 || statusArg > 299))))))) {
|
|
129
130
|
blockers.push({ code: 'INVALID_REQUEST', message: 'Deployment route declaration is malformed.' });
|
|
130
131
|
}
|
|
132
|
+
// Presence is decided from the own property alone: reading `requestArg.protocol` would run an
|
|
133
|
+
// accessor a caller attached to the body, and the offer a validator judges has to be the value
|
|
134
|
+
// the server negotiates from. A data property holding `undefined` states no offer, exactly as
|
|
135
|
+
// the optional members above read an omitted value, so spreading an offer a caller may not hold
|
|
136
|
+
// is not a malformed one. An accessor is neither of those: it is refused, and never invoked —
|
|
137
|
+
// the check reads a descriptor, and `validateProtocolOfferOn` reads the key as data as well.
|
|
138
|
+
const protocolProperty = Object.getOwnPropertyDescriptor(requestArg, 'protocol');
|
|
139
|
+
const statedProtocolOffer = protocolProperty !== undefined
|
|
140
|
+
&& !(Object.hasOwn(protocolProperty, 'value') && protocolProperty.value === undefined)
|
|
141
|
+
? validateProtocolOfferOn(requestArg, 'deployment preflight protocol offer')
|
|
142
|
+
: [];
|
|
143
|
+
if (statedProtocolOffer.length > 0) {
|
|
144
|
+
blockers.push({
|
|
145
|
+
code: 'INVALID_REQUEST',
|
|
146
|
+
message: `The stated protocol offer is malformed: ${statedProtocolOffer.join('; ')}.`,
|
|
147
|
+
});
|
|
148
|
+
}
|
|
131
149
|
if (mode === 'greenfield' && Array.isArray(requestArg.routes)
|
|
132
150
|
&& JSON.stringify([...new Set(requestArg.routes.map((routeArg) => (isRecord(routeArg) && typeof routeArg.hostname === 'string' ? routeArg.hostname : '')))].sort())
|
|
133
151
|
!== JSON.stringify([...new Set(configurationPublicDomains)].sort())) {
|
|
@@ -187,4 +205,4 @@ export const validateDeploymentReleaseEvidence = (argsArg) => {
|
|
|
187
205
|
}
|
|
188
206
|
return blockers;
|
|
189
207
|
};
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentpreflight.js","sourceRoot":"","sources":["../../ts/data/deploymentpreflight.ts"],"names":[],"mappings":"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"}
|
|
208
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentpreflight.js","sourceRoot":"","sources":["../../ts/data/deploymentpreflight.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
|
/**
|