@serve.zone/interfaces 30.3.0 → 30.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +10 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/privatenetwork.d.ts +28 -0
- package/dist_ts/data/privatenetwork.js +57 -1
- package/package.json +1 -1
- package/readme.md +13 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/privatenetwork.ts +72 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-09 - 30.4.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- add service private network DNS policy composition (privatenetwork-dns)
|
|
8
|
+
- Adds composeServicePrivateNetworkDnsPolicyV1 to derive detached service DNS policy metadata from membership and active network snapshots.
|
|
9
|
+
- Intersects external DNS upstreams and permitted suffixes across all attachments while preserving nested permitted branches.
|
|
10
|
+
- Rejects missing, duplicate, extra, inactive, or inconsistent network inputs and documents caller fencing requirements.
|
|
11
|
+
- Adds coverage for default search domains, forwarding intersections, detached outputs, and maximum attachment suffix composition.
|
|
12
|
+
|
|
3
13
|
## 2026-09-09 - 30.3.0
|
|
4
14
|
|
|
5
15
|
### Fixes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '30.
|
|
6
|
+
version: '30.4.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=
|
|
@@ -93,4 +93,32 @@ export declare const snapshotSetServicePrivateNetworksV1: (value: unknown) => IS
|
|
|
93
93
|
export declare const snapshotPrivateNetworkMutationV1: (value: unknown) => TPrivateNetworkMutationV1;
|
|
94
94
|
/** Pure naming helper; it does not reserve a name or create any public DNS/ingress record. */
|
|
95
95
|
export declare const buildPrivateNetworkFqdnV1: (networkValue: unknown, aliasValue: unknown) => string;
|
|
96
|
+
export interface IServicePrivateNetworkDnsPolicyV1 {
|
|
97
|
+
organizationId: string;
|
|
98
|
+
serviceId: string;
|
|
99
|
+
membershipRevision: number;
|
|
100
|
+
networkSuffixes: Array<{
|
|
101
|
+
networkId: string;
|
|
102
|
+
networkRevision: number;
|
|
103
|
+
dnsSuffix: string;
|
|
104
|
+
}>;
|
|
105
|
+
/** Empty or exactly the selected default network; never an ordered network union. */
|
|
106
|
+
searchDomains: string[];
|
|
107
|
+
externalDns: {
|
|
108
|
+
upstreams: Array<{
|
|
109
|
+
address: string;
|
|
110
|
+
port: number;
|
|
111
|
+
}>;
|
|
112
|
+
allowAnyPublicName: boolean;
|
|
113
|
+
/** Intersection can contain up to maximumAttachments * maximumPermittedSuffixes. */
|
|
114
|
+
permittedSuffixes: string[];
|
|
115
|
+
} | null;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Pure policy composition for the COMPLETE current attachment set. This is not
|
|
119
|
+
* membership authentication, endpoint readiness, a DNS lease or a packet grant.
|
|
120
|
+
* The caller must fence these exact revisions before issuing runtime authority.
|
|
121
|
+
* An inactive/missing/extra network is rejected, never silently omitted.
|
|
122
|
+
*/
|
|
123
|
+
export declare const composeServicePrivateNetworkDnsPolicyV1: (membershipValue: unknown, networksValue: unknown) => IServicePrivateNetworkDnsPolicyV1;
|
|
96
124
|
export {};
|
|
@@ -165,4 +165,60 @@ export const buildPrivateNetworkFqdnV1 = (networkValue, aliasValue) => safe(() =
|
|
|
165
165
|
const network = snapshotPrivateNetworkV1(networkValue);
|
|
166
166
|
return `${label(aliasValue)}.${network.networkDnsKey}.${network.organizationDnsKey}.${privateNetworkV1Contract.privateRoot}`;
|
|
167
167
|
});
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"privatenetwork.js","sourceRoot":"","sources":["../../ts/data/privatenetwork.ts"],"names":[],"mappings":"AAmEA,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,WAAW,EAAE,WAAW;IACxB,kBAAkB,EAAE,EAAE;IACtB,2BAA2B,EAAE,EAAE;IAC/B,gBAAgB,EAAE,CAAC;IACnB,wBAAwB,EAAE,EAAE;IAC5B,iBAAiB,EAAE,OAAO;IAC1B,yBAAyB,EAAE,CAAC;IAC5B,yBAAyB,EAAE,CAAC;IAC5B,uBAAuB,EAAE,2CAA2C;IACpE,QAAQ,EAAE,WAAW;CACb,CAAC,CAAC;AAEZ,MAAM,IAAI,GAAG,GAAU,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrF,SAAS,YAAY,CAAC,KAAc,IAAmB,IAAI,CAAC,KAAK;IAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5E,MAAM,IAAI,GAAG,CAAI,SAAkB,EAAK,EAAE,GAAG,IAAI,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;AAAC,CAAC;AAAC,MAAM,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;AAAC,CAAC,CAAC,CAAC,CAAC;AACpG,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,IAAc,EAA2B,EAAE;IACzE,YAAY,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IACnF,YAAY,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;IACzG,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvF,MAAM,MAAM,GAA4B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/D,YAAY,CAAC,UAAU,EAAE,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,KAAK,GAAG,CAAI,KAAc,EAAE,OAAe,EAAE,IAA0B,EAAO,EAAE;IACpF,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC;IAClH,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzE,YAAY,CAAC,UAAU,EAAE,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAU,EAAE;IAC5C,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,qCAAqC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7F,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAU,EAAE;IACzC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACvH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,IAAI,GAAG,CAAC,KAAc,EAAU,EAAE;IACtC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG;WAC5E,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,4CAA4C,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1F,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,MAAiB,EAAU,EAAE;IAC3D,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAI,MAAM,CAAC,IAAI,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9F,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,KAAK,GAAG,CAAC,KAAc,EAAU,EAAE;IACvC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE;WACvD,mCAAmC,CAAC,IAAI,CAAC,KAAK,CAAC;WAC/C,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACxF,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,MAAM,GAAG,CAAC,MAAgB,EAAY,EAAE;IAC5C,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;IACvF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,IAAI,GAAG,CAAC,KAAc,EAAU,EAAE;IACtC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACrH,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,KAAK,KAAK,iBAAiB,CAAC,CAAC;IAC5F,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,YAAY,GAAG,CAAC,KAAc,EAAU,EAAE;IAC9C,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,YAAY,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE;WACpE,mCAAmC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;WAC/C,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,oGAAoG;AACpG,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,KAAc,EAA2B,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACnG,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC;IAC9D,YAAY,CAAC,MAAM,CAAC,YAAY,KAAK,kBAAkB,CAAC,CAAC;IACzD,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI;QAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAChG,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,oBAAoB,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACtG,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,wBAAwB,CAAC,gBAAgB,EAAE,KAAK,CAAC,EAAE;QAC7F,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,YAAY,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC;QAC5B,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;IACnD,CAAC,CAAC,CAAC;IACH,YAAY,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3I,YAAY,CAAC,OAAO,QAAQ,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC;IAC/D,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,wBAAwB,EAAE,YAAY,CAAC,CAAC,CAAC;IACrI,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1G,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,WAAW,EAAE;YACtD,SAAS,EAAE,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB;SAC9E,EAAE,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,CAAC,gBAAyB,EAAE,YAAqB,EAAuE,EAAE;IAC3I,MAAM,WAAW,GAAG,KAAK,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE;QAC/F,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3D,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC;YAClD,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,wBAAwB,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;IAC9G,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACjF,YAAY,CAAC,gBAAgB,KAAK,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,CAAC;IACrH,YAAY,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACxF,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAqB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACvF,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,eAAe;QAC3G,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IACpE,YAAY,CAAC,OAAO,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAe,CAAC,CAAC,CAAC;IACjH,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7C,YAAY,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC;IACrC,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC;QACvG,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;QAC9G,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAmC;QACjH,MAAM,EAAE,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;AACnF,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,KAAc,EAA6B,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACvG,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC/H,YAAY,CAAC,OAAO,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;QACrH,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;AACxG,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,KAAc,EAAgC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC7G,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACrJ,YAAY,CAAC,OAAO,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;QACrH,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC1I,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,KAAc,EAA6B,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACvG,YAAY,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC;IAC7E,YAAY,CAAC,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,QAAQ,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB;QAC7G,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5G,YAAY,CAAC,OAAO,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,EAAE,aAAa,EAAE,CAAU,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;IAC3I,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC3B,YAAY,CAAC,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC;QAChD,OAAO,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;IAC1I,CAAC;IACD,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;IAClH,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC;IACtE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;AAC9H,CAAC,CAAC,CAAC;AAEH,8FAA8F;AAC9F,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,YAAqB,EAAE,UAAmB,EAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACzG,MAAM,OAAO,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;IACvD,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,kBAAkB,IAAI,wBAAwB,CAAC,WAAW,EAAE,CAAC;AAC/H,CAAC,CAAC,CAAC"}
|
|
168
|
+
const suffixWithin = (candidate, parent) => candidate === parent || candidate.endsWith(`.${parent}`);
|
|
169
|
+
const minimalSuffixes = (values) => {
|
|
170
|
+
const unique = [...new Set(values)].sort();
|
|
171
|
+
return unique.filter(candidate => !unique.some(parent => candidate !== parent && suffixWithin(candidate, parent)));
|
|
172
|
+
};
|
|
173
|
+
/**
|
|
174
|
+
* Pure policy composition for the COMPLETE current attachment set. This is not
|
|
175
|
+
* membership authentication, endpoint readiness, a DNS lease or a packet grant.
|
|
176
|
+
* The caller must fence these exact revisions before issuing runtime authority.
|
|
177
|
+
* An inactive/missing/extra network is rejected, never silently omitted.
|
|
178
|
+
*/
|
|
179
|
+
export const composeServicePrivateNetworkDnsPolicyV1 = (membershipValue, networksValue) => safe(() => {
|
|
180
|
+
const member = snapshotServicePrivateNetworksV1(membershipValue);
|
|
181
|
+
const networks = array(networksValue, privateNetworkV1Contract.maximumAttachments, snapshotPrivateNetworkV1);
|
|
182
|
+
requireValue(networks.length === member.attachments.length
|
|
183
|
+
&& new Set(networks.map(network => network.id)).size === networks.length
|
|
184
|
+
&& new Set(networks.map(network => network.networkDnsKey)).size === networks.length
|
|
185
|
+
&& new Set(networks.map(network => network.organizationDnsKey)).size <= 1);
|
|
186
|
+
for (const network of networks)
|
|
187
|
+
requireValue(network.organizationId === member.organizationId
|
|
188
|
+
&& network.state === 'active' && member.attachments.some(attachment => attachment.networkId === network.id));
|
|
189
|
+
const ordered = member.attachments.map(attachment => networks.find(network => network.id === attachment.networkId));
|
|
190
|
+
const networkSuffixes = ordered.map(network => ({ networkId: network.id, networkRevision: network.revision,
|
|
191
|
+
dnsSuffix: `${network.networkDnsKey}.${network.organizationDnsKey}.${privateNetworkV1Contract.privateRoot}` }));
|
|
192
|
+
const searchDomains = member.defaultNetworkId === null ? []
|
|
193
|
+
: [networkSuffixes.find(network => network.networkId === member.defaultNetworkId).dnsSuffix];
|
|
194
|
+
let externalDns = null;
|
|
195
|
+
if (ordered.length > 0 && ordered.every(network => network.policy.externalDns !== null)) {
|
|
196
|
+
const policies = ordered.map(network => network.policy.externalDns);
|
|
197
|
+
const upstreams = policies[0].upstreams.filter(upstream => policies.every(policy => policy.upstreams.some(candidate => candidate.address === upstream.address && candidate.port === upstream.port))).sort((left, right) => left.address < right.address ? -1 : left.address > right.address ? 1 : left.port - right.port);
|
|
198
|
+
// null is the unrestricted public-name set during intersection, not denial.
|
|
199
|
+
let permittedSuffixes = null;
|
|
200
|
+
for (const policy of policies) {
|
|
201
|
+
if (policy.allowAnyPublicName)
|
|
202
|
+
continue;
|
|
203
|
+
if (permittedSuffixes === null)
|
|
204
|
+
permittedSuffixes = minimalSuffixes(policy.permittedSuffixes);
|
|
205
|
+
else {
|
|
206
|
+
const intersection = [];
|
|
207
|
+
for (const previous of permittedSuffixes)
|
|
208
|
+
for (const next of policy.permittedSuffixes) {
|
|
209
|
+
if (suffixWithin(previous, next))
|
|
210
|
+
intersection.push(previous);
|
|
211
|
+
else if (suffixWithin(next, previous))
|
|
212
|
+
intersection.push(next);
|
|
213
|
+
}
|
|
214
|
+
permittedSuffixes = minimalSuffixes(intersection);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
if (upstreams.length > 0 && (permittedSuffixes === null || permittedSuffixes.length > 0)) {
|
|
218
|
+
externalDns = { upstreams, allowAnyPublicName: permittedSuffixes === null, permittedSuffixes: permittedSuffixes ?? [] };
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
return { organizationId: member.organizationId, serviceId: member.serviceId, membershipRevision: member.revision,
|
|
222
|
+
networkSuffixes, searchDomains, externalDns };
|
|
223
|
+
});
|
|
224
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"privatenetwork.js","sourceRoot":"","sources":["../../ts/data/privatenetwork.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -210,6 +210,19 @@ suffix. Fully qualified names remain unambiguous across networks. Network policy
|
|
|
210
210
|
permits member-to-member connectivity and explicitly configures or denies external
|
|
211
211
|
DNS forwarding. Creating an alias does not publish public DNS, ingress or ports.
|
|
212
212
|
|
|
213
|
+
`data.composeServicePrivateNetworkDnsPolicyV1(membership, networks)` derives the
|
|
214
|
+
service's network suffixes, the single selected search suffix, and the intersection
|
|
215
|
+
of external forwarding permissions. Supply every attached network exactly once,
|
|
216
|
+
with active state and matching canonical organization/DNS keys. Missing, extra,
|
|
217
|
+
inactive or inconsistent network definitions are rejected. Forwarding requires
|
|
218
|
+
every attachment to permit both the queried public name and the same exact
|
|
219
|
+
upstream IP/port; a denied or empty intersection returns `externalDns: null`.
|
|
220
|
+
The default network changes only short-name search. Nested suffix unions are
|
|
221
|
+
intersected at DNS label boundaries and canonicalized without dropping permitted
|
|
222
|
+
branches; the composed list can contain up to 1,024 suffixes across 16 networks.
|
|
223
|
+
This pure helper returns detached policy metadata. Its caller must authenticate
|
|
224
|
+
and fence the included membership/network revisions before issuing node authority.
|
|
225
|
+
|
|
213
226
|
The snapshot helpers validate and detach content; they do not authenticate it,
|
|
214
227
|
reserve names, prove membership, or report applied state. Packet authority remains
|
|
215
228
|
until an applied denial or independent fence. DNS snapshots have a separate maximum
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -232,3 +232,75 @@ export const buildPrivateNetworkFqdnV1 = (networkValue: unknown, aliasValue: unk
|
|
|
232
232
|
const network = snapshotPrivateNetworkV1(networkValue);
|
|
233
233
|
return `${label(aliasValue)}.${network.networkDnsKey}.${network.organizationDnsKey}.${privateNetworkV1Contract.privateRoot}`;
|
|
234
234
|
});
|
|
235
|
+
|
|
236
|
+
export interface IServicePrivateNetworkDnsPolicyV1 {
|
|
237
|
+
organizationId: string;
|
|
238
|
+
serviceId: string;
|
|
239
|
+
membershipRevision: number;
|
|
240
|
+
networkSuffixes: Array<{ networkId: string; networkRevision: number; dnsSuffix: string }>;
|
|
241
|
+
/** Empty or exactly the selected default network; never an ordered network union. */
|
|
242
|
+
searchDomains: string[];
|
|
243
|
+
externalDns: {
|
|
244
|
+
upstreams: Array<{ address: string; port: number }>;
|
|
245
|
+
allowAnyPublicName: boolean;
|
|
246
|
+
/** Intersection can contain up to maximumAttachments * maximumPermittedSuffixes. */
|
|
247
|
+
permittedSuffixes: string[];
|
|
248
|
+
} | null;
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
const suffixWithin = (candidate: string, parent: string): boolean =>
|
|
252
|
+
candidate === parent || candidate.endsWith(`.${parent}`);
|
|
253
|
+
const minimalSuffixes = (values: string[]): string[] => {
|
|
254
|
+
const unique = [...new Set(values)].sort();
|
|
255
|
+
return unique.filter(candidate => !unique.some(parent => candidate !== parent && suffixWithin(candidate, parent)));
|
|
256
|
+
};
|
|
257
|
+
|
|
258
|
+
/**
|
|
259
|
+
* Pure policy composition for the COMPLETE current attachment set. This is not
|
|
260
|
+
* membership authentication, endpoint readiness, a DNS lease or a packet grant.
|
|
261
|
+
* The caller must fence these exact revisions before issuing runtime authority.
|
|
262
|
+
* An inactive/missing/extra network is rejected, never silently omitted.
|
|
263
|
+
*/
|
|
264
|
+
export const composeServicePrivateNetworkDnsPolicyV1 = (
|
|
265
|
+
membershipValue: unknown, networksValue: unknown,
|
|
266
|
+
): IServicePrivateNetworkDnsPolicyV1 => safe(() => {
|
|
267
|
+
const member = snapshotServicePrivateNetworksV1(membershipValue);
|
|
268
|
+
const networks = array(networksValue, privateNetworkV1Contract.maximumAttachments, snapshotPrivateNetworkV1);
|
|
269
|
+
requireValue(networks.length === member.attachments.length
|
|
270
|
+
&& new Set(networks.map(network => network.id)).size === networks.length
|
|
271
|
+
&& new Set(networks.map(network => network.networkDnsKey)).size === networks.length
|
|
272
|
+
&& new Set(networks.map(network => network.organizationDnsKey)).size <= 1);
|
|
273
|
+
for (const network of networks) requireValue(network.organizationId === member.organizationId
|
|
274
|
+
&& network.state === 'active' && member.attachments.some(attachment => attachment.networkId === network.id));
|
|
275
|
+
const ordered = member.attachments.map(attachment => networks.find(network => network.id === attachment.networkId)!);
|
|
276
|
+
const networkSuffixes = ordered.map(network => ({ networkId: network.id, networkRevision: network.revision,
|
|
277
|
+
dnsSuffix: `${network.networkDnsKey}.${network.organizationDnsKey}.${privateNetworkV1Contract.privateRoot}` }));
|
|
278
|
+
const searchDomains = member.defaultNetworkId === null ? []
|
|
279
|
+
: [networkSuffixes.find(network => network.networkId === member.defaultNetworkId)!.dnsSuffix];
|
|
280
|
+
let externalDns: IServicePrivateNetworkDnsPolicyV1['externalDns'] = null;
|
|
281
|
+
if (ordered.length > 0 && ordered.every(network => network.policy.externalDns !== null)) {
|
|
282
|
+
const policies = ordered.map(network => network.policy.externalDns!);
|
|
283
|
+
const upstreams = policies[0].upstreams.filter(upstream => policies.every(policy => policy.upstreams.some(
|
|
284
|
+
candidate => candidate.address === upstream.address && candidate.port === upstream.port,
|
|
285
|
+
))).sort((left, right) => left.address < right.address ? -1 : left.address > right.address ? 1 : left.port - right.port);
|
|
286
|
+
// null is the unrestricted public-name set during intersection, not denial.
|
|
287
|
+
let permittedSuffixes: string[] | null = null;
|
|
288
|
+
for (const policy of policies) {
|
|
289
|
+
if (policy.allowAnyPublicName) continue;
|
|
290
|
+
if (permittedSuffixes === null) permittedSuffixes = minimalSuffixes(policy.permittedSuffixes);
|
|
291
|
+
else {
|
|
292
|
+
const intersection: string[] = [];
|
|
293
|
+
for (const previous of permittedSuffixes) for (const next of policy.permittedSuffixes) {
|
|
294
|
+
if (suffixWithin(previous, next)) intersection.push(previous);
|
|
295
|
+
else if (suffixWithin(next, previous)) intersection.push(next);
|
|
296
|
+
}
|
|
297
|
+
permittedSuffixes = minimalSuffixes(intersection);
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
if (upstreams.length > 0 && (permittedSuffixes === null || permittedSuffixes.length > 0)) {
|
|
301
|
+
externalDns = { upstreams, allowAnyPublicName: permittedSuffixes === null, permittedSuffixes: permittedSuffixes ?? [] };
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
return { organizationId: member.organizationId, serviceId: member.serviceId, membershipRevision: member.revision,
|
|
305
|
+
networkSuffixes, searchDomains, externalDns };
|
|
306
|
+
});
|