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

Modifications made.

Browse source
This commit is contained in:
n1073645 2020-02-13 16:40:12 +00:00
parent 4247ddb0ce
commit 6373ad0bc3
6 changed files with 13 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/Operation.mjs
View file

@ -25,7 +25,6 @@ class Operation {
this._flowControl = false; this._flowControl = false;
this._manualBake = false; this._manualBake = false;
this._ingList = []; this._ingList = [];
// this._checks = [];
this._inputRegexes = []; this._inputRegexes = [];
this._outputRegexes = []; this._outputRegexes = [];

18
src/core/lib/Magic.mjs
View file

@ -246,19 +246,6 @@ class Magic {
return results; return results;
} }
/**
* Checks the mime value of the data compared to the specified type.
*
* @param {ArrayBuffer} data
* @param {string} type
* @returns {boolean}
*/
async checkMime (data, type) {
if (isType(type, data)) {
return false;
}
return true;
}
/** /**
* Uses the checks to validate the input/output of potential operations. * Uses the checks to validate the input/output of potential operations.
@ -296,7 +283,7 @@ class Magic {
const mime = OperationConfig[op.op].mimeCheck; const mime = OperationConfig[op.op].mimeCheck;
if (mime) if (mime)
if (await this.checkMime(output, mime.type)) if (!isType(output, mime.type))
return; return;
// If the recipe returned an empty buffer, do not continue // If the recipe returned an empty buffer, do not continue
@ -390,7 +377,7 @@ class Magic {
const prevOp = recipeConfig[recipeConfig.length - 1]; const prevOp = recipeConfig[recipeConfig.length - 1];
results = results.concat(await this.regexesTests("Input", matchingOps, prevOp, depth, extLang, intensive, recipeConfig, crib, inputEntropy)); results = results.concat(await this.regexesTests("Input", matchingOps, prevOp, depth, extLang, intensive, recipeConfig, crib, inputEntropy));
results = results.concat(await this.regexesTests("Output", this.opPatterns.getOutputRegexes(), prevOp, depth, extLang, intensive, recipeConfig, crib, inputEntropy)); results = results.concat(await this.regexesTests("Output", this.opPatterns.OutputRegexes, prevOp, depth, extLang, intensive, recipeConfig, crib, inputEntropy));
if (intensive) { if (intensive) {
// Run brute forcing of various types on the data and create a new branch for each option // Run brute forcing of various types on the data and create a new branch for each option
@ -488,7 +475,6 @@ class Magic {
* @returns {number[]} * @returns {number[]}
*/ */
_freqDist(data=this.inputBuffer) { _freqDist(data=this.inputBuffer) {
// if (this.freqDist) return this.freqDist;
const len = data.length; const len = data.length;
let i = len; let i = len;

10
src/core/lib/MagicObject.mjs
View file

@ -1,3 +1,4 @@
import OperationConfig from "../config/OperationConfig.json";
/** /**
* An object used by magic to store the input/output criteria for valid operation results. * An object used by magic to store the input/output criteria for valid operation results.
* *
@ -5,8 +6,6 @@
* @copyright Crown Copyright 2020 * @copyright Crown Copyright 2020
* @license Apache-2.0 * @license Apache-2.0
*/ */
import OperationConfig from "../config/OperationConfig.json";
class potentialOps { class potentialOps {
/** /**
@ -19,8 +18,8 @@ class potentialOps {
this.inputRegexes = this.generateInputOpPatterns(); this.inputRegexes = this.generateInputOpPatterns();
this.outputRegexes = this.generateOutputOpPatterns(); this.outputRegexes = this.generateOutputOpPatterns();
} else { } else {
this.inputRegexes = prevOp.getInputRegexes(); this.inputRegexes = prevOp.InputRegexes;
this.outputRegexes = prevOp.getOutputRegexes(); this.outputRegexes = prevOp.OutputRegexes;
} }
} }
@ -131,4 +130,5 @@ class potentialOps {
return opPatterns; return opPatterns;
} }
} export default potentialOps; }
export default potentialOps;

22
src/core/operations/ChangeIPFormat.mjs
View file

@ -37,28 +37,6 @@ class ChangeIPFormat extends Operation {
"value": ["Dotted Decimal", "Decimal", "Octal", "Hex"] "value": ["Dotted Decimal", "Decimal", "Octal", "Hex"]
} }
]; ];
this.checks =
{
inRegexes: [
{
match: "^\\s*([0-9]{1,3}\\.){3}[0-9]{1,3}$",
flags: "",
magic: false,
args: ["Dotted Decimal", "Decimal"]
},
{
match: "^\\s*([0-9]{1,3}\\.){3}[0-9]{1,3}$",
flags: "",
magic: false,
args: ["Dotted Decimal", "Octal"]
},
{
match: "^\\s*([0-9]{1,3}\\.){3}[0-9]{1,3}$",
flags: "",
magic: false,
args: ["Dotted Decimal", "Hex"]
}]
};
} }
/** /**

10
src/core/operations/FormatMACAddresses.mjs
View file

@ -55,16 +55,6 @@ class FormatMACAddresses extends Operation {
"value": false "value": false
} }
]; ];
this.checks =
{
inRegexes: [
{
match: "^\\s*([0-9a-f]{2}:){5}[0-9a-f]{2}$",
flags: "i",
magic: false,
args: ["Both", true, true, true, true, true]
}]
};
} }
/** /**