Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-09-28 14:31:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regexes are now checked for 0-length matches and incremented manually to avoid infinite loops

Browse Source
This commit is contained in:
n1474335 2018-01-10 19:44:25 +00:00
parent 56551712d6
commit ec02b7deda
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/config/OperationConfig.js
View File

@ -2061,7 +2061,6 @@ const OperationConfig = {
"Find / Replace": {
module: "Regex",
description: "Replaces all occurrences of the first string with the second.<br><br> Includes support for regular expressions (regex), simple strings and extended strings (which support \\n, \\r, \\t, \\b, \\f and escaped hex bytes using \\x notation, e.g. \\x00 for a null byte).",
manualBake: true,
inputType: "string",
outputType: "string",
args: [
@ -2139,7 +2138,6 @@ const OperationConfig = {
"Filter": {
module: "Default",
description: "Splits up the input using the specified delimiter and then filters each branch based on a regular expression.",
manualBake: true,
inputType: "string",
outputType: "string",
args: [
@ -2302,7 +2300,6 @@ const OperationConfig = {
"Regular expression": {
module: "Regex",
description: "Define your own regular expression (regex) to search the input data with, optionally choosing from a list of pre-defined patterns.",
manualBake: true,
inputType: "string",
outputType: "html",
args: [

5
src/core/operations/Extract.js
View File

@ -29,6 +29,11 @@ const Extract = {
match;
while ((match = searchRegex.exec(input))) {
// Moves pointer when an empty string is matched (prevents infinite loop)
if (match.index === searchRegex.lastIndex) {
searchRegex.lastIndex++;
}
if (removeRegex && removeRegex.test(match[0]))
continue;
total++;

10
src/core/operations/Regex.js
View File

@ -208,6 +208,11 @@ const Regex = {
total = 0;
while ((m = regex.exec(input))) {
// Moves pointer when an empty string is matched (prevents infinite loop)
if (m.index === regex.lastIndex) {
regex.lastIndex++;
}
// Add up to match
output += Utils.escapeHtml(input.slice(i, m.index));
@ -248,6 +253,11 @@ const Regex = {
match;
while ((match = regex.exec(input))) {
// Moves pointer when an empty string is matched (prevents infinite loop)
if (match.index === regex.lastIndex) {
regex.lastIndex++;
}
total++;
if (matches) {
output += match[0] + "\n";