@serve.zone/interfaces 32.55.0 → 32.56.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 +40 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/appstore/catalog.d.ts +1 -1
- package/dist_ts/appstore/catalog.js +2 -1
- package/dist_ts/appstore/types.d.ts +36 -0
- package/dist_ts/appstore/types.js +11 -1
- package/dist_ts/appstore/versionconfig.d.ts +11 -3
- package/dist_ts/appstore/versionconfig.js +146 -7
- package/dist_ts/data/clusteringress.d.ts +10 -2
- package/dist_ts/data/clusteringress.js +16 -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 +2 -1
- 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 +1 -1
- package/readme.md +22 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/appstore/catalog.ts +1 -0
- package/ts/appstore/types.ts +38 -0
- package/ts/appstore/versionconfig.ts +163 -5
- package/ts/data/clusteringress.ts +23 -3
- package/ts/data/deploymentpreflight.ts +8 -3
- package/ts/data/settings.ts +2 -1
- package/ts/private/ipaddress.ts +23 -0
|
@@ -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":"AAKA,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAG1F,OAAO,EAAE,kCAAkC,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAuB,MAAM,gBAAgB,CAAC;AAO9E,OAAO,EACL,8BAA8B,EAC9B,sCAAsC,EACtC,gCAAgC,EAChC,uCAAuC,GACxC,MAAM,0BAA0B,CAAC;AAIlC;;;;GAIG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,iBAAiB;IACjB,uBAAuB;IACvB;;;;OAIG;IACH,sCAAsC;IACtC,4BAA4B;IAC5B,4BAA4B;IAC5B,gCAAgC;IAChC,+BAA+B;IAC/B,iCAAiC;IACjC,qCAAqC;IACrC,8BAA8B;IAC9B,uBAAuB;IACvB,yBAAyB;IACzB,uBAAuB;IACvB,sBAAsB;IACtB,mBAAmB;IACnB,wBAAwB;IACxB,qBAAqB;IACrB,4BAA4B;IAC5B,8BAA8B;IAC9B,uBAAuB;IACvB,mCAAmC;IACnC,2BAA2B;IAC3B,gCAAgC;IAChC,2BAA2B;IAC3B,qBAAqB;IACrB,+BAA+B;IAC/B,sBAAsB;IACtB,+BAA+B;IAC/B,gCAAgC;IAChC,oCAAoC;IACpC,0BAA0B;IAC1B,0BAA0B;IAC1B,4BAA4B;IAC5B,wBAAwB;IACxB,kCAAkC;IAClC,mCAAmC;IACnC,0CAA0C;IAC1C,8BAA8B;IAC9B,iCAAiC;IACjC,iCAAiC;IACjC,8BAA8B;IAC9B,yBAAyB;IACzB,uBAAuB;IACvB,mBAAmB;IACnB;;;;OAIG;IACH,qBAAqB;IACrB,2BAA2B;IAC3B,yBAAyB;IACzB;;;;OAIG;IACH,mCAAmC;IACnC;;;OAGG;IACH,+BAA+B;IAC/B,8FAA8F;IAC9F,iCAAiC;CACzB,CAAC;AAuQX,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAC9C,MAAM,oBAAoB,GAAG,4MAA4M,CAAC;AAC1O,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAA8C;IACjF,YAAY;IACZ,MAAM;IACN,WAAW;IACX,sBAAsB;IACtB,uBAAuB;CACxB,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,CAAC,QAAiB,EAAuC,EAAE,CAC1E,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,UAAmB,EACY,EAAE;IACjC,MAAM,QAAQ,GAAkC,EAAE,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,QAAQ;WACvC,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG;WACjC,CAAC,+BAA+B,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACjE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAClH,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,KAAK,SAAS,CAAC;IAC3D,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,eAAe,GAAG,kCAAkC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACpF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,6CAA6C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;aACpF,CAAC,CAAC;QACL,CAAC;QACD,IAAI,UAAU,CAAC,cAAc,KAAK,SAAS;eACtC,UAAU,CAAC,WAAW,KAAK,SAAS;eACpC,UAAU,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YAC9C,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,gFAAgF;aAC1F,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,OAAO,UAAU,CAAC,cAAc,KAAK,QAAQ,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3G,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,2DAA2D,EAAE,CAAC,CAAC;YACzH,IAAI,OAAO,UAAU,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;gBAClD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;QACD,IAAI,OAAO,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,yCAAyC,EAAE,CAAC,CAAC;QACjG,CAAC;aAAM,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,mDAAmD,EAAE,CAAC,CAAC;QACjH,CAAC;IACH,CAAC;IACD,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;WACrC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG;WAC/B,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,mDAAmD,EAAE,CAAC,CAAC;QAC9G,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,IAAI,OAAO,UAAU,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACnG,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,6DAA6D,EAAE,CAAC,CAAC;QACzH,IAAI,OAAO,UAAU,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC,CAAC;QAChG,CAAC;IACH,CAAC;IACD,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QAC9D,CAAC,CAAC,UAAU,CAAC,qBAAqB;QAClC,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,2BAA2B,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC;QAC9E,CAAC,CAAC,aAAa,CAAC,cAAc;QAC9B,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,0BAA0B,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC;QAC5E,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,SAAS,EAAuB,EAAE,CAAC,CACvE,OAAO,SAAS,KAAK,QAAQ,CAC9B,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,uCAAuC,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,qDAAqD,EAAE,CAAC,CAAC;IAC7G,CAAC;IACD,IAAI,UAAU,CAAC,cAAc,KAAK,SAAS;WACtC,CAAC,OAAO,UAAU,CAAC,cAAc,KAAK,QAAQ,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QAC1G,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE,OAAO,EAAE,qDAAqD,EAAE,CAAC,CAAC;QACrH,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,KAAK,SAAS;WAClC,CAAC,4BAA4B,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1D,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,UAAU,KAAK,IAAI;QAC1E,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;IACpB,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACzD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC,CAAC;IAClG,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,KAAK,SAAS;WAClC,CAAC,UAAU,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;QAC/D,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC,CAAC;IAClG,CAAC;IACD,IAAI,YAAY,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1C,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,kDAAkD,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS;WAC7B,UAAU,CAAC,KAAK,KAAK,SAAS;WAC9B,UAAU,CAAC,KAAK,KAAK,SAAS;WAC9B,UAAU,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;QAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC,CAAC;IAChG,CAAC;IACD,IAAI,UAAU,CAAC,cAAc,KAAK,SAAS;WACtC,CAAC,OAAO,UAAU,CAAC,cAAc,KAAK,QAAQ;eAC5C,CAAC,qCAAqC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QAC/E,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,kDAAkD,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS;WACnC,CAAC,OAAO,UAAU,CAAC,WAAW,KAAK,QAAQ;eACzC,CAAC,qCAAqC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QAC5E,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QACrD,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACpC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;YACzD,CAAC,CAAC,QAAQ,CAAC,QAAQ;YACnB,CAAC,CAAC,SAAS,CACd,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,CACrC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;WAC9B,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE;WAC7B,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM;WACtD,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;eACtD,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;eACrC,8BAA8B,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,QAAQ;eACvE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC;eAC1C,CAAC,OAAO,QAAQ,CAAC,UAAU,KAAK,QAAQ;mBACtC,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC;eAC3D,CAAC,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,SAAS,CAAC;eACzE,CAAC,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;eAC1D,CAAC,QAAQ,CAAC,oBAAoB,KAAK,SAAS;mBAC1C,CAAC,OAAO,QAAQ,CAAC,oBAAoB,KAAK,QAAQ;uBAChD,8BAA8B,CAAC,QAAQ,CAAC,oBAAoB,CAAC;4BAC1D,QAAQ,CAAC,oBAAoB,CAAC,CAAC;eACtC,sCAAsC,CACvC,QAA8C,CAC/C,KAAK,SAAS;eACZ,CAAC,QAAQ,CAAC,aAAa,KAAK,SAAS;mBACnC,CAAC,OAAO,QAAQ,CAAC,aAAa,KAAK,QAAQ;uBACzC,gCAAgC,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,QAAQ,CAAC,aAAa,CAAC,CAAC;eACzF,CAAC,QAAQ,CAAC,mBAAmB,KAAK,SAAS;mBACzC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;uBAC3C,QAAQ,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC;uBACvC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,GAAG,EAAE;uBACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,mBAAmB,CAAC,MAAM;uBAClF,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAClD,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,GAAG,IAAI,SAAS,GAAG,GAAG,CACvE,CAAC,CAAC,CAAC,CAAC,CACZ,EAAE,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,4CAA4C,EAAE,CAAC,CAAC;IACpG,CAAC;IACD,8FAA8F;IAC9F,+FAA+F;IAC/F,8FAA8F;IAC9F,gGAAgG;IAChG,8FAA8F;IAC9F,6FAA6F;IAC7F,MAAM,gBAAgB,GAAG,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACjF,MAAM,mBAAmB,GAAG,gBAAgB,KAAK,SAAS;WACrD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,IAAI,gBAAgB,CAAC,KAAK,KAAK,SAAS,CAAC;QACtF,CAAC,CAAC,uBAAuB,CAAC,UAAU,EAAE,qCAAqC,CAAC;QAC5E,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,2CAA2C,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;SACtF,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;WACxD,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAChE,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CACrF,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACxE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,+DAA+D;SACzE,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,OAMjD,EAAiC,EAAE;IAClC,MAAM,QAAQ,GAAkC,EAAE,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,qCAAqC,EAAE,CAAC,CAAC;IAChG,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,QAAQ,CAAC,iBAAiB,KAAK,IAAI,EAAE,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,qDAAqD,EAAE,CAAC,CAAC;IACpH,CAAC;IACD,IACE,QAAQ,CAAC,cAAc,KAAK,OAAO,CAAC,cAAc;WAC/C,QAAQ,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO;WACpC,QAAQ,CAAC,mBAAmB,KAAK,OAAO,CAAC,mBAAmB;WAC5D,QAAQ,CAAC,cAAc,KAAK,OAAO,CAAC,cAAc,EACrD,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,kEAAkE,EAAE,CAAC,CAAC;IACnI,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,EAA+C,CAAC;IACzE,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACvF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1C,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC,CAAC;IACzG,CAAC;IACD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC,CAAC;YACvG,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAC9B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAmD,CAAC,EAAE,CAAC;YAChH,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,sCAAsC,EAAE,CAAC,CAAC;YACrG,SAAS;QACX,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,IAAmD,CAAC,CAAC;QACnE,IACE,WAAW,CAAC,aAAa,KAAK,OAAO,CAAC,cAAc;eACjD,OAAO,WAAW,CAAC,eAAe,KAAK,QAAQ;eAC/C,CAAC,qBAAqB,CAAC,WAAW,CAAC,eAAe,CAAC;eACnD,OAAO,WAAW,CAAC,QAAQ,KAAK,QAAQ;eACxC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE;eAC5B,OAAO,WAAW,CAAC,UAAU,KAAK,QAAQ;eAC1C,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC;eAC7C,WAAW,CAAC,UAAU,GAAG,CAAC,EAC7B,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IACD,KAAK,MAAM,YAAY,IAAI,qBAAqB,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,WAAW,YAAY,YAAY,EAAE,CAAC,CAAC;QACpG,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -35,7 +35,8 @@ export interface ICloudlySettings {
|
|
|
35
35
|
* cluster ingress serves to them (`IClusterHttpRoute.sourceAllowList`), so the gateway that checks
|
|
36
36
|
* the hostname's source profile stays the only way in. Absent: no non-public hostname is served
|
|
37
37
|
* by a cluster ingress. A value is accepted only when `validateClusterRouteSourceAllowList`
|
|
38
|
-
* answers no error.
|
|
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.
|
|
39
40
|
*/
|
|
40
41
|
dcrouterForwardSourceAddresses?: string[];
|
|
41
42
|
dcrouterMailSubmissionHost?: string;
|
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
package/readme.md
CHANGED
|
@@ -3332,7 +3332,11 @@ that crossed a newer one all settle the same way. `IClusterHttpRoute` names one
|
|
|
3332
3332
|
terminates it, optional Basic `authentication` and an optional `sourceAllowList`: the only
|
|
3333
3333
|
sources the ingress serves the hostname to, as 1 to `clusterIngressLimits.maximumSourceAllowListEntries`
|
|
3334
3334
|
(64) distinct canonical address prefixes of either family (`192.0.2.10/32`), none of length zero;
|
|
3335
|
-
absent means every source.
|
|
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
|
|
3336
3340
|
gateway forwards from (`ICloudlySettings.dcrouterForwardSourceAddresses`), so the gateway that
|
|
3337
3341
|
checks the hostname's source profile stays the only way in whether or not the node's uplink is
|
|
3338
3342
|
reachable from elsewhere. `validateClusterRouteSourceAllowList(value, path?)` judges one list. A
|
|
@@ -3607,9 +3611,25 @@ The catalog validator judges every supported version config in full; no consumer
|
|
|
3607
3611
|
|
|
3608
3612
|
- `image`, then the port model (`appstore.validateAppStoreVersionPortModel`): `port` or `targetPorts` is required, and `targetPorts`, `domains` and `publicPortMappings` are read as exactly their types and resolved through `data.normalizeServicePortConfig`.
|
|
3609
3613
|
- `containerArgs` and the environment declarations.
|
|
3610
|
-
- Storage (`appstore.validateAppStoreVersionStorage`): the exact config member set (`appstore.appStoreVersionConfigKeys`), `platformRequirements`, `storageClasses` and `storageRequests` (declared together, every class used), the storage feature ids `requiresFeatures` must name, portable legacy `volumes`, and every environment, secret-file and mount destination used once.
|
|
3614
|
+
- Storage (`appstore.validateAppStoreVersionStorage`): the exact config member set (`appstore.appStoreVersionConfigKeys`), `platformRequirements`, `storageClasses` and `storageRequests` (declared together, every class used), `backupExclusions`, the storage feature ids `requiresFeatures` must name, portable legacy `volumes`, and every environment, secret-file and mount destination used once.
|
|
3611
3615
|
- Platform OIDC, then Docker `publishedPorts` (`appstore.validateAppStorePublishedPorts`).
|
|
3612
3616
|
|
|
3617
|
+
A version declares data it keeps only for observability, such as workload logs, as `backupExclusions` (`IAppStoreBackupExclusion[]`): a backup leaves those object keys out, and a restore neither brings them back nor removes them. Each entry names one objectStorage request of the version (`storageRequest`: an explicit request id, or `legacy-s3` when the version declares `platformRequirements.s3`; a filesystem request is refused), 1 to 16 `keyPrefixes` and a one-line `reason` an operator reads:
|
|
3618
|
+
|
|
3619
|
+
```typescript
|
|
3620
|
+
const cloudlyVersion: Partial<appstore.IAppStoreVersionConfig> = {
|
|
3621
|
+
platformRequirements: { s3: true },
|
|
3622
|
+
backupExclusions: [{
|
|
3623
|
+
storageRequest: 'legacy-s3',
|
|
3624
|
+
keyPrefixes: ['runtime-logs/'],
|
|
3625
|
+
reason: 'Workload logs; a restore brings back state, not past logs.',
|
|
3626
|
+
}],
|
|
3627
|
+
requiresFeatures: [appstore.appStoreStorageFeatureIds.objectStorageBackupExclusions],
|
|
3628
|
+
};
|
|
3629
|
+
```
|
|
3630
|
+
|
|
3631
|
+
Entries are in strictly increasing `storageRequest` order with each request at most once. A key prefix is 1 to 512 UTF-8 bytes, ends in `/`, does not start with `/`, has no empty, `.` or `..` segment and no control character; the prefixes of an entry are strictly increasing and none lies inside another. `appstore.appStoreBackupExclusionLimits` states the bounds, and `appstore.validateAppStoreBackupExclusionKeyPrefixes(value, label?)` is the one prefix-list rule: the version-config check applies it to each entry, and a reader of a list carrying such prefixes elsewhere, such as a backup manifest, judges it there too (an empty list means valid, otherwise one `Invalid <label>` reason). A version declaring any entry names `storage.object-storage.backup-exclusions` (`appStoreStorageFeatureIds.objectStorageBackupExclusions`) in `requiresFeatures`, so a host that does not leave the keys out of its backups lists the version without installing it, and an older host never reads the member.
|
|
3632
|
+
|
|
3613
3633
|
Each storage request is judged on its own by the storage contract behind `platform.normalizeStorageRequest`: members, capacity quantities and limits, protection, delivery and mount path, with that contract's messages and bounds, and a legacy volume's mount path as the request it becomes. The version config adds what only holds between requests: each request's class is declared, of its kind and backs a declared limit (`hardQuota`), backup or snapshots; ids, environment keys, secret files and mounts are used once; the legacy names `legacyFilesystem`, `legacyObjectStorage` and `legacy-s3` stay reserved. Two App Store narrowings apply on top: a request id is a stable lowercase identifier (it shares a namespace with the derived `legacy-volume-*` ids), and a file delivery targets one file directly below `/run/secrets`.
|
|
3614
3634
|
|
|
3615
3635
|
Each of these validators stops at the first violation and answers it as a one-element list starting `Invalid <label>`, so a config is refused for the same reason everywhere.
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/appstore/catalog.ts
CHANGED
package/ts/appstore/types.ts
CHANGED
|
@@ -62,6 +62,8 @@ export const appStoreStorageFeatureIds = {
|
|
|
62
62
|
filesystem: 'storage.filesystem',
|
|
63
63
|
objectStorage: 'storage.object-storage',
|
|
64
64
|
objectStorageFile: 'storage.object-storage.file',
|
|
65
|
+
/** The version declares `backupExclusions`; a consumer naming it leaves those keys out of backups. */
|
|
66
|
+
objectStorageBackupExclusions: 'storage.object-storage.backup-exclusions',
|
|
65
67
|
} as const;
|
|
66
68
|
|
|
67
69
|
export type TAppStoreStorageFeatureId =
|
|
@@ -127,6 +129,35 @@ export type TAppStoreStorageRequest =
|
|
|
127
129
|
| IAppStoreFilesystemStorageRequest
|
|
128
130
|
| IAppStoreObjectStorageRequest;
|
|
129
131
|
|
|
132
|
+
/** The bounds of `IAppStoreVersionConfig.backupExclusions`. */
|
|
133
|
+
export const appStoreBackupExclusionLimits = Object.freeze({
|
|
134
|
+
/** At most one entry per object-storage request; a version config holds at most 64 requests. */
|
|
135
|
+
maximumEntries: 64,
|
|
136
|
+
maximumKeyPrefixes: 16,
|
|
137
|
+
maximumKeyPrefixBytes: 512,
|
|
138
|
+
maximumReasonLength: 512,
|
|
139
|
+
} as const);
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* Keys of one object-storage request that the app keeps only for observability, such as its
|
|
143
|
+
* workload logs. A backup leaves them out; a restore neither brings them back nor removes them.
|
|
144
|
+
*/
|
|
145
|
+
export interface IAppStoreBackupExclusion {
|
|
146
|
+
/**
|
|
147
|
+
* An objectStorage request of this version: an explicit request id, or `legacy-s3` when the
|
|
148
|
+
* version declares `platformRequirements.s3`. A filesystem request cannot declare exclusions.
|
|
149
|
+
*/
|
|
150
|
+
storageRequest: string;
|
|
151
|
+
/**
|
|
152
|
+
* 1 to 16 object key prefixes in strictly increasing UTF-16 code-unit order, none a prefix of
|
|
153
|
+
* another. Each is 1 to 512 UTF-8 bytes, ends in `/`, does not start with `/`, has no empty,
|
|
154
|
+
* `.` or `..` segment and no control character or unpaired surrogate.
|
|
155
|
+
*/
|
|
156
|
+
keyPrefixes: string[];
|
|
157
|
+
/** One operator-readable line, e.g. "Workload logs; a restore brings back state, not past logs." */
|
|
158
|
+
reason: string;
|
|
159
|
+
}
|
|
160
|
+
|
|
130
161
|
export interface IAppStoreInlineSource {
|
|
131
162
|
type: 'inline';
|
|
132
163
|
}
|
|
@@ -402,6 +433,13 @@ export interface IAppStoreVersionConfig {
|
|
|
402
433
|
storageClasses?: Record<string, IAppStoreStorageClass>;
|
|
403
434
|
/** Stable named filesystem and managed object-storage requests. */
|
|
404
435
|
storageRequests?: TAppStoreStorageRequest[];
|
|
436
|
+
/**
|
|
437
|
+
* Data the app keeps only for observability, in strictly increasing `storageRequest` order with
|
|
438
|
+
* each request at most once. A backup leaves it out; a restore neither brings it back nor
|
|
439
|
+
* removes it. A version declaring any entry names
|
|
440
|
+
* `appStoreStorageFeatureIds.objectStorageBackupExclusions` in `requiresFeatures`.
|
|
441
|
+
*/
|
|
442
|
+
backupExclusions?: IAppStoreBackupExclusion[];
|
|
405
443
|
publishedPorts?: IAppStorePublishedPort[];
|
|
406
444
|
platformRequirements?: IAppStorePlatformRequirements;
|
|
407
445
|
/**
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
* `platform.normalizeStorageRequest`), reporting through this module's rejection. What this module
|
|
16
16
|
* adds are the rules a request can only break inside a version config: its class is declared and of
|
|
17
17
|
* its kind, the class backs a declared limit or protection, ids and destinations are used once, the
|
|
18
|
-
* legacy names stay reserved,
|
|
18
|
+
* legacy names stay reserved, a backup exclusion names an object-storage request, and the storage
|
|
19
|
+
* feature ids are named.
|
|
19
20
|
*/
|
|
20
21
|
import { normalizeServiceAbsolutePath, validateServiceContainerArgs } from '../data/service.js';
|
|
21
22
|
import { normalizeServicePortConfig } from '../data/serviceports.js';
|
|
@@ -26,16 +27,22 @@ import type {
|
|
|
26
27
|
TServiceTargetPortRef,
|
|
27
28
|
TServiceTargetProtocol,
|
|
28
29
|
} from '../data/serviceports.js';
|
|
30
|
+
import { compareWireTokens } from '../private/canonicaljson.js';
|
|
29
31
|
import { readDataElements, readDataProperties } from '../private/dataproperties.js';
|
|
30
32
|
import type { TCompleteKeyList } from '../private/keylist.js';
|
|
31
33
|
import { createStorageContractReaders } from '../private/storagecontract.js';
|
|
32
34
|
import type { TObjectStorageDelivery } from '../platform/storage.js';
|
|
33
35
|
import {
|
|
36
|
+
appStoreBackupExclusionLimits,
|
|
34
37
|
appStoreStorageFeatureIds,
|
|
35
38
|
validateAppStoreEnvironmentDeclarations,
|
|
36
39
|
validateAppStoreVersionPlatformOidc,
|
|
37
40
|
} from './types.js';
|
|
38
|
-
import type {
|
|
41
|
+
import type {
|
|
42
|
+
IAppStoreBackupExclusion,
|
|
43
|
+
IAppStoreVersionConfig,
|
|
44
|
+
TAppStoreStorageRequest,
|
|
45
|
+
} from './types.js';
|
|
39
46
|
|
|
40
47
|
const versionConfigMemberList = [
|
|
41
48
|
'image',
|
|
@@ -48,6 +55,7 @@ const versionConfigMemberList = [
|
|
|
48
55
|
'volumes',
|
|
49
56
|
'storageClasses',
|
|
50
57
|
'storageRequests',
|
|
58
|
+
'backupExclusions',
|
|
51
59
|
'publishedPorts',
|
|
52
60
|
'platformRequirements',
|
|
53
61
|
'platformOidc',
|
|
@@ -92,6 +100,8 @@ const legacyObjectStorageClassKey = 'legacyObjectStorage';
|
|
|
92
100
|
const legacyObjectStorageRequestId = 'legacy-s3';
|
|
93
101
|
const knownStorageFeatureIds: readonly string[] = Object.values(appStoreStorageFeatureIds);
|
|
94
102
|
const platformRequirementKeys = ['mongodb', 's3', 'clickhouse', 'valkey', 'mariadb', 'mail'] as const;
|
|
103
|
+
const controlCharacterPattern = /[\u0000-\u001f\u007f]/;
|
|
104
|
+
const utf8Encoder = new TextEncoder();
|
|
95
105
|
|
|
96
106
|
/** Thrown inside this module only; every exported validator answers it as its result. */
|
|
97
107
|
class AppStoreVersionConfigRejection extends Error {}
|
|
@@ -601,6 +611,7 @@ function checkExplicitStorageRequests(
|
|
|
601
611
|
function checkFeatureDeclaration(
|
|
602
612
|
requiresFeaturesArg: unknown,
|
|
603
613
|
explicitRequestsArg: readonly TAppStoreStorageRequest[],
|
|
614
|
+
backupExclusionsArg: readonly IAppStoreBackupExclusion[],
|
|
604
615
|
labelArg: string,
|
|
605
616
|
): void {
|
|
606
617
|
const derivedFeatures = new Set<string>();
|
|
@@ -614,6 +625,9 @@ function checkFeatureDeclaration(
|
|
|
614
625
|
if (explicitRequestsArg.some((requestArg) => requestArg.kind === 'objectStorage' && requestArg.delivery.type === 'file')) {
|
|
615
626
|
derivedFeatures.add(appStoreStorageFeatureIds.objectStorageFile);
|
|
616
627
|
}
|
|
628
|
+
if (backupExclusionsArg.length > 0) {
|
|
629
|
+
derivedFeatures.add(appStoreStorageFeatureIds.objectStorageBackupExclusions);
|
|
630
|
+
}
|
|
617
631
|
|
|
618
632
|
const declaredEntries = requiresFeaturesArg === undefined
|
|
619
633
|
? []
|
|
@@ -641,6 +655,123 @@ function checkFeatureDeclaration(
|
|
|
641
655
|
}
|
|
642
656
|
}
|
|
643
657
|
|
|
658
|
+
const hasUnpairedSurrogate = (valueArg: string): boolean => {
|
|
659
|
+
for (let index = 0; index < valueArg.length; index++) {
|
|
660
|
+
const codeUnit = valueArg.charCodeAt(index);
|
|
661
|
+
if (codeUnit >= 0xd800 && codeUnit <= 0xdbff) {
|
|
662
|
+
const following = valueArg.charCodeAt(index + 1);
|
|
663
|
+
if (!(following >= 0xdc00 && following <= 0xdfff)) return true;
|
|
664
|
+
index++;
|
|
665
|
+
} else if (codeUnit >= 0xdc00 && codeUnit <= 0xdfff) {
|
|
666
|
+
return true;
|
|
667
|
+
}
|
|
668
|
+
}
|
|
669
|
+
return false;
|
|
670
|
+
};
|
|
671
|
+
|
|
672
|
+
/** One object key prefix: a relative key path that names a whole subtree. */
|
|
673
|
+
function checkBackupExclusionKeyPrefix(valueArg: unknown, labelArg: string): string {
|
|
674
|
+
if (typeof valueArg !== 'string') return reject(`Invalid ${labelArg}: expected a string`);
|
|
675
|
+
if (controlCharacterPattern.test(valueArg) || hasUnpairedSurrogate(valueArg)) {
|
|
676
|
+
reject(`Invalid ${labelArg}: must not contain a control character or an unpaired surrogate`);
|
|
677
|
+
}
|
|
678
|
+
const byteLength = utf8Encoder.encode(valueArg).byteLength;
|
|
679
|
+
if (byteLength < 1 || byteLength > appStoreBackupExclusionLimits.maximumKeyPrefixBytes) {
|
|
680
|
+
reject(`Invalid ${labelArg}: must be 1 to ${appStoreBackupExclusionLimits.maximumKeyPrefixBytes} UTF-8 bytes`);
|
|
681
|
+
}
|
|
682
|
+
if (valueArg.startsWith('/')) reject(`Invalid ${labelArg}: must not start with '/'`);
|
|
683
|
+
if (!valueArg.endsWith('/')) reject(`Invalid ${labelArg}: must end with '/'`);
|
|
684
|
+
if (valueArg.slice(0, -1).split('/').some((segmentArg) => segmentArg === '' || segmentArg === '.' || segmentArg === '..')) {
|
|
685
|
+
reject(`Invalid ${labelArg}: must not contain an empty, '.' or '..' segment`);
|
|
686
|
+
}
|
|
687
|
+
return valueArg;
|
|
688
|
+
}
|
|
689
|
+
|
|
690
|
+
/**
|
|
691
|
+
* One exclusion's key prefix list: 1 to 16 prefixes, strictly increasing, none inside another.
|
|
692
|
+
* `validateAppStoreBackupExclusionKeyPrefixes` exports it, so every reader of a prefix list judges
|
|
693
|
+
* it by this one rule.
|
|
694
|
+
*/
|
|
695
|
+
function checkBackupExclusionKeyPrefixes(valueArg: unknown, labelArg: string): string[] {
|
|
696
|
+
const { maximumKeyPrefixes } = appStoreBackupExclusionLimits;
|
|
697
|
+
const prefixEntries = readDataElements(valueArg, maximumKeyPrefixes);
|
|
698
|
+
if (prefixEntries === null || prefixEntries.length === 0) {
|
|
699
|
+
return reject(`Invalid ${labelArg}: expected an array of 1 to ${maximumKeyPrefixes} key prefixes`);
|
|
700
|
+
}
|
|
701
|
+
const keyPrefixes: string[] = [];
|
|
702
|
+
prefixEntries.forEach((prefixArg, indexArg) => {
|
|
703
|
+
const prefixLabel = `${labelArg}[${indexArg}]`;
|
|
704
|
+
const prefix = checkBackupExclusionKeyPrefix(prefixArg, prefixLabel);
|
|
705
|
+
const previousPrefix = keyPrefixes[keyPrefixes.length - 1];
|
|
706
|
+
if (previousPrefix !== undefined && compareWireTokens(previousPrefix, prefix) >= 0) {
|
|
707
|
+
reject(`Invalid ${labelArg}: must be strictly increasing`);
|
|
708
|
+
}
|
|
709
|
+
const covering = keyPrefixes.find((existingArg) => prefix.startsWith(existingArg));
|
|
710
|
+
if (covering !== undefined) {
|
|
711
|
+
reject(`Invalid ${prefixLabel}: '${prefix}' lies inside '${covering}'`);
|
|
712
|
+
}
|
|
713
|
+
keyPrefixes.push(prefix);
|
|
714
|
+
});
|
|
715
|
+
return keyPrefixes;
|
|
716
|
+
}
|
|
717
|
+
|
|
718
|
+
/**
|
|
719
|
+
* The members of each backup exclusion, its key prefixes and the entry order. Which request an
|
|
720
|
+
* entry names is judged once the config's requests are known (`checkBackupExclusionTargets`).
|
|
721
|
+
*/
|
|
722
|
+
function checkBackupExclusions(valueArg: unknown, labelArg: string): IAppStoreBackupExclusion[] {
|
|
723
|
+
if (valueArg === undefined) return [];
|
|
724
|
+
const { maximumEntries, maximumReasonLength } = appStoreBackupExclusionLimits;
|
|
725
|
+
const entries = readDataElements(valueArg, maximumEntries);
|
|
726
|
+
if (entries === null || entries.length === 0) {
|
|
727
|
+
return reject(`Invalid ${labelArg}: backupExclusions must contain between 1 and ${maximumEntries} entries`);
|
|
728
|
+
}
|
|
729
|
+
let previousRequest: string | null = null;
|
|
730
|
+
return entries.map((entryArg, indexArg): IAppStoreBackupExclusion => {
|
|
731
|
+
const entryLabel = `${labelArg} backupExclusions[${indexArg}]`;
|
|
732
|
+
const entry = readRecord(entryArg, entryLabel);
|
|
733
|
+
assertExactKeys(entry, ['storageRequest', 'keyPrefixes', 'reason'], entryLabel);
|
|
734
|
+
const { storageRequest, reason } = entry;
|
|
735
|
+
if (typeof storageRequest !== 'string') return reject(`Invalid ${entryLabel}.storageRequest: expected a string`);
|
|
736
|
+
if (previousRequest !== null && compareWireTokens(previousRequest, storageRequest) >= 0) {
|
|
737
|
+
reject(previousRequest === storageRequest
|
|
738
|
+
? `Invalid ${labelArg}: backupExclusions name storage request '${storageRequest}' more than once`
|
|
739
|
+
: `Invalid ${labelArg}: backupExclusions must be in strictly increasing storageRequest order`);
|
|
740
|
+
}
|
|
741
|
+
previousRequest = storageRequest;
|
|
742
|
+
|
|
743
|
+
const keyPrefixes = checkBackupExclusionKeyPrefixes(entry.keyPrefixes, `${entryLabel}.keyPrefixes`);
|
|
744
|
+
|
|
745
|
+
if (typeof reason !== 'string'
|
|
746
|
+
|| reason.length === 0
|
|
747
|
+
|| reason.length > maximumReasonLength
|
|
748
|
+
|| reason.trim() !== reason
|
|
749
|
+
|| controlCharacterPattern.test(reason)
|
|
750
|
+
|| hasUnpairedSurrogate(reason)) {
|
|
751
|
+
reject(`Invalid ${entryLabel}.reason: must be one trimmed line of 1 to ${maximumReasonLength} characters`);
|
|
752
|
+
}
|
|
753
|
+
return { storageRequest, keyPrefixes, reason };
|
|
754
|
+
});
|
|
755
|
+
}
|
|
756
|
+
|
|
757
|
+
/** Each backup exclusion names an object-storage request of the normalized config. */
|
|
758
|
+
function checkBackupExclusionTargets(
|
|
759
|
+
exclusionsArg: readonly IAppStoreBackupExclusion[],
|
|
760
|
+
objectStorageRequestIdsArg: ReadonlySet<string>,
|
|
761
|
+
filesystemRequestIdsArg: ReadonlySet<string>,
|
|
762
|
+
labelArg: string,
|
|
763
|
+
): void {
|
|
764
|
+
exclusionsArg.forEach((exclusionArg, indexArg) => {
|
|
765
|
+
const { storageRequest } = exclusionArg;
|
|
766
|
+
if (objectStorageRequestIdsArg.has(storageRequest)) return;
|
|
767
|
+
const requestLabel = `${labelArg} backupExclusions[${indexArg}].storageRequest`;
|
|
768
|
+
if (filesystemRequestIdsArg.has(storageRequest)) {
|
|
769
|
+
reject(`Invalid ${requestLabel}: '${storageRequest}' is a filesystem request; only an objectStorage request declares backup exclusions`);
|
|
770
|
+
}
|
|
771
|
+
reject(`Invalid ${requestLabel}: '${storageRequest}' does not name an objectStorage request of this version`);
|
|
772
|
+
});
|
|
773
|
+
}
|
|
774
|
+
|
|
644
775
|
interface ILegacyVolumeFacts {
|
|
645
776
|
name?: string;
|
|
646
777
|
mountPath: string;
|
|
@@ -710,7 +841,8 @@ function checkStorage(configArg: Record<string, unknown>, labelArg: string): voi
|
|
|
710
841
|
destinations,
|
|
711
842
|
labelArg,
|
|
712
843
|
);
|
|
713
|
-
|
|
844
|
+
const backupExclusions = checkBackupExclusions(configArg.backupExclusions, labelArg);
|
|
845
|
+
checkFeatureDeclaration(configArg.requiresFeatures, explicitRequests, backupExclusions, labelArg);
|
|
714
846
|
const legacyS3 = platformRequirements.s3 === true;
|
|
715
847
|
if (legacyS3 && explicitRequests.some((requestArg) => requestArg.kind === 'objectStorage')) {
|
|
716
848
|
reject(`Invalid ${labelArg}: platformRequirements.s3 cannot coexist with explicit objectStorage requests`);
|
|
@@ -727,6 +859,7 @@ function checkStorage(configArg: Record<string, unknown>, labelArg: string): voi
|
|
|
727
859
|
const allMounts: Array<{ id: string; mountPath: string }> = explicitRequests.flatMap((requestArg) => (
|
|
728
860
|
requestArg.kind === 'filesystem' ? [{ id: requestArg.id, mountPath: requestArg.mountPath }] : []
|
|
729
861
|
));
|
|
862
|
+
const legacyVolumeRequestIds: string[] = [];
|
|
730
863
|
legacyVolumes.forEach((volumeArg, indexArg) => {
|
|
731
864
|
const requestId = legacyVolumeRequestId(volumeArg, indexArg, labelArg);
|
|
732
865
|
if (requestIds.has(requestId)) reject(`Invalid ${labelArg}: storage request id '${requestId}' is duplicated`);
|
|
@@ -734,6 +867,7 @@ function checkStorage(configArg: Record<string, unknown>, labelArg: string): voi
|
|
|
734
867
|
requestIds.add(requestId);
|
|
735
868
|
mountPaths.push(volumeArg.mountPath);
|
|
736
869
|
allMounts.push({ id: requestId, mountPath: volumeArg.mountPath });
|
|
870
|
+
legacyVolumeRequestIds.push(requestId);
|
|
737
871
|
});
|
|
738
872
|
|
|
739
873
|
if (legacyS3) {
|
|
@@ -744,6 +878,18 @@ function checkStorage(configArg: Record<string, unknown>, labelArg: string): voi
|
|
|
744
878
|
reject(`Invalid ${labelArg}: storage request id '${legacyObjectStorageRequestId}' is reserved for legacy S3 normalization`);
|
|
745
879
|
}
|
|
746
880
|
}
|
|
881
|
+
checkBackupExclusionTargets(
|
|
882
|
+
backupExclusions,
|
|
883
|
+
new Set([
|
|
884
|
+
...explicitRequests.flatMap((requestArg) => (requestArg.kind === 'objectStorage' ? [requestArg.id] : [])),
|
|
885
|
+
...(legacyS3 ? [legacyObjectStorageRequestId] : []),
|
|
886
|
+
]),
|
|
887
|
+
new Set([
|
|
888
|
+
...explicitRequests.flatMap((requestArg) => (requestArg.kind === 'filesystem' ? [requestArg.id] : [])),
|
|
889
|
+
...legacyVolumeRequestIds,
|
|
890
|
+
]),
|
|
891
|
+
labelArg,
|
|
892
|
+
);
|
|
747
893
|
|
|
748
894
|
const checkedMounts: string[] = [];
|
|
749
895
|
for (const mount of allMounts) {
|
|
@@ -777,12 +923,24 @@ export const validateAppStorePublishedPorts = (publishedPortsArg: unknown, label
|
|
|
777
923
|
|
|
778
924
|
/**
|
|
779
925
|
* The config's member set and its storage: legacy `volumes`, `storageClasses`, `storageRequests`,
|
|
780
|
-
* `platformRequirements`, the storage feature ids `requiresFeatures` must name,
|
|
781
|
-
* environment, secret-file and mount destination being used once.
|
|
926
|
+
* `platformRequirements`, `backupExclusions`, the storage feature ids `requiresFeatures` must name,
|
|
927
|
+
* and every environment, secret-file and mount destination being used once.
|
|
782
928
|
*/
|
|
783
929
|
export const validateAppStoreVersionStorage = (configArg: unknown, labelArg = defaultLabel): string[] =>
|
|
784
930
|
firstRejection(() => checkStorage(readConfig(configArg, labelArg), labelArg));
|
|
785
931
|
|
|
932
|
+
/**
|
|
933
|
+
* One backup exclusion's `keyPrefixes`, the rule `validateAppStoreVersionStorage` applies to each
|
|
934
|
+
* `IAppStoreBackupExclusion`: 1 to 16 prefixes in strictly increasing UTF-16 code-unit order, none
|
|
935
|
+
* inside another, each 1 to 512 UTF-8 bytes ending in `/`, without a leading `/`, an empty, `.` or
|
|
936
|
+
* `..` segment, a control character or an unpaired surrogate. A reader of a list that carries such
|
|
937
|
+
* prefixes elsewhere, such as a backup manifest, judges it here.
|
|
938
|
+
*/
|
|
939
|
+
export const validateAppStoreBackupExclusionKeyPrefixes = (
|
|
940
|
+
valueArg: unknown,
|
|
941
|
+
labelArg = 'keyPrefixes',
|
|
942
|
+
): string[] => firstRejection(() => checkBackupExclusionKeyPrefixes(valueArg, labelArg));
|
|
943
|
+
|
|
786
944
|
/**
|
|
787
945
|
* Every member rule of a version config, in the order a host applies them: image, port model,
|
|
788
946
|
* container arguments, environment declarations, storage, platform OIDC, published ports.
|