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

Multiple Register operations can now be called in a single recipe

Browse source
This commit is contained in:
n1474335 2017-09-28 18:39:35 +00:00
parent e2ac297102
commit 877ab57f0a
6 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/core/FlowControl.js
View file

@ -116,7 +116,7 @@ const FlowControl = {
if (!registers) return state;
if (ENVIRONMENT_IS_WORKER()) {
self.setRegisters(state.progress, registers.slice(1));
self.setRegisters(state.progress, state.numRegisters, registers.slice(1));
}
/**
@ -127,31 +127,34 @@ const FlowControl = {
*/
function replaceRegister(str) {
// Replace references to registers ($Rn) with contents of registers
str = str.replace(/((?:^|[^\\])(?:\\.|[^\\])*?)\$R(\d{1,2})/g, (match, pre, regNum) => {
str = str ? str.replace(/((?:^|[^\\])(?:\\.|[^\\])*?)\$R(\d{1,2})/g, (match, pre, regNum) => {
const index = parseInt(regNum, 10) + 1;
return (index >= registers.length) ? match : pre + registers[index];
});
return (index <= state.numRegisters || index >= state.numRegisters + registers.length) ?
match : pre + registers[index - state.numRegisters];
}) : str;
// Unescape remaining register references
return str.replace(/\\\$R(\d{1,2})/, "$R$1");
return str ? str.replace(/\\\$R(\d{1,2})/, "$R$1") : str;
}
// Step through all subsequent ops and replace registers in args with extracted content
for (let i = state.progress + 1; i < state.opList.length; i++) {
if (state.opList[i].isDisabled()) continue;
let args = state.opList[i].getIngValues();
args = args.map(arg => {
if (typeof arg !== "string" && typeof arg !== "object") return arg;
if (typeof arg === "object" && arg.string) {
if (typeof arg === "object" && arg.hasOwnProperty("string")) {
arg.string = replaceRegister(arg.string);
return arg;
}
return replaceRegister(arg);
});
state.opList[i].setIngValues(args);
}
state.numRegisters += registers.length - 1;
return state;
},