Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP tidy up. WHy is dish being passed back with chef.bake now?

This commit is contained in:
d98762625 2019-02-15 16:11:13 +00:00
parent 573a292e16
commit 9094e8bde9
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -200,7 +200,7 @@ module.exports = function (grunt) {
}, moduleEntryPoints), }, moduleEntryPoints),
output: { output: {
path: __dirname + "/build/prod", path: __dirname + "/build/prod",
globalObject: "this" // globalObject: "this"
}, },
resolve: { resolve: {
alias: { alias: {
@ -366,7 +366,7 @@ module.exports = function (grunt) {
} }
}, },
output: { output: {
globalObject: "this", // globalObject: "this",
}, },
plugins: [ plugins: [
new webpack.DefinePlugin(BUILD_CONSTANTS), new webpack.DefinePlugin(BUILD_CONSTANTS),

2
src/core/Utils.mjs
View File

@ -9,8 +9,6 @@ import {fromBase64, toBase64} from "./lib/Base64";
import {fromHex} from "./lib/Hex"; import {fromHex} from "./lib/Hex";
import {fromDecimal} from "./lib/Decimal"; import {fromDecimal} from "./lib/Decimal";
import {fromBinary} from "./lib/Binary"; import {fromBinary} from "./lib/Binary";
import { fstat } from "fs";
/** /**
* Utility functions for use in operations, the core framework and the stage. * Utility functions for use in operations, the core framework and the stage.

2
src/core/config/scripts/generateOpsIndex.mjs
View File

@ -24,7 +24,7 @@ if (!fs.existsSync(dir)) {
// Find all operation files // Find all operation files
const opObjs = []; const opObjs = [];
fs.readdirSync(path.join(dir, "../operations")).forEach(file => { fs.readdirSync(path.join(dir, "../operations")).forEach(file => {
if (!file.endsWith(".mjs") || file === "index.mjs" || file === "DetectFileType.mjs" || file === "Fork.mjs" || file === "GenerateQRCode.mjs" || file === "Magic.mjs" || file === "ParseQRCode.mjs" || file === "PlayMedia.mjs" || file === "RenderImage.mjs" || file === "ScanForEmbeddedFiles.mjs" || file === "SplitColourChannels.mjs") return; if (!file.endsWith(".mjs") || file === "index.mjs") return;
opObjs.push(file.split(".mjs")[0]); opObjs.push(file.split(".mjs")[0]);
}); });

2
src/core/operations/Tar.mjs
View File

@ -132,8 +132,6 @@ class Tar extends Operation {
tarball.writeBytes(input); tarball.writeBytes(input);
tarball.writeEndBlocks(); tarball.writeEndBlocks();
console.log("here");
return new File([new Uint8Array(tarball.bytes)], args[0]); return new File([new Uint8Array(tarball.bytes)], args[0]);
} }

1
src/core/operations/Untar.mjs
View File

@ -131,7 +131,6 @@ class Untar extends Operation {
* @returns {html} * @returns {html}
*/ */
async present(files) { async present(files) {
console.log("err....");
return await Utils.displayFilesAsHTML(files); return await Utils.displayFilesAsHTML(files);
} }

8
tests/node/tests/nodeApi.mjs
View File

@ -160,9 +160,9 @@ TestRegister.addApiTests([
assert(chef.bake); assert(chef.bake);
}), }),
it("chef.bake: should return SyncDish", () => { it("chef.bake: should return NodeDish", () => {
const result = chef.bake("input", "to base 64"); const result = chef.bake("input", "to base 64");
assert(result instanceof SyncDish); assert(result instanceof NodeDish);
}), }),
it("chef.bake: should take an input and an op name and perform it", () => { it("chef.bake: should take an input and an op name and perform it", () => {
@ -222,7 +222,7 @@ TestRegister.addApiTests([
it("chef.bake: if recipe is empty array, return input as dish", () => { it("chef.bake: if recipe is empty array, return input as dish", () => {
const result = chef.bake("some input", []); const result = chef.bake("some input", []);
assert.strictEqual(result.toString(), "some input"); assert.strictEqual(result.toString(), "some input");
assert(result instanceof SyncDish, "Result is not instance of SyncDish"); assert(result instanceof NodeDish, "Result is not instance of NodeDish");
}), }),
it("chef.bake: accepts an array of operations as recipe", () => { it("chef.bake: accepts an array of operations as recipe", () => {
@ -332,7 +332,7 @@ TestRegister.addApiTests([
it("Composable Dish: composed function returns another dish", () => { it("Composable Dish: composed function returns another dish", () => {
const result = new Dish("some input").apply(toBase32); const result = new Dish("some input").apply(toBase32);
assert.ok(result instanceof SyncDish); assert.ok(result instanceof NodeDish);
}), }),