Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 06:01:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes need for runParseEscapedString

Browse Source 
- Fixes examples
- Actually makes it work
This commit is contained in:
Matt C 2017-08-04 15:54:00 +01:00
parent 3186335f47
commit 9161cc693d
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3254,14 +3254,14 @@ const OperationConfig = {
},
"Escape String": {
description: "Escapes a string so that it can be embedded in another. For example, <code>Don't stop me now</code> becomes <code>Don\\'t stop me now</code>.",
run: StrUtils.run_escape,
run: StrUtils.runEscape,
inputType: "string",
outputType: "string",
args: []
},
"Unescape String": {
description: "Unescapes a string that was embedded inside another so that it can be used in it's own right. For example, <code>Don\\'t stop me now</code> becomes <code>Don't stop me now</code>.",
run: StrUtils.run_unescape,
run: StrUtils.runUnescape,
inputType: "string",
outputType: "string",
args: []

40
src/core/operations/StrUtils.js
View File

@ -448,18 +448,6 @@ const StrUtils = {
return outputs.join(sampleDelim);
},
/**
* Parse escaped string operation.
*
* @param {string} input
* @param {Object[]} args
* @returns {string}
*/
runParseEscapedString: function(input, args) {
return Utils.parseEscapedChars(input);
},
/**
* @constant
* @default
@ -475,31 +463,41 @@ const StrUtils = {
/**
* Escapes a string for embedding in another string.
*
* Example: "Don't do that" -> "Don\'t do that"
*
* @author Vel0x [dalemy@microsoft.com]
*
* @param {string} input
* @param {Object[]} args
* @returns {string}
*
* @example
* StrUtils.runUnescape("Don't do that", [])
* > "Don\'t do that"
* StrUtils.runUnescape(`Hello
* World`, [])
* > "Hello\nWorld"
*/
runEscape: function(input, args) {
return StrUtils._replace_by_keys(input, "unescaped", "escaped");
return StrUtils._replaceByKeys(input, "unescaped", "escaped");
},
/**
* Unescapes a string that was part of another string
*
* Example: "Don\'t do that" -> "Don't do that"
*
* @author Vel0x [dalemy@microsoft.com]
*
* @param {string} input
* @param {Object[]} args
* @returns {string}
*
* @example
* StrUtils.runUnescape("Don\'t do that", [])
* > "Don't do that"
* StrUtils.runUnescape("Hello\nWorld", [])
* > `Hello
* World`
*/
runUnescape: function(input, args) {
return StrUtils._replace_by_keys(input, "escaped", "unescaped");
return StrUtils._replaceByKeys(Utils.parseEscapedChars(input), "escaped", "unescaped");
},
/**
@ -515,12 +513,10 @@ const StrUtils = {
* @returns {string}
*/
_replaceByKeys: function(input, patternKey, replacementKey) {
const replacementsLength = StrUtils.ESCAPE_REPLACEMENTS.length;
let output = input;
for (let i = 0; i < replacementsLength; i++) {
const replacement = StrUtils.ESCAPE_REPLACEMENTS[i];
StrUtils.ESCAPE_REPLACEMENTS.forEach(replacement => {
output = output.split(replacement[patternKey]).join(replacement[replacementKey]);
}
});
return output;
},