fix(ipsec): совместимость инициализации и клиентов IPsec с RouterOS 7.24

Проверено пробами на стенде RouterOS 7.24.5: /certificate не принимает comment, sign и export-certificate адресуются только по .id и не принимают name и days-valid, подпись меняет authority и digest-algorithm, peer с address 0.0.0.0/0 возвращается без address, id файлов имеют вид **<base62>. Сертификаты продукта опознаются по имени и цепочке подписи, версии операций повышены (init 5, user_create 3, экспорт 2). Стабы приёмки отказывают как RouterOS 7.24. Генеральная репетиция на CHR: init 13 и PSK-клиент 2 команды сошлись с проекцией продукта, туннель, ping 10/10, рост SA, сверка 66/66.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
DenozordecandClaude Opus 5.5 committed 2026-11-21 12:04:15 +07:00
1 parent a237813ff5
commit e7eb108c32
22 files changed
+125 -77

No files matched your search

@@ -41,7 +41,7 @@ try {
const [id, tool, , section, permission, effect, scope, schema, handlers] = calls[0]
assert.equal(id, operation); assert.equal(tool, "mm_ipsec_existing_certificate_export_plan")
assert.equal(section, "network"); assert.equal(permission, "mm:network:write"); assert.equal(effect, "write"); assert.equal(scope, "servers")
assert.equal(handlers.prepare, adapter.prepare); assert.equal(handlers.version, 1)
assert.equal(handlers.prepare, adapter.prepare); assert.equal(handlers.version, 2)
assert.equal(schema.safeParse({ serverId: 1, selector: { kind: "certificate", name: "client" }, privateKeyExport: true, passphrase: { kind: "generate" } }).success, true)
assert.equal(schema.safeParse({ serverId: 1, selector: { kind: "certificate", name: "client" }, privateKeyExport: true, passphrase: "NEVER_RAW" }).success, false)
assert.equal(findMcpService(operation), productionService)
@@ -8,7 +8,7 @@ import { registerMcpService } from "./service-registry.js"
* registration runs on import. JSON/tool requests cannot install an adapter. */
export function installIpsecExistingCertificateExportAdapter(register: typeof add, service: typeof registerMcpService, adapter: ReturnType<typeof createIpsecExistingCertificateExportAdapter>) {
service(IPSEC_EXISTING_CERTIFICATE_EXPORT_OPERATION, adapter.service)
register(IPSEC_EXISTING_CERTIFICATE_EXPORT_OPERATION, "mm_ipsec_existing_certificate_export_plan", "Экспорт существующего сертификата IPsec с явным приватным/CA-допуском и выдачей файла только владельцу", "network", "mm:network:write", "write", "servers", ipsecExistingCertificateExportActionSchema, { version: 1, prepare: adapter.prepare })
register(IPSEC_EXISTING_CERTIFICATE_EXPORT_OPERATION, "mm_ipsec_existing_certificate_export_plan", "Экспорт существующего сертификата IPsec с явным приватным/CA-допуском и выдачей файла только владельцу", "network", "mm:network:write", "write", "servers", ipsecExistingCertificateExportActionSchema, { version: 2, prepare: adapter.prepare })
}
export function registerIpsecExistingCertificateExportActions(register: typeof add): boolean {
@@ -52,15 +52,20 @@ export async function acceptIpsecServerInit(actor: AuthUser) {
let raw = ""; for await (const chunk of req) raw += chunk
const fields = raw ? JSON.parse(raw) as Row : {}
commands.push({ method: req.method!, path, fields })
// RouterOS 7.24 (stand probe 2026-11-21): no `comment` on /certificate; sign and export by `.id` only, no `name`/`days-valid`.
const refusal = req.method === "PUT" && path === "/certificate" && "comment" in fields ? "unknown parameter comment"
: path === "/certificate/sign" && ("days-valid" in fields || "name" in fields) ? ("days-valid" in fields ? "unknown parameter days-valid" : "missing =.id=")
: path === "/certificate/export-certificate" && "name" in fields ? "unknown parameter name" : undefined
if (refusal) { res.statusCode = 400; res.end(JSON.stringify({ error: 400, message: "Bad Request", detail: refusal })); return }
let result: Row = {}
if (mode !== "ignored") {
if (path === "/certificate/sign") {
const row = catalogs["/certificate"].find(row => row.name === fields.name); assert(row)
Object.assign(row, { ...(fields.ca ? { ca: fields.ca } : {}), fingerprint: "synthetic-fingerprint", "invalid-before": "2026-01-01", "invalid-after": "2030-01-01", "private-key": "true", "serial-number": "synthetic" })
const row = catalogs["/certificate"].find(row => row[".id"] === fields[".id"]); assert(row)
Object.assign(row, { ...(fields.ca ? { ca: fields.ca } : { authority: "true" }), "digest-algorithm": "sha256", fingerprint: "synthetic-fingerprint", "invalid-before": "2026-01-01", "invalid-after": "2030-01-01", "private-key": "true", "serial-number": "synthetic" })
} else {
const catalog = Object.hasOwn(catalogs, path) ? path : Object.keys(catalogs).sort((a, b) => b.length - a.length).find(value => path.startsWith(value + "/")); assert(catalog)
if (req.method === "PUT") { result = { ".id": `*new${++serial}`, ...fields, "native-default": "NEVER_NATIVE_DEFAULT" }; catalogs[catalog].push(result) }
else if (req.method === "PATCH") { const row = catalogs[catalog].find(row => row[".id"] === path.slice(catalog.length + 1)); assert(row); Object.assign(row, fields) }
if (req.method === "PUT") { result = { ".id": `*new${++serial}`, ...fields, "native-default": "NEVER_NATIVE_DEFAULT" }; if (catalog === "/ip/ipsec/peer" && result.address === "0.0.0.0/0") delete result.address; catalogs[catalog].push(result) }
else if (req.method === "PATCH") { const row = catalogs[catalog].find(row => row[".id"] === path.slice(catalog.length + 1)); assert(row); Object.assign(row, fields); if (catalog === "/ip/ipsec/peer" && row.address === "0.0.0.0/0") delete row.address }
else throw Error("unexpected mutation")
}
}
@@ -105,5 +105,5 @@ export function createIpsecServerInitAdapter(overrides: Partial<typeof productio
export function registerIpsecServerInitActions(register: typeof add) {
const adapter = createIpsecServerInitAdapter()
registerMcpService(operation, adapter.service)
register(operation, "mm_ipsec_server_init_plan", "Инициализировать сервер IKEv2 с полным preflight и проверкой каждой native-команды", "network", "mm:network:write", "write", "servers", ipsecServerInitActionSchema, { version: 4, prepare: adapter.prepare })
register(operation, "mm_ipsec_server_init_plan", "Инициализировать сервер IKEv2 с полным preflight и проверкой каждой native-команды", "network", "mm:network:write", "write", "servers", ipsecServerInitActionSchema, { version: 5, prepare: adapter.prepare })
}
@@ -44,12 +44,17 @@ export async function acceptIpsecUserCreate(actor: AuthUser) {
const fields = raw ? JSON.parse(raw) as Row : {}
if (path === "/file/get" || path === "/file/print") { res.end(JSON.stringify({ ret: fakeP12 })); return }
commands.push({ method: req.method!, path, fields })
// RouterOS 7.24 (stand probe 2026-11-21): no `comment` on /certificate; sign and export by `.id` only, no `name`/`days-valid`.
const refusal = req.method === "PUT" && path === "/certificate" && "comment" in fields ? "unknown parameter comment"
: path === "/certificate/sign" && ("days-valid" in fields || "name" in fields) ? ("days-valid" in fields ? "unknown parameter days-valid" : "missing =.id=")
: path === "/certificate/export-certificate" && "name" in fields ? "unknown parameter name" : undefined
if (refusal) { res.statusCode = 400; res.end(JSON.stringify({ error: 400, message: "Bad Request", detail: refusal })); return }
let result: Row = {}
if (mode !== "ignored") {
if (path === "/certificate/sign") {
const row = catalogs["/certificate"].find(row => row.name === fields.name); assert(row)
Object.assign(row, { ca: fields.ca, fingerprint: "synthetic-fingerprint", "invalid-before": "2026-01-01", "invalid-after": "2030-01-01", "private-key": "true", "serial-number": "synthetic" })
} else if (path === "/certificate/export-certificate") catalogs["/file"].push({ ".id": `*new${++serial}`, name: `${fields["file-name"]}.p12`, size: String(Buffer.byteLength(fakeP12)), type: "file" })
const row = catalogs["/certificate"].find(row => row[".id"] === fields[".id"]); assert(row)
Object.assign(row, { ca: fields.ca, "digest-algorithm": "sha256", fingerprint: "synthetic-fingerprint", "invalid-before": "2026-01-01", "invalid-after": "2030-01-01", "private-key": "true", "serial-number": "synthetic" })
} else if (path === "/certificate/export-certificate") assert(catalogs["/certificate"].some(row => row[".id"] === fields[".id"])), catalogs["/file"].push({ ".id": `*new${++serial}`, name: `${fields["file-name"]}.p12`, size: String(Buffer.byteLength(fakeP12)), type: "file" })
else {
const catalog = Object.keys(catalogs).find(value => path === value || path.startsWith(value + "/")); assert(catalog)
if (req.method === "PUT") { result = { ".id": `*new${++serial}`, ...fields, "native-default": "NEVER_NATIVE_DEFAULT" }; catalogs[catalog].push(result) }
@@ -148,5 +148,5 @@ export function createIpsecUserCreateAdapter(overrides: Partial<typeof productio
export function registerIpsecUserCreateActions(register: typeof add) {
const adapter = createIpsecUserCreateAdapter()
registerMcpService(operation, adapter.service)
register(operation, "mm_ipsec_user_create_plan", "Создать клиента IPsec с проверкой всех native-команд, явным приватным экспортом и managed-only историей", "network", "mm:network:write", "write", "servers", ipsecUserCreateActionSchema, { version: 2, prepare: adapter.prepare })
register(operation, "mm_ipsec_user_create_plan", "Создать клиента IPsec с проверкой всех native-команд, явным приватным экспортом и managed-only историей", "network", "mm:network:write", "write", "servers", ipsecUserCreateActionSchema, { version: 3, prepare: adapter.prepare })
}
@@ -10,8 +10,10 @@ assert.equal(findMcpOperation(fullFlowSettings.operation.id)?.version, 3)
assert.equal(fullFlowSettings.schema.safeParse({ settings: { collectorIp: "10.255.254.1", enabled: false, mapServiceMinSharePct: 0 } }).success, true)
assert.equal(fullFlowSettings.schema.safeParse({ topN: 10 }).success, false)
assert.equal(findAction("mm_netflow_host_keys_generate_plan").operation.id, "traffic.flow.settings.generate-keys")
assert.equal(findAction("mm_ipsec_user_create_plan").operation.version, 2)
assert.equal(findAction("mm_ipsec_server_init_plan").operation.version, 4)
assert.equal(findAction("mm_ipsec_user_create_plan").operation.version, 3)
assert.equal(findAction("mm_ipsec_server_init_plan").operation.version, 5)
// RouterOS 7.24 certificate bodies (no comment, sign/export by .id): earlier prepared plans need a new approval.
assert.equal(findAction("mm_ipsec_existing_certificate_export_plan").operation.version, 2)
assert.equal(findAction("mm_ipsec_server_remove_plan").operation.version, 2)
assert.equal(findAction("mm_ipsec_revision_restore_plan").operation.version, 1)
assert.equal(findAction("mm_wireguard_revision_restore_plan").operation.id, "config.wireguard.revisions.restore")