Compare commits

...
3 Commits
Author SHA1 Message Date
Denozordec 26249e1a4d fix(ci): проверять сокращённое окно при избытке потоков
Docker images / prepare-release (push) Successful in 10s
Docker images / backend-test (push) Successful in 10m7s
Docker images / backend-image (push) Successful in 1m58s
Docker images / frontend-image (push) Successful in 2m12s
Docker images / updater-image (push) Successful in 38s
Docker images / netflow-agent-image (push) Successful in 32s
Docker images / notify-webhook (push) Successful in 2s
Docker images / publish-release (push) Successful in 9s
2026-11-22 11:42:20 +07:00
Denozordec 136474ba95 fix(ci): проверять тип отказа при превышении объёма потоков
Docker images / prepare-release (push) Canceled after 0s
Docker images / backend-test (push) Canceled after 0s
Docker images / backend-image (push) Canceled after 0s
Docker images / frontend-image (push) Canceled after 0s
Docker images / updater-image (push) Canceled after 0s
Docker images / netflow-agent-image (push) Canceled after 0s
Docker images / publish-release (push) Canceled after 0s
Docker images / notify-webhook (push) Canceled after 0s
2026-11-22 11:34:08 +07:00
Denozordec f0e08f9731 fix(mcp): учитывать префиксы при проверке адресов соседей BGP
Docker images / prepare-release (push) Successful in 11s
Docker images / backend-test (push) Successful in 10m33s
Docker images / frontend-image (push) Successful in 2m11s
Docker images / updater-image (push) Successful in 39s
Docker images / backend-image (push) Canceled after 0s
Docker images / netflow-agent-image (push) Canceled after 8s
Docker images / publish-release (push) Canceled after 0s
Docker images / notify-webhook (push) Canceled after 0s
2026-11-22 11:31:14 +07:00
4 changed files with 50 additions and 8 deletions

No files matched your search

+32 -5
View File
@@ -14,6 +14,7 @@ import { createMcpConnection, authenticateMcpToken, updateMcpSettings, rotateCon
import { invokeMcpTool, approvePlan, applyPlan, recoverMcpOperations } from "./runtime.js"
import { decryptSecret, encryptSecret, invalidateMcpAccess, tokenDigest } from "./security.js"
import { addRoutingDependencies } from "./routing-dependencies.js"
import { FlowSourceWindowTooLarge } from "../../services/traffic-flow-read-window.js"
import { acceptOspfRouteProofMcp } from "./ospf-route-proof-acceptance.js"
import { acceptNetworkNeighborsMcp } from "./network-neighbors-acceptance.js"
import { acceptIpv6NdWriteMcp } from "./ipv6-nd-write-acceptance.js"
@@ -1629,13 +1630,33 @@ try {
await assert.rejects(invokeMcpTool(ospfPrincipal, "mm_ospf_instance_create_plan", { serverId: 1, fields: { name: "blocked-ospf", "router-id": "192.0.2.1", version: "3", vrf: "main" } }))
await pool.query("DELETE FROM mcp_protections WHERE id=$1", [vrfProtection])
bgpFixtures = true
const bgpAccess = await createMcpConnection(mcpConnectionCreateSchema.parse({ name: "BGP dependency test", mode: "approval", expiresAt: new Date(Date.now() + 1800000).toISOString(), permissions: ["mm:bgp:read", "mm:bgp:write", "mm:network:read"], scope: { serverIds: [1], operationIds: ["ros.bgp_instance.delete", "ros.bgp_instance.update", "ros.bgp_connection.create", "ros.vrf.delete"], allowGlobal: false } }), actor)
const bgpAccess = await createMcpConnection(mcpConnectionCreateSchema.parse({ name: "BGP dependency test", mode: "approval", expiresAt: new Date(Date.now() + 1800000).toISOString(), permissions: ["mm:bgp:read", "mm:bgp:write", "mm:network:read"], scope: { serverIds: [1], operationIds: ["ros.bgp_instance.delete", "ros.bgp_instance.update", "ros.bgp_connection.create", "ros.bgp_connection.update", "ros.vrf.delete"], allowGlobal: false } }), actor)
const bgpPrincipal = await authenticateMcpToken(bgpAccess.token)
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_instance_delete_plan", { serverId: 1, id: "*bgp" }), /используется подключением/)
const peerFields = { name: "new-peer", instance: "missing", "remote.address": "192.0.2.2", "local.address": "192.0.2.1", "remote.as": 64513, "local.role": "ebgp" }
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: peerFields }), /Не подтверждена зависимость/)
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: { ...peerFields, instance: "fixture-bgp", "local.address": "fd00::1" } }), /одного семейства/)
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: { ...peerFields, instance: "fixture-bgp", "remote.address": "0.0.0.0/0" } }))
const savedPeer = fixtureBgp.connection[0]
const preparePassivePeer = () => invokeMcpTool(bgpPrincipal, "mm_bgp_connection_update_plan", {
serverId: 1, id: savedPeer[".id"], fields: { connect: false, listen: true },
}) as Promise<{ state: string; changes: { steps: { step: { fields: unknown } }[] } }>
try {
for (const [local, remote] of [["10.255.255.100", "10.255.255.11/32"], ["2001:db8::1", "2001:db8::2/128"]]) {
fixtureBgp.connection[0] = { ...savedPeer, "local.address": local, "remote.address": remote }
const plan = await preparePassivePeer()
assert.equal(plan.state, "awaiting-approval")
assert.equal(plan.changes.steps.length, 1)
assert.deepEqual(plan.changes.steps[0].step.fields, { connect: "false", listen: "true" })
}
fixtureBgp.connection[0] = { ...savedPeer, "remote.address": "2001:db8::2/128" }
await assert.rejects(preparePassivePeer(), /одного семейства/)
fixtureBgp.connection[0] = { ...savedPeer, "remote.address": "192.0.2.2/33" }
await assert.rejects(preparePassivePeer(), /Некорректный адрес или префикс/)
} finally {
fixtureBgp.connection[0] = savedPeer
}
console.log("✓ MCP BGP dependency validation accepts stored IPv4/IPv6 CIDR for a passive-mode update and rejects mixed families and invalid prefix lengths")
const peerProtection = randomUUID()
await pool.query("INSERT INTO mcp_protections(id,object_ref,created_by) VALUES($1,$2::jsonb,'integration')", [peerProtection, JSON.stringify({ kind: "bgp_connection", id: "*peer", serverId: 1, protection: "deny" })])
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_instance_update_plan", { serverId: 1, id: "*bgp", fields: { as: 64514 } }))
@@ -2033,7 +2054,7 @@ try {
assert.equal(badPeer.configurationMembershipVerified,false); assert.equal(badPeer.incomplete,true); assert.equal(badPeer.failures.length,1); assert.equal(badPeer.exporters[0].storedPeerRecord,null)
await pool.query("UPDATE traffic_flow_settings SET peers_json=jsonb_set(peers_json,'{0,publicKey}',$1::jsonb) WHERE id=1",[JSON.stringify("public-one")]); invalidateFlowSettings()
const rawWindow = await flowWindow(5,[1]); assert.equal(rawWindow.rows.length,4); assert.ok(rawWindow.rows.every(row=>row.serverId===1&&row.bucketAt<=rawWindow.until))
await assert.rejects(flowRows(rawWindow.since,1,{maxRows:1,untilIso:rawWindow.until}),/предел/)
await assert.rejects(flowRows(rawWindow.since,1,{maxRows:1,untilIso:rawWindow.until}),FlowSourceWindowTooLarge)
type TalkerPage = { items: {serverId:string;src:string;bytes:number;bps:number}[]; total:number; totalConversations:number; retainedRowsBytes:number; nextOffset:number|null; incomplete:boolean; serverIds:number[] }
const talkers = await invokeMcpTool(flowPrincipal,"mm_netflow_talkers_get",{minutes:5,limit:1}) as TalkerPage
assert.equal(talkers.retainedRowsBytes,3100); assert.equal(talkers.totalConversations,4); assert.equal(talkers.total,4); assert.equal(talkers.nextOffset,1); assert.equal(talkers.incomplete,true)
@@ -2099,8 +2120,14 @@ try {
assert.ok(restVisible.every((row:{src:string})=>row.src!=="198.18.242.6"),"Future rows must not enter REST talkers")
assert.equal((await flowHttp.inject({method:"GET",url:"/api/traffic/flows?range=5m"})).statusCode,200)
for(const path of ["/api/traffic/flow/exporters?range=5m","/api/traffic/flow/clients?range=5m","/api/traffic/flow/monthly?month="+flowMonth+"&serverId=1"]) { const response = await flowHttp.inject({method:"GET",url:path}); assert.equal(response.statusCode,200,response.body); assert.equal(typeof response.json(),"object") } } finally { await flowHttp.close() }
await pool.query("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,bytes,packets,in_iface) SELECT 1,now()-interval '90 seconds'+n*interval '1 millisecond','198.18.242.11','8.8.8.8',1,1,'cap' FROM generate_series(1,50001) n")
await assert.rejects(invokeMcpTool(flowPrincipal,"mm_netflow_talkers_get",{minutes:5}), (error:{code?:string})=>error.code==="STATE_UNAVAILABLE")
await pool.query("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,bytes,packets,in_iface) SELECT 1,now()-interval '90 seconds'+n*interval '1 microsecond','198.18.242.11','8.8.8.8',1,1,'cap' FROM generate_series(1,50001) n")
const denseReport = await invokeMcpTool(flowPrincipal, "mm_netflow_talkers_get", { minutes: 5 }) as TalkerPage & {
sourceWindow: { requestedMinutes: number; effectiveMinutes: number }; from: string; to: string
}
assert.equal(denseReport.sourceWindow.requestedMinutes, 5)
assert.equal(denseReport.sourceWindow.effectiveMinutes, 1)
assert.equal(Date.parse(denseReport.to) - Date.parse(denseReport.from), denseReport.sourceWindow.effectiveMinutes * 60_000)
assert(denseReport.items.every(row => row.src !== "198.18.242.11"), "The skipped dense window must not publish a partial page")
await pool.query("DELETE FROM flow_buckets WHERE server_id=1 AND src='198.18.242.11'")
const talkerRace = async (change:()=>Promise<unknown>, principal=flowPrincipal, signal?:AbortSignal) => {
const blocker = await pool.connect()
@@ -2134,7 +2161,7 @@ try {
assert.equal(catalogCalls,0,"Talker history and races must never poll RouterOS")
assert.equal((await pool.query("SELECT count(*)::int AS n FROM mcp_plans WHERE connection_id=$1",[flowAccess.connection.id])).rows[0].n,0)
assert.ok(!JSON.stringify((await pool.query("SELECT result FROM mcp_requests WHERE connection_id=$1",[flowAccess.connection.id])).rows).includes("NEVER_FLOW"))
console.log("✓ NetFlow talkers: shared REST parity, scoped SQL/pending, topN/pages, 50001-row refusal, real blocked-read source/topN/grant/owner/cancel/pause races, no global fields or network")
console.log("✓ NetFlow talkers: shared REST parity, scoped SQL/pending, topN/pages, bounded dense-window fallback, real blocked-read source/topN/grant/owner/cancel/pause races, no global fields or network")
} finally {
countCatalogCalls = false; clearPendingFlows(); resetFlowRipe()
await pool.query("DELETE FROM app_users WHERE id=ANY($1::text[])",[flowUsers])
@@ -134,6 +134,15 @@ export async function resolveOspfInterfaceSelectors(serverId: number, selectors:
return names
}
function bgpAddressFamily(value: string): number {
if (!value.includes("/")) return isIP(value)
try {
return isIP(canonicalBgpPolicyPrefix(value).split("/")[0])
} catch {
return 0
}
}
export async function addRoutingDependencies(serverId: number, resource: string, action: RosStep["action"], current: ConfigurationRow | undefined, fields: Record<string, string>, snapshots: RosSnapshot[], objects: ChangeEvidence["objects"]) {
const read = async (id: string) => {
const existing = snapshots.find(snapshot => snapshot.resource === id)
@@ -227,7 +236,11 @@ export async function addRoutingDependencies(serverId: number, resource: string,
}
if (resource === "bgp_connection") {
const local = fields["local.address"] ?? current?.["local.address"], remote = fields["remote.address"] ?? current?.["remote.address"]
if (typeof local === "string" && typeof remote === "string" && isIP(local) !== isIP(remote)) throw new McpError("INVALID_INPUT", "Адреса BGP-соединения должны быть одного семейства", 400)
if (typeof local === "string" && typeof remote === "string") {
const localFamily = bgpAddressFamily(local), remoteFamily = bgpAddressFamily(remote)
if (!localFamily || !remoteFamily) throw new McpError("INVALID_INPUT", "Некорректный адрес или префикс BGP-соединения", 400)
if (localFamily !== remoteFamily) throw new McpError("INVALID_INPUT", "Адреса BGP-соединения должны быть одного семейства", 400)
}
}
if (resource === "bgp_instance" && current && ["as", "router-id", "disabled"].some(key => fields[key] !== undefined && fields[key] !== current[key])) {
for (const row of (await read("bgp_connection")).rows.filter(row => [current.name, current[".id"]].includes(row.instance))) objects.push({ kind: "bgp_connection", id: String(row[".id"]), serverId })
+2 -1
View File
@@ -8,6 +8,7 @@ import { ensurePartitionFor } from "../db/partitions.js"
import { createMcpConnection, authenticateMcpToken, setConnectionStatus } from "../modules/mcp/store.js"
import { invokeMcpTool } from "../modules/mcp/runtime.js"
import { buildFlowAnalytics, invalidateFlowAnalyticsCache } from "../services/traffic-flow-analytics.js"
import { FlowSourceWindowTooLarge } from "../services/traffic-flow-read-window.js"
import { loadFlowTopology, invalidateFlowCatalogCache } from "../services/traffic-flow-topology.js"
import { resetFlowRingsForTests as clearPendingFlows } from "../services/traffic-flow-ingest.js"
import { disableRipeEnqueueForTests, resetRipeCacheForTests } from "../services/traffic-flow-ripe.js"
@@ -53,7 +54,7 @@ export async function verifyMcpFlowAnalytics(actor: AuthUser) {
await pool.query("DELETE FROM flow_buckets WHERE server_id=110 AND in_iface='analytics-duplicate-in'")
await assert.rejects(read({userId:users[1]})); await assert.rejects(read({userId:users[2]}))
await assert.rejects(read({serverId:111})); await assert.rejects(read({minutes:1441})); await assert.rejects(read({interface:"__all__"})); await assert.rejects(read({skipHeavy:true}))
await assert.rejects(buildFlowAnalytics({serverId:110,minutes:5},{serverIds:[110],maxRows:1,authorize:async()=>{}}),/предел/)
await assert.rejects(buildFlowAnalytics({serverId:110,minutes:5},{serverIds:[110],maxRows:1,authorize:async()=>{}}),FlowSourceWindowTooLarge)
const cancelled = new AbortController(); cancelled.abort(); await assert.rejects(invokeMcpTool(principal,"mm_netflow_analytics_report_get",{serverId:110},cancelled.signal))
const duringQuery = (match: string, action: () => Promise<unknown>) =>
duringFlowSourceQuery(pool, match, action, () => assert.rejects(read()))
+2 -1
View File
@@ -10,6 +10,7 @@ import { ensurePartitionFor } from "../db/partitions.js"
import { createMcpConnection, authenticateMcpToken, setConnectionStatus } from "../modules/mcp/store.js"
import { invokeMcpTool } from "../modules/mcp/runtime.js"
import { buildFlowMapHops, invalidateFlowMapHopsCache } from "../services/traffic-flow-map-hops.js"
import { FlowSourceWindowTooLarge } from "../services/traffic-flow-read-window.js"
import { invalidateFlowCatalogCache } from "../services/traffic-flow-topology.js"
import { resetFlowRingsForTests, ingestParsedFlowsForServerForTests } from "../services/traffic-flow-ingest.js"
import { disableRipeEnqueueForTests, resetRipeCacheForTests } from "../services/traffic-flow-ripe.js"
@@ -57,7 +58,7 @@ export async function verifyMcpFlowMap(actor: AuthUser) {
ingestParsedFlowsForServerForTests(113,[{src:"198.18.240.6",dst:"8.8.4.4",proto:6,srcPort:1,dstPort:443,bytes:999,packets:1,inIface:"NEVER_MAP_PENDING",outIface:""}])
assert.equal((await read()).map.totalBytes,600)
for (const input of [{userId:users[2]},{userId:users[3]},{serverId:113},{minutes:1441},{interface:"__all__"},{minSharePct:0},{nestedLimit:51}]) await assert.rejects(read(input))
await assert.rejects(buildFlowMapHops({serverId:112,minutes:5},{serverIds:[112],maxRows:1,authorize:async()=>{}}),/предел/)
await assert.rejects(buildFlowMapHops({serverId:112,minutes:5},{serverIds:[112],maxRows:1,authorize:async()=>{}}),FlowSourceWindowTooLarge)
const cancelled=new AbortController();cancelled.abort();await assert.rejects(invokeMcpTool(principal,"mm_netflow_map_hops_get",{serverId:112},cancelled.signal))
const duringQuery = (match: string, action: () => Promise<unknown>) =>
duringFlowSourceQuery(pool, match, action, () => assert.rejects(read()))