feat: deploy platform inventory and signed APT retry client compatibility
Rust development slice / linux (push) Failing after 6s

This commit is contained in:
2026-11-13 15:55:35 +01:00
parent fd7225600b
commit 42c9b9c59c
9 changed files with 222 additions and 16 deletions
+20
View File
@@ -48,6 +48,26 @@ describe('root and dedicated dev-test APT actions', () => {
const before = JSON.stringify(value); await validateSensitiveInput(value, auth); expect(JSON.stringify(value)).toBe(before);
await expect(validateSensitiveInput({ ...value, parameters: { ...value.parameters, version: '2' } }, auth)).rejects.toThrow('Paketidentität');
});
it('requires an explicit schema3 native retry reference; rejects missing/unknown/normal retry fields', async () => {
const base = await manifest();
const native_retry = { schema_version: 1, previous_grant_id: '11111111-1111-4111-8111-111111111111', previous_attempt_id: '22222222-2222-4222-8222-222222222222', bootstrap_marker_sha256: 'a'.repeat(64) };
const m = { ...base, schema_version: 3, native_retry };
await validateSensitiveInput(input(m), auth);
expect(() => validateAptManifest({ ...base, schema_version: 3 }, true)).toThrow();
expect(() => validateAptManifest({ ...base, native_retry }, true)).toThrow();
expect(() => validateAptManifest({ ...m, native_retry: { ...native_retry, previous_grant_id: '../active' } }, true)).toThrow();
expect(() => validateAptManifest({ ...m, native_retry: { ...native_retry, previous_attempt_id: '00000000-0000-0000-0000-000000000000' } }, true)).toThrow();
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('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 };
await validateSensitiveInput(value, auth);
await expect(validateSensitiveInput({ ...value, parameters: { ...value.parameters, packages: ['other'] } }, auth)).rejects.toThrow('Updateauswahl');
await expect(validateSensitiveInput({ ...value, parameters: { ...value.parameters, packages: [] } }, auth)).rejects.toThrow('Updateauswahl');
await expect(validateSensitiveInput({ ...value, parameters: { ...value.parameters, packages: ['rmm-mvp-test=1.0'] } }, auth)).rejects.toThrow('Updateauswahl');
});
it('checks exact plan byte hash and manifest consistency without demanding execution IDs', async () => {
const p = { targets: ['asset'], jobs: [{ payload: { asset_id: 'asset', action: { action: 'apt_native_acceptance', apt_manifest: await manifest() } } }] }, raw = new TextEncoder().encode(JSON.stringify(p));
const plan = { plan_payload: p, plan_payload_bytes: Array.from(raw), plan_hash: await sha256(raw), jobs: p.jobs };
+10 -3
View File
@@ -27,8 +27,15 @@ 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']);
if (m.type !== 'rmm.apt.helper-action' || m.schema_version !== 2 || m.execution_profile !== 'dev-test' || m.action !== (acceptance ? 'apt-native-acceptance' : 'apt-execute')) throw new Error('APT Schema 2 / 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'] : [])]);
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');
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']);
const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
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);
}
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);
@@ -68,7 +75,7 @@ export async function validateSensitiveInput(input: PlanInput, auth: Session) {
if (!Array.isArray(packages)) throw new Error('Paketclosure fehlt');
if (input.action === 'ensure_package' && (input.parameters.recipe_version !== t.recipe_version || (input.parameters.recipe_id !== undefined && input.parameters.recipe_id !== t.recipe_id))) throw new Error('Äußere Rezeptbindung widerspricht Manifest');
if (input.action === 'ensure_package' && !packages.some(v => { const p = record(v); return p.name === input.parameters.package && p.new_version === input.parameters.version && p.architecture === input.parameters.architecture; })) throw new Error('Exakte Paketidentität fehlt in Closure');
if (input.action === 'apply_updates' && (!Array.isArray(input.parameters.packages) || !input.parameters.packages.every(v => typeof v === 'string' && packages.some(x => { const p = record(x); return v === `${p.name}=${p.new_version}`; })))) throw new Error('Feste Updateversionen fehlen in Closure');
if (input.action === 'apply_updates' && (!Array.isArray(input.parameters.packages) || input.parameters.packages.length !== packages.length || !input.parameters.packages.every(v => typeof v === 'string' && packages.some(x => { const p = record(x); return v === p.name; })))) throw new Error('Exakte Updateauswahl fehlt in versionsgebundener Closure');
await verifyAptManifest(m, false);
}
}