@serve.zone/interfaces 22.0.0 → 23.0.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 +12 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/appstore/types.d.ts +31 -16
- package/dist_ts/appstore/types.js +208 -11
- package/dist_ts/data/deploymentoperation.js +6 -20
- package/dist_ts/data/deploymentpreflight.d.ts +2 -6
- package/dist_ts/data/deploymentpreflight.js +1 -1
- package/dist_ts/data/hostedapp.d.ts +40 -14
- package/dist_ts/data/hostedapp.js +90 -1
- package/dist_ts/data/immutableimage.d.ts +30 -1
- package/dist_ts/data/immutableimage.js +103 -1
- package/dist_ts/data/index.d.ts +0 -2
- package/dist_ts/data/index.js +1 -3
- package/dist_ts/data/secret.d.ts +186 -13
- package/dist_ts/data/secret.js +543 -45
- package/dist_ts/data/service.d.ts +0 -39
- package/dist_ts/data/service.js +1 -77
- package/dist_ts/data/settings.d.ts +62 -43
- package/dist_ts/data/settings.js +34 -2
- package/dist_ts/platform/storage.d.ts +13 -14
- package/dist_ts/platform/storage.js +1 -1
- package/dist_ts/platform/storagemigration.d.ts +8 -8
- package/dist_ts/platform/storagemigration.golden.d.ts +2 -2
- package/dist_ts/platform/storagemigration.golden.js +19 -88
- package/dist_ts/platform/storagemigration.js +46 -58
- package/dist_ts/platform/types.d.ts +5 -19
- package/dist_ts/plugins.d.ts +2 -1
- package/dist_ts/plugins.js +3 -2
- package/dist_ts/requests/hostedapp.d.ts +12 -9
- package/dist_ts/requests/hostedapp.js +38 -1
- package/dist_ts/requests/index.d.ts +1 -3
- package/dist_ts/requests/index.js +2 -4
- package/dist_ts/requests/platform.d.ts +0 -1
- package/dist_ts/requests/secret.d.ts +23 -17
- package/dist_ts/requests/secret.js +161 -2
- package/dist_ts/requests/service.d.ts +0 -13
- package/dist_ts/requests/settings.d.ts +3 -3
- package/dist_ts/runtime.d.ts +78 -26
- package/dist_ts/runtime.js +219 -19
- package/package.json +2 -1
- package/readme.md +106 -28
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/appstore/types.ts +251 -25
- package/ts/data/deploymentoperation.ts +7 -31
- package/ts/data/deploymentpreflight.ts +2 -5
- package/ts/data/hostedapp.ts +144 -18
- package/ts/data/immutableimage.ts +150 -1
- package/ts/data/index.ts +0 -2
- package/ts/data/secret.ts +775 -53
- package/ts/data/service.ts +0 -118
- package/ts/data/settings.ts +70 -80
- package/ts/platform/storage.ts +15 -16
- package/ts/platform/storagemigration.golden.ts +18 -95
- package/ts/platform/storagemigration.ts +57 -87
- package/ts/platform/types.ts +6 -19
- package/ts/plugins.ts +2 -0
- package/ts/requests/hostedapp.ts +50 -9
- package/ts/requests/index.ts +0 -4
- package/ts/requests/platform.ts +0 -1
- package/ts/requests/secret.ts +204 -9
- package/ts/requests/service.ts +0 -16
- package/ts/requests/settings.ts +3 -3
- package/ts/runtime.ts +314 -41
- package/dist_ts/data/secretbundle.d.ts +0 -57
- package/dist_ts/data/secretbundle.js +0 -2
- package/dist_ts/data/secretgroup.d.ts +0 -52
- package/dist_ts/data/secretgroup.js +0 -2
- package/dist_ts/requests/secretbundle.d.ts +0 -75
- package/dist_ts/requests/secretbundle.js +0 -4
- package/dist_ts/requests/secretgroup.d.ts +0 -52
- package/dist_ts/requests/secretgroup.js +0 -4
- package/ts/data/secretbundle.ts +0 -65
- package/ts/data/secretgroup.ts +0 -58
- package/ts/requests/secretbundle.ts +0 -103
- package/ts/requests/secretgroup.ts +0 -74
|
@@ -1,6 +1,22 @@
|
|
|
1
1
|
export type THostedAppHostType = 'onebox' | 'cloudly' | string;
|
|
2
2
|
export declare const hostedAppOidcRoleClaim: "roles";
|
|
3
3
|
export declare const hostedAppOidcAppInstanceIdClaim: "servezone_app_instance_id";
|
|
4
|
+
export declare const hostedAppMachineServiceIdClaim: "servezone_service_id";
|
|
5
|
+
export declare const hostedAppMachineAudience: "serve.zone/hosted-app-lifecycle";
|
|
6
|
+
export interface IHostedAppMachineClaims {
|
|
7
|
+
sub: string;
|
|
8
|
+
aud: typeof hostedAppMachineAudience;
|
|
9
|
+
iat: number;
|
|
10
|
+
exp: number;
|
|
11
|
+
[hostedAppOidcAppInstanceIdClaim]: string;
|
|
12
|
+
[hostedAppMachineServiceIdClaim]: string;
|
|
13
|
+
}
|
|
14
|
+
export declare const createHostedAppMachineSubject: (appInstanceIdArg: string) => string;
|
|
15
|
+
export declare const validateHostedAppMachineClaims: (claimsArg: unknown, expectedArg: {
|
|
16
|
+
appInstanceId: string;
|
|
17
|
+
serviceId: string;
|
|
18
|
+
nowEpochSeconds?: number;
|
|
19
|
+
}) => string[];
|
|
4
20
|
export interface IHostedAppRoleDefinition {
|
|
5
21
|
/** Stable role identifier emitted in the hosted app's audience-scoped token. */
|
|
6
22
|
id: string;
|
|
@@ -71,29 +87,30 @@ export declare const validateHostedAppPlatformOidcRegistration: (registrationArg
|
|
|
71
87
|
appOrigin: string;
|
|
72
88
|
}) => string[];
|
|
73
89
|
export type THostedAppRuntimeStatus = 'starting' | 'running' | 'setupRequired' | 'degraded' | 'stopped' | 'unknown';
|
|
74
|
-
export type THostedAppBootstrapActionType = '
|
|
90
|
+
export type THostedAppBootstrapActionType = 'setupRoute' | 'message';
|
|
75
91
|
export type THostedAppBootstrapActionStatus = 'requested' | 'ready' | 'completed' | 'dismissed' | 'expired';
|
|
76
92
|
export type THostedAppUpgradeStatus = 'unknown' | 'upToDate' | 'available' | 'running' | 'success' | 'failed';
|
|
77
|
-
|
|
78
|
-
appInstanceId: string;
|
|
79
|
-
appControlToken: string;
|
|
80
|
-
hostType?: THostedAppHostType;
|
|
81
|
-
}
|
|
82
|
-
export interface IHostedAppBootstrapAction {
|
|
93
|
+
interface IHostedAppBootstrapActionBase {
|
|
83
94
|
id: string;
|
|
84
|
-
|
|
95
|
+
/** Server-managed CAS revision incremented on every action transition. */
|
|
96
|
+
revision: number;
|
|
85
97
|
status: THostedAppBootstrapActionStatus;
|
|
86
98
|
label: string;
|
|
87
|
-
url?: string;
|
|
88
|
-
username?: string;
|
|
89
|
-
password?: string;
|
|
90
|
-
message?: string;
|
|
91
99
|
expiresAt?: number;
|
|
92
100
|
createdAt: number;
|
|
93
101
|
updatedAt: number;
|
|
94
102
|
completedAt?: number;
|
|
95
103
|
dismissedAt?: number;
|
|
96
104
|
}
|
|
105
|
+
export type IHostedAppBootstrapAction = (IHostedAppBootstrapActionBase & {
|
|
106
|
+
type: 'setupRoute';
|
|
107
|
+
route: string;
|
|
108
|
+
message?: never;
|
|
109
|
+
}) | (IHostedAppBootstrapActionBase & {
|
|
110
|
+
type: 'message';
|
|
111
|
+
route?: never;
|
|
112
|
+
message: string;
|
|
113
|
+
});
|
|
97
114
|
export interface IHostedAppUpgradeState {
|
|
98
115
|
status: THostedAppUpgradeStatus;
|
|
99
116
|
appTemplateId?: string;
|
|
@@ -123,7 +140,16 @@ export interface IHostedAppLifecycleState extends IHostedAppLifecycleReport {
|
|
|
123
140
|
bootstrapAction?: IHostedAppBootstrapAction;
|
|
124
141
|
upgradeState?: IHostedAppUpgradeState;
|
|
125
142
|
}
|
|
126
|
-
|
|
143
|
+
type THostedAppBootstrapActionServerFields = 'id' | 'revision' | 'status' | 'createdAt' | 'updatedAt' | 'completedAt' | 'dismissedAt';
|
|
144
|
+
export type IHostedAppBootstrapActionRequest = (Omit<Extract<IHostedAppBootstrapAction, {
|
|
145
|
+
type: 'setupRoute';
|
|
146
|
+
}>, THostedAppBootstrapActionServerFields> & {
|
|
147
|
+
id?: string;
|
|
148
|
+
}) | (Omit<Extract<IHostedAppBootstrapAction, {
|
|
149
|
+
type: 'message';
|
|
150
|
+
}>, THostedAppBootstrapActionServerFields> & {
|
|
127
151
|
id?: string;
|
|
128
|
-
};
|
|
152
|
+
});
|
|
153
|
+
export declare const normalizeHostedAppSetupRoute: (routeArg: unknown) => string | undefined;
|
|
154
|
+
export declare const validateHostedAppBootstrapActionRequest: (actionArg: unknown) => string[];
|
|
129
155
|
export {};
|
|
@@ -1,5 +1,37 @@
|
|
|
1
1
|
export const hostedAppOidcRoleClaim = 'roles';
|
|
2
2
|
export const hostedAppOidcAppInstanceIdClaim = 'servezone_app_instance_id';
|
|
3
|
+
export const hostedAppMachineServiceIdClaim = 'servezone_service_id';
|
|
4
|
+
export const hostedAppMachineAudience = 'serve.zone/hosted-app-lifecycle';
|
|
5
|
+
export const createHostedAppMachineSubject = (appInstanceIdArg) => (`urn:serve.zone:hosted-app:${appInstanceIdArg}`);
|
|
6
|
+
export const validateHostedAppMachineClaims = (claimsArg, expectedArg) => {
|
|
7
|
+
if (!claimsArg || typeof claimsArg !== 'object' || Array.isArray(claimsArg)) {
|
|
8
|
+
return ['hosted app machine claims must be an object'];
|
|
9
|
+
}
|
|
10
|
+
const claims = claimsArg;
|
|
11
|
+
const errors = [];
|
|
12
|
+
if (claims.sub !== createHostedAppMachineSubject(expectedArg.appInstanceId)) {
|
|
13
|
+
errors.push('hosted app machine subject does not match');
|
|
14
|
+
}
|
|
15
|
+
if (claims.aud !== hostedAppMachineAudience) {
|
|
16
|
+
errors.push('hosted app machine audience does not match');
|
|
17
|
+
}
|
|
18
|
+
if (claims[hostedAppOidcAppInstanceIdClaim] !== expectedArg.appInstanceId) {
|
|
19
|
+
errors.push('hosted app machine app instance does not match');
|
|
20
|
+
}
|
|
21
|
+
if (claims[hostedAppMachineServiceIdClaim] !== expectedArg.serviceId) {
|
|
22
|
+
errors.push('hosted app machine service does not match');
|
|
23
|
+
}
|
|
24
|
+
const now = expectedArg.nowEpochSeconds ?? Math.floor(Date.now() / 1000);
|
|
25
|
+
if (!Number.isSafeInteger(claims.iat) || claims.iat < 0
|
|
26
|
+
|| claims.iat > now) {
|
|
27
|
+
errors.push('hosted app machine issued-at time is malformed');
|
|
28
|
+
}
|
|
29
|
+
if (!Number.isSafeInteger(claims.exp) || claims.exp <= now
|
|
30
|
+
|| (Number.isSafeInteger(claims.iat) && claims.exp <= claims.iat)) {
|
|
31
|
+
errors.push('hosted app machine expiry is malformed or expired');
|
|
32
|
+
}
|
|
33
|
+
return errors;
|
|
34
|
+
};
|
|
3
35
|
const hostedAppRoleIdRegex = /^[a-z][a-z0-9:_-]{0,63}$/;
|
|
4
36
|
const hostedAppOpaqueIdRegex = /^[^\s\u0000-\u001f\u007f]{1,200}$/;
|
|
5
37
|
export const validateHostedAppRoleDefinitions = (rolesArg) => {
|
|
@@ -188,4 +220,61 @@ export const validateHostedAppPlatformOidcRegistration = (registrationArg, expec
|
|
|
188
220
|
}
|
|
189
221
|
return errors;
|
|
190
222
|
};
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hostedapp.js","sourceRoot":"","sources":["../../ts/data/hostedapp.ts"],"names":[],"mappings":"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"}
|
|
223
|
+
export const normalizeHostedAppSetupRoute = (routeArg) => {
|
|
224
|
+
if (typeof routeArg !== 'string'
|
|
225
|
+
|| !routeArg.startsWith('/')
|
|
226
|
+
|| routeArg.startsWith('//')
|
|
227
|
+
|| /[\\?#\s]/.test(routeArg)
|
|
228
|
+
|| /%5c/i.test(routeArg)) {
|
|
229
|
+
return undefined;
|
|
230
|
+
}
|
|
231
|
+
const parsed = new URL(routeArg, 'https://app.invalid');
|
|
232
|
+
return parsed.pathname === routeArg ? routeArg : undefined;
|
|
233
|
+
};
|
|
234
|
+
export const validateHostedAppBootstrapActionRequest = (actionArg) => {
|
|
235
|
+
if (!actionArg || typeof actionArg !== 'object' || Array.isArray(actionArg)) {
|
|
236
|
+
return ['hosted app bootstrap action must be an object'];
|
|
237
|
+
}
|
|
238
|
+
const action = actionArg;
|
|
239
|
+
const errors = [];
|
|
240
|
+
const allowedKeys = action.type === 'setupRoute'
|
|
241
|
+
? new Set(['id', 'type', 'label', 'route', 'expiresAt'])
|
|
242
|
+
: action.type === 'message'
|
|
243
|
+
? new Set(['id', 'type', 'label', 'message', 'expiresAt'])
|
|
244
|
+
: new Set(['id', 'type', 'label', 'expiresAt']);
|
|
245
|
+
if (Object.keys(action).some((keyArg) => !allowedKeys.has(keyArg))) {
|
|
246
|
+
errors.push('hosted app bootstrap action contains fields outside its schema');
|
|
247
|
+
}
|
|
248
|
+
if (action.id !== undefined
|
|
249
|
+
&& (typeof action.id !== 'string'
|
|
250
|
+
|| !/^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/.test(action.id))) {
|
|
251
|
+
errors.push('hosted app bootstrap action id must be canonical');
|
|
252
|
+
}
|
|
253
|
+
if (action.expiresAt !== undefined
|
|
254
|
+
&& (!Number.isSafeInteger(action.expiresAt) || action.expiresAt < 1)) {
|
|
255
|
+
errors.push('hosted app bootstrap action expiresAt must be a positive integer');
|
|
256
|
+
}
|
|
257
|
+
if (action.type !== 'setupRoute' && action.type !== 'message') {
|
|
258
|
+
errors.push('hosted app bootstrap action type is unsupported');
|
|
259
|
+
}
|
|
260
|
+
if (typeof action.label !== 'string' || !action.label.trim() || action.label.length > 200) {
|
|
261
|
+
errors.push('hosted app bootstrap action label must be bounded');
|
|
262
|
+
}
|
|
263
|
+
if (action.type === 'setupRoute') {
|
|
264
|
+
if (normalizeHostedAppSetupRoute(action.route) !== action.route) {
|
|
265
|
+
errors.push('hosted app setup route must be a canonical same-origin absolute path');
|
|
266
|
+
}
|
|
267
|
+
if ('message' in action)
|
|
268
|
+
errors.push('hosted app setup route forbids message');
|
|
269
|
+
}
|
|
270
|
+
if (action.type === 'message') {
|
|
271
|
+
if (typeof action.message !== 'string' || !action.message.trim()
|
|
272
|
+
|| action.message.length > 4000) {
|
|
273
|
+
errors.push('hosted app bootstrap message must be bounded');
|
|
274
|
+
}
|
|
275
|
+
if ('route' in action)
|
|
276
|
+
errors.push('hosted app message forbids route');
|
|
277
|
+
}
|
|
278
|
+
return errors;
|
|
279
|
+
};
|
|
280
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hostedapp.js","sourceRoot":"","sources":["../../ts/data/hostedapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,28 @@ export interface ICoreflowRuntimeCapabilities {
|
|
|
21
21
|
/** Coreflow can answer the versioned, node-scoped Corestore inventory probe. */
|
|
22
22
|
corestoreInventoryVersion?: 1;
|
|
23
23
|
/** Coreflow can consume exact, cluster-scoped resolved secret manifests. */
|
|
24
|
-
secretManifestVersion
|
|
24
|
+
secretManifestVersion: 2;
|
|
25
|
+
sealedSecretMaterialVersion: 1;
|
|
26
|
+
secretRecipientEnrollmentVersion: 1;
|
|
27
|
+
workloadInitEnvironmentVersion: 1;
|
|
28
|
+
}
|
|
29
|
+
export type TImmutableContainerPlatform = 'linux/amd64' | 'linux/arm64';
|
|
30
|
+
export interface IImmutableContainerInvocationPlatformEvidenceV1 {
|
|
31
|
+
platform: TImmutableContainerPlatform;
|
|
32
|
+
platformManifestDigest: TSha256Digest;
|
|
33
|
+
imageConfigDigest: TSha256Digest;
|
|
34
|
+
/** Effective non-empty OCI argv after applying the deployment containerArgs. */
|
|
35
|
+
effectiveArgv: string[];
|
|
36
|
+
}
|
|
37
|
+
export interface IImmutableContainerInvocationV1 {
|
|
38
|
+
schemaVersion: 1;
|
|
39
|
+
/** Sorted, unique, non-empty and limited to the authoritative platform union. */
|
|
40
|
+
targetPlatforms: TImmutableContainerPlatform[];
|
|
41
|
+
/** The one effective argv shared by every target platform. */
|
|
42
|
+
argv: string[];
|
|
43
|
+
/** Sorted exact one-to-one platform evidence. */
|
|
44
|
+
evidence: IImmutableContainerInvocationPlatformEvidenceV1[];
|
|
45
|
+
digest: TSha256Digest;
|
|
25
46
|
}
|
|
26
47
|
/**
|
|
27
48
|
* A registry manifest observed by Cloudly. Observation alone does not make the
|
|
@@ -97,6 +118,8 @@ export interface IImmutableImageDeploymentPlan {
|
|
|
97
118
|
requestedDigest: TSha256Digest;
|
|
98
119
|
digestPinnedImageReference: string;
|
|
99
120
|
manifestMediaType: TOciManifestMediaType;
|
|
121
|
+
/** Mandatory immutable command/config evidence for every target platform. */
|
|
122
|
+
containerInvocation: IImmutableContainerInvocationV1;
|
|
100
123
|
createdAt: number;
|
|
101
124
|
mode: TImmutableImageRolloutMode;
|
|
102
125
|
/** Full pre-adoption service configuration fence, required only for adoption. */
|
|
@@ -186,10 +209,16 @@ export interface IImageRolloutStatus {
|
|
|
186
209
|
updatedAt: number;
|
|
187
210
|
reporters: IImageRolloutReporterStatus[];
|
|
188
211
|
}
|
|
212
|
+
export declare const createImmutableContainerInvocationDigestInput: (invocationArg: Omit<IImmutableContainerInvocationV1, "digest"> | IImmutableContainerInvocationV1) => string;
|
|
213
|
+
export declare const computeImmutableContainerInvocationDigest: (invocationArg: Omit<IImmutableContainerInvocationV1, "digest"> | IImmutableContainerInvocationV1) => Promise<TSha256Digest>;
|
|
214
|
+
export declare const verifyImmutableContainerInvocationDigest: (invocationArg: IImmutableContainerInvocationV1) => Promise<boolean>;
|
|
215
|
+
export declare const validateImmutableContainerInvocation: (invocationArg: unknown) => string[];
|
|
189
216
|
export declare const normalizeSha256Digest: (digest: unknown) => TSha256Digest | undefined;
|
|
190
217
|
export declare const isSha256Digest: (digest: string) => digest is TSha256Digest;
|
|
191
218
|
export declare const buildDigestPinnedImageReference: (registryHost: string, repository: string, digest: TSha256Digest) => string;
|
|
192
219
|
export declare const getDigestFromPinnedImageReference: (imageReference: string) => TSha256Digest | undefined;
|
|
193
220
|
export declare const validateImmutableImageDeploymentPlan: (planArg: IImmutableImageDeploymentPlan) => string[];
|
|
221
|
+
/** Coreflow uses this async verifier before resolving or opening secret material. */
|
|
222
|
+
export declare const verifyImmutableImageDeploymentPlan: (planArg: IImmutableImageDeploymentPlan) => Promise<boolean>;
|
|
194
223
|
export declare const validateImageRolloutStatus: (statusArg: IImageRolloutStatus) => string[];
|
|
195
224
|
export {};
|
|
@@ -74,6 +74,104 @@ export const normalizeImmutableReleaseTag = (tagArg) => {
|
|
|
74
74
|
return tagArg;
|
|
75
75
|
};
|
|
76
76
|
const sha256DigestRegex = /^sha256:[a-f0-9]{64}$/;
|
|
77
|
+
const immutableContainerPlatforms = new Set([
|
|
78
|
+
'linux/amd64',
|
|
79
|
+
'linux/arm64',
|
|
80
|
+
]);
|
|
81
|
+
const validateImmutableArgv = (argvArg) => (Array.isArray(argvArg)
|
|
82
|
+
&& argvArg.length > 0
|
|
83
|
+
&& argvArg.length <= 128
|
|
84
|
+
&& argvArg.every((argumentArg) => typeof argumentArg === 'string'
|
|
85
|
+
&& argumentArg.length > 0
|
|
86
|
+
&& !/[\u0000-\u001f\u007f]/.test(argumentArg)
|
|
87
|
+
&& new TextEncoder().encode(argumentArg).byteLength <= 4096));
|
|
88
|
+
export const createImmutableContainerInvocationDigestInput = (invocationArg) => JSON.stringify({
|
|
89
|
+
schemaVersion: invocationArg.schemaVersion,
|
|
90
|
+
targetPlatforms: invocationArg.targetPlatforms,
|
|
91
|
+
argv: invocationArg.argv,
|
|
92
|
+
evidence: invocationArg.evidence.map((entryArg) => ({
|
|
93
|
+
platform: entryArg.platform,
|
|
94
|
+
platformManifestDigest: entryArg.platformManifestDigest,
|
|
95
|
+
imageConfigDigest: entryArg.imageConfigDigest,
|
|
96
|
+
effectiveArgv: entryArg.effectiveArgv,
|
|
97
|
+
})),
|
|
98
|
+
});
|
|
99
|
+
export const computeImmutableContainerInvocationDigest = async (invocationArg) => {
|
|
100
|
+
const input = new TextEncoder().encode(createImmutableContainerInvocationDigestInput(invocationArg));
|
|
101
|
+
const digest = new Uint8Array(await globalThis.crypto.subtle.digest('SHA-256', input.buffer));
|
|
102
|
+
return `sha256:${[...digest]
|
|
103
|
+
.map((byteArg) => byteArg.toString(16).padStart(2, '0'))
|
|
104
|
+
.join('')}`;
|
|
105
|
+
};
|
|
106
|
+
export const verifyImmutableContainerInvocationDigest = async (invocationArg) => invocationArg.digest
|
|
107
|
+
=== await computeImmutableContainerInvocationDigest(invocationArg);
|
|
108
|
+
export const validateImmutableContainerInvocation = (invocationArg) => {
|
|
109
|
+
if (!invocationArg || typeof invocationArg !== 'object' || Array.isArray(invocationArg)) {
|
|
110
|
+
return ['containerInvocation must be an object'];
|
|
111
|
+
}
|
|
112
|
+
const invocation = invocationArg;
|
|
113
|
+
const errors = [];
|
|
114
|
+
if (JSON.stringify(Object.keys(invocation).sort()) !== JSON.stringify([
|
|
115
|
+
'argv',
|
|
116
|
+
'digest',
|
|
117
|
+
'evidence',
|
|
118
|
+
'schemaVersion',
|
|
119
|
+
'targetPlatforms',
|
|
120
|
+
])) {
|
|
121
|
+
errors.push('containerInvocation must use its exact schema');
|
|
122
|
+
}
|
|
123
|
+
if (invocation.schemaVersion !== 1)
|
|
124
|
+
errors.push('containerInvocation schemaVersion must be 1');
|
|
125
|
+
const platforms = Array.isArray(invocation.targetPlatforms)
|
|
126
|
+
? invocation.targetPlatforms
|
|
127
|
+
: [];
|
|
128
|
+
if (platforms.length === 0
|
|
129
|
+
|| platforms.some((platformArg) => typeof platformArg !== 'string'
|
|
130
|
+
|| !immutableContainerPlatforms.has(platformArg))
|
|
131
|
+
|| new Set(platforms).size !== platforms.length
|
|
132
|
+
|| JSON.stringify(platforms) !== JSON.stringify([...platforms].sort())) {
|
|
133
|
+
errors.push('containerInvocation targetPlatforms must be sorted unique supported platforms');
|
|
134
|
+
}
|
|
135
|
+
if (!validateImmutableArgv(invocation.argv)) {
|
|
136
|
+
errors.push('containerInvocation argv must be a non-empty canonical argument vector');
|
|
137
|
+
}
|
|
138
|
+
const evidence = Array.isArray(invocation.evidence) ? invocation.evidence : [];
|
|
139
|
+
const evidencePlatforms = [];
|
|
140
|
+
for (const [index, entryArg] of evidence.entries()) {
|
|
141
|
+
if (!entryArg || typeof entryArg !== 'object' || Array.isArray(entryArg)) {
|
|
142
|
+
errors.push(`containerInvocation evidence[${index}] must be an object`);
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
const entry = entryArg;
|
|
146
|
+
if (JSON.stringify(Object.keys(entry).sort()) !== JSON.stringify([
|
|
147
|
+
'effectiveArgv',
|
|
148
|
+
'imageConfigDigest',
|
|
149
|
+
'platform',
|
|
150
|
+
'platformManifestDigest',
|
|
151
|
+
])) {
|
|
152
|
+
errors.push(`containerInvocation evidence[${index}] must use its exact schema`);
|
|
153
|
+
}
|
|
154
|
+
evidencePlatforms.push(entry.platform);
|
|
155
|
+
if (!immutableContainerPlatforms.has(entry.platform)) {
|
|
156
|
+
errors.push(`containerInvocation evidence[${index}].platform is unsupported`);
|
|
157
|
+
}
|
|
158
|
+
if (!isSha256Digest(entry.platformManifestDigest)
|
|
159
|
+
|| !isSha256Digest(entry.imageConfigDigest)) {
|
|
160
|
+
errors.push(`containerInvocation evidence[${index}] digests must be canonical`);
|
|
161
|
+
}
|
|
162
|
+
if (!validateImmutableArgv(entry.effectiveArgv)
|
|
163
|
+
|| JSON.stringify(entry.effectiveArgv) !== JSON.stringify(invocation.argv)) {
|
|
164
|
+
errors.push(`containerInvocation evidence[${index}] effective argv must match`);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
if (JSON.stringify(evidencePlatforms) !== JSON.stringify(platforms)) {
|
|
168
|
+
errors.push('containerInvocation evidence must exactly cover targetPlatforms in order');
|
|
169
|
+
}
|
|
170
|
+
if (typeof invocation.digest !== 'string' || !isSha256Digest(invocation.digest)) {
|
|
171
|
+
errors.push('containerInvocation digest must be canonical');
|
|
172
|
+
}
|
|
173
|
+
return errors;
|
|
174
|
+
};
|
|
77
175
|
export const normalizeSha256Digest = (digest) => {
|
|
78
176
|
if (typeof digest !== 'string')
|
|
79
177
|
return undefined;
|
|
@@ -133,6 +231,7 @@ export const validateImmutableImageDeploymentPlan = (planArg) => {
|
|
|
133
231
|
].includes(planArg.manifestMediaType)) {
|
|
134
232
|
errors.push('immutable rollout root must be an OCI image index');
|
|
135
233
|
}
|
|
234
|
+
errors.push(...validateImmutableContainerInvocation(planArg.containerInvocation));
|
|
136
235
|
let expectedReference;
|
|
137
236
|
try {
|
|
138
237
|
expectedReference = buildDigestPinnedImageReference(planArg.registryHost, planArg.repository, planArg.requestedDigest);
|
|
@@ -177,6 +276,9 @@ export const validateImmutableImageDeploymentPlan = (planArg) => {
|
|
|
177
276
|
}
|
|
178
277
|
return errors;
|
|
179
278
|
};
|
|
279
|
+
/** Coreflow uses this async verifier before resolving or opening secret material. */
|
|
280
|
+
export const verifyImmutableImageDeploymentPlan = async (planArg) => validateImmutableImageDeploymentPlan(planArg).length === 0
|
|
281
|
+
&& await verifyImmutableContainerInvocationDigest(planArg.containerInvocation);
|
|
180
282
|
export const validateImageRolloutStatus = (statusArg) => {
|
|
181
283
|
const errors = [];
|
|
182
284
|
if (!isImmutableIdentifier(statusArg.rolloutId)) {
|
|
@@ -277,4 +379,4 @@ export const validateImageRolloutStatus = (statusArg) => {
|
|
|
277
379
|
}
|
|
278
380
|
return errors;
|
|
279
381
|
};
|
|
280
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.ts"],"names":[],"mappings":"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"}
|
|
382
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -22,8 +22,6 @@ export * from './isolatedrestore.golden.js';
|
|
|
22
22
|
export * from './mail.js';
|
|
23
23
|
export * from './registry.js';
|
|
24
24
|
export * from './secret.js';
|
|
25
|
-
export * from './secretbundle.js';
|
|
26
|
-
export * from './secretgroup.js';
|
|
27
25
|
export * from './baremetal.js';
|
|
28
26
|
export * from './baseos.js';
|
|
29
27
|
export * from './backup.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -22,8 +22,6 @@ export * from './isolatedrestore.golden.js';
|
|
|
22
22
|
export * from './mail.js';
|
|
23
23
|
export * from './registry.js';
|
|
24
24
|
export * from './secret.js';
|
|
25
|
-
export * from './secretbundle.js';
|
|
26
|
-
export * from './secretgroup.js';
|
|
27
25
|
export * from './baremetal.js';
|
|
28
26
|
export * from './baseos.js';
|
|
29
27
|
export * from './backup.js';
|
|
@@ -37,4 +35,4 @@ export * from './traffic.js';
|
|
|
37
35
|
export * from './user.js';
|
|
38
36
|
export * from './version.js';
|
|
39
37
|
export * from './webpush.js';
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUMifQ==
|