@serve.zone/interfaces 32.54.0 → 32.55.1
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 +41 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusteringress.d.ts +38 -0
- package/dist_ts/data/clusteringress.js +58 -3
- package/dist_ts/data/deploymentpreflight.d.ts +8 -3
- package/dist_ts/data/deploymentpreflight.js +1 -1
- package/dist_ts/data/settings.d.ts +10 -0
- package/dist_ts/data/settings.js +1 -1
- package/dist_ts/private/ipaddress.d.ts +8 -0
- package/dist_ts/private/ipaddress.js +17 -1
- package/package.json +2 -2
- package/readme.md +15 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusteringress.ts +84 -2
- package/ts/data/deploymentpreflight.ts +8 -3
- package/ts/data/settings.ts +10 -0
- package/ts/private/ipaddress.ts +23 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,46 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-10-13 - 32.55.1
|
|
4
|
+
|
|
5
|
+
### Fixes
|
|
6
|
+
|
|
7
|
+
- `validateClusterRouteSourceAllowList` (and so `validateClusterRouteTable` and
|
|
8
|
+
`ICloudlySettings.dcrouterForwardSourceAddresses`) refuses an entry inside the IPv4-mapped range
|
|
9
|
+
`::ffff:0:0/96`, such as `::ffff:c000:200/120`. The cluster ingress compares an IPv4-mapped client
|
|
10
|
+
as IPv4, so such an entry could never match and the ingress refuses the whole route table that
|
|
11
|
+
carries it; the reason names the IPv4 prefix to write instead (`192.0.2.0/24`). A shorter IPv6
|
|
12
|
+
prefix that merely contains the mapped range stays accepted: it still matches the IPv6 sources
|
|
13
|
+
it names.
|
|
14
|
+
|
|
15
|
+
### Documentation
|
|
16
|
+
|
|
17
|
+
- `RECOVERY_REDEPLOY_OVER_FAILED_RUNTIME` also covers the grant Cloudly makes when the retained
|
|
18
|
+
deployment plan breaks the plan contract (unexecutable, such as a Swarm-era plan without
|
|
19
|
+
`containerInvocation`), the runtime is unattested and no deployment operation is in flight.
|
|
20
|
+
|
|
21
|
+
## 2026-10-13 - 32.55.0
|
|
22
|
+
|
|
23
|
+
### Features
|
|
24
|
+
|
|
25
|
+
- `IClusterHttpRoute` takes an optional `sourceAllowList`: the only sources the cluster ingress
|
|
26
|
+
serves the hostname to, as 1 to `clusterIngressLimits.maximumSourceAllowListEntries` (64)
|
|
27
|
+
distinct canonical address prefixes of either family, none of length zero; absent means every
|
|
28
|
+
source. `validateClusterRouteSourceAllowList(value, path?)` judges one list, and
|
|
29
|
+
`validateClusterRouteTable` judges it on every route that carries it. A reader built before the
|
|
30
|
+
member refuses the whole table that carries it, so an ingress that applies it registers with the
|
|
31
|
+
new `clusterIngressCapabilities.routeSourceAllowList` (`route-source-allowlist`,
|
|
32
|
+
`TClusterIngressCapability`), and Cloudly sends it only to such an ingress through a relay on this
|
|
33
|
+
release or later.
|
|
34
|
+
- `ICloudlySettings.dcrouterForwardSourceAddresses`: the source addresses dcrouter's forwarded
|
|
35
|
+
connections arrive from at a node, as canonical address prefixes judged by
|
|
36
|
+
`validateClusterRouteSourceAllowList`. Cloudly restricts every non-public hostname a node's
|
|
37
|
+
cluster ingress serves to them, so the gateway that checks the hostname's source profile stays
|
|
38
|
+
the only way in.
|
|
39
|
+
|
|
40
|
+
### Maintenance
|
|
41
|
+
|
|
42
|
+
- release tooling: @git.zone/tstest 7.2.1, pnpm 12.10.1
|
|
43
|
+
|
|
3
44
|
## 2026-10-12 - 32.54.0
|
|
4
45
|
|
|
5
46
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.55.1',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -18,11 +18,23 @@ export declare const clusterIngressLimits: Readonly<{
|
|
|
18
18
|
maximumRoutes: 4096;
|
|
19
19
|
maximumPortRoutes: 1024;
|
|
20
20
|
maximumDestinationsPerRoute: 64;
|
|
21
|
+
maximumSourceAllowListEntries: 64;
|
|
21
22
|
maximumStatisticsPageSize: 1000;
|
|
22
23
|
maximumCursorLength: 512;
|
|
23
24
|
maximumIdentifierLength: 200;
|
|
24
25
|
maximumIngressCapabilities: 32;
|
|
25
26
|
}>;
|
|
27
|
+
/**
|
|
28
|
+
* The capabilities an ingress names on its registration, each spelled once here.
|
|
29
|
+
*
|
|
30
|
+
* `routeSourceAllowList`: the ingress applies `IClusterHttpRoute.sourceAllowList`. A route table
|
|
31
|
+
* that carries the member is refused whole by a reader built before it, so Cloudly sends a route
|
|
32
|
+
* with a source allowlist only to an ingress that registered with this capability.
|
|
33
|
+
*/
|
|
34
|
+
export declare const clusterIngressCapabilities: Readonly<{
|
|
35
|
+
readonly routeSourceAllowList: 'route-source-allowlist';
|
|
36
|
+
}>;
|
|
37
|
+
export type TClusterIngressCapability = (typeof clusterIngressCapabilities)[keyof typeof clusterIngressCapabilities];
|
|
26
38
|
/** One backend a route forwards to: an address a node answers on, and its port. */
|
|
27
39
|
export interface IClusterRouteDestination {
|
|
28
40
|
address: string;
|
|
@@ -50,6 +62,22 @@ export interface IClusterHttpRoute {
|
|
|
50
62
|
privateKey: string;
|
|
51
63
|
};
|
|
52
64
|
authentication?: IClusterRouteAuthentication;
|
|
65
|
+
/**
|
|
66
|
+
* The only sources the ingress serves `hostName` to, as canonical address prefixes of either
|
|
67
|
+
* family (`192.0.2.10/32`, `2001:db8::/64`); a request from any other source is refused.
|
|
68
|
+
* Absent means every source. When present it lists 1 to
|
|
69
|
+
* `clusterIngressLimits.maximumSourceAllowListEntries` distinct prefixes, none of length zero:
|
|
70
|
+
* an unrestricted route omits the member rather than spelling "everyone" a second way. No prefix
|
|
71
|
+
* lies inside the IPv4-mapped range `::ffff:0:0/96`: the ingress compares an IPv4-mapped client
|
|
72
|
+
* as IPv4, so such a prefix could never match and the ingress refuses the whole table carrying
|
|
73
|
+
* it; an IPv4 source is written as IPv4 (`192.0.2.0/24`, not `::ffff:c000:200/120`). A shorter
|
|
74
|
+
* IPv6 prefix that merely contains that range is accepted and admits only IPv6 sources.
|
|
75
|
+
*
|
|
76
|
+
* Cloudly sets it on a hostname that is not public, to the addresses the gateway forwards from,
|
|
77
|
+
* so the gateway that checked the source stays the only way in. An ingress that applies it
|
|
78
|
+
* registers with `clusterIngressCapabilities.routeSourceAllowList`.
|
|
79
|
+
*/
|
|
80
|
+
sourceAllowList?: string[];
|
|
53
81
|
}
|
|
54
82
|
/** One TCP or UDP port the ingress forwards without terminating anything. */
|
|
55
83
|
export interface IClusterPortRoute {
|
|
@@ -108,6 +136,16 @@ export interface IClusterTrafficStatistics {
|
|
|
108
136
|
* table that carried both would serve one of them without a certificate.
|
|
109
137
|
*/
|
|
110
138
|
export declare const isClusterIngressHostName: (valueArg: unknown) => valueArg is string;
|
|
139
|
+
/**
|
|
140
|
+
* Validates one source allowlist (`IClusterHttpRoute.sourceAllowList`) and names every reason it is
|
|
141
|
+
* refused: 1 to `clusterIngressLimits.maximumSourceAllowListEntries` distinct canonical address
|
|
142
|
+
* prefixes whose host bits are zero, none of length zero and none inside the IPv4-mapped range
|
|
143
|
+
* `::ffff:0:0/96` (prefix length 96 or more with the `::ffff` head). The ingress compares an
|
|
144
|
+
* IPv4-mapped client as IPv4, so a mapped entry could never match and the ingress refuses the whole
|
|
145
|
+
* table that carries one; the reason names the IPv4 prefix to write instead. A shorter IPv6 prefix
|
|
146
|
+
* that merely contains the mapped range still matches the IPv6 sources it names and is accepted.
|
|
147
|
+
*/
|
|
148
|
+
export declare const validateClusterRouteSourceAllowList: (valueArg: unknown, pathArg?: string) => string[];
|
|
111
149
|
/**
|
|
112
150
|
* Validates one route table and names every reason it is refused.
|
|
113
151
|
*
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
|
|
2
2
|
import { isUtcCalendarDay } from '../private/utccalendarday.js';
|
|
3
3
|
import { validateProtocolOfferOn } from '../protocol.js';
|
|
4
|
-
import { hasExactKeys, readExactDataRecord } from '../private/dataproperties.js';
|
|
4
|
+
import { hasExactKeys, readDataElements, readExactDataRecord } from '../private/dataproperties.js';
|
|
5
|
+
import { formatCanonicalIpPrefix, ipv4PrefixOfMapped, parseCanonicalIpPrefix, } from '../private/ipaddress.js';
|
|
5
6
|
import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
6
7
|
import { validateClusterRelay } from './cluster.js';
|
|
7
8
|
/**
|
|
@@ -23,11 +24,22 @@ export const clusterIngressLimits = Object.freeze({
|
|
|
23
24
|
maximumRoutes: 4096,
|
|
24
25
|
maximumPortRoutes: 1024,
|
|
25
26
|
maximumDestinationsPerRoute: 64,
|
|
27
|
+
maximumSourceAllowListEntries: 64,
|
|
26
28
|
maximumStatisticsPageSize: 1000,
|
|
27
29
|
maximumCursorLength: 512,
|
|
28
30
|
maximumIdentifierLength: 200,
|
|
29
31
|
maximumIngressCapabilities: 32,
|
|
30
32
|
});
|
|
33
|
+
/**
|
|
34
|
+
* The capabilities an ingress names on its registration, each spelled once here.
|
|
35
|
+
*
|
|
36
|
+
* `routeSourceAllowList`: the ingress applies `IClusterHttpRoute.sourceAllowList`. A route table
|
|
37
|
+
* that carries the member is refused whole by a reader built before it, so Cloudly sends a route
|
|
38
|
+
* with a source allowlist only to an ingress that registered with this capability.
|
|
39
|
+
*/
|
|
40
|
+
export const clusterIngressCapabilities = Object.freeze({
|
|
41
|
+
routeSourceAllowList: 'route-source-allowlist',
|
|
42
|
+
});
|
|
31
43
|
const isRecord = (valueArg) => (Boolean(valueArg)
|
|
32
44
|
&& typeof valueArg === 'object'
|
|
33
45
|
&& !Array.isArray(valueArg)
|
|
@@ -101,9 +113,49 @@ const validateAuthentication = (valueArg, pathArg) => {
|
|
|
101
113
|
? []
|
|
102
114
|
: [`${pathArg} must be Basic authentication with a user and a pass`];
|
|
103
115
|
};
|
|
116
|
+
/**
|
|
117
|
+
* Validates one source allowlist (`IClusterHttpRoute.sourceAllowList`) and names every reason it is
|
|
118
|
+
* refused: 1 to `clusterIngressLimits.maximumSourceAllowListEntries` distinct canonical address
|
|
119
|
+
* prefixes whose host bits are zero, none of length zero and none inside the IPv4-mapped range
|
|
120
|
+
* `::ffff:0:0/96` (prefix length 96 or more with the `::ffff` head). The ingress compares an
|
|
121
|
+
* IPv4-mapped client as IPv4, so a mapped entry could never match and the ingress refuses the whole
|
|
122
|
+
* table that carries one; the reason names the IPv4 prefix to write instead. A shorter IPv6 prefix
|
|
123
|
+
* that merely contains the mapped range still matches the IPv6 sources it names and is accepted.
|
|
124
|
+
*/
|
|
125
|
+
export const validateClusterRouteSourceAllowList = (valueArg, pathArg = 'sourceAllowList') => {
|
|
126
|
+
const maximum = clusterIngressLimits.maximumSourceAllowListEntries;
|
|
127
|
+
const prefixes = readDataElements(valueArg, maximum);
|
|
128
|
+
if (prefixes === null || prefixes.length === 0) {
|
|
129
|
+
return [`${pathArg} must list 1 to ${maximum} address prefixes`];
|
|
130
|
+
}
|
|
131
|
+
const errors = [];
|
|
132
|
+
prefixes.forEach((prefixArg, indexArg) => {
|
|
133
|
+
const prefix = parseCanonicalIpPrefix(prefixArg);
|
|
134
|
+
const mappedIpv4 = prefix === null ? null : ipv4PrefixOfMapped(prefix);
|
|
135
|
+
if (prefix === null) {
|
|
136
|
+
errors.push(`${pathArg}[${indexArg}] must be a canonical address prefix whose host bits are zero`);
|
|
137
|
+
}
|
|
138
|
+
else if (prefix.length === 0) {
|
|
139
|
+
errors.push(`${pathArg}[${indexArg}] must not admit a whole address family; `
|
|
140
|
+
+ 'an unrestricted route omits sourceAllowList');
|
|
141
|
+
}
|
|
142
|
+
else if (mappedIpv4 !== null) {
|
|
143
|
+
// Its IPv4 form of `::ffff:0:0/96` would be `0.0.0.0/0`, itself refused above.
|
|
144
|
+
errors.push(`${pathArg}[${indexArg}] must not be IPv4-mapped: an IPv4-mapped prefix never matches, `
|
|
145
|
+
+ 'because the ingress compares clients as IPv4; '
|
|
146
|
+
+ (mappedIpv4.length === 0
|
|
147
|
+
? 'its IPv4 form admits a whole address family, and an unrestricted route omits sourceAllowList'
|
|
148
|
+
: `write ${formatCanonicalIpPrefix(mappedIpv4)}`));
|
|
149
|
+
}
|
|
150
|
+
else if (prefixes.indexOf(prefixArg) !== indexArg) {
|
|
151
|
+
errors.push(`${pathArg}[${indexArg}] repeats ${prefixArg}`);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
return errors;
|
|
155
|
+
};
|
|
104
156
|
const validateHttpRoute = (valueArg, pathArg) => {
|
|
105
157
|
if (!isRecord(valueArg)
|
|
106
|
-
|| !hasExactKeys(valueArg, ['hostName', 'destinations', 'certificate'], ['authentication'])) {
|
|
158
|
+
|| !hasExactKeys(valueArg, ['hostName', 'destinations', 'certificate'], ['authentication', 'sourceAllowList'])) {
|
|
107
159
|
return [`${pathArg} must use its exact schema`];
|
|
108
160
|
}
|
|
109
161
|
const errors = [];
|
|
@@ -115,6 +167,9 @@ const validateHttpRoute = (valueArg, pathArg) => {
|
|
|
115
167
|
if (valueArg.authentication !== undefined) {
|
|
116
168
|
errors.push(...validateAuthentication(valueArg.authentication, `${pathArg} authentication`));
|
|
117
169
|
}
|
|
170
|
+
if (valueArg.sourceAllowList !== undefined) {
|
|
171
|
+
errors.push(...validateClusterRouteSourceAllowList(valueArg.sourceAllowList, `${pathArg} sourceAllowList`));
|
|
172
|
+
}
|
|
118
173
|
return errors;
|
|
119
174
|
};
|
|
120
175
|
const validatePortRoute = (valueArg, pathArg) => {
|
|
@@ -441,4 +496,4 @@ export const validateClusterIngressRouteTableChange = (valueArg, pathArg = 'clus
|
|
|
441
496
|
? []
|
|
442
497
|
: [`${pathArg} revision must be a non-negative safe integer`];
|
|
443
498
|
};
|
|
444
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusteringress.js","sourceRoot":"","sources":["../../ts/data/clusteringress.ts"],"names":[],"mappings":"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"}
|
|
499
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusteringress.js","sourceRoot":"","sources":["../../ts/data/clusteringress.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,9 +46,14 @@ export type TDeploymentPreflightWarningCode = 'RECOVERY_REDEPLOY_OVER_FAILED_RUN
|
|
|
46
46
|
* `RECOVERY_REDEPLOY_OVER_FAILED_RUNTIME` documents that an existing-service
|
|
47
47
|
* reserve preflight suppressed the CURRENT_RUNTIME_DIGEST_MISSING and
|
|
48
48
|
* RUNTIME_ATTESTATION_MISMATCH blockers because the current runtime provides
|
|
49
|
-
* no consistent attested digest and
|
|
50
|
-
*
|
|
51
|
-
* runtime)
|
|
49
|
+
* no consistent attested digest and either
|
|
50
|
+
* - the service's most recent deployment operation ended 'failed' or
|
|
51
|
+
* 'cleaned' (a recovery redeploy over a known-bad runtime), or
|
|
52
|
+
* - the retained deployment plan breaks the plan contract, so it can never be
|
|
53
|
+
* executed again (for example a Swarm-era plan without
|
|
54
|
+
* `containerInvocation`), and no deployment operation is in flight: the
|
|
55
|
+
* most recent one is absent or ended 'succeeded', 'rolled-back', 'failed'
|
|
56
|
+
* or 'cleaned' (a recovery redeploy over an unexecutable plan).
|
|
52
57
|
* `PLATFORM_BINDING_READINESS_DEFERRED` documents that the promote preflight
|
|
53
58
|
* of a held greenfield service that was never promoted accepted a Corestore
|
|
54
59
|
* `database` or `objectstorage` binding that is enabled but not yet `ready`.
|
|
@@ -306,4 +306,4 @@ export const validateDeploymentReleaseEvidence = (argsArg) => {
|
|
|
306
306
|
}
|
|
307
307
|
return blockers;
|
|
308
308
|
};
|
|
309
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentpreflight.js","sourceRoot":"","sources":["../../ts/data/deploymentpreflight.ts"],"names":[],"mappings":"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"}
|
|
309
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentpreflight.js","sourceRoot":"","sources":["../../ts/data/deploymentpreflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,16 @@ export interface ICloudlySettings {
|
|
|
29
29
|
dcrouterTargetHost?: string;
|
|
30
30
|
dcrouterTargetPort?: number;
|
|
31
31
|
dcrouterTargetHostsByNode?: Record<string, string>;
|
|
32
|
+
/**
|
|
33
|
+
* The source addresses dcrouter's forwarded connections arrive from at a node, as canonical
|
|
34
|
+
* address prefixes (`192.0.2.10/32`). Cloudly restricts every non-public hostname a node's
|
|
35
|
+
* cluster ingress serves to them (`IClusterHttpRoute.sourceAllowList`), so the gateway that checks
|
|
36
|
+
* the hostname's source profile stays the only way in. Absent: no non-public hostname is served
|
|
37
|
+
* by a cluster ingress. A value is accepted only when `validateClusterRouteSourceAllowList`
|
|
38
|
+
* answers no error; an IPv4 source is written as IPv4 (`192.0.2.0/24`), never as an IPv4-mapped
|
|
39
|
+
* IPv6 prefix (`::ffff:c000:200/120`), which the ingress could never match.
|
|
40
|
+
*/
|
|
41
|
+
dcrouterForwardSourceAddresses?: string[];
|
|
32
42
|
dcrouterMailSubmissionHost?: string;
|
|
33
43
|
dcrouterMailSubmissionPort?: number;
|
|
34
44
|
dcrouterMailSubmissionTlsMode?: 'plain' | 'starttls' | 'implicitTls';
|
package/dist_ts/data/settings.js
CHANGED
|
@@ -122,4 +122,4 @@ export const validateExternalGatewayEnrollmentState = (valueArg) => {
|
|
|
122
122
|
}
|
|
123
123
|
return errors;
|
|
124
124
|
};
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dGluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL3NldHRpbmdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQWlGaEYsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNwRCxJQUFJLEVBQUUsUUFBUTtJQUNkLFFBQVEsRUFBRSxrQkFBa0I7Q0FDUyxDQUFDLENBQUM7QUFFekMsTUFBTSxDQUFDLE1BQU0sa0NBQWtDLEdBQzdDLHlCQUFtRSxDQUFDO0FBRXRFLHVFQUF1RTtBQUN2RSxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ25ELFlBQVksRUFBRSxlQUFlO0lBQzdCLGVBQWUsRUFBRSxrQkFBa0I7SUFDbkMsK0JBQStCLEVBQUUsb0NBQW9DO0lBQ3JFLHVCQUF1QixFQUFFLDRCQUE0QjtJQUNyRCxlQUFlLEVBQUUsbUJBQW1CO0lBQ3BDLG9CQUFvQixFQUFFLHdCQUF3QjtJQUM5QyxnQkFBZ0IsRUFBRSxtQkFBbUI7SUFDckMsWUFBWSxFQUFFLGdCQUFnQjtJQUM5QixZQUFZLEVBQUUsZ0JBQWdCO0lBQzlCLFNBQVMsRUFBRSxZQUFZO0lBQ3ZCLGlCQUFpQixFQUFFLG9CQUFvQjtJQUN2QyxhQUFhLEVBQUUsaUJBQWlCO0lBQ2hDLGlCQUFpQixFQUFFLHFCQUFxQjtJQUN4QyxhQUFhLEVBQUUsaUJBQWlCO0lBQ2hDLG1CQUFtQixFQUFFLHVCQUF1QjtJQUM1QyxjQUFjLEVBQUUsa0JBQWtCO0lBQ2xDLG9CQUFvQixFQUFFLHlCQUF5QjtJQUMvQyxXQUFXLEVBQUUsZUFBZTtJQUM1QixXQUFXLEVBQUUsY0FBYztJQUMzQixpQkFBaUIsRUFBRSxxQkFBcUI7SUFDeEMsb0JBQW9CLEVBQUUsd0JBQXdCO0lBQzlDLGNBQWMsRUFB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
|
|
@@ -27,3 +27,11 @@ export declare const parseCanonicalIpAddress: (valueArg: unknown) => IIpAddressV
|
|
|
27
27
|
export declare const parseCanonicalIpPrefix: (valueArg: unknown) => IIpPrefixValue | null;
|
|
28
28
|
/** True when the address lies inside the prefix; families never contain each other. */
|
|
29
29
|
export declare const ipPrefixContains: (prefixArg: IIpPrefixValue, addressArg: IIpAddressValue) => boolean;
|
|
30
|
+
/** The canonical text of one prefix, the spelling `parseCanonicalIpPrefix` reads back. */
|
|
31
|
+
export declare const formatCanonicalIpPrefix: (prefixArg: IIpPrefixValue) => string;
|
|
32
|
+
/**
|
|
33
|
+
* The IPv4 prefix an IPv6 prefix inside the IPv4-mapped range `::ffff:0:0/96` spells
|
|
34
|
+
* (`::ffff:c000:200/120` is `192.0.2.0/24`), or `null` for any other prefix. A shorter IPv6 prefix
|
|
35
|
+
* that merely contains the range is not mapped: it still names IPv6 addresses outside it.
|
|
36
|
+
*/
|
|
37
|
+
export declare const ipv4PrefixOfMapped: (prefixArg: IIpPrefixValue) => IIpPrefixValue | null;
|
|
@@ -46,6 +46,8 @@ const parseIpv6 = (valueArg) => {
|
|
|
46
46
|
}
|
|
47
47
|
return groups.reduce((sumArg, groupArg) => (sumArg << 16n) | BigInt(parseInt(groupArg, 16)), 0n);
|
|
48
48
|
};
|
|
49
|
+
/** The dotted-quad text of one IPv4 address. */
|
|
50
|
+
const formatIpv4 = (valueArg) => [24n, 16n, 8n, 0n].map((shiftArg) => ((valueArg >> shiftArg) & 0xffn).toString()).join('.');
|
|
49
51
|
/** The RFC 5952 text of one IPv6 address. */
|
|
50
52
|
const formatIpv6 = (valueArg) => {
|
|
51
53
|
const groups = [];
|
|
@@ -117,4 +119,18 @@ export const ipPrefixContains = (prefixArg, addressArg) => {
|
|
|
117
119
|
const hostBits = BigInt(familyBits(prefixArg.family) - prefixArg.length);
|
|
118
120
|
return addressArg.value >> hostBits === prefixArg.network >> hostBits;
|
|
119
121
|
};
|
|
120
|
-
|
|
122
|
+
/** The canonical text of one prefix, the spelling `parseCanonicalIpPrefix` reads back. */
|
|
123
|
+
export const formatCanonicalIpPrefix = (prefixArg) => `${prefixArg.family === 4 ? formatIpv4(prefixArg.network) : formatIpv6(prefixArg.network)}/${prefixArg.length}`;
|
|
124
|
+
/** Length of the IPv4-mapped IPv6 range `::ffff:0:0/96` (RFC 4291 section 2.5.5.2). */
|
|
125
|
+
const ipv4MappedPrefixLength = 96;
|
|
126
|
+
/**
|
|
127
|
+
* The IPv4 prefix an IPv6 prefix inside the IPv4-mapped range `::ffff:0:0/96` spells
|
|
128
|
+
* (`::ffff:c000:200/120` is `192.0.2.0/24`), or `null` for any other prefix. A shorter IPv6 prefix
|
|
129
|
+
* that merely contains the range is not mapped: it still names IPv6 addresses outside it.
|
|
130
|
+
*/
|
|
131
|
+
export const ipv4PrefixOfMapped = (prefixArg) => prefixArg.family === 6
|
|
132
|
+
&& prefixArg.length >= ipv4MappedPrefixLength
|
|
133
|
+
&& prefixArg.network >> 32n === 0xffffn
|
|
134
|
+
? { family: 4, network: prefixArg.network & 0xffffffffn, length: prefixArg.length - ipv4MappedPrefixLength }
|
|
135
|
+
: null;
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBhZGRyZXNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcHJpdmF0ZS9pcGFkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7OztHQVNHO0FBZUgsTUFBTSxVQUFVLEdBQUcsQ0FBQyxTQUEyQixFQUFVLEVBQUUsQ0FBQyxDQUFDLFNBQVMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7QUFFekYsTUFBTSxTQUFTLEdBQUcsQ0FBQyxRQUFnQixFQUFpQixFQUFFO0lBQ3BELElBQUksUUFBUSxDQUFDLE1BQU0sR0FBRyxFQUFFLEVBQUUsQ0FBQztRQUN6QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25DLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDO1dBQ2xCLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMseUJBQXlCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3RHLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUM1RixDQUFDLENBQUM7QUFFRixNQUFNLGVBQWUsR0FBRyxDQUFDLFFBQWdCLEVBQW1CLEVBQUU7SUFDNUQsSUFBSSxRQUFRLENBQUMsTUFBTSxHQUFHLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUMzRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLElBQUksTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN0QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUQsSUFBSSxNQUFNLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ3hCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMxRCxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNsQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxPQUFPLENBQUMsR0FBRyxJQUFJLEVBQUUsR0FBRyxJQUFJLEtBQUssQ0FBUyxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7QUFDM0YsQ0FBQyxDQUFDO0FBRUYsTUFBTSxTQUFTLEdBQUcsQ0FBQyxRQUFnQixFQUFpQixFQUFFO0lBQ3BELE1BQU0sTUFBTSxHQUFHLGVBQWUsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN6QyxJQUFJLE1BQU0sS0FBSyxJQUFJLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDO1dBQ3JDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNuRSxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ25HLENBQUMsQ0FBQztBQUVGLGdEQUFnRDtBQUNoRCxNQUFNLFVBQVUsR0FBRyxDQUFDLFFBQWdCLEVBQVUsRUFBRSxDQUM5QyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsSUFBSSxRQUFRLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUU5Riw2Q0FBNkM7QUFDN0MsTUFBTSxVQUFVLEdBQUcsQ0FBQyxRQUFnQixFQUFVLEVBQUU7SUFDOUMsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO0lBQzVCLEtBQUssSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUN4QyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsSUFBSSxNQUFNLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBQ0QsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDbkIsSUFBSSxVQUFVLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLEtBQUssSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssR0FBRyxDQUFDLEdBQUcsQ0FBQztRQUMvQixJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN4QixLQUFLLEVBQUUsQ0FBQztZQUNSLFNBQVM7UUFDWCxDQUFDO1FBQ0QsSUFBSSxHQUFHLEdBQUcsS0FBSyxDQUFDO1FBQ2hCLE9BQU8sR0FBRyxHQUFHLENBQUMsSUFBSSxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDcEMsR0FBRyxFQUFFLENBQUM7UUFDUixDQUFDO1FBQ0QsSUFBSSxHQUFHLEdBQUcsS0FBSyxHQUFHLFVBQVUsRUFBRSxDQUFDO1lBQzdCLFNBQVMsR0FBRyxLQUFLLENBQUM7WUFDbEIsVUFBVSxHQUFHLEdBQUcsR0FBRyxLQUFLLENBQUM7UUFDM0IsQ0FBQztRQUNELEtBQUssR0FBRyxHQUFHLENBQUM7SUFDZCxDQUFDO0lBQ0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdELElBQUksVUFBVSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ25CLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN4QixDQUFDO0lBQ0QsT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsR0FBRyxVQUFVLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztBQUNsRyxDQUFDLENBQUM7QUFFRixtRkFBbUY7QUFDbkYsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxRQUFpQixFQUEwQixFQUFFO0lBQ25GLElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDakMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLElBQUksSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ2xCLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBQ0QsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLE9BQU8sSUFBSSxLQUFLLElBQUksSUFBSSxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7QUFDNUYsQ0FBQyxDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxRQUFpQixFQUF5QixFQUFFO0lBQ2pGLElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDakMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNsQyxJQUFJLEtBQUssQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDcEUsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsTUFBTSxPQUFPLEdBQUcsdUJBQXVCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hDLElBQUksT0FBTyxLQUFLLElBQUksSUFBSSxNQUFNLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1FBQzVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDO0lBQzdELE9BQU8sT0FBTyxDQUFDLEtBQUssR0FBRyxDQUFDLEVBQUUsSUFBSSxRQUFRLENBQUMsS0FBSyxFQUFFO1FBQzVDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRTtRQUM1RCxDQUFDLENBQUMsSUFBSSxDQUFDO0FBQ1gsQ0FBQyxDQUFDO0FBRUYsdUZBQXVGO0FBQ3ZGLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsU0FBeUIsRUFBRSxVQUEyQixFQUFXLEVBQUU7SUFDbEcsSUFBSSxTQUFTLENBQUMsTUFBTSxLQUFLLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUMzQyxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDekUsT0FBTyxVQUFVLENBQUMsS0FBSyxJQUFJLFFBQVEsS0FBSyxTQUFTLENBQUMsT0FBTyxJQUFJLFFBQVEsQ0FBQztBQUN4RSxDQUFDLENBQUM7QUFFRiwwRkFBMEY7QUFDMUYsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxTQUF5QixFQUFVLEVBQUUsQ0FDM0UsR0FBRyxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUM7QUFFbEgsdUZBQXVGO0FBQ3ZGLE1BQU0sc0JBQXNCLEdBQUcsRUFBRSxDQUFDO0FBRWxDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxDQUFDLFNBQXlCLEVBQXlCLEVBQUUsQ0FDckYsU0FBUyxDQUFDLE1BQU0sS0FBSyxDQUFDO09BQ2pCLFNBQVMsQ0FBQyxNQUFNLElBQUksc0JBQXNCO09BQzFDLFNBQVMsQ0FBQyxPQUFPLElBQUksR0FBRyxLQUFLLE9BQU87SUFDdkMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQUUsU0FBUyxDQUFDLE9BQU8sR0FBRyxXQUFXLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxNQUFNLEdBQUcsc0JBQXNCLEVBQUU7SUFDNUcsQ0FBQyxDQUFDLElBQUksQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.55.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@git.zone/tsbuild": "^6.0.2",
|
|
31
31
|
"@git.zone/tsdoc": "^3.0.2",
|
|
32
32
|
"@git.zone/tsrun": "^3.0.3",
|
|
33
|
-
"@git.zone/tstest": "^7.2.
|
|
33
|
+
"@git.zone/tstest": "^7.2.1",
|
|
34
34
|
"@types/node": "26.6.4",
|
|
35
35
|
"typescript": "^6.0.3"
|
|
36
36
|
},
|
package/readme.md
CHANGED
|
@@ -3329,8 +3329,21 @@ schema field: the protocol version is the installed `@serve.zone/interfaces` ver
|
|
|
3329
3329
|
than the one they hold and ignore anything else, so a repeated push, a replayed push and a push
|
|
3330
3330
|
that crossed a newer one all settle the same way. `IClusterHttpRoute` names one hostname, its
|
|
3331
3331
|
`destinations` (`{ address, port }`, unicast IPv4 and a real port), the `certificate` that
|
|
3332
|
-
terminates it
|
|
3333
|
-
|
|
3332
|
+
terminates it, optional Basic `authentication` and an optional `sourceAllowList`: the only
|
|
3333
|
+
sources the ingress serves the hostname to, as 1 to `clusterIngressLimits.maximumSourceAllowListEntries`
|
|
3334
|
+
(64) distinct canonical address prefixes of either family (`192.0.2.10/32`), none of length zero;
|
|
3335
|
+
absent means every source. No entry may lie inside the IPv4-mapped range `::ffff:0:0/96` (length
|
|
3336
|
+
96 or more with the `::ffff` head): the ingress compares an IPv4-mapped client as IPv4, so such an
|
|
3337
|
+
entry could never match and the ingress would refuse the whole table carrying it. The reason names
|
|
3338
|
+
the IPv4 prefix to write instead (`::ffff:c000:200/120` → `192.0.2.0/24`). A shorter IPv6 prefix
|
|
3339
|
+
that merely contains the mapped range (`::/80`) is accepted and admits only IPv6 sources. Cloudly sets it on a hostname that is not public, to the addresses the
|
|
3340
|
+
gateway forwards from (`ICloudlySettings.dcrouterForwardSourceAddresses`), so the gateway that
|
|
3341
|
+
checks the hostname's source profile stays the only way in whether or not the node's uplink is
|
|
3342
|
+
reachable from elsewhere. `validateClusterRouteSourceAllowList(value, path?)` judges one list. A
|
|
3343
|
+
reader built before the member refuses the whole table that carries it, so an ingress that applies
|
|
3344
|
+
it registers with `clusterIngressCapabilities.routeSourceAllowList` (`route-source-allowlist`), and
|
|
3345
|
+
Cloudly sends the member only to such an ingress through a relay that reads it.
|
|
3346
|
+
`IClusterPortRoute` forwards a TCP or UDP listen port without terminating anything. `validateClusterRouteTable(value, path?)` returns one
|
|
3334
3347
|
named reason per violation, refuses two routes for one hostname and two port routes for one
|
|
3335
3348
|
transport and port, and — because a validation reason travels into logs — **never quotes
|
|
3336
3349
|
certificate material or a password in a reason**.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
|
|
2
2
|
import { isUtcCalendarDay } from '../private/utccalendarday.js';
|
|
3
3
|
import { validateProtocolOfferOn } from '../protocol.js';
|
|
4
|
-
import { hasExactKeys, readExactDataRecord } from '../private/dataproperties.js';
|
|
4
|
+
import { hasExactKeys, readDataElements, readExactDataRecord } from '../private/dataproperties.js';
|
|
5
|
+
import {
|
|
6
|
+
formatCanonicalIpPrefix,
|
|
7
|
+
ipv4PrefixOfMapped,
|
|
8
|
+
parseCanonicalIpPrefix,
|
|
9
|
+
} from '../private/ipaddress.js';
|
|
5
10
|
import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
6
11
|
import { validateClusterRelay } from './cluster.js';
|
|
7
12
|
import type { TServiceRuntimeRefusal } from './serviceruntime.js';
|
|
@@ -26,12 +31,27 @@ export const clusterIngressLimits = Object.freeze({
|
|
|
26
31
|
maximumRoutes: 4096,
|
|
27
32
|
maximumPortRoutes: 1024,
|
|
28
33
|
maximumDestinationsPerRoute: 64,
|
|
34
|
+
maximumSourceAllowListEntries: 64,
|
|
29
35
|
maximumStatisticsPageSize: 1000,
|
|
30
36
|
maximumCursorLength: 512,
|
|
31
37
|
maximumIdentifierLength: 200,
|
|
32
38
|
maximumIngressCapabilities: 32,
|
|
33
39
|
});
|
|
34
40
|
|
|
41
|
+
/**
|
|
42
|
+
* The capabilities an ingress names on its registration, each spelled once here.
|
|
43
|
+
*
|
|
44
|
+
* `routeSourceAllowList`: the ingress applies `IClusterHttpRoute.sourceAllowList`. A route table
|
|
45
|
+
* that carries the member is refused whole by a reader built before it, so Cloudly sends a route
|
|
46
|
+
* with a source allowlist only to an ingress that registered with this capability.
|
|
47
|
+
*/
|
|
48
|
+
export const clusterIngressCapabilities = Object.freeze({
|
|
49
|
+
routeSourceAllowList: 'route-source-allowlist',
|
|
50
|
+
} as const);
|
|
51
|
+
|
|
52
|
+
export type TClusterIngressCapability =
|
|
53
|
+
(typeof clusterIngressCapabilities)[keyof typeof clusterIngressCapabilities];
|
|
54
|
+
|
|
35
55
|
/** One backend a route forwards to: an address a node answers on, and its port. */
|
|
36
56
|
export interface IClusterRouteDestination {
|
|
37
57
|
address: string;
|
|
@@ -61,6 +81,22 @@ export interface IClusterHttpRoute {
|
|
|
61
81
|
privateKey: string;
|
|
62
82
|
};
|
|
63
83
|
authentication?: IClusterRouteAuthentication;
|
|
84
|
+
/**
|
|
85
|
+
* The only sources the ingress serves `hostName` to, as canonical address prefixes of either
|
|
86
|
+
* family (`192.0.2.10/32`, `2001:db8::/64`); a request from any other source is refused.
|
|
87
|
+
* Absent means every source. When present it lists 1 to
|
|
88
|
+
* `clusterIngressLimits.maximumSourceAllowListEntries` distinct prefixes, none of length zero:
|
|
89
|
+
* an unrestricted route omits the member rather than spelling "everyone" a second way. No prefix
|
|
90
|
+
* lies inside the IPv4-mapped range `::ffff:0:0/96`: the ingress compares an IPv4-mapped client
|
|
91
|
+
* as IPv4, so such a prefix could never match and the ingress refuses the whole table carrying
|
|
92
|
+
* it; an IPv4 source is written as IPv4 (`192.0.2.0/24`, not `::ffff:c000:200/120`). A shorter
|
|
93
|
+
* IPv6 prefix that merely contains that range is accepted and admits only IPv6 sources.
|
|
94
|
+
*
|
|
95
|
+
* Cloudly sets it on a hostname that is not public, to the addresses the gateway forwards from,
|
|
96
|
+
* so the gateway that checked the source stays the only way in. An ingress that applies it
|
|
97
|
+
* registers with `clusterIngressCapabilities.routeSourceAllowList`.
|
|
98
|
+
*/
|
|
99
|
+
sourceAllowList?: string[];
|
|
64
100
|
}
|
|
65
101
|
|
|
66
102
|
/** One TCP or UDP port the ingress forwards without terminating anything. */
|
|
@@ -205,9 +241,51 @@ const validateAuthentication = (valueArg: unknown, pathArg: string): string[] =>
|
|
|
205
241
|
: [`${pathArg} must be Basic authentication with a user and a pass`];
|
|
206
242
|
};
|
|
207
243
|
|
|
244
|
+
/**
|
|
245
|
+
* Validates one source allowlist (`IClusterHttpRoute.sourceAllowList`) and names every reason it is
|
|
246
|
+
* refused: 1 to `clusterIngressLimits.maximumSourceAllowListEntries` distinct canonical address
|
|
247
|
+
* prefixes whose host bits are zero, none of length zero and none inside the IPv4-mapped range
|
|
248
|
+
* `::ffff:0:0/96` (prefix length 96 or more with the `::ffff` head). The ingress compares an
|
|
249
|
+
* IPv4-mapped client as IPv4, so a mapped entry could never match and the ingress refuses the whole
|
|
250
|
+
* table that carries one; the reason names the IPv4 prefix to write instead. A shorter IPv6 prefix
|
|
251
|
+
* that merely contains the mapped range still matches the IPv6 sources it names and is accepted.
|
|
252
|
+
*/
|
|
253
|
+
export const validateClusterRouteSourceAllowList = (
|
|
254
|
+
valueArg: unknown,
|
|
255
|
+
pathArg = 'sourceAllowList',
|
|
256
|
+
): string[] => {
|
|
257
|
+
const maximum = clusterIngressLimits.maximumSourceAllowListEntries;
|
|
258
|
+
const prefixes = readDataElements(valueArg, maximum);
|
|
259
|
+
if (prefixes === null || prefixes.length === 0) {
|
|
260
|
+
return [`${pathArg} must list 1 to ${maximum} address prefixes`];
|
|
261
|
+
}
|
|
262
|
+
const errors: string[] = [];
|
|
263
|
+
prefixes.forEach((prefixArg, indexArg) => {
|
|
264
|
+
const prefix = parseCanonicalIpPrefix(prefixArg);
|
|
265
|
+
const mappedIpv4 = prefix === null ? null : ipv4PrefixOfMapped(prefix);
|
|
266
|
+
if (prefix === null) {
|
|
267
|
+
errors.push(`${pathArg}[${indexArg}] must be a canonical address prefix whose host bits are zero`);
|
|
268
|
+
} else if (prefix.length === 0) {
|
|
269
|
+
errors.push(`${pathArg}[${indexArg}] must not admit a whole address family; `
|
|
270
|
+
+ 'an unrestricted route omits sourceAllowList');
|
|
271
|
+
} else if (mappedIpv4 !== null) {
|
|
272
|
+
// Its IPv4 form of `::ffff:0:0/96` would be `0.0.0.0/0`, itself refused above.
|
|
273
|
+
errors.push(`${pathArg}[${indexArg}] must not be IPv4-mapped: an IPv4-mapped prefix never matches, `
|
|
274
|
+
+ 'because the ingress compares clients as IPv4; '
|
|
275
|
+
+ (mappedIpv4.length === 0
|
|
276
|
+
? 'its IPv4 form admits a whole address family, and an unrestricted route omits sourceAllowList'
|
|
277
|
+
: `write ${formatCanonicalIpPrefix(mappedIpv4)}`));
|
|
278
|
+
} else if (prefixes.indexOf(prefixArg) !== indexArg) {
|
|
279
|
+
errors.push(`${pathArg}[${indexArg}] repeats ${prefixArg}`);
|
|
280
|
+
}
|
|
281
|
+
});
|
|
282
|
+
return errors;
|
|
283
|
+
};
|
|
284
|
+
|
|
208
285
|
const validateHttpRoute = (valueArg: unknown, pathArg: string): string[] => {
|
|
209
286
|
if (!isRecord(valueArg)
|
|
210
|
-
|| !hasExactKeys(valueArg, ['hostName', 'destinations', 'certificate'],
|
|
287
|
+
|| !hasExactKeys(valueArg, ['hostName', 'destinations', 'certificate'],
|
|
288
|
+
['authentication', 'sourceAllowList'])) {
|
|
211
289
|
return [`${pathArg} must use its exact schema`];
|
|
212
290
|
}
|
|
213
291
|
const errors: string[] = [];
|
|
@@ -219,6 +297,10 @@ const validateHttpRoute = (valueArg: unknown, pathArg: string): string[] => {
|
|
|
219
297
|
if (valueArg.authentication !== undefined) {
|
|
220
298
|
errors.push(...validateAuthentication(valueArg.authentication, `${pathArg} authentication`));
|
|
221
299
|
}
|
|
300
|
+
if (valueArg.sourceAllowList !== undefined) {
|
|
301
|
+
errors.push(...validateClusterRouteSourceAllowList(valueArg.sourceAllowList,
|
|
302
|
+
`${pathArg} sourceAllowList`));
|
|
303
|
+
}
|
|
222
304
|
return errors;
|
|
223
305
|
};
|
|
224
306
|
|
|
@@ -117,9 +117,14 @@ export type TDeploymentPreflightWarningCode =
|
|
|
117
117
|
* `RECOVERY_REDEPLOY_OVER_FAILED_RUNTIME` documents that an existing-service
|
|
118
118
|
* reserve preflight suppressed the CURRENT_RUNTIME_DIGEST_MISSING and
|
|
119
119
|
* RUNTIME_ATTESTATION_MISMATCH blockers because the current runtime provides
|
|
120
|
-
* no consistent attested digest and
|
|
121
|
-
*
|
|
122
|
-
* runtime)
|
|
120
|
+
* no consistent attested digest and either
|
|
121
|
+
* - the service's most recent deployment operation ended 'failed' or
|
|
122
|
+
* 'cleaned' (a recovery redeploy over a known-bad runtime), or
|
|
123
|
+
* - the retained deployment plan breaks the plan contract, so it can never be
|
|
124
|
+
* executed again (for example a Swarm-era plan without
|
|
125
|
+
* `containerInvocation`), and no deployment operation is in flight: the
|
|
126
|
+
* most recent one is absent or ended 'succeeded', 'rolled-back', 'failed'
|
|
127
|
+
* or 'cleaned' (a recovery redeploy over an unexecutable plan).
|
|
123
128
|
* `PLATFORM_BINDING_READINESS_DEFERRED` documents that the promote preflight
|
|
124
129
|
* of a held greenfield service that was never promoted accepted a Corestore
|
|
125
130
|
* `database` or `objectstorage` binding that is enabled but not yet `ready`.
|
package/ts/data/settings.ts
CHANGED
|
@@ -39,6 +39,16 @@ export interface ICloudlySettings {
|
|
|
39
39
|
dcrouterTargetHost?: string;
|
|
40
40
|
dcrouterTargetPort?: number;
|
|
41
41
|
dcrouterTargetHostsByNode?: Record<string, string>;
|
|
42
|
+
/**
|
|
43
|
+
* The source addresses dcrouter's forwarded connections arrive from at a node, as canonical
|
|
44
|
+
* address prefixes (`192.0.2.10/32`). Cloudly restricts every non-public hostname a node's
|
|
45
|
+
* cluster ingress serves to them (`IClusterHttpRoute.sourceAllowList`), so the gateway that checks
|
|
46
|
+
* the hostname's source profile stays the only way in. Absent: no non-public hostname is served
|
|
47
|
+
* by a cluster ingress. A value is accepted only when `validateClusterRouteSourceAllowList`
|
|
48
|
+
* answers no error; an IPv4 source is written as IPv4 (`192.0.2.0/24`), never as an IPv4-mapped
|
|
49
|
+
* IPv6 prefix (`::ffff:c000:200/120`), which the ingress could never match.
|
|
50
|
+
*/
|
|
51
|
+
dcrouterForwardSourceAddresses?: string[];
|
|
42
52
|
dcrouterMailSubmissionHost?: string;
|
|
43
53
|
dcrouterMailSubmissionPort?: number;
|
|
44
54
|
dcrouterMailSubmissionTlsMode?: 'plain' | 'starttls' | 'implicitTls';
|
package/ts/private/ipaddress.ts
CHANGED
|
@@ -64,6 +64,10 @@ const parseIpv6 = (valueArg: string): bigint | null => {
|
|
|
64
64
|
return groups.reduce((sumArg, groupArg) => (sumArg << 16n) | BigInt(parseInt(groupArg, 16)), 0n);
|
|
65
65
|
};
|
|
66
66
|
|
|
67
|
+
/** The dotted-quad text of one IPv4 address. */
|
|
68
|
+
const formatIpv4 = (valueArg: bigint): string =>
|
|
69
|
+
[24n, 16n, 8n, 0n].map((shiftArg) => ((valueArg >> shiftArg) & 0xffn).toString()).join('.');
|
|
70
|
+
|
|
67
71
|
/** The RFC 5952 text of one IPv6 address. */
|
|
68
72
|
const formatIpv6 = (valueArg: bigint): string => {
|
|
69
73
|
const groups: number[] = [];
|
|
@@ -138,3 +142,22 @@ export const ipPrefixContains = (prefixArg: IIpPrefixValue, addressArg: IIpAddre
|
|
|
138
142
|
const hostBits = BigInt(familyBits(prefixArg.family) - prefixArg.length);
|
|
139
143
|
return addressArg.value >> hostBits === prefixArg.network >> hostBits;
|
|
140
144
|
};
|
|
145
|
+
|
|
146
|
+
/** The canonical text of one prefix, the spelling `parseCanonicalIpPrefix` reads back. */
|
|
147
|
+
export const formatCanonicalIpPrefix = (prefixArg: IIpPrefixValue): string =>
|
|
148
|
+
`${prefixArg.family === 4 ? formatIpv4(prefixArg.network) : formatIpv6(prefixArg.network)}/${prefixArg.length}`;
|
|
149
|
+
|
|
150
|
+
/** Length of the IPv4-mapped IPv6 range `::ffff:0:0/96` (RFC 4291 section 2.5.5.2). */
|
|
151
|
+
const ipv4MappedPrefixLength = 96;
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* The IPv4 prefix an IPv6 prefix inside the IPv4-mapped range `::ffff:0:0/96` spells
|
|
155
|
+
* (`::ffff:c000:200/120` is `192.0.2.0/24`), or `null` for any other prefix. A shorter IPv6 prefix
|
|
156
|
+
* that merely contains the range is not mapped: it still names IPv6 addresses outside it.
|
|
157
|
+
*/
|
|
158
|
+
export const ipv4PrefixOfMapped = (prefixArg: IIpPrefixValue): IIpPrefixValue | null =>
|
|
159
|
+
prefixArg.family === 6
|
|
160
|
+
&& prefixArg.length >= ipv4MappedPrefixLength
|
|
161
|
+
&& prefixArg.network >> 32n === 0xffffn
|
|
162
|
+
? { family: 4, network: prefixArg.network & 0xffffffffn, length: prefixArg.length - ipv4MappedPrefixLength }
|
|
163
|
+
: null;
|