From d3a347a8ca992dcb13afed5cc93f864448265b05 Mon Sep 17 00:00:00 2001 From: Denozordec Date: Sun, 15 Nov 2026 21:58:29 +0700 Subject: [PATCH] =?UTF-8?q?fix(test):=20=D0=B2=D0=BD=D0=B5=D0=B4=D1=80?= =?UTF-8?q?=D1=8F=D1=82=D1=8C=20=D0=BF=D0=BE=D0=B7=D0=B4=D0=BD=D0=B5=D0=B5?= =?UTF-8?q?=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20GRE?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20COMMIT=20=D0=B0=D1=83=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=D0=B0=20=D0=BD=D0=B0=D0=BC=D0=B5=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Устаревший тест, не дефект продукта. Аудит configuration.intent для RouterOS-записи пишется на транзакционном клиенте (requestAccountingWrite), поэтому перехват pool.query не срабатывал: поздняя пауза, защита или изменение ревизии не внедрялись, и восстановление законно завершалось applied. Фикстур afterConfigurationIntentCommit принимает предикат по payload (method), тест GRE использует его; ожидания (unknown, без записи в RouterOS) не менялись. Co-Authored-By: Claude Opus 5.5 --- .../fixtures/configuration-audit-commit.ts | 6 +++-- backend/src/test/mcp-gre-revision.ts | 23 +++++++------------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/backend/src/test/fixtures/configuration-audit-commit.ts b/backend/src/test/fixtures/configuration-audit-commit.ts index 8d3a641e..a68d7f01 100644 --- a/backend/src/test/fixtures/configuration-audit-commit.ts +++ b/backend/src/test/fixtures/configuration-audit-commit.ts @@ -24,13 +24,15 @@ const audit = (args: unknown[], action: string) => { } /** Trigger fixture drift after the intent is durable and before the native call. */ -export function afterConfigurationIntentCommit(kind: string, action: () => Promise) { +export function afterConfigurationIntentCommit(kind: string | ((payload: Record) => boolean), action: () => Promise) { let fired = false + const matches = typeof kind === "string" ? (payload: { object?: { kind?: unknown } }) => payload.object?.kind === kind : kind const restore = proxyClientQueries(() => { let intent = false return async (args, run) => { const result = await run() - if (audit(args, "configuration.intent")?.object?.kind === kind) intent = true + const payload = audit(args, "configuration.intent") + if (payload && matches(payload)) intent = true if (args[0] === "COMMIT" && intent && !fired) { fired = true; await action() } return result } diff --git a/backend/src/test/mcp-gre-revision.ts b/backend/src/test/mcp-gre-revision.ts index c4b443b8..4687ac2e 100644 --- a/backend/src/test/mcp-gre-revision.ts +++ b/backend/src/test/mcp-gre-revision.ts @@ -12,6 +12,7 @@ import {canonicalGreSnapshot} from "../services/entity-snapshots.js" import {fingerprintPayload} from "../services/config-revisions.js" import greRoutes from "../routes/gre.js" import {acceptGreReadCancellation} from "./mcp-gre-read-cancellation.js" +import {afterConfigurationIntentCommit} from "./fixtures/configuration-audit-commit.js" type Collections=Record[]> interface Fixture{get:()=>Collections;set:(value:Collections)=>void;writes:()=>number;reads:()=>number;ignored:(v:boolean)=>void;lost:(v:boolean)=>void;afterCommand:(hook:(()=>Promise)|undefined)=>void;dependencies:(value:Collections)=>void} @@ -113,21 +114,13 @@ export async function acceptGreRevisionRestore(actor:AuthUser,fixture:Fixture){ fixture.set(method==="PUT"?{"/interface/gre":[],"/ip/address":[],"/ipv6/address":[]}:seed()) const payload=method==="PUT"?canonicalGreSnapshot({tunnels:[{...desired().tunnels.find(r=>r.name==="restore-new")!,innerAddresses:[],localInnerIp:""}]}):method==="DELETE"?{tunnels:[]}:canonicalGreSnapshot({tunnels:desired().tunnels.filter(r=>r.name==="restore-old")}) const id=await revision(payload),prepared=await plan(id);await approvePlan(prepared.planId,actor,true) - let fired=false - pool.query=((...args:unknown[])=>{ - const sql=typeof args[0]==="string"?args[0]:(args[0]as{text?:string})?.text,params=args[1]as unknown[]|undefined - const pending=(query as(...args:unknown[])=>Promise)(...args) - if(!fired&&sql?.startsWith("INSERT INTO mcp_audit")&¶ms?.[1]==="configuration.intent"&&String(params?.[3]).includes('"method":"'+method+'"')){ - fired=true;return pending.then(async value=>{ - if(mode==="PAUSE")await query("UPDATE mcp_connections SET policy=jsonb_set(policy,'{status}','\"paused\"'::jsonb) WHERE id=$1",[issued.connection.id]) - else if(mode==="REVISION")await query("UPDATE config_revisions SET payload='{}'::jsonb WHERE id=$1",[id]) - else await query("INSERT INTO mcp_protections(id,object_ref,created_by) VALUES($1,$2::jsonb,$3)",[protection,JSON.stringify({kind:"vlan",id:"*late",serverId,protection:"deny"}),actor.id]) - return value - }) - } - return pending - })as typeof pool.query - try{const count=fixture.writes(),op=await applyPlan(principal,prepared.planId,randomUUID());assert.equal(await wait(op.id),"unknown");assert.equal(fired,true);assert.equal(fixture.writes(),count)}finally{pool.query=query as typeof pool.query;await query("DELETE FROM mcp_protections WHERE id=$1",[protection]);await query("UPDATE mcp_connections SET policy=jsonb_set(policy,'{status}','\"active\"'::jsonb) WHERE id=$1",[issued.connection.id])} + // Audits commit on transaction clients, so the drift hook wraps pool.connect rather than pool.query. + const late=afterConfigurationIntentCommit(payload=>payload.method===method,async()=>{ + if(mode==="PAUSE")await query("UPDATE mcp_connections SET policy=jsonb_set(policy,'{status}','\"paused\"'::jsonb) WHERE id=$1",[issued.connection.id]) + else if(mode==="REVISION")await query("UPDATE config_revisions SET payload='{}'::jsonb WHERE id=$1",[id]) + else await query("INSERT INTO mcp_protections(id,object_ref,created_by) VALUES($1,$2::jsonb,$3)",[protection,JSON.stringify({kind:"vlan",id:"*late",serverId,protection:"deny"}),actor.id]) + }) + try{const count=fixture.writes(),op=await applyPlan(principal,prepared.planId,randomUUID());assert.equal(await wait(op.id),"unknown");assert.equal(late.fired(),true);assert.equal(fixture.writes(),count)}finally{late.restore();await query("DELETE FROM mcp_protections WHERE id=$1",[protection]);await query("UPDATE mcp_connections SET policy=jsonb_set(policy,'{status}','\"active\"'::jsonb) WHERE id=$1",[issued.connection.id])} } for(const fault of ["ignored","lost","collateral","late-binding","wrong-default-key"]){ fixture.set(seed());const prepared=await plan(selected),count=fixture.writes()