@serve.zone/interfaces 31.9.0 → 32.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/.smartconfig.json +1 -0
- package/changelog.md +467 -0
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/appstore/types.d.ts +4 -6
- package/dist_ts/appstore/types.js +5 -5
- package/dist_ts/data/backup.d.ts +3 -26
- package/dist_ts/data/cluster.d.ts +36 -11
- package/dist_ts/data/cluster.js +33 -22
- package/dist_ts/data/clusteringress.d.ts +8 -0
- package/dist_ts/data/clusteringress.js +13 -8
- package/dist_ts/data/clusternode.d.ts +121 -74
- package/dist_ts/data/clusternode.js +109 -132
- package/dist_ts/data/coremail.d.ts +3 -7
- package/dist_ts/data/coremail.js +2 -2
- package/dist_ts/data/coremail.runtime.d.ts +0 -1
- package/dist_ts/data/coremail.runtime.js +5 -22
- package/dist_ts/data/deploymentadoption.d.ts +0 -2
- package/dist_ts/data/deploymentadoption.js +40 -6
- package/dist_ts/data/deploymentoperation.js +16 -3
- package/dist_ts/data/deploymentpreflight.d.ts +0 -2
- package/dist_ts/data/deploymentpreflight.js +1 -1
- package/dist_ts/data/immutableimage.d.ts +38 -21
- package/dist_ts/data/immutableimage.js +45 -5
- package/dist_ts/data/index.d.ts +1 -1
- package/dist_ts/data/isolatedrestore.d.ts +139 -21
- package/dist_ts/data/isolatedrestore.golden.d.ts +0 -1
- package/dist_ts/data/isolatedrestore.golden.js +6 -9
- package/dist_ts/data/isolatedrestore.js +176 -40
- package/dist_ts/data/mail.d.ts +1 -1
- package/dist_ts/data/networkaddressplan.d.ts +8 -8
- package/dist_ts/data/networkaddressplan.js +4 -4
- package/dist_ts/data/networkauthority.d.ts +20 -22
- package/dist_ts/data/networkauthority.js +26 -28
- package/dist_ts/data/networkcredential.d.ts +10 -10
- package/dist_ts/data/networkcredential.js +16 -16
- package/dist_ts/data/networkdelivery.d.ts +18 -18
- package/dist_ts/data/networkdelivery.js +16 -16
- package/dist_ts/data/networklease.d.ts +18 -7
- package/dist_ts/data/networklease.js +29 -7
- package/dist_ts/data/networknode.d.ts +2 -2
- package/dist_ts/data/networkprojection.d.ts +59 -60
- package/dist_ts/data/networkprojection.js +53 -57
- package/dist_ts/data/networkprotection.d.ts +27 -28
- package/dist_ts/data/networkprotection.js +36 -36
- package/dist_ts/data/networkrouter.d.ts +11 -11
- package/dist_ts/data/networkrouter.js +1 -1
- package/dist_ts/data/networksigning.d.ts +16 -18
- package/dist_ts/data/networksigning.js +20 -21
- package/dist_ts/data/nodecredential.d.ts +4 -6
- package/dist_ts/data/nodeenrollment.d.ts +35 -40
- package/dist_ts/data/nodeenrollment.js +57 -72
- package/dist_ts/data/privatenetwork.d.ts +21 -24
- package/dist_ts/data/privatenetwork.js +39 -54
- package/dist_ts/data/runtimeassignment.d.ts +50 -34
- package/dist_ts/data/runtimeassignment.js +79 -45
- package/dist_ts/data/runtimeconfig.d.ts +21 -22
- package/dist_ts/data/runtimeconfig.js +24 -24
- package/dist_ts/data/runtimesession.d.ts +100 -62
- package/dist_ts/data/runtimesession.js +98 -79
- package/dist_ts/data/runtimeterminalreceipt.d.ts +28 -29
- package/dist_ts/data/runtimeterminalreceipt.js +42 -42
- package/dist_ts/data/secret.d.ts +18 -25
- package/dist_ts/data/secret.js +12 -52
- package/dist_ts/data/servicecredential.d.ts +14 -16
- package/dist_ts/data/servicecredential.js +17 -28
- package/dist_ts/data/serviceruntime.d.ts +7 -7
- package/dist_ts/data/serviceruntime.js +4 -4
- package/dist_ts/data/sparknodereport.d.ts +27 -14
- package/dist_ts/data/sparknodereport.js +35 -28
- package/dist_ts/data/webpush.d.ts +0 -1
- package/dist_ts/index.d.ts +2 -1
- package/dist_ts/index.js +3 -2
- package/dist_ts/platform/objectstorageretention.d.ts +21 -24
- package/dist_ts/platform/objectstorageretention.js +6 -18
- package/dist_ts/platform/storage.d.ts +1 -3
- package/dist_ts/platform/storagemigration.d.ts +0 -7
- package/dist_ts/platform/storagemigration.golden.d.ts +0 -1
- package/dist_ts/platform/storagemigration.golden.js +8 -12
- package/dist_ts/platform/storagemigration.js +6 -51
- package/dist_ts/platform/types.d.ts +2 -2
- package/dist_ts/private/canonicaljson.d.ts +9 -1
- package/dist_ts/private/canonicaljson.js +14 -2
- package/dist_ts/private/dataproperties.d.ts +62 -0
- package/dist_ts/private/dataproperties.js +117 -0
- package/dist_ts/private/networkcontract.d.ts +10 -10
- package/dist_ts/private/networkcontract.js +1 -1
- package/dist_ts/private/releaseversion.d.ts +37 -0
- package/dist_ts/private/releaseversion.js +48 -0
- package/dist_ts/private/runtimepolicy.d.ts +2 -2
- package/dist_ts/private/runtimepolicy.js +1 -1
- package/dist_ts/private/tokenlist.d.ts +9 -0
- package/dist_ts/private/tokenlist.js +23 -0
- package/dist_ts/protocol.d.ts +137 -0
- package/dist_ts/protocol.js +255 -0
- package/dist_ts/requests/admin.d.ts +8 -8
- package/dist_ts/requests/backup.d.ts +102 -112
- package/dist_ts/requests/cluster.d.ts +10 -10
- package/dist_ts/requests/clusteringress.d.ts +9 -0
- package/dist_ts/requests/clusteringress.js +1 -1
- package/dist_ts/requests/config.d.ts +3 -3
- package/dist_ts/requests/corestore.d.ts +0 -3
- package/dist_ts/requests/corestore.js +5 -9
- package/dist_ts/requests/network.d.ts +30 -30
- package/dist_ts/requests/node.d.ts +15 -28
- package/dist_ts/requests/pallet.d.ts +13 -13
- package/dist_ts/requests/runtimesession.d.ts +53 -41
- package/dist_ts/requests/secret.d.ts +4 -5
- package/dist_ts/requests/secret.js +1 -5
- package/dist_ts/runtime.corestore.d.ts +56 -74
- package/dist_ts/runtime.corestore.databaseexportpackage.d.ts +30 -36
- package/dist_ts/runtime.corestore.databaseexportpackage.golden.d.ts +11 -12
- package/dist_ts/runtime.corestore.databaseexportpackage.golden.js +54 -71
- package/dist_ts/runtime.corestore.databaseexportpackage.js +9 -25
- package/dist_ts/runtime.corestore.js +35 -135
- package/dist_ts/runtime.corestore.relay.js +2 -7
- package/dist_ts/runtime.d.ts +38 -48
- package/dist_ts/runtime.js +20 -77
- package/dist_ts/runtime.networkprojection.d.ts +4 -4
- package/dist_ts/runtime.networkprojection.js +18 -18
- package/dist_ts/runtime.workloadinit.d.ts +23 -24
- package/dist_ts/runtime.workloadinit.js +6 -13
- package/package.json +2 -2
- package/readme.md +421 -270
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/appstore/types.ts +4 -6
- package/ts/data/backup.ts +3 -38
- package/ts/data/cluster.ts +51 -34
- package/ts/data/clusteringress.ts +12 -12
- package/ts/data/clusternode.ts +204 -232
- package/ts/data/coremail.runtime.ts +4 -21
- package/ts/data/coremail.ts +3 -7
- package/ts/data/deploymentadoption.ts +46 -4
- package/ts/data/deploymentoperation.ts +16 -1
- package/ts/data/deploymentpreflight.ts +0 -2
- package/ts/data/immutableimage.ts +71 -24
- package/ts/data/index.ts +1 -1
- package/ts/data/isolatedrestore.golden.ts +5 -9
- package/ts/data/isolatedrestore.ts +339 -54
- package/ts/data/mail.ts +1 -1
- package/ts/data/networkaddressplan.ts +13 -13
- package/ts/data/networkauthority.ts +42 -46
- package/ts/data/networkcredential.ts +24 -24
- package/ts/data/networkdelivery.ts +27 -27
- package/ts/data/networklease.ts +40 -13
- package/ts/data/networknode.ts +2 -2
- package/ts/data/networkprojection.ts +119 -124
- package/ts/data/networkprotection.ts +54 -55
- package/ts/data/networkrouter.ts +14 -14
- package/ts/data/networksigning.ts +29 -32
- package/ts/data/nodecredential.ts +4 -6
- package/ts/data/nodeenrollment.ts +96 -114
- package/ts/data/privatenetwork.ts +58 -74
- package/ts/data/runtimeassignment.ts +143 -94
- package/ts/data/runtimeconfig.ts +45 -46
- package/ts/data/runtimesession.ts +185 -138
- package/ts/data/runtimeterminalreceipt.ts +72 -73
- package/ts/data/secret.ts +28 -76
- package/ts/data/servicecredential.ts +33 -43
- package/ts/data/serviceruntime.ts +11 -11
- package/ts/data/sparknodereport.ts +48 -36
- package/ts/data/webpush.ts +0 -1
- package/ts/index.ts +2 -0
- package/ts/platform/objectstorageretention.ts +36 -55
- package/ts/platform/storage.ts +1 -3
- package/ts/platform/storagemigration.golden.ts +7 -11
- package/ts/platform/storagemigration.ts +5 -55
- package/ts/platform/types.ts +2 -2
- package/ts/private/canonicaljson.ts +13 -1
- package/ts/private/dataproperties.ts +139 -0
- package/ts/private/networkcontract.ts +9 -9
- package/ts/private/releaseversion.ts +70 -0
- package/ts/private/runtimepolicy.ts +2 -2
- package/ts/private/tokenlist.ts +30 -0
- package/ts/protocol.ts +364 -0
- package/ts/requests/admin.ts +11 -11
- package/ts/requests/backup.ts +112 -117
- package/ts/requests/cluster.ts +13 -13
- package/ts/requests/clusteringress.ts +9 -0
- package/ts/requests/config.ts +3 -3
- package/ts/requests/corestore.ts +4 -16
- package/ts/requests/network.ts +40 -40
- package/ts/requests/node.ts +21 -38
- package/ts/requests/pallet.ts +17 -17
- package/ts/requests/runtimesession.ts +63 -51
- package/ts/requests/secret.ts +5 -10
- package/ts/runtime.corestore.databaseexportpackage.golden.ts +77 -95
- package/ts/runtime.corestore.databaseexportpackage.ts +51 -73
- package/ts/runtime.corestore.relay.ts +1 -10
- package/ts/runtime.corestore.ts +118 -268
- package/ts/runtime.networkprojection.ts +30 -30
- package/ts/runtime.ts +83 -158
- package/ts/runtime.workloadinit.ts +36 -48
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.d.ts +0 -902
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.golden.d.ts +0 -35
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.golden.js +0 -315
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.js +0 -3315
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.d.ts +0 -291
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.golden.d.ts +0 -30
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.golden.js +0 -408
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.js +0 -1126
- package/ts/runtime.cloudlylegacydeploymentsettlement.golden.ts +0 -421
- package/ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.golden.ts +0 -510
- package/ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.ts +0 -2470
- package/ts/runtime.cloudlylegacydeploymentsettlement.ts +0 -6630
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import * as plugins from './plugins.runtime.js';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { snapshotRuntimeNetworkNodeScope, snapshotRuntimeNetworkProjection, validateRuntimeNetworkProjection } from './data/networkprojection.js';
|
|
3
|
+
import { computeRuntimeNetworkSigningAuthorityDigest, runtimeNetworkSigningContract, snapshotRuntimeNetworkSigningAuthority, snapshotSignedRuntimeNetworkProjection } from './data/networksigning.js';
|
|
4
4
|
import { runtimeNetworkDnsLeaseRenewalContract, snapshotRuntimeNetworkDnsLeaseRenewal, snapshotSignedRuntimeNetworkDnsLeaseRenewal, validateRuntimeNetworkDnsLeaseRenewal } from './data/networklease.js';
|
|
5
5
|
import { captureNetwork, failNetwork, networkCanonical, networkEqual, networkReference, networkReferenceOf, networkSameScope, requireNetwork } from './private/networkcontract.js';
|
|
6
6
|
/** The private KeyObject is process-local. Persist only through the controller's encrypted secret store. */
|
|
7
|
-
export const
|
|
7
|
+
export const createRuntimeNetworkSigningKey = () => {
|
|
8
8
|
const pair = plugins.crypto.generateKeyPairSync('ed25519');
|
|
9
9
|
const jwk = pair.publicKey.export({ format: 'jwk' });
|
|
10
10
|
requireNetwork(jwk.kty === 'OKP' && jwk.crv === 'Ed25519' && typeof jwk.x === 'string');
|
|
11
11
|
return { publicKey: Buffer.from(jwk.x, 'base64url').toString('hex'), privateKey: pair.privateKey };
|
|
12
12
|
};
|
|
13
|
-
const projectionEnvelope = (authority, projection) => ({ domain:
|
|
13
|
+
const projectionEnvelope = (authority, projection) => ({ domain: runtimeNetworkSigningContract.signatureDomain, authority, projection });
|
|
14
14
|
const renewalEnvelope = (authority, renewal) => ({ domain: runtimeNetworkDnsLeaseRenewalContract.signatureDomain, authority, renewal });
|
|
15
15
|
const envelopeBytes = (envelope) => new TextEncoder().encode(networkCanonical(envelope));
|
|
16
16
|
/** A revoked revision has no key; any other must be intact and belong to the controller that owns the content. */
|
|
17
17
|
const liveKeyOf = async (authority, contentController) => {
|
|
18
18
|
const { publicKey } = authority;
|
|
19
19
|
requireNetwork(publicKey !== null && networkEqual(authority.controller, contentController)
|
|
20
|
-
&& authority.digest === await
|
|
20
|
+
&& authority.digest === await computeRuntimeNetworkSigningAuthorityDigest(authority));
|
|
21
21
|
return publicKey;
|
|
22
22
|
};
|
|
23
23
|
/** Sign as the authority's revision, and only with the private half of its live key. */
|
|
@@ -37,12 +37,12 @@ const requireSignedBy = async (trusted, signed, contentController, envelope) =>
|
|
|
37
37
|
requireNetwork(plugins.crypto.verify(null, envelopeBytes(envelope), key, Buffer.from(signed.signature, 'hex')));
|
|
38
38
|
};
|
|
39
39
|
/** Sign only validated complete state and a matching dedicated private key. */
|
|
40
|
-
export const
|
|
40
|
+
export const signRuntimeNetworkProjection = async (projectionValue, authorityValue, privateKey) => {
|
|
41
41
|
try {
|
|
42
|
-
const input =
|
|
43
|
-
const projection = await
|
|
42
|
+
const input = snapshotRuntimeNetworkProjection(projectionValue), authority = snapshotRuntimeNetworkSigningAuthority(authorityValue);
|
|
43
|
+
const projection = await validateRuntimeNetworkProjection(input);
|
|
44
44
|
const signed = await signAs(authority, privateKey, projection.controller, reference => projectionEnvelope(reference, projection));
|
|
45
|
-
return {
|
|
45
|
+
return { authority: signed.authority, projection, signature: signed.signature };
|
|
46
46
|
}
|
|
47
47
|
catch {
|
|
48
48
|
return failNetwork();
|
|
@@ -53,14 +53,14 @@ export const signRuntimeNetworkProjectionV1 = async (projectionValue, authorityV
|
|
|
53
53
|
* This verifies content/scope/signature only. The owner still performs atomic revision
|
|
54
54
|
* admission, live-session fencing, allocation barriers and conservative DNS time checks.
|
|
55
55
|
*/
|
|
56
|
-
export const
|
|
56
|
+
export const verifyRuntimeNetworkProjection = async (value, trustedAuthorityValue, trustedScopeValue) => {
|
|
57
57
|
try {
|
|
58
|
-
const signed =
|
|
59
|
-
const authority =
|
|
60
|
-
const trusted =
|
|
58
|
+
const signed = snapshotSignedRuntimeNetworkProjection(value);
|
|
59
|
+
const authority = snapshotRuntimeNetworkSigningAuthority(trustedAuthorityValue);
|
|
60
|
+
const trusted = snapshotRuntimeNetworkNodeScope(trustedScopeValue);
|
|
61
61
|
requireNetwork(networkSameScope(signed.projection, trusted));
|
|
62
62
|
await requireSignedBy(authority, signed, signed.projection.controller, projectionEnvelope(signed.authority, signed.projection));
|
|
63
|
-
await
|
|
63
|
+
await validateRuntimeNetworkProjection(signed.projection);
|
|
64
64
|
return signed;
|
|
65
65
|
}
|
|
66
66
|
catch {
|
|
@@ -70,7 +70,7 @@ export const verifyRuntimeNetworkProjectionV1 = async (value, trustedAuthorityVa
|
|
|
70
70
|
/** Sign only a validated renewal, with the same authority and key that sign this controller's projections. */
|
|
71
71
|
export const signRuntimeNetworkDnsLeaseRenewal = async (renewalValue, authorityValue, privateKey) => {
|
|
72
72
|
try {
|
|
73
|
-
const input = snapshotRuntimeNetworkDnsLeaseRenewal(renewalValue), authority =
|
|
73
|
+
const input = snapshotRuntimeNetworkDnsLeaseRenewal(renewalValue), authority = snapshotRuntimeNetworkSigningAuthority(authorityValue);
|
|
74
74
|
const renewal = await validateRuntimeNetworkDnsLeaseRenewal(input);
|
|
75
75
|
const signed = await signAs(authority, privateKey, renewal.controller, reference => renewalEnvelope(reference, renewal));
|
|
76
76
|
return { authority: signed.authority, renewal, signature: signed.signature };
|
|
@@ -92,8 +92,8 @@ export const signRuntimeNetworkDnsLeaseRenewal = async (renewalValue, authorityV
|
|
|
92
92
|
export const verifyRuntimeNetworkDnsLeaseRenewal = async (value, trustedAuthorityValue, trustedScopeValue, projectionAuthorityValue) => {
|
|
93
93
|
try {
|
|
94
94
|
const signed = snapshotSignedRuntimeNetworkDnsLeaseRenewal(value);
|
|
95
|
-
const authority =
|
|
96
|
-
const trusted =
|
|
95
|
+
const authority = snapshotRuntimeNetworkSigningAuthority(trustedAuthorityValue);
|
|
96
|
+
const trusted = snapshotRuntimeNetworkNodeScope(trustedScopeValue);
|
|
97
97
|
const projectionAuthority = networkReference(captureNetwork(projectionAuthorityValue));
|
|
98
98
|
requireNetwork(networkSameScope(signed.renewal, trusted) && networkEqual(signed.authority, projectionAuthority));
|
|
99
99
|
await requireSignedBy(authority, signed, signed.renewal.controller, renewalEnvelope(signed.authority, signed.renewal));
|
|
@@ -104,4 +104,4 @@ export const verifyRuntimeNetworkDnsLeaseRenewal = async (value, trustedAuthorit
|
|
|
104
104
|
return failNetwork();
|
|
105
105
|
}
|
|
106
106
|
};
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5uZXR3b3JrcHJvamVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3J1bnRpbWUubmV0d29ya3Byb2plY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxzQkFBc0IsQ0FBQztBQUdoRCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsZ0NBQWdDLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVsSixPQUFPLEVBQUUsMkNBQTJDLEVBQUUsNkJBQTZCLEVBQ2pGLHNDQUFzQyxFQUFFLHNDQUFzQyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbkgsT0FBTyxFQUFFLHFDQUFxQyxFQUFFLHFDQUFxQyxFQUNuRiwyQ0FBMkMsRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JILE9BQU8sRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFDeEcsZ0JBQWdCLEVBQUUsY0FBYyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFekUsNEdBQTRHO0FBQzVHLE1BQU0sQ0FBQyxNQUFNLDhCQUE4QixHQUFHLEdBQWdFLEVBQUU7SUFDOUcsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMzRCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ3JELGNBQWMsQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLEtBQUssSUFBSSxHQUFHLENBQUMsR0FBRyxLQUFLLFNBQVMsSUFBSSxPQUFPLEdBQUcsQ0FBQyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUM7SUFDeEYsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsSUFBSSxD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
|
|
@@ -7,18 +7,18 @@ export declare const workloadInitReleaseContract: Readonly<{
|
|
|
7
7
|
readonly imageIndexMediaType: "application/vnd.oci.image.index.v1+json";
|
|
8
8
|
readonly statementType: "https://in-toto.io/Statement/v1";
|
|
9
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
|
|
10
|
+
readonly buildType: "https://serve.zone/buildtypes/workloadinit-gitzone-tsdocker";
|
|
11
|
+
readonly builderId: "https://serve.zone/builders/workloadinit-manual-release";
|
|
12
12
|
readonly signatureFormat: "cosign-dsse-bundle-v0.3";
|
|
13
13
|
readonly signatureAlgorithm: "ecdsa-p256-sha256";
|
|
14
14
|
}>;
|
|
15
|
-
export interface
|
|
15
|
+
export interface IWorkloadInitBuildToolVersions {
|
|
16
16
|
dockerBuildx: string;
|
|
17
17
|
gitzone: string;
|
|
18
18
|
tsdocker: string;
|
|
19
19
|
tsrust: string;
|
|
20
20
|
}
|
|
21
|
-
export interface
|
|
21
|
+
export interface IWorkloadInitReleaseIdentity {
|
|
22
22
|
packageName: typeof workloadInitReleaseContract.packageName;
|
|
23
23
|
version: string;
|
|
24
24
|
sourceRepository: typeof workloadInitReleaseContract.sourceRepository;
|
|
@@ -29,7 +29,7 @@ export interface IWorkloadInitReleaseIdentityV1 {
|
|
|
29
29
|
imageRepository: typeof workloadInitReleaseContract.imageRepository;
|
|
30
30
|
imageTag: string;
|
|
31
31
|
}
|
|
32
|
-
export interface
|
|
32
|
+
export interface IWorkloadInitReleaseAttestationStatement {
|
|
33
33
|
_type: typeof workloadInitReleaseContract.statementType;
|
|
34
34
|
subject: [
|
|
35
35
|
{
|
|
@@ -68,7 +68,7 @@ export interface IWorkloadInitReleaseAttestationStatementV1 {
|
|
|
68
68
|
runDetails: {
|
|
69
69
|
builder: {
|
|
70
70
|
id: typeof workloadInitReleaseContract.builderId;
|
|
71
|
-
version:
|
|
71
|
+
version: IWorkloadInitBuildToolVersions;
|
|
72
72
|
};
|
|
73
73
|
};
|
|
74
74
|
};
|
|
@@ -77,7 +77,7 @@ export interface IWorkloadInitReleaseAttestationStatementV1 {
|
|
|
77
77
|
* Cloudly-created summary of a private DSSE verification. Shape and digest
|
|
78
78
|
* validation do not independently prove the signature or its trust policy.
|
|
79
79
|
*/
|
|
80
|
-
export interface
|
|
80
|
+
export interface IWorkloadInitCloudlyVerificationSummary {
|
|
81
81
|
signatureFormat: typeof workloadInitReleaseContract.signatureFormat;
|
|
82
82
|
signatureAlgorithm: typeof workloadInitReleaseContract.signatureAlgorithm;
|
|
83
83
|
signerKeyId: TSha256Digest;
|
|
@@ -89,41 +89,40 @@ export interface IWorkloadInitCloudlyVerificationSummaryV1 {
|
|
|
89
89
|
policyDigest: TSha256Digest;
|
|
90
90
|
verifiedAt: number;
|
|
91
91
|
}
|
|
92
|
-
export interface
|
|
92
|
+
export interface IWorkloadInitApprovedArtifact {
|
|
93
93
|
platform: TImmutableContainerPlatform;
|
|
94
94
|
workloadInitPlatformManifestDigest: TSha256Digest;
|
|
95
95
|
workloadInitExecutableDigest: TSha256Digest;
|
|
96
96
|
}
|
|
97
|
-
export interface
|
|
98
|
-
|
|
99
|
-
release: IWorkloadInitReleaseIdentityV1;
|
|
97
|
+
export interface IWorkloadInitReleaseApproval {
|
|
98
|
+
release: IWorkloadInitReleaseIdentity;
|
|
100
99
|
imageIndexMediaType: typeof workloadInitReleaseContract.imageIndexMediaType;
|
|
101
100
|
workloadInitImageIndexDigest: TSha256Digest;
|
|
102
|
-
artifacts: [
|
|
103
|
-
verificationSummary:
|
|
101
|
+
artifacts: [IWorkloadInitApprovedArtifact, IWorkloadInitApprovedArtifact];
|
|
102
|
+
verificationSummary: IWorkloadInitCloudlyVerificationSummary;
|
|
104
103
|
approvedAt: number;
|
|
105
104
|
approvalDigest: TSha256Digest;
|
|
106
105
|
}
|
|
107
|
-
export interface
|
|
108
|
-
|
|
106
|
+
export interface IWorkloadInitApprovalAuthorityReference {
|
|
107
|
+
/** Counts Cloudly's approval decisions; a later generation supersedes an earlier one. */
|
|
109
108
|
authorityGeneration: number;
|
|
110
109
|
approvalDigest: TSha256Digest;
|
|
111
110
|
}
|
|
112
|
-
export interface
|
|
113
|
-
approval:
|
|
111
|
+
export interface IWorkloadInitActiveApprovalAuthority extends IWorkloadInitApprovalAuthorityReference {
|
|
112
|
+
approval: IWorkloadInitReleaseApproval;
|
|
114
113
|
}
|
|
115
114
|
export declare const validateWorkloadInitReleaseIdentity: (releaseArg: unknown) => string[];
|
|
116
115
|
export declare const createWorkloadInitReleaseAttestationStatement: (inputArg: {
|
|
117
|
-
release:
|
|
116
|
+
release: IWorkloadInitReleaseIdentity;
|
|
118
117
|
workloadInitImageIndexDigest: TSha256Digest;
|
|
119
|
-
toolVersions:
|
|
120
|
-
}) =>
|
|
121
|
-
export declare const createWorkloadInitReleaseAttestationPayload: (statementArg:
|
|
122
|
-
export declare const computeWorkloadInitReleaseAttestationStatementDigest: (statementArg:
|
|
118
|
+
toolVersions: IWorkloadInitBuildToolVersions;
|
|
119
|
+
}) => IWorkloadInitReleaseAttestationStatement;
|
|
120
|
+
export declare const createWorkloadInitReleaseAttestationPayload: (statementArg: IWorkloadInitReleaseAttestationStatement) => Uint8Array;
|
|
121
|
+
export declare const computeWorkloadInitReleaseAttestationStatementDigest: (statementArg: IWorkloadInitReleaseAttestationStatement) => Promise<TSha256Digest>;
|
|
123
122
|
export declare const validateWorkloadInitReleaseAttestationStatement: (statementArg: unknown) => string[];
|
|
124
123
|
export declare const validateWorkloadInitCloudlyVerificationSummary: (summaryArg: unknown) => string[];
|
|
125
|
-
export declare const createWorkloadInitReleaseApprovalDigestInput: (approvalArg:
|
|
126
|
-
export declare const computeWorkloadInitReleaseApprovalDigest: (approvalArg:
|
|
124
|
+
export declare const createWorkloadInitReleaseApprovalDigestInput: (approvalArg: IWorkloadInitReleaseApproval) => string;
|
|
125
|
+
export declare const computeWorkloadInitReleaseApprovalDigest: (approvalArg: IWorkloadInitReleaseApproval) => Promise<TSha256Digest>;
|
|
127
126
|
export declare const validateWorkloadInitReleaseApproval: (approvalArg: unknown) => Promise<string[]>;
|
|
128
127
|
export declare const validateWorkloadInitApprovalAuthorityReference: (referenceArg: unknown) => string[];
|
|
129
128
|
export declare const validateWorkloadInitActiveApprovalAuthority: (authorityArg: unknown) => Promise<string[]>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isSha256Digest } from './data/immutableimage.js';
|
|
2
|
+
import { hasExactKeys } from './private/dataproperties.js';
|
|
2
3
|
export const workloadInitReleaseContract = Object.freeze({
|
|
3
4
|
packageName: '@serve.zone/workloadinit',
|
|
4
5
|
sourceRepository: 'https://code.foss.global/serve.zone/workloadinit.git',
|
|
@@ -7,8 +8,8 @@ export const workloadInitReleaseContract = Object.freeze({
|
|
|
7
8
|
imageIndexMediaType: 'application/vnd.oci.image.index.v1+json',
|
|
8
9
|
statementType: 'https://in-toto.io/Statement/v1',
|
|
9
10
|
predicateType: 'https://slsa.dev/provenance/v1',
|
|
10
|
-
buildType: 'https://serve.zone/buildtypes/workloadinit-gitzone-tsdocker
|
|
11
|
-
builderId: 'https://serve.zone/builders/workloadinit-manual-release
|
|
11
|
+
buildType: 'https://serve.zone/buildtypes/workloadinit-gitzone-tsdocker',
|
|
12
|
+
builderId: 'https://serve.zone/builders/workloadinit-manual-release',
|
|
12
13
|
signatureFormat: 'cosign-dsse-bundle-v0.3',
|
|
13
14
|
signatureAlgorithm: 'ecdsa-p256-sha256',
|
|
14
15
|
});
|
|
@@ -17,7 +18,6 @@ const gitRevisionRegex = /^[a-f0-9]{40}$/;
|
|
|
17
18
|
const bareSha256Regex = /^[a-f0-9]{64}$/;
|
|
18
19
|
const toolVersionRegex = /^[A-Za-z0-9][A-Za-z0-9.+_-]{0,63}$/;
|
|
19
20
|
const isRecord = (valueArg) => (Boolean(valueArg) && typeof valueArg === 'object' && !Array.isArray(valueArg));
|
|
20
|
-
const hasExactKeys = (valueArg, keysArg) => JSON.stringify(Object.keys(valueArg).sort()) === JSON.stringify([...keysArg].sort());
|
|
21
21
|
const isPositiveSafeInteger = (valueArg) => (Number.isSafeInteger(valueArg) && valueArg > 0);
|
|
22
22
|
const computeSha256 = async (inputArg) => {
|
|
23
23
|
const digest = new Uint8Array(await globalThis.crypto.subtle.digest('SHA-256', new Uint8Array(inputArg)));
|
|
@@ -272,7 +272,6 @@ const canonicalVerificationSummary = (summaryArg) => ({
|
|
|
272
272
|
verifiedAt: summaryArg.verifiedAt,
|
|
273
273
|
});
|
|
274
274
|
export const createWorkloadInitReleaseApprovalDigestInput = (approvalArg) => JSON.stringify({
|
|
275
|
-
schemaVersion: approvalArg.schemaVersion,
|
|
276
275
|
purpose: 'serve.zone/workloadinit-release-approval',
|
|
277
276
|
release: canonicalReleaseIdentity(approvalArg.release),
|
|
278
277
|
imageIndexMediaType: approvalArg.imageIndexMediaType,
|
|
@@ -286,7 +285,6 @@ export const validateWorkloadInitReleaseApproval = async (approvalArg) => {
|
|
|
286
285
|
try {
|
|
287
286
|
if (!isRecord(approvalArg)
|
|
288
287
|
|| !hasExactKeys(approvalArg, [
|
|
289
|
-
'schemaVersion',
|
|
290
288
|
'release',
|
|
291
289
|
'imageIndexMediaType',
|
|
292
290
|
'workloadInitImageIndexDigest',
|
|
@@ -301,8 +299,7 @@ export const validateWorkloadInitReleaseApproval = async (approvalArg) => {
|
|
|
301
299
|
...validateWorkloadInitReleaseIdentity(approvalArg.release),
|
|
302
300
|
...validateWorkloadInitCloudlyVerificationSummary(approvalArg.verificationSummary),
|
|
303
301
|
];
|
|
304
|
-
if (approvalArg.
|
|
305
|
-
|| approvalArg.imageIndexMediaType !== workloadInitReleaseContract.imageIndexMediaType
|
|
302
|
+
if (approvalArg.imageIndexMediaType !== workloadInitReleaseContract.imageIndexMediaType
|
|
306
303
|
|| typeof approvalArg.workloadInitImageIndexDigest !== 'string'
|
|
307
304
|
|| !isSha256Digest(approvalArg.workloadInitImageIndexDigest)
|
|
308
305
|
|| !isPositiveSafeInteger(approvalArg.approvedAt)
|
|
@@ -362,15 +359,13 @@ export const validateWorkloadInitReleaseApproval = async (approvalArg) => {
|
|
|
362
359
|
export const validateWorkloadInitApprovalAuthorityReference = (referenceArg) => {
|
|
363
360
|
if (!isRecord(referenceArg)
|
|
364
361
|
|| !hasExactKeys(referenceArg, [
|
|
365
|
-
'authorityVersion',
|
|
366
362
|
'authorityGeneration',
|
|
367
363
|
'approvalDigest',
|
|
368
364
|
])) {
|
|
369
365
|
return ['WorkloadInit approval authority reference must use its exact schema'];
|
|
370
366
|
}
|
|
371
367
|
const errors = [];
|
|
372
|
-
if (referenceArg.
|
|
373
|
-
|| !isPositiveSafeInteger(referenceArg.authorityGeneration)
|
|
368
|
+
if (!isPositiveSafeInteger(referenceArg.authorityGeneration)
|
|
374
369
|
|| typeof referenceArg.approvalDigest !== 'string'
|
|
375
370
|
|| !isSha256Digest(referenceArg.approvalDigest)) {
|
|
376
371
|
errors.push('WorkloadInit approval authority reference fields must be canonical');
|
|
@@ -380,7 +375,6 @@ export const validateWorkloadInitApprovalAuthorityReference = (referenceArg) =>
|
|
|
380
375
|
export const validateWorkloadInitActiveApprovalAuthority = async (authorityArg) => {
|
|
381
376
|
if (!isRecord(authorityArg)
|
|
382
377
|
|| !hasExactKeys(authorityArg, [
|
|
383
|
-
'authorityVersion',
|
|
384
378
|
'authorityGeneration',
|
|
385
379
|
'approvalDigest',
|
|
386
380
|
'approval',
|
|
@@ -388,7 +382,6 @@ export const validateWorkloadInitActiveApprovalAuthority = async (authorityArg)
|
|
|
388
382
|
return ['active WorkloadInit approval authority must use its exact schema'];
|
|
389
383
|
}
|
|
390
384
|
const reference = {
|
|
391
|
-
authorityVersion: authorityArg.authorityVersion,
|
|
392
385
|
authorityGeneration: authorityArg.authorityGeneration,
|
|
393
386
|
approvalDigest: authorityArg.approvalDigest,
|
|
394
387
|
};
|
|
@@ -402,4 +395,4 @@ export const validateWorkloadInitActiveApprovalAuthority = async (authorityArg)
|
|
|
402
395
|
}
|
|
403
396
|
return errors;
|
|
404
397
|
};
|
|
405
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.workloadinit.js","sourceRoot":"","sources":["../ts/runtime.workloadinit.ts"],"names":[],"mappings":"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"}
|
|
398
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.workloadinit.js","sourceRoot":"","sources":["../ts/runtime.workloadinit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "32.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@tsclass/tsclass": "^9.5.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@git.zone/tsbuild": "^4.
|
|
30
|
+
"@git.zone/tsbuild": "^4.5.0",
|
|
31
31
|
"@git.zone/tsdoc": "^2.2.0",
|
|
32
32
|
"@git.zone/tsrun": "^2.0.6",
|
|
33
33
|
"@git.zone/tstest": "6.1.1",
|