gsadmin/sencho
1
0
Fork 0
mirror of https://github.com/Studio-Saelix/sencho.git synced 2026-08-22 16:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(blueprints): fail closed on marker ownership for apply and withdraw (#1694)

Browse Source 
* fix(blueprints): fail closed on marker ownership for apply and withdraw

Require a matching .blueprint.json under the stack lock, persist required_blueprint_id on deletion intents, remove the legacy remote apply fallback, and protect the marker in the file explorer.

* fix(blueprints): add CodeQL path barriers on ownership probes

Use the canonical resolve-and-startsWith sanitizer inline at the marker and stack-directory fs sinks so js/path-injection clears.

* fix(blueprints): block delete on failed withdraw and defer marker write

Refuse Blueprint DELETE when pre-delete withdraw does not complete, and write .blueprint.json only after a successful deploy so failed applies cannot orphan stacks or claim an unapplied revision.

* test(blueprints): align lock-order assert with deferred marker write

Update the per-stack lock ordering expectations to compose, cleanup, deploy, then marker after the partial-apply fix.

* fix(deps): bump postcss past GHSA-r28c-9q8g-f849 for npm audit

Raise the Vitest/Vite transitive postcss to 8.5.23 so Backend CI audit --audit-level=high passes.
This commit is contained in:
Anso
2026-07-24 15:57:18 -04:00
committed by GitHub
parent e33eda3c38
commit 17a8dc8a94
19 changed files with 1092 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/__tests__/deployed-stack-deletion-service.test.ts
+39
View File
@@ -89,6 +89,7 @@ describe('DeployedStackDeletionService ready transaction', () => {
rollback_tags_json: '[]',
override_paths_json: '[]',
prune_volumes_requested: 0,
required_blueprint_id: null,
created_at: now,
updated_at: now,
};
@@ -111,6 +112,7 @@ describe('DeployedStackDeletionService ready transaction', () => {
rollback_tags_json: '[]',
override_paths_json: '[]',
prune_volumes_requested: 0,
required_blueprint_id: null,
created_at: now,
updated_at: now,
});
@@ -129,6 +131,7 @@ describe('DeployedStackDeletionService ready transaction', () => {
rollback_tags_json: '[]',
override_paths_json: '[]',
prune_volumes_requested: 0,
required_blueprint_id: null,
created_at: now,
updated_at: now,
});
@@ -154,3 +157,39 @@ describe('overrideDeletionContainmentBase', () => {
});
});
describe('DeployedStackDeletionService blueprint ownership probe', () => {
it('returns failed (not name_conflict) when marker read fails with non-ENOENT I/O', async () => {
const { promises: fsPromises } = await import('fs');
const { vi } = await import('vitest');
const composeDir = process.env.COMPOSE_DIR!;
const stackName = `del-probe-${Date.now()}`;
const stackDir = path.join(composeDir, stackName);
await fsPromises.mkdir(stackDir, { recursive: true });
await fsPromises.writeFile(path.join(stackDir, 'compose.yaml'), 'services: {}\n');
await fsPromises.writeFile(
path.join(stackDir, '.blueprint.json'),
JSON.stringify({ blueprintId: 7, revision: 1, lastApplied: 0 }),
);
const accessErr = Object.assign(new Error('EACCES'), { code: 'EACCES' });
const readSpy = vi.spyOn(fsPromises, 'readFile').mockRejectedValueOnce(accessErr);
const result = await DeployedStackDeletionService.getInstance().deleteDeployedStack({
nodeId: NODE,
stackName,
pruneVolumes: false,
actor: 'test',
requireBlueprintId: 7,
});
expect(result.ok).toBe(false);
if (!result.ok) {
expect(result.code).toBe('failed');
expect(result.error).toMatch(/EACCES|Failed to read|permission/i);
}
expect(readSpy).toHaveBeenCalled();
readSpy.mockRestore();
await fsPromises.rm(stackDir, { recursive: true, force: true });
});
});