From 3554b5984fb91d1090d98e2db1f4e6b1b07ea8a9 Mon Sep 17 00:00:00 2001 From: May P Date: Mon, 23 Mar 2026 17:08:07 +0200 Subject: [PATCH] it is not removing the damn rule, added logging rq --- routes/webhook.js | 4 +++- services/natQueue.js | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/routes/webhook.js b/routes/webhook.js index a402bb3..4fd7994 100644 --- a/routes/webhook.js +++ b/routes/webhook.js @@ -12,7 +12,9 @@ router.post('/', (req, res) => { const body = req.body || {}; const event = body.event || ''; const data = body || {}; - info(`Webhook: ${event}\n${JSON.stringify(body)}`); + info(`Webhook: ${event}\nbody: ${JSON.stringify(body)}`); + info('headers: ' + JSON.stringify(req.headers)) + return; try { if (event === 'created: Allocation') { enqueueNatAdd(data.ip, data.port); diff --git a/services/natQueue.js b/services/natQueue.js index 102e870..241a6ea 100644 --- a/services/natQueue.js +++ b/services/natQueue.js @@ -72,17 +72,20 @@ export function enqueueNatRemove(ip, port, proto = 'tcp/udp') { current: 1, rowCount: 1000, searchPhrase: `pelican-${ip}-${port}`, - }) + }); const rows = result?.rows || []; for (const rule of rows) { + info(rule.descr); if (rule.descr === `pelican-${ip}-${port}`) { + info(JSON.stringify(rule)); await opnsenseRequest('POST', `/api/firewall/d_nat/delRule/${rule.uuid}`); + success(`deleted rule udp+tcp at ${ip}:${port}`); } } await applyRules(); - success(`deleted rule udp+tcp at ${ip}:${port}`); + success('Successfully applied rules'); }); } \ No newline at end of file