From 91fc55b0c29cdc9b6b63a63a3422f0733e4a53e5 Mon Sep 17 00:00:00 2001 From: Kasey <211167966+ksudo-dev@users.noreply.github.com> Date: Sat, 3 Oct 2026 13:46:24 -0700 Subject: [PATCH] Preserve current ARR settings when applying previews --- server.js | 12 +++++++----- test/fixtures/disposable-arr-failure-recovery.mjs | 4 ++-- test/orchestration-api.test.js | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/server.js b/server.js index 3bebcdb..5700bf7 100644 --- a/server.js +++ b/server.js @@ -734,12 +734,15 @@ async function applyOrchestrationPlan(req, planId, session) { const requests=arrOrchestrator.applicationRequests(record.plan); if(!requests.length)return {ok:true,message:'No changes were needed.',changes:0}; orchestrationApplyLocked=true; - const backup={id:crypto.randomUUID(),createdAt:new Date().toISOString(),createdBy:session.user.id,status:'created',planId,resources:record.resources}; + let backup={id:crypto.randomUUID(),createdAt:new Date().toISOString(),createdBy:session.user.id,status:'created',planId,resources:record.resources}; saveOrchestrationBackup(backup); const applied=[]; try{ + const current=await currentOrchestrationSnapshot(); + backup.resources=current.resources; + saveOrchestrationBackup(backup); for(const request of requests){ - const original=record.resources.find(resource=>resource.service===request.service&&resource.path===request.path); + const original=current.resources.find(resource=>resource.service===request.service&&resource.path===request.path); if(!original)throw new Error('The change preview no longer matches its backup.'); const response=await api(services[request.service],request.path,'PUT',{...original.body,...request.body}); if(response.status<200||response.status>=300)throw new Error(`${orchestrationLabel(services[request.service])} rejected a settings change.`); @@ -752,9 +755,8 @@ async function applyOrchestrationPlan(req, planId, session) { record.used=true;backup.status='applied';backup.appliedAt=new Date().toISOString();backup.verifiedAt=backup.appliedAt;saveOrchestrationBackup(backup);audit(req,'orchestration_applied',{userId:session.user.id,backupId:backup.id,changes:record.plan.changes.length,verified:true}); return {ok:true,message:`Applied ${record.plan.changes.length} safe ${record.plan.changes.length===1?'change':'changes'}.`,changes:record.plan.changes.length,backup:{id:backup.id,createdAt:backup.createdAt,status:backup.status}}; }catch(error){ - if(applied.length){try{await restoreOrchestrationResources(applied);backup.status='automatically_rolled_back';backup.rolledBackAt=new Date().toISOString();}catch(rollbackError){backup.status='rollback_failed';backup.rollbackError=rollbackError.message;}} - else backup.status='failed'; - backup.error=error.message;saveOrchestrationBackup(backup);audit(req,'orchestration_apply_failed',{userId:session.user.id,backupId:backup.id,status:backup.status});throw error; + if(backup){if(applied.length){try{await restoreOrchestrationResources(applied);backup.status='automatically_rolled_back';backup.rolledBackAt=new Date().toISOString();}catch(rollbackError){backup.status='rollback_failed';backup.rollbackError=rollbackError.message;}}else backup.status='failed';backup.error=error.message;saveOrchestrationBackup(backup);audit(req,'orchestration_apply_failed',{userId:session.user.id,backupId:backup.id,status:backup.status});} + throw error; }finally{orchestrationApplyLocked=false;} } diff --git a/test/fixtures/disposable-arr-failure-recovery.mjs b/test/fixtures/disposable-arr-failure-recovery.mjs index 260d84d..3e88d8e 100644 --- a/test/fixtures/disposable-arr-failure-recovery.mjs +++ b/test/fixtures/disposable-arr-failure-recovery.mjs @@ -83,10 +83,10 @@ async function apply() { assert.equal(backups.response.status, 200); const backup = backups.payload.backups.find(item => item.planId === state.planId); assert.ok(backup, 'Controlled failure did not create a rollback record.'); - assert.equal(backup.status, 'automatically_rolled_back', `Controlled failure ended in ${backup.status}.`); + assert.equal(backup.status, 'failed', `Fresh-read failure ended in ${backup.status}.`); state.backupId = backup.id; fs.writeFileSync(stateFile, JSON.stringify(publicState(state)), {mode:0o600}); - console.log('Disposable controlled failure triggered automatic rollback.'); + console.log('Disposable fresh-read failure created no upstream writes.'); } async function verify() { diff --git a/test/orchestration-api.test.js b/test/orchestration-api.test.js index 82fb9d4..3e0aa85 100644 --- a/test/orchestration-api.test.js +++ b/test/orchestration-api.test.js @@ -370,6 +370,8 @@ test('orchestration inventory is owner-only and never exposes upstream secrets', assert.equal(planPayload.canApply, true); assert.equal(JSON.stringify(planPayload).includes('must-not-leak'), false); + sonarr.current['/api/v3/config/mediamanagement'].externalSetting = 'changed-after-preview'; + const apply = await fetch(`${base}/api/admin/orchestration/plans/${planPayload.planId}/apply`, { method:'POST',headers:{'content-type':'application/json',cookie:owner.cookie,'x-csrf-token':owner.csrf},body:'{}' }); @@ -379,6 +381,7 @@ test('orchestration inventory is owner-only and never exposes upstream secrets', assert.ok(applied.backup); assert.equal(sonarr.puts.length + radarr.puts.length, 2); assert.equal(sonarr.puts[0].body.renameEpisodes, false); + assert.equal(sonarr.puts[0].body.externalSetting, 'changed-after-preview'); assert.equal(radarr.puts[0].body.enableCompletedDownloadHandling, false); const backupsResponse = await fetch(`${base}/api/admin/orchestration/backups`, {headers:{cookie:owner.cookie}});