From a2ce9853b3752d1e5372d5f02a51322d6589ff2a Mon Sep 17 00:00:00 2001 From: n1073645 Date: Tue, 3 Dec 2019 12:20:59 +0000 Subject: [PATCH] Magic now understands an output regex --- src/core/lib/Magic.mjs | 4 ++-- src/core/operations/DefangIPAddresses.mjs | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/core/lib/Magic.mjs b/src/core/lib/Magic.mjs index 7c8f579d..52413c93 100644 --- a/src/core/lib/Magic.mjs +++ b/src/core/lib/Magic.mjs @@ -280,10 +280,10 @@ class Magic { break; case "Output": if(!(new RegExp(op.match, op.flags).test(Utils.arrayBufferToStr(output)))){ - if (shouldMatch) + if (op.shouldMatch) return; } else { - if (!shouldMatch) + if (!op.shouldMatch) return; } break; diff --git a/src/core/operations/DefangIPAddresses.mjs b/src/core/operations/DefangIPAddresses.mjs index 55485a6c..a55d21f8 100644 --- a/src/core/operations/DefangIPAddresses.mjs +++ b/src/core/operations/DefangIPAddresses.mjs @@ -32,7 +32,16 @@ class DefangIPAddresses extends Operation { flags: "i", args: [], } - ]); + ], + [ + { + match: "^\\s*(([0-9]{1,3}\\[\\.\\]){3}[0-9]{1,3}|([0-9a-f]{4}\\[\\:\\]){7}[0-9a-f]{4})\\s*$", + flags: "i", + shouldMatch: true, + args: [] + } + ] + ); } /**