@serve.zone/interfaces 32.52.0 → 32.53.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 +57 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/appstore/catalog.d.ts +92 -12
- package/dist_ts/appstore/catalog.js +119 -5
- package/dist_ts/appstore/types.d.ts +28 -4
- package/dist_ts/appstore/types.js +1 -1
- package/dist_ts/appstore/versionconfig.d.ts +1 -1
- package/dist_ts/data/cluster.d.ts +1 -1
- package/dist_ts/data/clusteringress.d.ts +4 -4
- package/dist_ts/data/clusteringressdesignation.d.ts +2 -2
- package/dist_ts/data/clusternode.d.ts +6 -6
- package/dist_ts/data/clusternode.js +1 -1
- package/dist_ts/data/clusternodehostname.d.ts +5 -5
- package/dist_ts/data/clusternodehostname.js +3 -3
- package/dist_ts/data/clusterrelaycredential.d.ts +3 -3
- package/dist_ts/data/clusterruntime.d.ts +1 -1
- package/dist_ts/data/clustervpn.d.ts +4 -4
- package/dist_ts/data/coremail.d.ts +11 -11
- package/dist_ts/data/coremail.runtime.d.ts +6 -6
- package/dist_ts/data/coremail.runtime.js +1 -1
- package/dist_ts/data/corestorecontroltoken.d.ts +1 -1
- package/dist_ts/data/corestorelegacyadoption.d.ts +2 -2
- package/dist_ts/data/deploymentmachineuser.d.ts +1 -1
- package/dist_ts/data/deploymentpreflight.d.ts +26 -1
- package/dist_ts/data/fleetcutover.d.ts +28 -28
- package/dist_ts/data/hostedapp.d.ts +4 -4
- package/dist_ts/data/immutableimage.d.ts +3 -3
- package/dist_ts/data/isolatedrestore.d.ts +7 -7
- package/dist_ts/data/isolatedrestore.js +1 -1
- package/dist_ts/data/networkaddressplan.d.ts +2 -2
- package/dist_ts/data/networkapplication.d.ts +9 -9
- package/dist_ts/data/networkauthority.d.ts +5 -5
- package/dist_ts/data/networkcredential.js +1 -1
- package/dist_ts/data/networkegressretirement.d.ts +3 -3
- package/dist_ts/data/networkegressretirement.js +1 -1
- package/dist_ts/data/networkhost.d.ts +3 -3
- package/dist_ts/data/networklease.d.ts +9 -9
- package/dist_ts/data/networkprojection.d.ts +7 -7
- package/dist_ts/data/networkprojectionretirement.d.ts +6 -6
- package/dist_ts/data/networkprotection.d.ts +9 -9
- package/dist_ts/data/networksigning.d.ts +6 -6
- package/dist_ts/data/networkworkloadingress.d.ts +3 -3
- package/dist_ts/data/nodeenrollment.d.ts +8 -8
- package/dist_ts/data/noderetirement.d.ts +1 -1
- package/dist_ts/data/noderuntimebinding.d.ts +11 -11
- package/dist_ts/data/privatenetwork.d.ts +3 -3
- package/dist_ts/data/runtimeassignment.d.ts +9 -9
- package/dist_ts/data/runtimeassignment.js +1 -1
- package/dist_ts/data/runtimeassignmentexec.d.ts +2 -2
- package/dist_ts/data/runtimeassignmentlogs.d.ts +4 -4
- package/dist_ts/data/runtimeassignmentstats.d.ts +2 -2
- package/dist_ts/data/runtimeconfig.d.ts +1 -1
- package/dist_ts/data/runtimelocalstorageclaim.d.ts +4 -4
- package/dist_ts/data/runtimelocalvolumearchive.d.ts +5 -5
- package/dist_ts/data/runtimesession.d.ts +5 -5
- package/dist_ts/data/runtimesession.js +1 -1
- package/dist_ts/data/runtimestorageclaim.d.ts +4 -4
- package/dist_ts/data/runtimeterminalreceipt.d.ts +2 -2
- package/dist_ts/data/runtimeterminalreceipt.js +1 -1
- package/dist_ts/data/secret.d.ts +4 -4
- package/dist_ts/data/secret.js +1 -1
- package/dist_ts/data/service.d.ts +10 -3
- package/dist_ts/data/serviceplatformownership.d.ts +1 -1
- package/dist_ts/data/serviceports.js +1 -1
- package/dist_ts/data/serviceruntime.d.ts +3 -3
- package/dist_ts/data/servicevolumeinitialization.d.ts +1 -1
- package/dist_ts/data/settings.d.ts +37 -31
- package/dist_ts/data/settings.js +1 -1
- package/dist_ts/data/sparklegacyretirement.d.ts +4 -4
- package/dist_ts/data/sparknodereport.d.ts +2 -2
- package/dist_ts/platform/storage.d.ts +1 -1
- package/dist_ts/platform/storagemigration.d.ts +6 -6
- package/dist_ts/platform/storagemigration.golden.d.ts +13 -13
- package/dist_ts/platform/types.d.ts +1 -1
- package/dist_ts/private/canonicaljson.d.ts +6 -6
- package/dist_ts/private/canonicaljson.js +1 -1
- package/dist_ts/private/dataproperties.js +1 -1
- package/dist_ts/private/networkcontract.js +1 -1
- package/dist_ts/private/storagecontract.d.ts +1 -1
- package/dist_ts/private/storagecontract.js +1 -1
- package/dist_ts/protocol.d.ts +1 -1
- package/dist_ts/requests/appstore.d.ts +18 -0
- package/dist_ts/requests/hostedapp.d.ts +6 -0
- package/dist_ts/requests/hostedapp.js +1 -1
- package/dist_ts/requests/node.d.ts +1 -1
- package/dist_ts/runtime.appstorecatalog.d.ts +17 -0
- package/dist_ts/runtime.appstorecatalog.js +84 -12
- package/dist_ts/runtime.assignmentsecret.d.ts +3 -3
- package/dist_ts/runtime.assignmentsecret.js +1 -1
- package/dist_ts/runtime.corestore.d.ts +13 -13
- package/dist_ts/runtime.d.ts +1 -1
- package/dist_ts/runtime.workloadinit.d.ts +11 -11
- package/package.json +4 -3
- package/readme.md +9 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/appstore/catalog.ts +175 -5
- package/ts/appstore/types.ts +25 -0
- package/ts/data/clusternodehostname.ts +3 -3
- package/ts/data/service.ts +10 -2
- package/ts/data/settings.ts +6 -0
- package/ts/requests/appstore.ts +22 -0
- package/ts/requests/hostedapp.ts +6 -0
- package/ts/requests/node.ts +1 -1
- package/ts/runtime.appstorecatalog.ts +91 -11
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import type { TSha256Digest, TImmutableContainerPlatform } from './data/immutableimage.js';
|
|
2
2
|
export declare const workloadInitReleaseContract: Readonly<{
|
|
3
|
-
readonly packageName:
|
|
4
|
-
readonly sourceRepository:
|
|
5
|
-
readonly imageRegistry:
|
|
6
|
-
readonly imageRepository:
|
|
7
|
-
readonly imageIndexMediaType:
|
|
8
|
-
readonly statementType:
|
|
9
|
-
readonly predicateType:
|
|
10
|
-
readonly buildType:
|
|
11
|
-
readonly builderId:
|
|
12
|
-
readonly signatureFormat:
|
|
13
|
-
readonly signatureAlgorithm:
|
|
3
|
+
readonly packageName: '@serve.zone/workloadinit';
|
|
4
|
+
readonly sourceRepository: 'https://code.foss.global/serve.zone/workloadinit.git';
|
|
5
|
+
readonly imageRegistry: 'code.foss.global';
|
|
6
|
+
readonly imageRepository: 'serve.zone/workloadinit';
|
|
7
|
+
readonly imageIndexMediaType: 'application/vnd.oci.image.index.v1+json';
|
|
8
|
+
readonly statementType: 'https://in-toto.io/Statement/v1';
|
|
9
|
+
readonly predicateType: 'https://slsa.dev/provenance/v1';
|
|
10
|
+
readonly buildType: 'https://serve.zone/buildtypes/workloadinit-gitzone-tsdocker';
|
|
11
|
+
readonly builderId: 'https://serve.zone/builders/workloadinit-manual-release';
|
|
12
|
+
readonly signatureFormat: 'cosign-dsse-bundle-v0.3';
|
|
13
|
+
readonly signatureAlgorithm: 'ecdsa-p256-sha256';
|
|
14
14
|
}>;
|
|
15
15
|
export interface IWorkloadInitBuildToolVersions {
|
|
16
16
|
dockerBuildx: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.53.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -27,11 +27,12 @@
|
|
|
27
27
|
"@tsclass/tsclass": "^9.5.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@git.zone/tsbuild": "^
|
|
30
|
+
"@git.zone/tsbuild": "^6.0.0",
|
|
31
31
|
"@git.zone/tsdoc": "^3.0.2",
|
|
32
32
|
"@git.zone/tsrun": "^3.0.2",
|
|
33
33
|
"@git.zone/tstest": "^7.2.0",
|
|
34
|
-
"@types/node": "26.6.3"
|
|
34
|
+
"@types/node": "26.6.3",
|
|
35
|
+
"typescript": "^6.0.3"
|
|
35
36
|
},
|
|
36
37
|
"files": [
|
|
37
38
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -3559,6 +3559,7 @@ Compatibility rules:
|
|
|
3559
3559
|
- Every level has exact keys; an unknown member is `schemaInvalid` (`appstore.validateAppStoreCatalog`).
|
|
3560
3560
|
- `requiresFeatures` gates one version: a consumer passes the feature ids it fulfils (`supportedFeatureIds`, e.g. `appStoreStorageFeatureIds` values). A version naming any other id stays listed, is refused for install and upgrade there, and its config is not interpreted, so a new config capability ships under a feature id without refusing the rest of the catalog (`appstore.getAppStoreCatalogMissingFeatureIds`).
|
|
3561
3561
|
- A published `app@version` stays in every later catalog and never changes (`appstore.judgeAppStoreCatalogSuccession`): a later catalog that no longer lists it is `publishedVersionRemoved`, one that lists it with another `configDigest` is `publishedVersionMutated`, and a revision that does not increase is `revisionRegressed`.
|
|
3562
|
+
- A version names the oldest host releases that run it (`minOneboxVersion`, `minCloudlyVersion`). A host passes itself to `appstore.judgeAppStoreCatalogInstallTarget` as `{ kind: 'onebox' | 'cloudly', version }` (`IAppStoreCatalogConsumer`), which refuses a version needing a newer release of it as `consumerVersionTooOld`; the version stays listed and installs once the host is upgraded.
|
|
3562
3563
|
- A publisher retires a version by withdrawing it, never by removing it. A withdrawn version keeps its entry, config and digest, so services installed from it keep reading it, and is refused as an install or upgrade target, like a version gated on a feature the consumer lacks (`appstore.judgeAppStoreCatalogInstallTarget`). A withdrawal is final: a later catalog that revokes or rewrites it is `publishedWithdrawalChanged`; a version withdrawn by mistake is republished under a new version.
|
|
3563
3564
|
|
|
3564
3565
|
Digests are SHA-256 over strict canonical JSON (keys in UTF-16 code-unit order, safe integers only) of a domain-separated value: `computeAppStoreCatalogConfigDigest`, `computeAppStoreCatalogDigest` and `computeAppStoreCatalogSigningKeyId`. A signature covers `createAppStoreCatalogSignaturePayload(catalogDigest)`. These helpers use Web Crypto and are safe in the browser entry.
|
|
@@ -3583,6 +3584,14 @@ if (!verification.accepted) {
|
|
|
3583
3584
|
|
|
3584
3585
|
`verifyAppStoreCatalogEnvelope` authenticates before it interprets: envelope shape, `catalogDigest`, one valid signature by a trusted key (a failing signature by a trusted key refuses the envelope), then contract, schema and every `configDigest`. The consumer then judges succession against its active catalog.
|
|
3585
3586
|
|
|
3587
|
+
A publisher keeps its signing key as a file: `importAppStoreCatalogSigningKeyPem(text)` reads one unencrypted PKCS#8 PEM Ed25519 private key (`openssl genpkey -algorithm ed25519`) into an `IAppStoreCatalogSigningKey` with its public key and key id, and `exportAppStoreCatalogSigningKeyPem(key)` writes one. `getAppStoreCatalogTrustedKey(key)` is the `IAppStoreCatalogTrustedKey` a consumer ships for it. A trusted key also converts from and to an SPKI PEM public key (`openssl pkey -pubout`) with `importAppStoreCatalogTrustedKeyPem` and `exportAppStoreCatalogTrustedKeyPem`. Each refuses another PEM label or key type and a key id that does not match its public key, and no error quotes its input.
|
|
3588
|
+
|
|
3589
|
+
A service records the App Store version it runs as `IService.data.appStoreTemplate` (`IAppStoreServiceTemplateSnapshot`: `appId`, `version`, `configDigest`, `config`, `catalogRevision`), taken from a verified catalog by `appstore.createAppStoreServiceTemplateSnapshot`. It is server-managed (`TServiceWritableData` excludes it): the host writes it at install, upgrade and catalog adoption, and runtime paths read it, never the live catalog. While no catalog is active, an `unavailable` status states its `cause` (`loading`, `failed`, `refused`) for programs next to the operator's `reason`, and App Store install, upgrade and upgrade preview are refused with the retryable code `APPSTORE_CATALOG_UNAVAILABLE` (`IAppStoreCatalogUnavailableErrorData`). `IReq_Any_ImportAppStoreCatalog` imports an operator's envelope text (origin `operatorImport`) and answers the status after it, so an air-gapped host needs no registry.
|
|
3590
|
+
|
|
3591
|
+
A host loads the catalog from the npm registries `appstore.resolveAppStoreCatalogRegistries(list)` answers: the configured list (Cloudly's `ICloudlySettings.appStoreCatalogRegistries`, an Onebox setting) in canonical form, or `appStoreCatalogDefaultRegistries` (npmjs) when it is empty. `appstore.validateAppStoreCatalogRegistries` is the one rule for a configured list: `https:` base URLs without credentials, query or fragment, each registry once.
|
|
3592
|
+
|
|
3593
|
+
A host's App Store views carry the listing as `IAppStoreApp` and `IAppStoreAppMeta`: `versions` names the install targets, and the optional `versionStates` (`IAppStoreAppVersionState`) states every listed version, withdrawn and feature-gated ones included, with its `judgeAppStoreCatalogInstallTarget` answer as `installRefusal`.
|
|
3594
|
+
|
|
3586
3595
|
`TAppStoreCatalogStatus` is the operator's view, discriminated by `availability`: `ready` (`IAppStoreCatalogReadyStatus`) always carries the `active` catalog's revision, digest, key and origin, including a restored last-known-good catalog; `unavailable` (`IAppStoreCatalogUnavailableStatus`) always carries a `reason` and no active catalog. Both state `supportedContract`, `supportedFeatureIds`, `lastAttempt`, `nextAttemptAt` and the last `refused` catalog. Loading a catalog never gates the boot, readiness or health of anything else; while none is active only App Store install, upgrade and upgrade-preview are refused. `requests.appstore.IReq_Any_GetAppStoreCatalogStatus` reads it, `IReq_Any_RefreshAppStoreCatalog` runs one attempt now and answers the state after it, and `IReq_Any_GetAppStoreTemplates` may answer it as `catalogStatus`.
|
|
3587
3596
|
|
|
3588
3597
|
The catalog validator judges every supported version config in full; no consumer needs a second validator. Besides the catalog's own rules (member set, image pinning, the feature gate, minimum versions, upgrade flags, `healthCheck`) it applies `appstore.validateAppStoreVersionConfig`, the member rules a host applies before it installs a version, in this order:
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/appstore/catalog.ts
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
14
14
|
import { getDigestFromPinnedImageReference, isSha256Digest } from '../data/immutableimage.js';
|
|
15
|
+
import { compareReleaseVersions, parseReleaseVersion } from '../data/releaseversion.js';
|
|
15
16
|
import {
|
|
16
17
|
canonicalizeStrictJson,
|
|
17
18
|
compareWireTokens,
|
|
@@ -268,14 +269,39 @@ export interface IAppStoreCatalogReadyStatus extends IAppStoreCatalogStatusBase
|
|
|
268
269
|
reason?: never;
|
|
269
270
|
}
|
|
270
271
|
|
|
272
|
+
/**
|
|
273
|
+
* Why no verified catalog is active, for programs; `reason` says it for operators.
|
|
274
|
+
*
|
|
275
|
+
* - `loading`: no attempt has ended since start and no last-known-good catalog was restored.
|
|
276
|
+
* - `failed`: the last attempt read no candidate (transport, integrity or packaging failed).
|
|
277
|
+
* - `refused`: the last attempt read a candidate and refused it (`refused` holds the record).
|
|
278
|
+
*/
|
|
279
|
+
export type TAppStoreCatalogUnavailableCause = 'loading' | 'failed' | 'refused';
|
|
280
|
+
|
|
271
281
|
/** No verified catalog is active, neither a last-known-good one nor a fetched one. */
|
|
272
282
|
export interface IAppStoreCatalogUnavailableStatus extends IAppStoreCatalogStatusBase {
|
|
273
283
|
availability: 'unavailable';
|
|
274
|
-
/** Why no catalog is active, e.g. the last attempt's failure. */
|
|
284
|
+
/** Why no catalog is active, e.g. the last attempt's failure. For operators; never parse it. */
|
|
275
285
|
reason: string;
|
|
286
|
+
/** Why no catalog is active, for programs. Every host that loads the catalog at runtime states it. */
|
|
287
|
+
cause?: TAppStoreCatalogUnavailableCause;
|
|
276
288
|
active?: never;
|
|
277
289
|
}
|
|
278
290
|
|
|
291
|
+
/**
|
|
292
|
+
* The code a host answers, as `TypedResponseError.errorData` (`IAppStoreCatalogUnavailableErrorData`),
|
|
293
|
+
* when it refuses an App Store install, upgrade or upgrade preview because no verified catalog is
|
|
294
|
+
* active. Retryable: the same request succeeds once a catalog is active.
|
|
295
|
+
*/
|
|
296
|
+
export const appStoreCatalogUnavailableErrorCode = 'APPSTORE_CATALOG_UNAVAILABLE' as const;
|
|
297
|
+
|
|
298
|
+
export interface IAppStoreCatalogUnavailableErrorData {
|
|
299
|
+
code: typeof appStoreCatalogUnavailableErrorCode;
|
|
300
|
+
retryable: true;
|
|
301
|
+
/** The status `cause` when the host states one. */
|
|
302
|
+
cause?: TAppStoreCatalogUnavailableCause;
|
|
303
|
+
}
|
|
304
|
+
|
|
279
305
|
/**
|
|
280
306
|
* The App Store domain's state as an operator sees it, discriminated by `availability`.
|
|
281
307
|
*
|
|
@@ -768,23 +794,167 @@ export const findAppStoreCatalogConfigDigestMismatch = async (
|
|
|
768
794
|
return null;
|
|
769
795
|
};
|
|
770
796
|
|
|
797
|
+
/** The registries a consumer loads the catalog from when it configures none. */
|
|
798
|
+
export const appStoreCatalogDefaultRegistries: readonly string[] = Object.freeze(['https://registry.npmjs.org']);
|
|
799
|
+
|
|
800
|
+
const maximumRegistries = 16;
|
|
801
|
+
const maximumRegistryUrlLength = 2048;
|
|
802
|
+
|
|
803
|
+
/** The canonical base URL of one registry entry, or `null` when the entry is not admissible. */
|
|
804
|
+
const readRegistryBaseUrl = (entryArg: unknown): string | null => {
|
|
805
|
+
if (typeof entryArg !== 'string' || entryArg.length > maximumRegistryUrlLength) return null;
|
|
806
|
+
let url: URL;
|
|
807
|
+
try {
|
|
808
|
+
url = new URL(entryArg);
|
|
809
|
+
} catch {
|
|
810
|
+
return null;
|
|
811
|
+
}
|
|
812
|
+
if (url.protocol !== 'https:' || url.username !== '' || url.password !== '' || url.search !== ''
|
|
813
|
+
|| url.hash !== '' || entryArg.includes('?') || entryArg.includes('#')) {
|
|
814
|
+
return null;
|
|
815
|
+
}
|
|
816
|
+
return url.toString().replace(/\/+$/, '');
|
|
817
|
+
};
|
|
818
|
+
|
|
819
|
+
/**
|
|
820
|
+
* The errors of a configured registry list; empty when a consumer may load from it. Every entry is
|
|
821
|
+
* an `https:` base URL without credentials, query or fragment, no two name the same registry, and
|
|
822
|
+
* an empty list means `appStoreCatalogDefaultRegistries`. Errors name entries by index and never
|
|
823
|
+
* quote them, so a URL carrying credentials does not reach a log.
|
|
824
|
+
*/
|
|
825
|
+
export const validateAppStoreCatalogRegistries = (listArg: unknown): string[] => {
|
|
826
|
+
const entries = readDataElements(listArg, maximumRegistries);
|
|
827
|
+
if (entries === null) return [`registries must be a list of at most ${maximumRegistries} URLs`];
|
|
828
|
+
const errors: string[] = [];
|
|
829
|
+
const seen = new Set<string>();
|
|
830
|
+
entries.forEach((entryArg, indexArg) => {
|
|
831
|
+
const baseUrl = readRegistryBaseUrl(entryArg);
|
|
832
|
+
if (baseUrl === null) {
|
|
833
|
+
errors.push(`registries[${indexArg}] must be an https base URL without credentials, query or fragment`);
|
|
834
|
+
} else if (seen.has(baseUrl)) {
|
|
835
|
+
errors.push(`registries[${indexArg}] names a registry listed before it`);
|
|
836
|
+
} else {
|
|
837
|
+
seen.add(baseUrl);
|
|
838
|
+
}
|
|
839
|
+
});
|
|
840
|
+
return errors;
|
|
841
|
+
};
|
|
842
|
+
|
|
843
|
+
/**
|
|
844
|
+
* The registry base URLs a consumer asks, in order: the configured list in canonical form (no
|
|
845
|
+
* trailing slash), or `appStoreCatalogDefaultRegistries` when it is absent or empty. Throws the
|
|
846
|
+
* `validateAppStoreCatalogRegistries` errors for a list it refuses.
|
|
847
|
+
*/
|
|
848
|
+
export const resolveAppStoreCatalogRegistries = (listArg: readonly string[] | undefined): string[] => {
|
|
849
|
+
const errors = validateAppStoreCatalogRegistries(listArg ?? []);
|
|
850
|
+
if (errors.length > 0) throw new Error(`App Store catalog registries refused: ${errors.join('; ')}`);
|
|
851
|
+
const configured = (listArg ?? []).map((entryArg) => readRegistryBaseUrl(entryArg))
|
|
852
|
+
.filter((entryArg): entryArg is string => entryArg !== null);
|
|
853
|
+
return configured.length > 0 ? configured : [...appStoreCatalogDefaultRegistries];
|
|
854
|
+
};
|
|
855
|
+
|
|
856
|
+
/**
|
|
857
|
+
* The App Store version a service runs, as its host took it from a verified catalog.
|
|
858
|
+
*
|
|
859
|
+
* Server-managed: a host writes it when it installs or upgrades the service and when it adopts an
|
|
860
|
+
* existing service on catalog activation, and every runtime path reads this snapshot, never the
|
|
861
|
+
* live catalog. Published versions never change (`judgeAppStoreCatalogSuccession`), so a snapshot
|
|
862
|
+
* stays equal to its catalog entry for as long as the entry is listed.
|
|
863
|
+
*/
|
|
864
|
+
export interface IAppStoreServiceTemplateSnapshot {
|
|
865
|
+
appId: string;
|
|
866
|
+
version: string;
|
|
867
|
+
/** The catalog entry's `configDigest`: `computeAppStoreCatalogConfigDigest(config)`. */
|
|
868
|
+
configDigest: TSha256Digest;
|
|
869
|
+
config: TAppStoreCatalogVersionConfig;
|
|
870
|
+
/** The `revision` of the catalog the snapshot was taken from. */
|
|
871
|
+
catalogRevision: number;
|
|
872
|
+
}
|
|
873
|
+
|
|
874
|
+
/**
|
|
875
|
+
* The snapshot of `appId@version` from a verified catalog, or `null` when the catalog does not list
|
|
876
|
+
* it. Withdrawn versions are listed and snapshot like any other: a host adopting an installed
|
|
877
|
+
* service records the version it runs; whether a version is an install or upgrade target is
|
|
878
|
+
* `judgeAppStoreCatalogInstallTarget`. The config is a copy the caller owns.
|
|
879
|
+
*/
|
|
880
|
+
export const createAppStoreServiceTemplateSnapshot = (
|
|
881
|
+
catalogArg: IAppStoreCatalog,
|
|
882
|
+
appIdArg: string,
|
|
883
|
+
versionArg: string,
|
|
884
|
+
): IAppStoreServiceTemplateSnapshot | null => {
|
|
885
|
+
const entry = catalogArg.apps.find((appArg) => appArg.info.id === appIdArg)
|
|
886
|
+
?.versions.find((candidateArg) => candidateArg.version === versionArg);
|
|
887
|
+
if (entry === undefined) return null;
|
|
888
|
+
return {
|
|
889
|
+
appId: appIdArg,
|
|
890
|
+
version: entry.version,
|
|
891
|
+
configDigest: entry.configDigest,
|
|
892
|
+
config: structuredClone(entry.config),
|
|
893
|
+
catalogRevision: catalogArg.revision,
|
|
894
|
+
};
|
|
895
|
+
};
|
|
896
|
+
|
|
897
|
+
/** The hosts that consume the catalog; each version names its minimum release of each. */
|
|
898
|
+
export type TAppStoreCatalogConsumerKind = 'onebox' | 'cloudly';
|
|
899
|
+
|
|
900
|
+
/** The consumer judging a version: which host it is and the release it runs. */
|
|
901
|
+
export interface IAppStoreCatalogConsumer {
|
|
902
|
+
kind: TAppStoreCatalogConsumerKind;
|
|
903
|
+
/** The host's own release, `MAJOR.MINOR.PATCH`. */
|
|
904
|
+
version: string;
|
|
905
|
+
}
|
|
906
|
+
|
|
907
|
+
const consumerMinimumVersionKeys = Object.freeze({
|
|
908
|
+
onebox: 'minOneboxVersion',
|
|
909
|
+
cloudly: 'minCloudlyVersion',
|
|
910
|
+
} as const);
|
|
911
|
+
|
|
771
912
|
/** Why a listed version is not an install or upgrade target for this consumer. */
|
|
772
913
|
export type TAppStoreCatalogInstallTargetRefusal =
|
|
773
914
|
| { reason: 'versionWithdrawn'; withdrawal: IAppStoreCatalogWithdrawal }
|
|
774
|
-
| { reason: 'featuresUnsupported'; missingFeatureIds: string[] }
|
|
915
|
+
| { reason: 'featuresUnsupported'; missingFeatureIds: string[] }
|
|
916
|
+
/** The version names a minimum release of this host (`minOneboxVersion`, `minCloudlyVersion`) newer than it runs. */
|
|
917
|
+
| {
|
|
918
|
+
reason: 'consumerVersionTooOld';
|
|
919
|
+
consumerKind: TAppStoreCatalogConsumerKind;
|
|
920
|
+
consumerVersion: string;
|
|
921
|
+
minimumVersion: string;
|
|
922
|
+
};
|
|
775
923
|
|
|
776
924
|
/**
|
|
777
925
|
* Whether a consumer may install a listed version, or upgrade a service to it; `null` when it may.
|
|
778
|
-
* A withdrawn version
|
|
779
|
-
* and are refused here,
|
|
926
|
+
* A withdrawn version, a version requiring a feature the consumer does not fulfil and a version
|
|
927
|
+
* requiring a newer release of the consumer stay listed and are refused here, in that order, and
|
|
928
|
+
* nowhere else is a second answer needed.
|
|
929
|
+
*
|
|
930
|
+
* A host passes `consumerArg` on every call; without it the minimum release is not judged. A
|
|
931
|
+
* consumer version that is not `MAJOR.MINOR.PATCH` throws: it is the host's own constant.
|
|
780
932
|
*/
|
|
781
933
|
export const judgeAppStoreCatalogInstallTarget = (
|
|
782
934
|
versionArg: IAppStoreCatalogVersion,
|
|
783
935
|
supportedFeatureIdsArg: Iterable<string>,
|
|
936
|
+
consumerArg?: IAppStoreCatalogConsumer,
|
|
784
937
|
): TAppStoreCatalogInstallTargetRefusal | null => {
|
|
938
|
+
const consumerVersion = consumerArg === undefined ? null : parseReleaseVersion(consumerArg.version);
|
|
939
|
+
if (consumerArg !== undefined && consumerVersion === null) {
|
|
940
|
+
throw new Error('App Store catalog consumer version must be MAJOR.MINOR.PATCH');
|
|
941
|
+
}
|
|
785
942
|
if (versionArg.withdrawn !== undefined) return { reason: 'versionWithdrawn', withdrawal: versionArg.withdrawn };
|
|
786
943
|
const missingFeatureIds = getAppStoreCatalogMissingFeatureIds(versionArg.config, supportedFeatureIdsArg);
|
|
787
|
-
|
|
944
|
+
if (missingFeatureIds.length > 0) return { reason: 'featuresUnsupported', missingFeatureIds };
|
|
945
|
+
if (consumerArg === undefined || consumerVersion === null) return null;
|
|
946
|
+
const minimumVersion = versionArg.config[consumerMinimumVersionKeys[consumerArg.kind]];
|
|
947
|
+
if (minimumVersion === undefined) return null;
|
|
948
|
+
const minimum = parseReleaseVersion(minimumVersion);
|
|
949
|
+
if (minimum === null || compareReleaseVersions(consumerVersion, minimum) < 0) {
|
|
950
|
+
return {
|
|
951
|
+
reason: 'consumerVersionTooOld',
|
|
952
|
+
consumerKind: consumerArg.kind,
|
|
953
|
+
consumerVersion: consumerArg.version,
|
|
954
|
+
minimumVersion,
|
|
955
|
+
};
|
|
956
|
+
}
|
|
957
|
+
return null;
|
|
788
958
|
};
|
|
789
959
|
|
|
790
960
|
export type TAppStoreCatalogSuccession =
|
package/ts/appstore/types.ts
CHANGED
|
@@ -27,6 +27,7 @@ import type {
|
|
|
27
27
|
TStorageResourceKind,
|
|
28
28
|
TStorageSnapshotMode,
|
|
29
29
|
} from '../platform/storage.js';
|
|
30
|
+
import type { TAppStoreCatalogInstallTargetRefusal } from './catalog.js';
|
|
30
31
|
|
|
31
32
|
export type TAppStorePlatformRequirement =
|
|
32
33
|
| 'mongodb'
|
|
@@ -314,6 +315,18 @@ export const validateAppStoreVersionPlatformOidc = (
|
|
|
314
315
|
return errors;
|
|
315
316
|
};
|
|
316
317
|
|
|
318
|
+
/** One listed version of an app as a host shows it: an install target, or why it is not one. */
|
|
319
|
+
export interface IAppStoreAppVersionState {
|
|
320
|
+
version: string;
|
|
321
|
+
/**
|
|
322
|
+
* `null` when the host may install the version or upgrade a service to it; otherwise
|
|
323
|
+
* `versionWithdrawn` with the withdrawal, `featuresUnsupported` with the feature ids the host
|
|
324
|
+
* does not fulfil or `consumerVersionTooOld` with the host release the version requires, as
|
|
325
|
+
* `judgeAppStoreCatalogInstallTarget` answers it.
|
|
326
|
+
*/
|
|
327
|
+
installRefusal: TAppStoreCatalogInstallTargetRefusal | null;
|
|
328
|
+
}
|
|
329
|
+
|
|
317
330
|
export interface IAppStoreApp {
|
|
318
331
|
id: string;
|
|
319
332
|
name: string;
|
|
@@ -323,6 +336,12 @@ export interface IAppStoreApp {
|
|
|
323
336
|
iconUrl?: string;
|
|
324
337
|
latestVersion: string;
|
|
325
338
|
versions?: string[];
|
|
339
|
+
/**
|
|
340
|
+
* Every version the catalog lists, withdrawn and feature-gated ones included, in catalog order,
|
|
341
|
+
* each with whether this host may install it. `versions` names only the install targets; a view
|
|
342
|
+
* reads this member to show the others and why they are not offered.
|
|
343
|
+
*/
|
|
344
|
+
versionStates?: IAppStoreAppVersionState[];
|
|
326
345
|
tags?: string[];
|
|
327
346
|
channel?: string;
|
|
328
347
|
upgradeStrategy?: TAppStoreUpgradeStrategy;
|
|
@@ -346,6 +365,12 @@ export interface IAppStoreAppMeta {
|
|
|
346
365
|
iconName?: string;
|
|
347
366
|
latestVersion: string;
|
|
348
367
|
versions: string[];
|
|
368
|
+
/**
|
|
369
|
+
* Every version the catalog lists, withdrawn and feature-gated ones included, in catalog order,
|
|
370
|
+
* each with whether this host may install it. `versions` names only the install targets; a view
|
|
371
|
+
* reads this member to show the others and why they are not offered.
|
|
372
|
+
*/
|
|
373
|
+
versionStates?: IAppStoreAppVersionState[];
|
|
349
374
|
maintainer?: string;
|
|
350
375
|
links?: Record<string, string>;
|
|
351
376
|
tags?: string[];
|
|
@@ -6,7 +6,7 @@ import { readExactDataRecord } from '../private/dataproperties.js';
|
|
|
6
6
|
* Cloudly owns the hostname a node should carry (`IClusterNode.data.hostnameIntent`); Spark applies
|
|
7
7
|
* it on the host and reports the hostname it observes, so a node has converged when its report
|
|
8
8
|
* states the intent's hostname. The default scheme is `cloudly-worker-<name>`: `name` is the
|
|
9
|
-
* operator's short name for the node (`
|
|
9
|
+
* operator's short name for the node (`alpha`, `bravo`), kept beside the hostname so the node
|
|
10
10
|
* can always be reset to the default however it was renamed.
|
|
11
11
|
*
|
|
12
12
|
* A hostname here is one RFC 1123 label, lowercase: the node's short static hostname, which is
|
|
@@ -51,8 +51,8 @@ export const deriveDefaultClusterNodeHostname = (nameArg: string): string => {
|
|
|
51
51
|
*
|
|
52
52
|
* It reads the first label of the hostname, so a report that states a dotted name proposes its
|
|
53
53
|
* short name. A label already in the default scheme proposes what follows the prefix
|
|
54
|
-
* (`cloudly-worker-
|
|
55
|
-
* (`
|
|
54
|
+
* (`cloudly-worker-bravo` → `bravo`); any other valid label proposes itself unchanged
|
|
55
|
+
* (`cloudlyworkeralpha` stays `cloudlyworkeralpha`). It never guesses a name out of a
|
|
56
56
|
* label in another scheme: an operator states that name when resetting the node to the default.
|
|
57
57
|
*/
|
|
58
58
|
export const proposeClusterNodeName = (hostnameArg: string): string | null => {
|
package/ts/data/service.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IServiceRessources } from './docker.js';
|
|
2
2
|
import type { IRegistryTarget } from './registry.js';
|
|
3
|
-
import type { IAppStorePublishedPort } from '../appstore/index.js';
|
|
3
|
+
import type { IAppStorePublishedPort, IAppStoreServiceTemplateSnapshot } from '../appstore/index.js';
|
|
4
4
|
import type { IHostedAppLifecycleState } from './hostedapp.js';
|
|
5
5
|
import type { IServiceMailConfig, TServiceMailWritableConfig } from './mail.js';
|
|
6
6
|
import type { IServiceWebPushConfig } from './webpush.js';
|
|
@@ -175,6 +175,12 @@ export interface IService {
|
|
|
175
175
|
appTemplateId?: string;
|
|
176
176
|
appTemplateVersion?: string;
|
|
177
177
|
appStoreUpgradePolicy?: 'manual' | 'notify' | 'auto';
|
|
178
|
+
/**
|
|
179
|
+
* Server-managed snapshot of the App Store version the service runs (`appTemplateId`@
|
|
180
|
+
* `appTemplateVersion`), written at install, upgrade and catalog adoption. Runtime paths read
|
|
181
|
+
* it instead of the live catalog.
|
|
182
|
+
*/
|
|
183
|
+
appStoreTemplate?: IAppStoreServiceTemplateSnapshot;
|
|
178
184
|
hostedAppLifecycle?: IHostedAppLifecycleState;
|
|
179
185
|
reconciliationStatus?: IServiceReconciliationStatus;
|
|
180
186
|
environment: { [key: string]: string };
|
|
@@ -254,11 +260,13 @@ export interface IService {
|
|
|
254
260
|
|
|
255
261
|
/**
|
|
256
262
|
* Caller-writable service data. Immutable rollout state and SecretSet
|
|
257
|
-
* attachments are changed only through their dedicated fenced APIs
|
|
263
|
+
* attachments are changed only through their dedicated fenced APIs, and the
|
|
264
|
+
* App Store template snapshot only by the host's install and upgrade.
|
|
258
265
|
*/
|
|
259
266
|
export type TServiceWritableData = Omit<
|
|
260
267
|
IService['data'],
|
|
261
268
|
| 'organizationId'
|
|
269
|
+
| 'appStoreTemplate'
|
|
262
270
|
| 'immutableImageRequired'
|
|
263
271
|
| 'imageDeployment'
|
|
264
272
|
| 'imageRolloutStatus'
|
package/ts/data/settings.ts
CHANGED
|
@@ -63,6 +63,12 @@ export interface ICloudlySettings {
|
|
|
63
63
|
coreMailDefaultMaxPendingInbound?: number;
|
|
64
64
|
corebuildWorkerUrl?: string;
|
|
65
65
|
corebuildWorkerUrls?: string[];
|
|
66
|
+
/**
|
|
67
|
+
* The npm registries Cloudly loads the App Store catalog from, in order. Absent or empty means
|
|
68
|
+
* `appstore.appStoreCatalogDefaultRegistries`; a value is accepted only when
|
|
69
|
+
* `appstore.validateAppStoreCatalogRegistries` answers no error.
|
|
70
|
+
*/
|
|
71
|
+
appStoreCatalogRegistries?: string[];
|
|
66
72
|
}
|
|
67
73
|
|
|
68
74
|
export const cloudlySystemSecretOwner = Object.freeze({
|
package/ts/requests/appstore.ts
CHANGED
|
@@ -112,6 +112,28 @@ export interface IReq_Any_RefreshAppStoreCatalog extends plugins.typedrequestInt
|
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
|
|
115
|
+
/**
|
|
116
|
+
* Imports a signed catalog envelope an operator carried in (an air-gapped host, or a catalog the
|
|
117
|
+
* registries do not serve yet) and answers the state after it. The host judges it exactly as a
|
|
118
|
+
* fetched one, authentication and succession included, and records it with origin
|
|
119
|
+
* `operatorImport`; the outcome is `status.lastAttempt`, and a refused envelope keeps the active
|
|
120
|
+
* catalog in place and is not a request error.
|
|
121
|
+
*/
|
|
122
|
+
export interface IReq_Any_ImportAppStoreCatalog extends plugins.typedrequestInterfaces.implementsTR<
|
|
123
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
124
|
+
IReq_Any_ImportAppStoreCatalog
|
|
125
|
+
> {
|
|
126
|
+
method: 'importAppStoreCatalog';
|
|
127
|
+
request: {
|
|
128
|
+
identity: IIdentity;
|
|
129
|
+
/** The envelope file's text (`IAppStoreCatalogEnvelope` as JSON), e.g. `catalog.envelope.json`. */
|
|
130
|
+
envelopeText: string;
|
|
131
|
+
};
|
|
132
|
+
response: {
|
|
133
|
+
status: TAppStoreCatalogStatus;
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
|
|
115
137
|
export interface IReq_Any_GetAppStoreConfig extends plugins.typedrequestInterfaces.implementsTR<
|
|
116
138
|
plugins.typedrequestInterfaces.ITypedRequest,
|
|
117
139
|
IReq_Any_GetAppStoreConfig
|
package/ts/requests/hostedapp.ts
CHANGED
|
@@ -32,6 +32,12 @@ export interface IReq_GetHostedAppAccessConfiguration extends plugins.typedreque
|
|
|
32
32
|
roles: data.IHostedAppRoleDefinition[];
|
|
33
33
|
platformOidcSupported: boolean;
|
|
34
34
|
platformOidcRegistration?: data.IHostedAppPlatformOidcRegistration;
|
|
35
|
+
/**
|
|
36
|
+
* Present when the host cannot read this app's roles and platform OIDC capability, e.g. the
|
|
37
|
+
* service holds no App Store template snapshot yet; `roles` is then empty and
|
|
38
|
+
* `platformOidcSupported` false. One such app never fails the whole listing.
|
|
39
|
+
*/
|
|
40
|
+
unavailableReason?: string;
|
|
35
41
|
}>;
|
|
36
42
|
};
|
|
37
43
|
}
|
package/ts/requests/node.ts
CHANGED
|
@@ -369,7 +369,7 @@ export interface IReq_Any_Cloudly_SetClusterNodeCorestoreDatabaseEndpoint extend
|
|
|
369
369
|
*
|
|
370
370
|
* The node's name stays as it is: the new intent keeps the name of the node's current intent. A
|
|
371
371
|
* node without an intent takes the name `data.proposeClusterNodeName(hostname)` (`foo` names the
|
|
372
|
-
* node `foo`, `cloudly-worker-
|
|
372
|
+
* node `foo`, `cloudly-worker-alpha` names it `alpha`), and is refused `name-invalid` when
|
|
373
373
|
* that is `null`.
|
|
374
374
|
*
|
|
375
375
|
* Cloudly records the intent and answers at once; Spark applies the intent of the latest
|
|
@@ -62,11 +62,96 @@ const publicKeyObjectOf = (publicKeyArg: string): plugins.crypto.KeyObject =>
|
|
|
62
62
|
key: { kty: 'OKP', crv: 'Ed25519', x: Buffer.from(publicKeyArg, 'hex').toString('base64url') },
|
|
63
63
|
});
|
|
64
64
|
|
|
65
|
+
/** One PEM block of exactly this label and nothing around it but whitespace. */
|
|
66
|
+
const isSinglePemBlock = (pemArg: string, labelArg: string): boolean =>
|
|
67
|
+
new RegExp(`^-----BEGIN ${labelArg}-----\\r?\\n(?:[A-Za-z0-9+/=]+\\r?\\n)+-----END ${labelArg}-----$`)
|
|
68
|
+
.test(pemArg.trim());
|
|
69
|
+
|
|
70
|
+
const signingKeyOf = async (privateKeyArg: plugins.crypto.KeyObject): Promise<IAppStoreCatalogSigningKey> => {
|
|
71
|
+
const publicKey = rawPublicKeyOf(plugins.crypto.createPublicKey(privateKeyArg));
|
|
72
|
+
return { keyId: await computeAppStoreCatalogSigningKeyId(publicKey), publicKey, privateKey: privateKeyArg };
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
/** The Ed25519 private key of a signing key whose `publicKey` it matches; `keyId` is the caller's check. */
|
|
76
|
+
const readSigningPrivateKey = (keyArg: IAppStoreCatalogSigningKey): plugins.crypto.KeyObject => {
|
|
77
|
+
const { privateKey } = keyArg;
|
|
78
|
+
if (!(privateKey instanceof plugins.crypto.KeyObject) || privateKey.type !== 'private'
|
|
79
|
+
|| privateKey.asymmetricKeyType !== 'ed25519') {
|
|
80
|
+
throw new Error('App Store catalog signing key must be an Ed25519 private key');
|
|
81
|
+
}
|
|
82
|
+
if (rawPublicKeyOf(plugins.crypto.createPublicKey(privateKey)) !== keyArg.publicKey) {
|
|
83
|
+
throw new Error(`App Store catalog signing key ${keyArg.keyId} does not match its private key`);
|
|
84
|
+
}
|
|
85
|
+
return privateKey;
|
|
86
|
+
};
|
|
87
|
+
|
|
65
88
|
/** A fresh Ed25519 catalog signing key with its key id. */
|
|
66
|
-
export const createAppStoreCatalogSigningKey = async (): Promise<IAppStoreCatalogSigningKey> =>
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
89
|
+
export const createAppStoreCatalogSigningKey = async (): Promise<IAppStoreCatalogSigningKey> =>
|
|
90
|
+
await signingKeyOf(plugins.crypto.generateKeyPairSync('ed25519').privateKey);
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* Reads a catalog signing key from the text of a PKCS#8 PEM file holding an unencrypted Ed25519
|
|
94
|
+
* private key (`-----BEGIN PRIVATE KEY-----`, as `openssl genpkey -algorithm ed25519` writes it)
|
|
95
|
+
* and derives its public key and key id. Errors never quote the input.
|
|
96
|
+
*/
|
|
97
|
+
export const importAppStoreCatalogSigningKeyPem = async (pkcs8PemArg: string): Promise<IAppStoreCatalogSigningKey> => {
|
|
98
|
+
if (typeof pkcs8PemArg !== 'string' || !isSinglePemBlock(pkcs8PemArg, 'PRIVATE KEY')) {
|
|
99
|
+
throw new Error('App Store catalog signing key must be one unencrypted PKCS#8 PEM private key block');
|
|
100
|
+
}
|
|
101
|
+
let privateKey: plugins.crypto.KeyObject;
|
|
102
|
+
try {
|
|
103
|
+
privateKey = plugins.crypto.createPrivateKey({ key: pkcs8PemArg, format: 'pem' });
|
|
104
|
+
} catch {
|
|
105
|
+
throw new Error('App Store catalog signing key is not a readable PKCS#8 PEM private key');
|
|
106
|
+
}
|
|
107
|
+
if (privateKey.asymmetricKeyType !== 'ed25519') {
|
|
108
|
+
throw new Error('App Store catalog signing key must be an Ed25519 private key');
|
|
109
|
+
}
|
|
110
|
+
return await signingKeyOf(privateKey);
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
/** The PKCS#8 PEM text of a signing key, for the key file `importAppStoreCatalogSigningKeyPem` reads. */
|
|
114
|
+
export const exportAppStoreCatalogSigningKeyPem = async (keyArg: IAppStoreCatalogSigningKey): Promise<string> => {
|
|
115
|
+
const privateKey = readSigningPrivateKey(keyArg);
|
|
116
|
+
if (await computeAppStoreCatalogSigningKeyId(keyArg.publicKey) !== keyArg.keyId) {
|
|
117
|
+
throw new Error(`App Store catalog signing key ${keyArg.keyId} does not match its public key`);
|
|
118
|
+
}
|
|
119
|
+
return privateKey.export({ format: 'pem', type: 'pkcs8' });
|
|
120
|
+
};
|
|
121
|
+
|
|
122
|
+
/** The trusted-key record a consumer ships for a signing key: its public half only. */
|
|
123
|
+
export const getAppStoreCatalogTrustedKey = (keyArg: IAppStoreCatalogSigningKey): IAppStoreCatalogTrustedKey => ({
|
|
124
|
+
keyId: keyArg.keyId,
|
|
125
|
+
publicKey: keyArg.publicKey,
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* Reads a trusted key from the text of an SPKI PEM public key (`-----BEGIN PUBLIC KEY-----`, as
|
|
130
|
+
* `openssl pkey -pubout` writes it) holding an Ed25519 key. Errors never quote the input.
|
|
131
|
+
*/
|
|
132
|
+
export const importAppStoreCatalogTrustedKeyPem = async (spkiPemArg: string): Promise<IAppStoreCatalogTrustedKey> => {
|
|
133
|
+
if (typeof spkiPemArg !== 'string' || !isSinglePemBlock(spkiPemArg, 'PUBLIC KEY')) {
|
|
134
|
+
throw new Error('App Store catalog trusted key must be one SPKI PEM public key block');
|
|
135
|
+
}
|
|
136
|
+
let publicKeyObject: plugins.crypto.KeyObject;
|
|
137
|
+
try {
|
|
138
|
+
publicKeyObject = plugins.crypto.createPublicKey({ key: spkiPemArg, format: 'pem' });
|
|
139
|
+
} catch {
|
|
140
|
+
throw new Error('App Store catalog trusted key is not a readable SPKI PEM public key');
|
|
141
|
+
}
|
|
142
|
+
if (publicKeyObject.type !== 'public' || publicKeyObject.asymmetricKeyType !== 'ed25519') {
|
|
143
|
+
throw new Error('App Store catalog trusted key must be an Ed25519 public key');
|
|
144
|
+
}
|
|
145
|
+
const publicKey = rawPublicKeyOf(publicKeyObject);
|
|
146
|
+
return { keyId: await computeAppStoreCatalogSigningKeyId(publicKey), publicKey };
|
|
147
|
+
};
|
|
148
|
+
|
|
149
|
+
/** The SPKI PEM text of a trusted key whose `keyId` matches its public key. */
|
|
150
|
+
export const exportAppStoreCatalogTrustedKeyPem = async (keyArg: IAppStoreCatalogTrustedKey): Promise<string> => {
|
|
151
|
+
if (await computeAppStoreCatalogSigningKeyId(keyArg.publicKey) !== keyArg.keyId) {
|
|
152
|
+
throw new Error(`App Store catalog trusted key ${keyArg.keyId} does not match its public key`);
|
|
153
|
+
}
|
|
154
|
+
return publicKeyObjectOf(keyArg.publicKey).export({ format: 'pem', type: 'spki' });
|
|
70
155
|
};
|
|
71
156
|
|
|
72
157
|
/**
|
|
@@ -91,13 +176,8 @@ export const signAppStoreCatalog = async (
|
|
|
91
176
|
const payload = createAppStoreCatalogSignaturePayload(catalogDigest);
|
|
92
177
|
const signatures: IAppStoreCatalogSignature[] = [];
|
|
93
178
|
for (const key of signingKeysArg) {
|
|
94
|
-
const
|
|
95
|
-
if (
|
|
96
|
-
|| privateKey.asymmetricKeyType !== 'ed25519') {
|
|
97
|
-
throw new Error('App Store catalog signing key must be an Ed25519 private key');
|
|
98
|
-
}
|
|
99
|
-
const publicKey = rawPublicKeyOf(plugins.crypto.createPublicKey(privateKey));
|
|
100
|
-
if (publicKey !== key.publicKey || await computeAppStoreCatalogSigningKeyId(publicKey) !== key.keyId) {
|
|
179
|
+
const privateKey = readSigningPrivateKey(key);
|
|
180
|
+
if (await computeAppStoreCatalogSigningKeyId(key.publicKey) !== key.keyId) {
|
|
101
181
|
throw new Error(`App Store catalog signing key ${key.keyId} does not match its private key`);
|
|
102
182
|
}
|
|
103
183
|
signatures.push({
|