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

Refactored scanning for file types to be more than twice as fast.

Browse source
This commit is contained in:
n1474335 2019-01-01 15:12:01 +00:00
parent ede75530d0
commit 4c285bce57
3 changed files with 83 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/core/operations/ExtractFiles.mjs
View file

@ -7,7 +7,7 @@
import Operation from "../Operation";
// import OperationError from "../errors/OperationError";
import Utils from "../Utils";
import {detectFileType, extractFile} from "../lib/FileType";
import {scanForFileTypes, extractFile} from "../lib/FileType";
/**
* Extract Files operation
@ -39,7 +39,7 @@ class ExtractFiles extends Operation {
const bytes = new Uint8Array(input);
// Scan for embedded files
const detectedFiles = scanForEmbeddedFiles(bytes);
const detectedFiles = scanForFileTypes(bytes);
// Extract each file that we support
const files = [];
@ -64,26 +64,4 @@ class ExtractFiles extends Operation {
}
/**
* TODO refactor
* @param data
*/
function scanForEmbeddedFiles(data) {
const detectedFiles = [];
for (let i = 0; i < data.length; i++) {
const fileDetails = detectFileType(data.slice(i));
if (fileDetails.length) {
fileDetails.forEach(match => {
detectedFiles.push({
offset: i,
fileDetails: match,
});
});
}
}
return detectedFiles;
}
export default ExtractFiles;

40
src/core/operations/ScanForEmbeddedFiles.mjs
View file

@ -6,7 +6,7 @@
import Operation from "../Operation";
import Utils from "../Utils";
import {detectFileType} from "../lib/FileType";
import {scanForFileTypes} from "../lib/FileType";
/**
* Scan for Embedded Files operation
@ -41,32 +41,30 @@ class ScanForEmbeddedFiles extends Operation {
*/
run(input, args) {
let output = "Scanning data for 'magic bytes' which may indicate embedded files. The following results may be false positives and should not be treat as reliable. Any suffiently long file is likely to contain these magic bytes coincidentally.\n",
types,
numFound = 0,
numCommonFound = 0;
const ignoreCommon = args[0],
commonExts = ["ico", "ttf", ""],
data = new Uint8Array(input);
commonExts = ["ttf", "utf16le", ""],
data = new Uint8Array(input),
types = scanForFileTypes(data);
for (let i = 0; i < data.length; i++) {
types = detectFileType(data.slice(i));
if (types.length) {
types.forEach(type => {
if (ignoreCommon && commonExts.indexOf(type.extension) > -1) {
numCommonFound++;
return;
}
numFound++;
output += "\nOffset " + i + " (0x" + Utils.hex(i) + "):\n" +
" File extension: " + type.extension + "\n" +
" MIME type: " + type.mime + "\n";
if (types.length) {
types.forEach(type => {
if (ignoreCommon && commonExts.indexOf(type.fileDetails.extension) > -1) {
numCommonFound++;
return;
}
if (type.description && type.description.length) {
output += " Description: " + type.description + "\n";
}
});
}
numFound++;
output += "\nOffset " + type.offset + " (0x" + Utils.hex(type.offset) + "):\n" +
" File extension: " + type.fileDetails.extension + "\n" +
" MIME type: " + type.fileDetails.mime + "\n";
if (type.fileDetails.description && type.fileDetails.description.length) {
output += " Description: " + type.fileDetails.description + "\n";
}
});
}
if (numFound === 0) {