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

add Merge (without Fork). Add flowcontrol setter to Operation

Browse source
This commit is contained in:
d98762625 2018-05-18 12:38:37 +01:00
parent 72d943aca2
commit bca73b496f
5 changed files with 353 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/index.mjs
View file

@ -38,7 +38,7 @@ import "./tests/operations/Checksum";
// import "./tests/operations/Compress";
// import "./tests/operations/Crypt";
// import "./tests/operations/DateTime";
// import "./tests/operations/FlowControl";
import "./tests/operations/FlowControl";
import "./tests/operations/Hash";
import "./tests/operations/Hexdump";
// import "./tests/operations/Image";

592
test/tests/operations/FlowControl.mjs
View file

@ -28,287 +28,287 @@ const ALL_BYTES = [
].join("");
TestRegister.addTests([
{
name: "Fork: nothing",
input: "",
expectedOutput: "",
recipeConfig: [
{
op: "Fork",
args: ["\n", "\n", false],
},
],
},
{
name: "Fork, Merge: nothing",
input: "",
expectedOutput: "",
recipeConfig: [
{
op: "Fork",
args: ["\n", "\n", false],
},
{
op: "Merge",
args: [],
},
],
},
{
name: "Fork, (expect) Error, Merge",
input: "1.1\n2.5\na\n3.4",
expectedError: true,
recipeConfig: [
{
op: "Fork",
args: ["\n", "\n", false],
},
{
op: "Object Identifier to Hex",
args: [],
},
{
op: "Merge",
args: [],
},
],
},
{
name: "Fork, Conditional Jump, Encodings",
input: "Some data with a 1 in it\nSome data with a 2 in it",
expectedOutput: "U29tZSBkYXRhIHdpdGggYSAxIGluIGl0\n53 6f 6d 65 20 64 61 74 61 20 77 69 74 68 20 61 20 32 20 69 6e 20 69 74\n",
recipeConfig: [
{"op": "Fork", "args": ["\\n", "\\n", false]},
{"op": "Conditional Jump", "args": ["1", false, "skipReturn", "10"]},
{"op": "To Hex", "args": ["Space"]},
{"op": "Return", "args": []},
{"op": "Label", "args": ["skipReturn"]},
{"op": "To Base64", "args": ["A-Za-z0-9+/="]}
]
},
{
name: "Jump: Empty Label",
input: [
"should be changed",
].join("\n"),
expectedOutput: [
"should be changed was changed",
].join("\n"),
recipeConfig: [
{
op: "Jump",
args: ["", 10],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "should be changed"
},
"should be changed was changed",
true,
true,
true,
],
},
],
},
{
name: "Jump: skips 1",
input: [
"shouldnt be changed",
].join("\n"),
expectedOutput: [
"shouldnt be changed",
].join("\n"),
recipeConfig: [
{
op: "Jump",
args: ["skipReplace", 10],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "shouldnt be changed"
},
"shouldnt be changed was changed",
true,
true,
true,
],
},
{
op: "Label",
args: ["skipReplace"]
},
],
},
{
name: "Conditional Jump: Skips 0",
input: [
"match",
"should be changed 1",
"should be changed 2",
].join("\n"),
expectedOutput: [
"match",
"should be changed 1 was changed",
"should be changed 2 was changed"
].join("\n"),
recipeConfig: [
{
op: "Conditional Jump",
args: ["match", false, "", 0],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "should be changed 1"
},
"should be changed 1 was changed",
true,
true,
true,
],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "should be changed 2"
},
"should be changed 2 was changed",
true,
true,
true,
],
},
],
},
{
name: "Comment: nothing",
input: "",
expectedOutput: "",
recipeConfig: [
{
"op": "Comment",
"args": [""]
}
]
},
{
name: "Fork, Comment, Base64",
input: "cat\nsat\nmat",
expectedOutput: "Y2F0\nc2F0\nbWF0\n",
recipeConfig: [
{
"op": "Fork",
"args": ["\\n", "\\n", false]
},
{
"op": "Comment",
"args": ["Testing 123"]
},
{
"op": "To Base64",
"args": ["A-Za-z0-9+/="]
}
]
},
{
name: "Conditional Jump: Skips 1",
input: [
"match",
"should not be changed",
"should be changed",
].join("\n"),
expectedOutput: [
"match",
"should not be changed",
"should be changed was changed"
].join("\n"),
recipeConfig: [
{
op: "Conditional Jump",
args: ["match", false, "skip match", 10],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "should not be changed"
},
"should not be changed was changed",
true,
true,
true,
],
},
{
op: "Label", args: ["skip match"],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "should be changed"
},
"should be changed was changed",
true,
true,
true,
],
},
],
},
{
name: "Conditional Jump: Skips backwards",
input: [
"match",
].join("\n"),
expectedOutput: [
"replaced",
].join("\n"),
recipeConfig: [
{
op: "Label",
args: ["back to the beginning"],
},
{
op: "Jump",
args: ["skip replace"],
},
{
op: "Find / Replace",
args: [
{
"option": "Regex",
"string": "match"
},
"replaced",
true,
true,
true,
],
},
{
op: "Label",
args: ["skip replace"],
},
{
op: "Conditional Jump",
args: ["match", false, "back to the beginning", 10],
},
],
},
// {
// name: "Fork: nothing",
// input: "",
// expectedOutput: "",
// recipeConfig: [
// {
// op: "Fork",
// args: ["\n", "\n", false],
// },
// ],
// },
// {
// name: "Fork, Merge: nothing",
// input: "",
// expectedOutput: "",
// recipeConfig: [
// {
// op: "Fork",
// args: ["\n", "\n", false],
// },
// {
// op: "Merge",
// args: [],
// },
// ],
// },
// {
// name: "Fork, (expect) Error, Merge",
// input: "1.1\n2.5\na\n3.4",
// expectedError: true,
// recipeConfig: [
// {
// op: "Fork",
// args: ["\n", "\n", false],
// },
// {
// op: "Object Identifier to Hex",
// args: [],
// },
// {
// op: "Merge",
// args: [],
// },
// ],
// },
// {
// name: "Fork, Conditional Jump, Encodings",
// input: "Some data with a 1 in it\nSome data with a 2 in it",
// expectedOutput: "U29tZSBkYXRhIHdpdGggYSAxIGluIGl0\n53 6f 6d 65 20 64 61 74 61 20 77 69 74 68 20 61 20 32 20 69 6e 20 69 74\n",
// recipeConfig: [
// {"op": "Fork", "args": ["\\n", "\\n", false]},
// {"op": "Conditional Jump", "args": ["1", false, "skipReturn", "10"]},
// {"op": "To Hex", "args": ["Space"]},
// {"op": "Return", "args": []},
// {"op": "Label", "args": ["skipReturn"]},
// {"op": "To Base64", "args": ["A-Za-z0-9+/="]}
// ]
// },
// {
// name: "Jump: Empty Label",
// input: [
// "should be changed",
// ].join("\n"),
// expectedOutput: [
// "should be changed was changed",
// ].join("\n"),
// recipeConfig: [
// {
// op: "Jump",
// args: ["", 10],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "should be changed"
// },
// "should be changed was changed",
// true,
// true,
// true,
// ],
// },
// ],
// },
// {
// name: "Jump: skips 1",
// input: [
// "shouldnt be changed",
// ].join("\n"),
// expectedOutput: [
// "shouldnt be changed",
// ].join("\n"),
// recipeConfig: [
// {
// op: "Jump",
// args: ["skipReplace", 10],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "shouldnt be changed"
// },
// "shouldnt be changed was changed",
// true,
// true,
// true,
// ],
// },
// {
// op: "Label",
// args: ["skipReplace"]
// },
// ],
// },
// {
// name: "Conditional Jump: Skips 0",
// input: [
// "match",
// "should be changed 1",
// "should be changed 2",
// ].join("\n"),
// expectedOutput: [
// "match",
// "should be changed 1 was changed",
// "should be changed 2 was changed"
// ].join("\n"),
// recipeConfig: [
// {
// op: "Conditional Jump",
// args: ["match", false, "", 0],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "should be changed 1"
// },
// "should be changed 1 was changed",
// true,
// true,
// true,
// ],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "should be changed 2"
// },
// "should be changed 2 was changed",
// true,
// true,
// true,
// ],
// },
// ],
// },
// {
// name: "Comment: nothing",
// input: "",
// expectedOutput: "",
// recipeConfig: [
// {
// "op": "Comment",
// "args": [""]
// }
// ]
// },
// {
// name: "Fork, Comment, Base64",
// input: "cat\nsat\nmat",
// expectedOutput: "Y2F0\nc2F0\nbWF0\n",
// recipeConfig: [
// {
// "op": "Fork",
// "args": ["\\n", "\\n", false]
// },
// {
// "op": "Comment",
// "args": ["Testing 123"]
// },
// {
// "op": "To Base64",
// "args": ["A-Za-z0-9+/="]
// }
// ]
// },
// {
// name: "Conditional Jump: Skips 1",
// input: [
// "match",
// "should not be changed",
// "should be changed",
// ].join("\n"),
// expectedOutput: [
// "match",
// "should not be changed",
// "should be changed was changed"
// ].join("\n"),
// recipeConfig: [
// {
// op: "Conditional Jump",
// args: ["match", false, "skip match", 10],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "should not be changed"
// },
// "should not be changed was changed",
// true,
// true,
// true,
// ],
// },
// {
// op: "Label", args: ["skip match"],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "should be changed"
// },
// "should be changed was changed",
// true,
// true,
// true,
// ],
// },
// ],
// },
// {
// name: "Conditional Jump: Skips backwards",
// input: [
// "match",
// ].join("\n"),
// expectedOutput: [
// "replaced",
// ].join("\n"),
// recipeConfig: [
// {
// op: "Label",
// args: ["back to the beginning"],
// },
// {
// op: "Jump",
// args: ["skip replace"],
// },
// {
// op: "Find / Replace",
// args: [
// {
// "option": "Regex",
// "string": "match"
// },
// "replaced",
// true,
// true,
// true,
// ],
// },
// {
// op: "Label",
// args: ["skip replace"],
// },
// {
// op: "Conditional Jump",
// args: ["match", false, "back to the beginning", 10],
// },
// ],
// },
{
name: "Register: RC4 key",
input: "http://malwarez.biz/beacon.php?key=0e932a5c&data=8db7d5ebe38663a54ecbb334e3db11",
@ -373,19 +373,19 @@ TestRegister.addTests([
}
]
},
{
name: "Label, Comment: Complex content",
input: ALL_BYTES,
expectedOutput: ALL_BYTES,
recipeConfig: [
{
op: "Label",
args: [""]
},
{
op: "Comment",
args: [""]
}
]
},
// {
// name: "Label, Comment: Complex content",
// input: ALL_BYTES,
// expectedOutput: ALL_BYTES,
// recipeConfig: [
// {
// op: "Label",
// args: [""]
// },
// {
// op: "Comment",
// args: [""]
// }
// ]
// },
]);