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

Added argSelector ingredient type and reversed rotors in Enigma and Bombe operations.

Browse source
This commit is contained in:
n1474335 2019-02-28 15:27:35 +00:00 • committed by s2224834
parent 4db6199fd9
commit c005c86c27
7 changed files with 344 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/core/operations/Bombe.mjs
View file

@ -30,28 +30,42 @@ class Bombe extends Operation {
this.presentType = "html";
this.args = [
{
name: "1st (right-hand) rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 2
name: "Model",
type: "argSelector",
value: [
{
name: "3-rotor",
off: [1]
},
{
name: "4-rotor",
on: [1]
}
]
},
{
name: "2nd (middle) rotor",
name: "Left-most rotor",
type: "editableOption",
value: ROTORS_FOURTH,
defaultIndex: 0
},
{
name: "Left-hand rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 0
},
{
name: "Middle rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 1
},
{
name: "3rd (left-hand) rotor",
name: "Right-hand rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 0
},
{
name: "4th (left-most, only some models) rotor",
type: "editableOption",
value: ROTORS_FOURTH,
defaultIndex: 0
defaultIndex: 2
},
{
name: "Reflector",
@ -93,23 +107,26 @@ class Bombe extends Operation {
* @returns {string}
*/
run(input, args) {
const reflectorstr = args[4];
let crib = args[5];
const offset = args[6];
const check = args[7];
const model = args[0];
const reflectorstr = args[5];
let crib = args[6];
const offset = args[7];
const check = args[8];
const rotors = [];
for (let i=0; i<4; i++) {
if (i === 3 && args[i] === "") {
if (i === 0 && model === "3-rotor") {
// No fourth rotor
break;
continue;
}
let rstr = args[i];
let rstr = args[i + 1];
// The Bombe doesn't take stepping into account so we'll just ignore it here
if (rstr.includes("<")) {
rstr = rstr.split("<", 2)[0];
}
rotors.push(rstr);
}
// Rotors are handled in reverse
rotors.reverse();
if (crib.length === 0) {
throw new OperationError("Crib cannot be empty");
}

135
src/core/operations/Enigma.mjs
View file

@ -28,67 +28,81 @@ class Enigma extends Operation {
this.outputType = "string";
this.args = [
{
name: "1st (right-hand) rotor",
name: "Model",
type: "argSelector",
value: [
{
name: "3-rotor",
off: [1, 2, 3]
},
{
name: "4-rotor",
on: [1, 2, 3]
}
]
},
{
name: "Left-most rotor",
type: "editableOption",
value: ROTORS_FOURTH,
defaultIndex: 0
},
{
name: "Left-most rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "Left-most rotor initial value",
type: "option",
value: LETTERS
},
{
name: "Left-hand rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 0
},
{
name: "Left-hand rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "Left-hand rotor initial value",
type: "option",
value: LETTERS
},
{
name: "Middle rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 1
},
{
name: "Middle rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "Middle rotor initial value",
type: "option",
value: LETTERS
},
{
name: "Right-hand rotor",
type: "editableOption",
value: ROTORS,
// Default config is the rotors I-III *left to right*
defaultIndex: 2
},
{
name: "1st rotor ring setting",
name: "Right-hand rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "1st rotor initial value",
type: "option",
value: LETTERS
},
{
name: "2nd (middle) rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 1
},
{
name: "2nd rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "2nd rotor initial value",
type: "option",
value: LETTERS
},
{
name: "3rd (left-hand) rotor",
type: "editableOption",
value: ROTORS,
defaultIndex: 0
},
{
name: "3rd rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "3rd rotor initial value",
type: "option",
value: LETTERS
},
{
name: "4th (left-most, only some models) rotor",
type: "editableOption",
value: ROTORS_FOURTH,
defaultIndex: 0
},
{
name: "4th rotor ring setting",
type: "option",
value: LETTERS
},
{
name: "4th rotor initial value",
name: "Right-hand rotor initial value",
type: "option",
value: LETTERS
},
@ -135,18 +149,21 @@ class Enigma extends Operation {
* @returns {string}
*/
run(input, args) {
const reflectorstr = args[12];
const plugboardstr = args[13];
const removeOther = args[14];
const model = args[0];
const reflectorstr = args[13];
const plugboardstr = args[14];
const removeOther = args[15];
const rotors = [];
for (let i=0; i<4; i++) {
if (i === 3 && args[i*3] === "") {
// No fourth rotor
break;
if (i === 0 && model === "3-rotor") {
// Skip the 4th rotor settings
continue;
}
const [rotorwiring, rotorsteps] = this.parseRotorStr(args[i*3], 1);
rotors.push(new Rotor(rotorwiring, rotorsteps, args[i*3 + 1], args[i*3 + 2]));
const [rotorwiring, rotorsteps] = this.parseRotorStr(args[i*3 + 1], 1);
rotors.push(new Rotor(rotorwiring, rotorsteps, args[i*3 + 2], args[i*3 + 3]));
}
// Rotors are handled in reverse
rotors.reverse();
const reflector = new Reflector(reflectorstr);
const plugboard = new Plugboard(plugboardstr);
if (removeOther) {