mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 14:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ESM: Tidied up recently added operations

Browse source
This commit is contained in:
n1474335 2018-05-28 15:42:43 -07:00
parent 6a561185df
commit 3f3a3e0016
12 changed files with 2082 additions and 2069 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core/operations/RegularExpression.mjs
View file

@ -7,6 +7,7 @@
import XRegExp from "xregexp";
import Operation from "../Operation";
import Utils from "../Utils";
import OperationError from "../errors/OperationError";
/**
* Regular expression operation
@ -133,14 +134,12 @@ class RegularExpression extends Operation {
* @returns {html}
*/
run(input, args) {
const userRegex = args[1],
i = args[2],
m = args[3],
s = args[4],
u = args[5],
a = args[6],
displayTotal = args[7],
outputFormat = args[8];
const [,
userRegex,
i, m, s, u, a,
displayTotal,
outputFormat
] = args;
let modifiers = "g";
if (i) modifiers += "i";
@ -166,7 +165,7 @@ class RegularExpression extends Operation {
return "Error: Invalid output format";
}
} catch (err) {
return "Invalid regex. Details: " + err.message;
throw new OperationError("Invalid regex. Details: " + err.message);
}
} else {
return Utils.escapeHtml(input);
@ -175,8 +174,6 @@ class RegularExpression extends Operation {
}
export default RegularExpression;
/**
* Creates a string listing the matches within a string.
*
@ -261,3 +258,5 @@ function regexHighlight (input, regex, displayTotal) {
return output;
}
export default RegularExpression;