fix: retain complete histories with bounded journal capacity and native recovery
Rust development slice / linux (push) Failing after 6s

This commit is contained in:
2026-11-13 19:11:45 +01:00
parent da7eb8109c
commit c512bd6fb2
36 changed files with 2556 additions and 38 deletions
+30
View File
@@ -10,6 +10,13 @@ async function manifest(acceptance = true) {
const raw = new TextEncoder().encode(JSON.stringify(transaction));
return { type: 'rmm.apt.helper-action', schema_version: 2, action: acceptance ? 'apt-native-acceptance' : 'apt-execute', execution_profile: 'dev-test', transaction_sha256: await sha256(raw), transaction_bytes: Array.from(raw), resolved_apt_transaction: transaction, provider_sha256: 'c'.repeat(64), hook_sha256: 'd'.repeat(64), apt_config_sha256: 'e'.repeat(64), runtime_sha256: 'f'.repeat(64), test_result_id: 'unit-test-only-not-native-evidence' };
}
async function recoveryManifest() {
const base = await manifest();
const transaction = { ...base.resolved_apt_transaction, schema_version: 2, operation: 'configure_only', packages: base.resolved_apt_transaction.packages.map(p => ({ ...p, old_version: '1.0' })) };
const raw = new TextEncoder().encode(JSON.stringify(transaction));
return { ...base, schema_version: 4, resolved_apt_transaction: transaction, transaction_bytes: Array.from(raw), transaction_sha256: await sha256(raw),
native_recovery: { schema_version: 1, previous_grant_id: '11111111-1111-4111-8111-111111111111', previous_attempt_id: '22222222-2222-4222-8222-222222222222', partial_proof_sha256: 'a'.repeat(64) } };
}
function input(apt_manifest: unknown): PlanInput { return { tenant_id: 't', action: 'apt_native_acceptance', targets: { asset_ids: ['asset'] }, parameters: { execution_identity: 'root', recipe_id: 'rmm-apt-fixture-install-1.0', recipe_version: '1', apt_manifest }, schedule: { not_before: '', start_before: '', offline_policy: 'wait_until_deadline' }, rollout: { max_parallel: 1, halt_after_failures: 1 }, reason: 'unit only' }; }
describe('immutable catalog and strict import contracts', () => {
it('only accepts full immutable exact APT package metadata, never URLs or unknown fields', () => {
@@ -60,6 +67,29 @@ describe('root and dedicated dev-test APT actions', () => {
expect(() => validateAptManifest({ ...m, native_retry: { ...native_retry, bootstrap_marker_sha256: '0'.repeat(64) } }, true)).toThrow();
expect(() => validateAptManifest({ ...m, action: 'apt-execute' }, false)).toThrow('eigener nativer');
});
it('accepts only an explicit schema4 configure-only partial binding and preserves all byte/plan checks', async () => {
const m = await recoveryManifest(), before = JSON.stringify(m);
await validateSensitiveInput(input(m), auth); expect(JSON.stringify(m)).toBe(before);
expect(() => validateAptManifest({ ...m, action: 'apt-execute' }, false)).toThrow('eigenen nativen');
expect(() => validateAptManifest({ ...m, native_recovery: { ...m.native_recovery, previous_grant_id: '00000000-0000-0000-0000-000000000000' } }, true)).toThrow();
expect(() => validateAptManifest({ ...m, native_recovery: { ...m.native_recovery, partial_proof_sha256: '0'.repeat(64) } }, true)).toThrow();
expect(() => validateAptManifest({ ...m, native_retry: {} }, true)).toThrow();
const wrongVersion = { ...m.resolved_apt_transaction, packages: m.resolved_apt_transaction.packages.map(p => ({ ...p, old_version: null })) };
const wrongRaw = new TextEncoder().encode(JSON.stringify(wrongVersion));
expect(() => validateAptManifest({ ...m, resolved_apt_transaction: wrongVersion, transaction_bytes: Array.from(wrongRaw) }, true)).toThrow('Version');
const normal = await manifest();
expect(() => validateAptManifest({ ...normal, resolved_apt_transaction: { ...normal.resolved_apt_transaction, operation: 'configure_only' } }, true)).toThrow('Schemafelder');
expect(() => validateAptManifest({ ...m, resolved_apt_transaction: { ...m.resolved_apt_transaction, operation: 'install' } }, true)).toThrow('Transaktionsschema');
await expect(verifyAptManifest({ ...m, transaction_sha256: 'b'.repeat(64) }, true)).rejects.toThrow('Transaktionshash');
const payload = { jobs: [{ payload: { action: { action: 'apt_native_acceptance', apt_manifest: m } } }] };
const raw = new TextEncoder().encode(JSON.stringify(payload));
const plan = { plan_payload: payload, plan_payload_bytes: Array.from(raw), plan_hash: await sha256(raw), jobs: payload.jobs };
await verifyPlanIntegrity(plan);
const changed = structuredClone(payload), changedJob = changed.jobs[0];
if (!changedJob) throw new Error('One fixture job required');
changedJob.payload.action.apt_manifest.native_recovery.partial_proof_sha256 = 'b'.repeat(64);
await expect(verifyPlanIntegrity({ ...plan, plan_payload: changed })).rejects.toThrow('widerspricht');
});
it('binds update package names to the exact versions in the unchanged signed manifest', async () => {
const m = await manifest(false); const value = input(m); value.action = 'apply_updates';
value.parameters = { execution_identity: 'root', provider: 'apt', packages: ['rmm-mvp-test'], reboot_policy: 'never', apt_manifest: m };
+14 -6
View File
@@ -27,8 +27,8 @@ export async function sha256(value: Uint8Array<ArrayBuffer>): Promise<string> {
function canonical(v: unknown): string { if (Array.isArray(v)) return `[${v.map(canonical).join(',')}]`; if (v !== null && typeof v === 'object') return `{${Object.entries(v).sort(([a], [b]) => a.localeCompare(b)).map(([k, x]) => `${JSON.stringify(k)}:${canonical(x)}`).join(',')}}`; return JSON.stringify(v); }
export function validateAptManifest(value: unknown, acceptance: boolean): RecordValue {
const m = record(value, 'apt_manifest');
exact(m, ['type', 'schema_version', 'action', 'execution_profile', 'transaction_sha256', 'resolved_apt_transaction', 'transaction_bytes', 'provider_sha256', 'hook_sha256', 'apt_config_sha256', 'runtime_sha256', 'test_result_id', ...(m.schema_version === 3 ? ['native_retry'] : [])]);
if (m.type !== 'rmm.apt.helper-action' || ![2, 3].includes(Number(m.schema_version)) || typeof m.schema_version !== 'number' || m.execution_profile !== 'dev-test' || m.action !== (acceptance ? 'apt-native-acceptance' : 'apt-execute')) throw new Error('APT Schema 2/3 / explizites dev-test-Profil erforderlich');
exact(m, ['type', 'schema_version', 'action', 'execution_profile', 'transaction_sha256', 'resolved_apt_transaction', 'transaction_bytes', 'provider_sha256', 'hook_sha256', 'apt_config_sha256', 'runtime_sha256', 'test_result_id', ...(m.schema_version === 3 ? ['native_retry'] : []), ...(m.schema_version === 4 ? ['native_recovery'] : [])]);
if (m.type !== 'rmm.apt.helper-action' || ![2, 3, 4].includes(Number(m.schema_version)) || typeof m.schema_version !== 'number' || m.execution_profile !== 'dev-test' || m.action !== (acceptance ? 'apt-native-acceptance' : 'apt-execute')) throw new Error('APT Schema 2/3/4 / explizites dev-test-Profil erforderlich');
if (m.schema_version === 3) {
if (!acceptance) throw new Error('Wiederaufnahme nur als eigener nativer Abnahmeplan');
const retry = record(m.native_retry); exact(retry, ['schema_version', 'previous_grant_id', 'previous_attempt_id', 'bootstrap_marker_sha256']);
@@ -36,11 +36,19 @@ export function validateAptManifest(value: unknown, acceptance: boolean): Record
if (retry.schema_version !== 1 || ['previous_grant_id', 'previous_attempt_id'].some(k => typeof retry[k] !== 'string' || !uuid.test(retry[k] as string) || retry[k] === '00000000-0000-0000-0000-000000000000')) throw new Error('Exakte ursprüngliche Grant-/Versuchsbindung erforderlich');
hash(retry.bootstrap_marker_sha256);
}
const recovery = m.schema_version === 4;
if (recovery) {
if (!acceptance) throw new Error('Configure-only benötigt einen eigenen nativen Abnahmeplan');
const ref = record(m.native_recovery); exact(ref, ['schema_version', 'previous_grant_id', 'previous_attempt_id', 'partial_proof_sha256']);
const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
if (ref.schema_version !== 1 || ['previous_grant_id', 'previous_attempt_id'].some(k => typeof ref[k] !== 'string' || !uuid.test(ref[k] as string) || ref[k] === '00000000-0000-0000-0000-000000000000')) throw new Error('Exakte geschlossene Partial-Grant-/Versuchsbindung erforderlich');
hash(ref.partial_proof_sha256);
}
for (const k of ['transaction_sha256', 'provider_sha256', 'hook_sha256', 'apt_config_sha256', 'runtime_sha256']) hash(m[k]);
if (typeof m.test_result_id !== 'string' || !/^[A-Za-z0-9_.-]{1,128}$/.test(m.test_result_id)) throw new Error('Exakte Testnachweis-ID erforderlich');
const transaction = record(m.resolved_apt_transaction);
exact(transaction, ['schema_version', 'recipe_id', 'recipe_version', 'platform', 'resolver_config_version', 'no_reboot', 'status_fingerprint', 'baseline_sha256', 'packages']);
if (transaction.schema_version !== 1 || transaction.recipe_version !== '1' || transaction.platform !== 'ubuntu-24.04-amd64' || transaction.resolver_config_version !== 'rmm-apt-local-v1' || transaction.no_reboot !== true) throw new Error('APT Transaktionsschema/Plattform/No-Reboot ungültig');
exact(transaction, ['schema_version', 'recipe_id', 'recipe_version', 'platform', 'resolver_config_version', 'no_reboot', 'status_fingerprint', 'baseline_sha256', 'packages', ...(recovery ? ['operation'] : [])]);
if (transaction.schema_version !== (recovery ? 2 : 1) || (recovery && transaction.operation !== 'configure_only') || transaction.recipe_version !== '1' || transaction.platform !== 'ubuntu-24.04-amd64' || transaction.resolver_config_version !== 'rmm-apt-local-v1' || transaction.no_reboot !== true) throw new Error('APT Transaktionsschema/Plattform/No-Reboot ungültig');
text(transaction.recipe_id, 'recipe_id'); hash(transaction.status_fingerprint); hash(transaction.baseline_sha256);
if (!Array.isArray(transaction.packages) || !transaction.packages.length || transaction.packages.length > 128) throw new Error('Vollständige Paketclosure erforderlich');
const identities = new Set<string>();
@@ -55,9 +63,9 @@ export function validateAptManifest(value: unknown, acceptance: boolean): Record
if (canonical(parsed) !== canonical(transaction)) throw new Error('Exakte Transaktionsbytes widersprechen Manifestobjekt');
if (acceptance) {
const install = transaction.recipe_id === 'rmm-apt-fixture-install-1.0', update = transaction.recipe_id === 'rmm-apt-fixture-update-1.1';
if ((!install && !update) || transaction.packages.length !== 1) throw new Error('Nur genaue native Fixture-Rezepte erlaubt');
if ((!install && !update) || (recovery && !install) || transaction.packages.length !== 1) throw new Error('Nur genaue native Fixture-Rezepte erlaubt');
const p = record(transaction.packages[0]);
if (p.name !== 'rmm-mvp-test' || p.architecture !== 'all' || p.origin !== 'rmm-test' || p.size !== 20672 || p.old_version !== (install ? null : '1.0') || p.new_version !== (install ? '1.0' : '1.1') || p.sha256 !== (install ? '74036ae81223deab3aae994fd2a2a695af408741777e1ce17dcb4e32f1235867' : 'ef67c9fe0ba1443fcfe465768e1204763063c369a2a1da04af6027d8a9c00491')) throw new Error('Native Fixture-Bytes/Version/Origin stimmen nicht überein');
if (p.name !== 'rmm-mvp-test' || p.architecture !== 'all' || p.origin !== 'rmm-test' || p.size !== 20672 || p.old_version !== (recovery ? '1.0' : install ? null : '1.0') || p.new_version !== (install ? '1.0' : '1.1') || p.sha256 !== (install ? '74036ae81223deab3aae994fd2a2a695af408741777e1ce17dcb4e32f1235867' : 'ef67c9fe0ba1443fcfe465768e1204763063c369a2a1da04af6027d8a9c00491')) throw new Error('Native Fixture-Bytes/Version/Origin stimmen nicht überein');
}
return m;
}