@serve.zone/pallet-bundle 36.4.2 → 36.6.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/dist_ts_bundle/inventory.d.ts +12 -2
- package/dist_ts_bundle/inventory.js +14 -4
- package/dist_ts_bundle/verify.d.ts +22 -0
- package/dist_ts_bundle/verify.js +42 -3
- package/package.json +2 -2
- package/readme.md +20 -1
- package/ts_bundle/inventory.ts +15 -3
- package/ts_bundle/readme.md +20 -1
- package/ts_bundle/verify.ts +65 -4
|
@@ -33,10 +33,20 @@ export declare const palletControlPaths: Readonly<{
|
|
|
33
33
|
}>;
|
|
34
34
|
/** Every key of a bundle's `control-build.json`, and nothing else. `nodeStopTimeoutSeconds` is the
|
|
35
35
|
* least a supervisor allows a stop of the bundle's node lifetime (`palletNodeStopTimeoutSeconds`),
|
|
36
|
-
* stated in the bundle itself so an installer reads the bound of the Pallet it runs.
|
|
37
|
-
|
|
36
|
+
* stated in the bundle itself so an installer reads the bound of the Pallet it runs.
|
|
37
|
+
* `guardKernelStateAdopts` lists the earlier Smartnftables releases whose kernel state the bundle's
|
|
38
|
+
* `pallet-guard` adopts in the same boot, each as `{ version, commit }`, exactly as the guard
|
|
39
|
+
* package's `kernel-state.json` declares them (sealed beside the guard as
|
|
40
|
+
* {@link palletGuardKernelStatePath}). */
|
|
41
|
+
export declare const palletControlRecordKeys: readonly ["packageName", "version", "sourceCommit", "sourceDirty", "target", "compiler", "lockSha256", "dataRoot", "socketPath", "runtimeSocketPath", "expectedUid", "nodeStopTimeoutSeconds", "clockManifestSha256", "dnsManifestSha256", "vpnInventorySha256", "containerdManifestSha256", "guardKernelStateAdopts", "files"];
|
|
38
42
|
export declare const palletControlRecordName = "control-build.json";
|
|
43
|
+
/** The guard package's own kernel state declaration (Smartnftables `kernel-state.json`), as the
|
|
44
|
+
* bundle carries it beside `pallet-guard`; the control record repeats its list as
|
|
45
|
+
* `guardKernelStateAdopts`. */
|
|
46
|
+
export declare const palletGuardKernelStatePath = "pallet-guard.kernel-state.json";
|
|
39
47
|
export type TPalletControlRole = 'control' | 'store' | 'runtime' | 'guard' | 'dns' | 'vpn';
|
|
48
|
+
/** The project that builds `pallet-guard` and declares the kernel state it adopts. */
|
|
49
|
+
export declare const palletGuardProjectName = "@push.rocks/smartnftables";
|
|
40
50
|
export interface IPalletControlRoleDescription {
|
|
41
51
|
/** Bundle-relative path; the control executable finds each sibling by this name. */
|
|
42
52
|
readonly path: string;
|
|
@@ -33,13 +33,23 @@ export const palletControlPaths = Object.freeze({
|
|
|
33
33
|
});
|
|
34
34
|
/** Every key of a bundle's `control-build.json`, and nothing else. `nodeStopTimeoutSeconds` is the
|
|
35
35
|
* least a supervisor allows a stop of the bundle's node lifetime (`palletNodeStopTimeoutSeconds`),
|
|
36
|
-
* stated in the bundle itself so an installer reads the bound of the Pallet it runs.
|
|
36
|
+
* stated in the bundle itself so an installer reads the bound of the Pallet it runs.
|
|
37
|
+
* `guardKernelStateAdopts` lists the earlier Smartnftables releases whose kernel state the bundle's
|
|
38
|
+
* `pallet-guard` adopts in the same boot, each as `{ version, commit }`, exactly as the guard
|
|
39
|
+
* package's `kernel-state.json` declares them (sealed beside the guard as
|
|
40
|
+
* {@link palletGuardKernelStatePath}). */
|
|
37
41
|
export const palletControlRecordKeys = Object.freeze([
|
|
38
42
|
'packageName', 'version', 'sourceCommit', 'sourceDirty', 'target', 'compiler', 'lockSha256', 'dataRoot',
|
|
39
43
|
'socketPath', 'runtimeSocketPath', 'expectedUid', 'nodeStopTimeoutSeconds', 'clockManifestSha256', 'dnsManifestSha256',
|
|
40
|
-
'vpnInventorySha256', 'containerdManifestSha256', 'files',
|
|
44
|
+
'vpnInventorySha256', 'containerdManifestSha256', 'guardKernelStateAdopts', 'files',
|
|
41
45
|
]);
|
|
42
46
|
export const palletControlRecordName = 'control-build.json';
|
|
47
|
+
/** The guard package's own kernel state declaration (Smartnftables `kernel-state.json`), as the
|
|
48
|
+
* bundle carries it beside `pallet-guard`; the control record repeats its list as
|
|
49
|
+
* `guardKernelStateAdopts`. */
|
|
50
|
+
export const palletGuardKernelStatePath = 'pallet-guard.kernel-state.json';
|
|
51
|
+
/** The project that builds `pallet-guard` and declares the kernel state it adopts. */
|
|
52
|
+
export const palletGuardProjectName = '@push.rocks/smartnftables';
|
|
43
53
|
/** The executables `pallet-control` starts by name, each verified against the digest it compiles in. */
|
|
44
54
|
export const palletControlRoles = Object.freeze({
|
|
45
55
|
control: { path: 'pallet-control' },
|
|
@@ -48,7 +58,7 @@ export const palletControlRoles = Object.freeze({
|
|
|
48
58
|
runtime: { path: 'pallet-runtime', provenance: { path: 'pallet-runtime.tsrust-build.json',
|
|
49
59
|
projectName: palletControlPackageName, binary: 'pallet' } },
|
|
50
60
|
guard: { path: 'pallet-guard', provenance: { path: 'pallet-guard.tsrust-build.json',
|
|
51
|
-
projectName:
|
|
61
|
+
projectName: palletGuardProjectName, binary: 'smartnftables' } },
|
|
52
62
|
dns: { path: 'pallet-dns', provenance: { path: 'pallet-dns.tsrust-build.json',
|
|
53
63
|
projectName: '@push.rocks/smartdns', binary: 'rustdns' } },
|
|
54
64
|
vpn: { path: 'pallet-vpn', provenance: { path: 'pallet-vpn.tsrust-build.json',
|
|
@@ -77,4 +87,4 @@ export const palletControlSourceInventories = Object.freeze([
|
|
|
77
87
|
{ manifest: 'notices/clock/manifest.json', prefixes: ['notices/clock/', 'sources/clock/'] },
|
|
78
88
|
{ manifest: 'notices/containerd/manifest.json', prefixes: ['notices/containerd/', 'sources/containerd/'] },
|
|
79
89
|
]);
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW52ZW50b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfYnVuZGxlL2ludmVudG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4Qzs7Ozs7Ozs7O0dBU0c7QUFFSCxvR0FBb0c7QUFDcEcsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsZ0JBQWdCLENBQUM7QUFDeEQsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsb0JBQW9CLENBQUM7QUFDN0QsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsbUJBQW1CLENBQUM7QUFFM0QsNkRBQTZEO0FBQzdELE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFHLENBQUMsYUFBYSxFQUFFLGFBQWEsQ0FBVSxDQUFDO0FBRzVFLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLENBQUMsUUFBaUIsRUFBb0MsRUFBRSxDQUMzRixvQkFBb0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQztBQUU3RCwyRUFBMkU7QUFDM0UsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxTQUErQixFQUFVLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxPQUFPLENBQUM7QUFFckgseUZBQXlGO0FBQ3pGLE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDOUMsK0RBQStEO0lBQy9ELFFBQVEsRUFBRSw0QkFBNEI7SUFDdEMsMEZBQTBGO0lBQzFGLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxVQUFVO0lBQzNFLHVGQUF1RjtJQUN2Rix5QkFBeUIsRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxrQ0FBa0MsQ0FBQyxVQUFVO0lBQ2hHLDhFQUE4RTtJQUM5RSxpQkFBaUIsRUFBRSx3Q0FBd0M7SUFDM0Qsd0VBQXdFO0lBQ3hFLFdBQVcsRUFBRSxDQUFDO0NBQ2YsQ0FBQyxDQUFDO0FBRUg7Ozs7OzswQ0FNMEM7QUFDMUMsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNuRCxhQUFhLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxhQUFhLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxZQUFZLEVBQUUsVUFBVTtJQUN2RyxZQUFZLEVBQUUsbUJBQW1CLEVBQUUsYUFBYSxFQUFFLHdCQUF3QixFQUFFLHFCQUFxQixFQUFFLG1CQUFtQjtJQUN0SCxvQkFBb0IsRUFBRSwwQkFBMEIsRUFBRSx3QkFBd0IsRUFBRSxPQUFPO0NBQzNFLENBQUMsQ0FBQztBQUVaLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHLG9CQUFvQixDQUFDO0FBRTVEOzsrQkFFK0I7QUFDL0IsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsZ0NBQWdDLENBQUM7QUFJM0Usc0ZBQXNGO0FBQ3RGLE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFHLDJCQUEyQixDQUFDO0FBYWxFLHdHQUF3RztBQUN4RyxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBd0UsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNuSCxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUU7SUFDbkMsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLGdCQUFnQixFQUFFLFVBQVUsRUFBRSxFQUFFLElBQUksRUFBRSxrQ0FBa0M7WUFDckYsV0FBVyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsRUFBRTtJQUM1RCxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLGtDQUFrQztZQUN2RixXQUFXLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxFQUFFO0lBQzdELEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLGdDQUFnQztZQUNqRixXQUFXLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLGVBQWUsRUFBRSxFQUFFO0lBQ2xFLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLDhCQUE4QjtZQUMzRSxXQUFXLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxFQUFFO0lBQzVELEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLDhCQUE4QjtZQUMzRSxXQUFXLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLGlCQUFpQixFQUFFLEVBQUU7Q0FDckUsQ0FBQyxDQUFDO0FBRUg7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ25ELEtBQUssRUFBRSxFQUFFLFFBQVEsRUFBRSw0QkFBNEIsRUFBRSxTQUFTLEVBQUUscUJBQXFCLEVBQUUsU0FBUyxFQUFFLGVBQWUsRUFBRTtJQUMvRyxVQUFVLEVBQUUsRUFBRSxRQUFRLEVBQUUsaUNBQWlDLEVBQUUsU0FBUyxFQUFFLDBCQUEwQjtRQUM5RixTQUFTLEVBQUUsb0JBQW9CLEVBQUU7SUFDbkMsR0FBRyxFQUFFLEVBQUUsUUFBUSxFQUFFLCtCQUErQixFQUFFLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFO0lBQ25HLEdBQUcsRUFBRSxFQUFFLFFBQVEsRUFBRSx5Q0FBeUMsRUFBRSxTQUFTLEVBQUUsb0JBQW9CLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRTtDQUN0RyxDQUFDLENBQUM7QUFFWixpR0FBaUc7QUFDakcsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLGlCQUFpQixFQUFFLHdCQUF3QixDQUFVLENBQUMsQ0FBQztBQUU5Rzs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQzFELEVBQUUsUUFBUSxFQUFFLDZCQUE2QixFQUFFLFFBQVEsRUFBRSxDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDLEVBQUU7SUFDM0YsRUFBRSxRQUFRLEVBQUUsa0NBQWtDLEVBQUUsUUFBUSxFQUFFLENBQUMscUJBQXFCLEVBQUUscUJBQXFCLENBQUMsRUFBRTtDQUNsRyxDQUFDLENBQUMifQ==
|
|
@@ -14,6 +14,12 @@ export interface IPalletControlExecutable {
|
|
|
14
14
|
readonly path: string;
|
|
15
15
|
readonly sha256: string;
|
|
16
16
|
}
|
|
17
|
+
/** One earlier Smartnftables release whose kernel state a bundle's `pallet-guard` adopts in the
|
|
18
|
+
* same boot, by its version and git commit. */
|
|
19
|
+
export interface IPalletGuardKernelStateRelease {
|
|
20
|
+
readonly version: string;
|
|
21
|
+
readonly commit: string;
|
|
22
|
+
}
|
|
17
23
|
/** Who built a native executable, from its tsrust provenance. */
|
|
18
24
|
export interface IPalletControlProvenance {
|
|
19
25
|
readonly projectName: string;
|
|
@@ -38,6 +44,14 @@ export interface IPalletControlBundle {
|
|
|
38
44
|
readonly containerdManifestSha256: string;
|
|
39
45
|
readonly containerdVersion: string;
|
|
40
46
|
readonly runcVersion: string;
|
|
47
|
+
/**
|
|
48
|
+
* The earlier Smartnftables releases whose kernel state this bundle's `pallet-guard` adopts in the
|
|
49
|
+
* same boot (`guardKernelStateAdopts` of its control record), strictly ascending and each earlier
|
|
50
|
+
* than the guard's own release (`provenance.guard`), exactly as the guard package's sealed
|
|
51
|
+
* declaration (`pallet-guard.kernel-state.json`) lists them. An in-place change of a running
|
|
52
|
+
* engine is admissible only to a bundle whose list names that engine's exact release.
|
|
53
|
+
*/
|
|
54
|
+
readonly guardKernelStateAdopts: readonly IPalletGuardKernelStateRelease[];
|
|
41
55
|
readonly files: TPalletSealedFiles;
|
|
42
56
|
}
|
|
43
57
|
/** A released bundle: every file verified against the pinned release manifest. */
|
|
@@ -51,6 +65,14 @@ export interface IPalletControlBuildExpectation {
|
|
|
51
65
|
readonly sourceDirty: boolean;
|
|
52
66
|
readonly target: TPalletControlTarget;
|
|
53
67
|
}
|
|
68
|
+
/**
|
|
69
|
+
* The earlier releases a Smartnftables kernel state declaration (`kernel-state.json`) lists, by its
|
|
70
|
+
* contract: exactly `engine` and `adopts`, the engine `@push.rocks/smartnftables`, and at least one
|
|
71
|
+
* release in `adopts`, each exactly `{ version, commit }` (a release version and a full git commit),
|
|
72
|
+
* strictly ascending, and each earlier than `guardVersionArg`, the release that ships the
|
|
73
|
+
* declaration. Anything else is refused `invalid_release`, an unknown engine included.
|
|
74
|
+
*/
|
|
75
|
+
export declare function palletGuardKernelStateAdopts(declarationArg: unknown, guardVersionArg: string): readonly IPalletGuardKernelStateRelease[];
|
|
54
76
|
export declare const validPalletBundlePin: (valueArg: unknown) => valueArg is IPalletBundlePin;
|
|
55
77
|
/** Refuses a malformed pin, and a pin of another Pallet version than this package states. */
|
|
56
78
|
export declare function requirePalletBundlePin(pinArg: unknown): Promise<IPalletBundlePin>;
|
package/dist_ts_bundle/verify.js
CHANGED
|
@@ -3,7 +3,7 @@ import { PalletBundleError, requireBundle } from './errors.js';
|
|
|
3
3
|
import { canonicalPath, requireCanonicalDirectory } from './paths.js';
|
|
4
4
|
import { palletBundleVersion } from './version.js';
|
|
5
5
|
import { palletNodeStopTimeoutSeconds } from './protocol.js';
|
|
6
|
-
import { isPalletControlTarget, palletControlBundleName, palletControlComponents, palletControlNoticeTrees, palletControlPackageName, palletControlPaths, palletControlRecordKeys, palletControlRecordName, palletControlRoles, palletControlSourceInventories, palletNativeTarget, } from './inventory.js';
|
|
6
|
+
import { isPalletControlTarget, palletControlBundleName, palletControlComponents, palletControlNoticeTrees, palletControlPackageName, palletControlPaths, palletControlRecordKeys, palletControlRecordName, palletControlRoles, palletControlSourceInventories, palletGuardKernelStatePath, palletGuardProjectName, palletNativeTarget, } from './inventory.js';
|
|
7
7
|
const hash = /^[a-f0-9]{64}$/;
|
|
8
8
|
const commit = /^[a-f0-9]{40}$/;
|
|
9
9
|
const semver = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
|
|
@@ -20,6 +20,39 @@ const list = (valueArg) => Array.isArray(valueArg);
|
|
|
20
20
|
const safeName = (nameArg) => typeof nameArg === 'string' && nameArg.length <= 1024 && /^[A-Za-z0-9][A-Za-z0-9._+@/-]*$/.test(nameArg) &&
|
|
21
21
|
!nameArg.split('/').some((part) => ['', '.', '..'].includes(part));
|
|
22
22
|
const invalid = () => { throw new PalletBundleError('invalid_release'); };
|
|
23
|
+
/** Whether release version `leftArg` is earlier than `rightArg` (both `semver`). */
|
|
24
|
+
const earlier = (leftArg, rightArg) => {
|
|
25
|
+
const left = leftArg.split('.').map(BigInt), right = rightArg.split('.').map(BigInt);
|
|
26
|
+
for (let index = 0; index < 3; index++)
|
|
27
|
+
if (left[index] !== right[index])
|
|
28
|
+
return left[index] < right[index];
|
|
29
|
+
return false;
|
|
30
|
+
};
|
|
31
|
+
/**
|
|
32
|
+
* The earlier releases a Smartnftables kernel state declaration (`kernel-state.json`) lists, by its
|
|
33
|
+
* contract: exactly `engine` and `adopts`, the engine `@push.rocks/smartnftables`, and at least one
|
|
34
|
+
* release in `adopts`, each exactly `{ version, commit }` (a release version and a full git commit),
|
|
35
|
+
* strictly ascending, and each earlier than `guardVersionArg`, the release that ships the
|
|
36
|
+
* declaration. Anything else is refused `invalid_release`, an unknown engine included.
|
|
37
|
+
*/
|
|
38
|
+
export function palletGuardKernelStateAdopts(declarationArg, guardVersionArg) {
|
|
39
|
+
requireBundle(typeof guardVersionArg === 'string' && semver.test(guardVersionArg), 'invalid_options');
|
|
40
|
+
requireBundle(record(declarationArg) && sameKeys(declarationArg, ['engine', 'adopts']) &&
|
|
41
|
+
declarationArg.engine === palletGuardProjectName && list(declarationArg.adopts) && declarationArg.adopts.length > 0, 'invalid_release');
|
|
42
|
+
const releases = [];
|
|
43
|
+
for (const entry of declarationArg.adopts) {
|
|
44
|
+
const previous = releases.at(-1);
|
|
45
|
+
requireBundle(record(entry) && sameKeys(entry, ['version', 'commit']) &&
|
|
46
|
+
typeof entry.version === 'string' && semver.test(entry.version) && typeof entry.commit === 'string' &&
|
|
47
|
+
commit.test(entry.commit) && earlier(entry.version, guardVersionArg) &&
|
|
48
|
+
(previous === undefined || earlier(previous.version, entry.version)), 'invalid_release');
|
|
49
|
+
releases.push(Object.freeze({ version: entry.version, commit: entry.commit }));
|
|
50
|
+
}
|
|
51
|
+
return Object.freeze(releases);
|
|
52
|
+
}
|
|
53
|
+
/** Whether `valueArg` states exactly `releasesArg`, in order, each as `{ version, commit }`. */
|
|
54
|
+
const sameReleases = (valueArg, releasesArg) => list(valueArg) && valueArg.length === releasesArg.length && valueArg.every((entry, index) => record(entry) && sameKeys(entry, ['version', 'commit']) &&
|
|
55
|
+
entry.version === releasesArg[index].version && entry.commit === releasesArg[index].commit);
|
|
23
56
|
export const validPalletBundlePin = (valueArg) => record(valueArg) && sameKeys(valueArg, ['version', 'sourceCommit', 'manifestSha256']) &&
|
|
24
57
|
typeof valueArg.version === 'string' && semver.test(valueArg.version) &&
|
|
25
58
|
typeof valueArg.sourceCommit === 'string' && commit.test(valueArg.sourceCommit) &&
|
|
@@ -92,6 +125,7 @@ function checkRecord(recordArg, filesArg, expectedArg) {
|
|
|
92
125
|
denoVersion: compiler.deno, lockSha256: control.lockSha256,
|
|
93
126
|
clockManifestSha256: componentDigest('clock'), containerdManifestSha256: componentDigest('containerd'),
|
|
94
127
|
dnsManifestSha256: componentDigest('dns'), vpnInventorySha256: componentDigest('vpn'),
|
|
128
|
+
guardKernelStateAdopts: control.guardKernelStateAdopts,
|
|
95
129
|
};
|
|
96
130
|
const declared = control.files;
|
|
97
131
|
requireBundle(record(declared) && Object.keys(declared).length > 0, 'invalid_release');
|
|
@@ -111,6 +145,7 @@ function checkRecord(recordArg, filesArg, expectedArg) {
|
|
|
111
145
|
requireBundle(Object.hasOwn(declared, role.provenance.path) && filesArg[role.provenance.path]?.mode === fileMode, 'invalid_release');
|
|
112
146
|
}
|
|
113
147
|
}
|
|
148
|
+
requireBundle(Object.hasOwn(declared, palletGuardKernelStatePath) && filesArg[palletGuardKernelStatePath]?.mode === fileMode, 'invalid_release');
|
|
114
149
|
return facts;
|
|
115
150
|
}
|
|
116
151
|
/** A listing component: its manifest names exactly the files below its directory. */
|
|
@@ -205,6 +240,10 @@ export async function inspectPalletControlBuild(directoryArg, filesArg, expected
|
|
|
205
240
|
dns: await checkProvenance(directory, filesArg, 'dns', expectedArg),
|
|
206
241
|
vpn: await checkProvenance(directory, filesArg, 'vpn', expectedArg),
|
|
207
242
|
};
|
|
243
|
+
// The guard package's own declaration, by its contract against the guard's release, and the
|
|
244
|
+
// record's list exactly as it states it.
|
|
245
|
+
const guardKernelStateAdopts = palletGuardKernelStateAdopts(await readJson(directory, filesArg, palletGuardKernelStatePath), provenance.guard.projectVersion);
|
|
246
|
+
requireBundle(sameReleases(control.guardKernelStateAdopts, guardKernelStateAdopts), 'invalid_release');
|
|
208
247
|
const executable = (roleArg) => Object.freeze({
|
|
209
248
|
path: plugins.path.join(directory, palletControlRoles[roleArg].path), sha256: filesArg[palletControlRoles[roleArg].path].sha256,
|
|
210
249
|
});
|
|
@@ -216,7 +255,7 @@ export async function inspectPalletControlBuild(directoryArg, filesArg, expected
|
|
|
216
255
|
provenance: Object.freeze(provenance),
|
|
217
256
|
clockManifestSha256: control.clockManifestSha256, dnsManifestSha256: control.dnsManifestSha256,
|
|
218
257
|
vpnInventorySha256: control.vpnInventorySha256, containerdManifestSha256: control.containerdManifestSha256,
|
|
219
|
-
containerdVersion: containerd.containerdVersion, runcVersion: containerd.runcVersion,
|
|
258
|
+
containerdVersion: containerd.containerdVersion, runcVersion: containerd.runcVersion, guardKernelStateAdopts,
|
|
220
259
|
files: Object.freeze({ ...filesArg }),
|
|
221
260
|
});
|
|
222
261
|
}
|
|
@@ -262,4 +301,4 @@ export async function extractPalletControlBundle(downloadDirectoryArg, targetArg
|
|
|
262
301
|
throw error;
|
|
263
302
|
}
|
|
264
303
|
}
|
|
265
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"verify.js","sourceRoot":"","sources":["../ts_bundle/verify.ts"],"names":[],"mappings":"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"}
|
|
304
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"verify.js","sourceRoot":"","sources":["../ts_bundle/verify.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"url": "https://community.foss.global/"
|
|
11
11
|
},
|
|
12
12
|
"name": "@serve.zone/pallet-bundle",
|
|
13
|
-
"version": "36.
|
|
13
|
+
"version": "36.6.0",
|
|
14
14
|
"type": "module",
|
|
15
15
|
"description": "Install surface of Pallet's sealed control bundle: pinned release download and verification, the service units Pallet's contract states, and supervisors for the pallet-control process protocol.",
|
|
16
16
|
"main": "./dist_ts_bundle/index.js",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@git.zone/tspack": "1.4.2",
|
|
26
26
|
"@push.rocks/smartdaemon": "2.18.0",
|
|
27
|
-
"@serve.zone/interfaces": "32.
|
|
27
|
+
"@serve.zone/interfaces": "32.66.0"
|
|
28
28
|
},
|
|
29
29
|
"files": [
|
|
30
30
|
"ts_bundle",
|
package/readme.md
CHANGED
|
@@ -96,10 +96,29 @@ The verifier checks, against the sealed records of the bundle's files:
|
|
|
96
96
|
- the clock and containerd manifests, which list every file below their directories with digest,
|
|
97
97
|
size and mode, and the digests the control record pins for them and for the DNS and VPN notices;
|
|
98
98
|
- the notice trees (`native-notices/`, `notices/smartnftables/`) and the clock and containerd notice
|
|
99
|
-
and corresponding-source inventories: each manifest names exactly the files below it
|
|
99
|
+
and corresponding-source inventories: each manifest names exactly the files below it;
|
|
100
|
+
- the guard's kernel state declaration (`pallet-guard.kernel-state.json`, the Smartnftables package's
|
|
101
|
+
own `kernel-state.json`) and the control record's `guardKernelStateAdopts`, below.
|
|
100
102
|
|
|
101
103
|
Refusals are `PalletBundleError` values with a fixed `code`; see `TPalletBundleErrorCode`.
|
|
102
104
|
|
|
105
|
+
### Kernel state of the guard
|
|
106
|
+
|
|
107
|
+
`bundle.guardKernelStateAdopts` lists the earlier Smartnftables releases whose kernel state the
|
|
108
|
+
bundle's `pallet-guard` adopts, verifies and releases in the same boot, each as `{ version, commit }`
|
|
109
|
+
(from 36.5.0). The bundle carries the guard package's declaration beside the guard, and its control
|
|
110
|
+
record seals the list as `guardKernelStateAdopts`; the verifier requires the declaration to state
|
|
111
|
+
exactly `engine` (`@push.rocks/smartnftables`, the guard's owning project) and `adopts`, at least one
|
|
112
|
+
release, each a release version and a full git commit, strictly ascending and each earlier than the
|
|
113
|
+
guard's own release (`bundle.provenance.guard`), and the record's list to be exactly the
|
|
114
|
+
declaration's. `palletGuardKernelStateAdopts(declaration, guardVersion)` states that contract.
|
|
115
|
+
|
|
116
|
+
An installer that replaces a running guard in place, without a reboot, admits the change only when
|
|
117
|
+
the target bundle's list names the running engine exactly: its project, version and commit, as the
|
|
118
|
+
running bundle's `provenance.guard` states them. A running engine the list does not name, or a target
|
|
119
|
+
whose list is missing or does not verify (the verifier refuses the bundle), admits nothing; there is
|
|
120
|
+
no fallback. The declaration covers the same boot only and never a downgrade.
|
|
121
|
+
|
|
103
122
|
## Service units
|
|
104
123
|
|
|
105
124
|
```typescript
|
package/ts_bundle/inventory.ts
CHANGED
|
@@ -42,17 +42,29 @@ export const palletControlPaths = Object.freeze({
|
|
|
42
42
|
|
|
43
43
|
/** Every key of a bundle's `control-build.json`, and nothing else. `nodeStopTimeoutSeconds` is the
|
|
44
44
|
* least a supervisor allows a stop of the bundle's node lifetime (`palletNodeStopTimeoutSeconds`),
|
|
45
|
-
* stated in the bundle itself so an installer reads the bound of the Pallet it runs.
|
|
45
|
+
* stated in the bundle itself so an installer reads the bound of the Pallet it runs.
|
|
46
|
+
* `guardKernelStateAdopts` lists the earlier Smartnftables releases whose kernel state the bundle's
|
|
47
|
+
* `pallet-guard` adopts in the same boot, each as `{ version, commit }`, exactly as the guard
|
|
48
|
+
* package's `kernel-state.json` declares them (sealed beside the guard as
|
|
49
|
+
* {@link palletGuardKernelStatePath}). */
|
|
46
50
|
export const palletControlRecordKeys = Object.freeze([
|
|
47
51
|
'packageName', 'version', 'sourceCommit', 'sourceDirty', 'target', 'compiler', 'lockSha256', 'dataRoot',
|
|
48
52
|
'socketPath', 'runtimeSocketPath', 'expectedUid', 'nodeStopTimeoutSeconds', 'clockManifestSha256', 'dnsManifestSha256',
|
|
49
|
-
'vpnInventorySha256', 'containerdManifestSha256', 'files',
|
|
53
|
+
'vpnInventorySha256', 'containerdManifestSha256', 'guardKernelStateAdopts', 'files',
|
|
50
54
|
] as const);
|
|
51
55
|
|
|
52
56
|
export const palletControlRecordName = 'control-build.json';
|
|
53
57
|
|
|
58
|
+
/** The guard package's own kernel state declaration (Smartnftables `kernel-state.json`), as the
|
|
59
|
+
* bundle carries it beside `pallet-guard`; the control record repeats its list as
|
|
60
|
+
* `guardKernelStateAdopts`. */
|
|
61
|
+
export const palletGuardKernelStatePath = 'pallet-guard.kernel-state.json';
|
|
62
|
+
|
|
54
63
|
export type TPalletControlRole = 'control' | 'store' | 'runtime' | 'guard' | 'dns' | 'vpn';
|
|
55
64
|
|
|
65
|
+
/** The project that builds `pallet-guard` and declares the kernel state it adopts. */
|
|
66
|
+
export const palletGuardProjectName = '@push.rocks/smartnftables';
|
|
67
|
+
|
|
56
68
|
export interface IPalletControlRoleDescription {
|
|
57
69
|
/** Bundle-relative path; the control executable finds each sibling by this name. */
|
|
58
70
|
readonly path: string;
|
|
@@ -72,7 +84,7 @@ export const palletControlRoles: Readonly<Record<TPalletControlRole, IPalletCont
|
|
|
72
84
|
runtime: { path: 'pallet-runtime', provenance: { path: 'pallet-runtime.tsrust-build.json',
|
|
73
85
|
projectName: palletControlPackageName, binary: 'pallet' } },
|
|
74
86
|
guard: { path: 'pallet-guard', provenance: { path: 'pallet-guard.tsrust-build.json',
|
|
75
|
-
projectName:
|
|
87
|
+
projectName: palletGuardProjectName, binary: 'smartnftables' } },
|
|
76
88
|
dns: { path: 'pallet-dns', provenance: { path: 'pallet-dns.tsrust-build.json',
|
|
77
89
|
projectName: '@push.rocks/smartdns', binary: 'rustdns' } },
|
|
78
90
|
vpn: { path: 'pallet-vpn', provenance: { path: 'pallet-vpn.tsrust-build.json',
|
package/ts_bundle/readme.md
CHANGED
|
@@ -96,10 +96,29 @@ The verifier checks, against the sealed records of the bundle's files:
|
|
|
96
96
|
- the clock and containerd manifests, which list every file below their directories with digest,
|
|
97
97
|
size and mode, and the digests the control record pins for them and for the DNS and VPN notices;
|
|
98
98
|
- the notice trees (`native-notices/`, `notices/smartnftables/`) and the clock and containerd notice
|
|
99
|
-
and corresponding-source inventories: each manifest names exactly the files below it
|
|
99
|
+
and corresponding-source inventories: each manifest names exactly the files below it;
|
|
100
|
+
- the guard's kernel state declaration (`pallet-guard.kernel-state.json`, the Smartnftables package's
|
|
101
|
+
own `kernel-state.json`) and the control record's `guardKernelStateAdopts`, below.
|
|
100
102
|
|
|
101
103
|
Refusals are `PalletBundleError` values with a fixed `code`; see `TPalletBundleErrorCode`.
|
|
102
104
|
|
|
105
|
+
### Kernel state of the guard
|
|
106
|
+
|
|
107
|
+
`bundle.guardKernelStateAdopts` lists the earlier Smartnftables releases whose kernel state the
|
|
108
|
+
bundle's `pallet-guard` adopts, verifies and releases in the same boot, each as `{ version, commit }`
|
|
109
|
+
(from 36.5.0). The bundle carries the guard package's declaration beside the guard, and its control
|
|
110
|
+
record seals the list as `guardKernelStateAdopts`; the verifier requires the declaration to state
|
|
111
|
+
exactly `engine` (`@push.rocks/smartnftables`, the guard's owning project) and `adopts`, at least one
|
|
112
|
+
release, each a release version and a full git commit, strictly ascending and each earlier than the
|
|
113
|
+
guard's own release (`bundle.provenance.guard`), and the record's list to be exactly the
|
|
114
|
+
declaration's. `palletGuardKernelStateAdopts(declaration, guardVersion)` states that contract.
|
|
115
|
+
|
|
116
|
+
An installer that replaces a running guard in place, without a reboot, admits the change only when
|
|
117
|
+
the target bundle's list names the running engine exactly: its project, version and commit, as the
|
|
118
|
+
running bundle's `provenance.guard` states them. A running engine the list does not name, or a target
|
|
119
|
+
whose list is missing or does not verify (the verifier refuses the bundle), admits nothing; there is
|
|
120
|
+
no fallback. The declaration covers the same boot only and never a downgrade.
|
|
121
|
+
|
|
103
122
|
## Service units
|
|
104
123
|
|
|
105
124
|
```typescript
|
package/ts_bundle/verify.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { palletNodeStopTimeoutSeconds } from './protocol.js';
|
|
|
6
6
|
import {
|
|
7
7
|
isPalletControlTarget, palletControlBundleName, palletControlComponents, palletControlNoticeTrees, palletControlPackageName,
|
|
8
8
|
palletControlPaths, palletControlRecordKeys, palletControlRecordName, palletControlRoles, palletControlSourceInventories,
|
|
9
|
-
palletNativeTarget, type TPalletControlRole, type TPalletControlTarget,
|
|
9
|
+
palletGuardKernelStatePath, palletGuardProjectName, palletNativeTarget, type TPalletControlRole, type TPalletControlTarget,
|
|
10
10
|
} from './inventory.js';
|
|
11
11
|
|
|
12
12
|
/** The trusted identity of one Pallet release, as a consumer pins it. */
|
|
@@ -26,6 +26,13 @@ export interface IPalletControlExecutable {
|
|
|
26
26
|
readonly sha256: string;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
+
/** One earlier Smartnftables release whose kernel state a bundle's `pallet-guard` adopts in the
|
|
30
|
+
* same boot, by its version and git commit. */
|
|
31
|
+
export interface IPalletGuardKernelStateRelease {
|
|
32
|
+
readonly version: string;
|
|
33
|
+
readonly commit: string;
|
|
34
|
+
}
|
|
35
|
+
|
|
29
36
|
/** Who built a native executable, from its tsrust provenance. */
|
|
30
37
|
export interface IPalletControlProvenance {
|
|
31
38
|
readonly projectName: string;
|
|
@@ -51,6 +58,14 @@ export interface IPalletControlBundle {
|
|
|
51
58
|
readonly containerdManifestSha256: string;
|
|
52
59
|
readonly containerdVersion: string;
|
|
53
60
|
readonly runcVersion: string;
|
|
61
|
+
/**
|
|
62
|
+
* The earlier Smartnftables releases whose kernel state this bundle's `pallet-guard` adopts in the
|
|
63
|
+
* same boot (`guardKernelStateAdopts` of its control record), strictly ascending and each earlier
|
|
64
|
+
* than the guard's own release (`provenance.guard`), exactly as the guard package's sealed
|
|
65
|
+
* declaration (`pallet-guard.kernel-state.json`) lists them. An in-place change of a running
|
|
66
|
+
* engine is admissible only to a bundle whose list names that engine's exact release.
|
|
67
|
+
*/
|
|
68
|
+
readonly guardKernelStateAdopts: readonly IPalletGuardKernelStateRelease[];
|
|
54
69
|
readonly files: TPalletSealedFiles;
|
|
55
70
|
}
|
|
56
71
|
|
|
@@ -87,6 +102,43 @@ const safeName = (nameArg: unknown): nameArg is string =>
|
|
|
87
102
|
typeof nameArg === 'string' && nameArg.length <= 1024 && /^[A-Za-z0-9][A-Za-z0-9._+@/-]*$/.test(nameArg) &&
|
|
88
103
|
!nameArg.split('/').some((part) => ['', '.', '..'].includes(part));
|
|
89
104
|
const invalid = (): never => { throw new PalletBundleError('invalid_release'); };
|
|
105
|
+
/** Whether release version `leftArg` is earlier than `rightArg` (both `semver`). */
|
|
106
|
+
const earlier = (leftArg: string, rightArg: string): boolean => {
|
|
107
|
+
const left = leftArg.split('.').map(BigInt), right = rightArg.split('.').map(BigInt);
|
|
108
|
+
for (let index = 0; index < 3; index++) if (left[index] !== right[index]) return left[index]! < right[index]!;
|
|
109
|
+
return false;
|
|
110
|
+
};
|
|
111
|
+
|
|
112
|
+
/**
|
|
113
|
+
* The earlier releases a Smartnftables kernel state declaration (`kernel-state.json`) lists, by its
|
|
114
|
+
* contract: exactly `engine` and `adopts`, the engine `@push.rocks/smartnftables`, and at least one
|
|
115
|
+
* release in `adopts`, each exactly `{ version, commit }` (a release version and a full git commit),
|
|
116
|
+
* strictly ascending, and each earlier than `guardVersionArg`, the release that ships the
|
|
117
|
+
* declaration. Anything else is refused `invalid_release`, an unknown engine included.
|
|
118
|
+
*/
|
|
119
|
+
export function palletGuardKernelStateAdopts(declarationArg: unknown, guardVersionArg: string,
|
|
120
|
+
): readonly IPalletGuardKernelStateRelease[] {
|
|
121
|
+
requireBundle(typeof guardVersionArg === 'string' && semver.test(guardVersionArg), 'invalid_options');
|
|
122
|
+
requireBundle(record(declarationArg) && sameKeys(declarationArg, ['engine', 'adopts']) &&
|
|
123
|
+
declarationArg.engine === palletGuardProjectName && list(declarationArg.adopts) && declarationArg.adopts.length > 0,
|
|
124
|
+
'invalid_release');
|
|
125
|
+
const releases: IPalletGuardKernelStateRelease[] = [];
|
|
126
|
+
for (const entry of declarationArg.adopts) {
|
|
127
|
+
const previous = releases.at(-1);
|
|
128
|
+
requireBundle(record(entry) && sameKeys(entry, ['version', 'commit']) &&
|
|
129
|
+
typeof entry.version === 'string' && semver.test(entry.version) && typeof entry.commit === 'string' &&
|
|
130
|
+
commit.test(entry.commit) && earlier(entry.version, guardVersionArg) &&
|
|
131
|
+
(previous === undefined || earlier(previous.version, entry.version)), 'invalid_release');
|
|
132
|
+
releases.push(Object.freeze({ version: entry.version, commit: entry.commit }));
|
|
133
|
+
}
|
|
134
|
+
return Object.freeze(releases);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
/** Whether `valueArg` states exactly `releasesArg`, in order, each as `{ version, commit }`. */
|
|
138
|
+
const sameReleases = (valueArg: unknown, releasesArg: readonly IPalletGuardKernelStateRelease[]): boolean =>
|
|
139
|
+
list(valueArg) && valueArg.length === releasesArg.length && valueArg.every((entry, index) =>
|
|
140
|
+
record(entry) && sameKeys(entry, ['version', 'commit']) &&
|
|
141
|
+
entry.version === releasesArg[index]!.version && entry.commit === releasesArg[index]!.commit);
|
|
90
142
|
|
|
91
143
|
export const validPalletBundlePin = (valueArg: unknown): valueArg is IPalletBundlePin =>
|
|
92
144
|
record(valueArg) && sameKeys(valueArg, ['version', 'sourceCommit', 'manifestSha256']) &&
|
|
@@ -137,9 +189,10 @@ const below = (filesArg: TPalletSealedFiles, prefixesArg: readonly string[]): st
|
|
|
137
189
|
const sameSet = (leftArg: readonly string[], rightArg: readonly string[]): boolean =>
|
|
138
190
|
leftArg.length === rightArg.length && [...leftArg].sort().every((name, index) => name === [...rightArg].sort()[index]);
|
|
139
191
|
|
|
140
|
-
/** The facts of a checked control record that a bundle states
|
|
192
|
+
/** The facts of a checked control record that a bundle states, and its kernel state list, which is
|
|
193
|
+
* checked against the guard's sealed declaration once the guard's release is known. */
|
|
141
194
|
type TPalletControlRecordFacts = Pick<IPalletControlBundle, 'denoVersion' | 'lockSha256' | 'clockManifestSha256' |
|
|
142
|
-
'containerdManifestSha256' | 'dnsManifestSha256' | 'vpnInventorySha256'
|
|
195
|
+
'containerdManifestSha256' | 'dnsManifestSha256' | 'vpnInventorySha256'> & { readonly guardKernelStateAdopts: unknown };
|
|
143
196
|
|
|
144
197
|
/** The control record: its identity, its fixed paths, and each declared file's sealed record. */
|
|
145
198
|
function checkRecord(recordArg: unknown, filesArg: TPalletSealedFiles,
|
|
@@ -167,6 +220,7 @@ function checkRecord(recordArg: unknown, filesArg: TPalletSealedFiles,
|
|
|
167
220
|
denoVersion: compiler.deno, lockSha256: control.lockSha256,
|
|
168
221
|
clockManifestSha256: componentDigest('clock'), containerdManifestSha256: componentDigest('containerd'),
|
|
169
222
|
dnsManifestSha256: componentDigest('dns'), vpnInventorySha256: componentDigest('vpn'),
|
|
223
|
+
guardKernelStateAdopts: control.guardKernelStateAdopts,
|
|
170
224
|
};
|
|
171
225
|
const declared = control.files;
|
|
172
226
|
requireBundle(record(declared) && Object.keys(declared).length > 0, 'invalid_release');
|
|
@@ -188,6 +242,8 @@ function checkRecord(recordArg: unknown, filesArg: TPalletSealedFiles,
|
|
|
188
242
|
'invalid_release');
|
|
189
243
|
}
|
|
190
244
|
}
|
|
245
|
+
requireBundle(Object.hasOwn(declared, palletGuardKernelStatePath) && filesArg[palletGuardKernelStatePath]?.mode === fileMode,
|
|
246
|
+
'invalid_release');
|
|
191
247
|
return facts;
|
|
192
248
|
}
|
|
193
249
|
|
|
@@ -294,6 +350,11 @@ export async function inspectPalletControlBuild(directoryArg: string, filesArg:
|
|
|
294
350
|
dns: await checkProvenance(directory, filesArg, 'dns', expectedArg),
|
|
295
351
|
vpn: await checkProvenance(directory, filesArg, 'vpn', expectedArg),
|
|
296
352
|
};
|
|
353
|
+
// The guard package's own declaration, by its contract against the guard's release, and the
|
|
354
|
+
// record's list exactly as it states it.
|
|
355
|
+
const guardKernelStateAdopts = palletGuardKernelStateAdopts(
|
|
356
|
+
await readJson(directory, filesArg, palletGuardKernelStatePath), provenance.guard.projectVersion);
|
|
357
|
+
requireBundle(sameReleases(control.guardKernelStateAdopts, guardKernelStateAdopts), 'invalid_release');
|
|
297
358
|
const executable = (roleArg: TPalletControlRole): IPalletControlExecutable => Object.freeze({
|
|
298
359
|
path: plugins.path.join(directory, palletControlRoles[roleArg].path), sha256: filesArg[palletControlRoles[roleArg].path].sha256,
|
|
299
360
|
});
|
|
@@ -305,7 +366,7 @@ export async function inspectPalletControlBuild(directoryArg: string, filesArg:
|
|
|
305
366
|
provenance: Object.freeze(provenance),
|
|
306
367
|
clockManifestSha256: control.clockManifestSha256, dnsManifestSha256: control.dnsManifestSha256,
|
|
307
368
|
vpnInventorySha256: control.vpnInventorySha256, containerdManifestSha256: control.containerdManifestSha256,
|
|
308
|
-
containerdVersion: containerd.containerdVersion, runcVersion: containerd.runcVersion,
|
|
369
|
+
containerdVersion: containerd.containerdVersion, runcVersion: containerd.runcVersion, guardKernelStateAdopts,
|
|
309
370
|
files: Object.freeze({ ...filesArg }),
|
|
310
371
|
});
|
|
311
372
|
}
|