start accepting multipart form data in /bake

Author: d98762625

app.js

@@ -16,9 +16,10 @@ const app = express();
 app.disable("x-powered-by");
 
 
-if (process.env.NODE_ENV === "production") {
+if (process.env.NODE_ENV === "production" || process.env.TEST_LOGGING) {
     app.use(pino({
-        level: "warn"
+        level: "warn",
+        prettyPrint: true,
     }));
     app.use(helmet());
 } else {

package-lock.json

@@ -26,7 +26,7 @@
   "scripts": {
     "nodemon": "nodemon",
     "start": "DEBUG=cyberchef-server:server node -r esm ./bin/www",
-    "test": "mocha -r esm",
+    "test": "TEST_LOGGING=true mocha -r esm",
     "prod": "NODE_ENV=production node -r esm ./bin/www",
     "lint": "./node_modules/.bin/eslint --fix .",
     "lint-test": "./node_modules/.bin/eslint ."
@@ -38,6 +38,7 @@
     "esm": "^3.2.25",
     "express": "~4.16.1",
     "express-pino-logger": "^4.0.0",
+    "formidable": "^1.2.2",
     "helmet": "^3.21.1",
     "swagger-ui-express": "^4.1.2",
     "yaml": "^1.7.2"

package.json

@@ -1,11 +1,73 @@
 import { Router } from "express";
+import formidable from "formidable";
 const router = Router();
 import { bake, Dish } from "cyberchef/src/node/index.mjs";
 
 /**
  * bakePost
  */
 router.post("/", async function bakePost(req, res, next) {
+    if (req.is("multipart/form-data")) {
+        bakeMultipartForm(req, res, next);
+    } else {
+        bakeBody(req, res, next);
+    }
+});
+
+async function bakeMultipartForm(req, res, next) {
+    const form = formidable();
+
+    try {
+
+        form.parse(req, async (err, fields, files) => {
+
+            // req.log.warn(`Recipe: ${fields.recipe}`);
+            // req.log.warn(`Input: ${files.input}`);
+            // req.log.warn(`Other input: ${fields.input}`);
+            if (err) {
+                throw err;
+            }
+
+            if (!('recipe' in fields)) {
+                throw new Error("Could not find required 'recipe' field in multipart form data");
+            }
+
+            let dish;
+
+            // Case: data is in files.input
+            if('input' in files) {
+                // read the contents of the file and use it as an input
+                res.json({ fields, files });
+            } else if ('input' in fields) {
+
+                dish = await bake(fields.input, fields.recipe);
+
+            } else {
+                throw new Error("Could not find 'input' field in multipart form data.");
+            }
+
+            // Attempt to translate to another type. Any translation errors
+            // propagate through to the errorHandler.
+            if ('outputType' in fields) {
+                dish.get(req.body.outputType);
+            }
+
+            if (dish) {
+                res.send({
+                    value: dish.value,
+                    type: Dish.enumLookup(dish.type),
+                });
+            }
+
+        });
+
+    } catch (e) {
+        next(e);
+    }
+}
+
+async function bakeBody(req, res, next) {
+
     try {
         if (!req.body.input) {
             throw new TypeError("'input' property is required in request body");
@@ -31,6 +93,6 @@ router.post("/", async function bakePost(req, res, next) {
     } catch (e) {
         next(e);
     }
-});
+}
 
 export default router;

routes/bake.js

@@ -0,0 +1 @@
+68 65 6c 6c 6f

test-input.txt

@@ -208,3 +208,37 @@ describe("POST /bake", function() {
     });
 
 });
+
+describe("POST /bake files", function () {
+    it("should take input as a multipart file upload", (done) => {
+        request(app)
+            .post("/bake")
+            .field("recipe", "from hex")
+            .attach("input", "test/test-hex-input.txt")
+            .expect(200, done);
+    });
+
+    it("should take input as a multipart field", (done) => {
+        request(app)
+            .post("/bake")
+            .field("recipe", "to morse code")
+            .field("input", "The crowds stared around wildly")
+            .expect(200, done);
+    });
+
+    it("should perform a simple recipe with input as a form field", (done) => {
+        request(app)
+            .post("/bake")
+            .field("recipe", "to morse code")
+            .field("input", "The crowds stared around wildly")
+            .expect(200)
+            .expect({
+                value: `- .... .
+-.-. .-. --- .-- -.. ...
+... - .- .-. . -..
+.- .-. --- ..- -. -..
+.-- .. .-.. -.. .-.. -.--`,
+                type: "string",
+            }, done);
+    })
+});

test/bake.js

@@ -0,0 +1 @@
+54 68 65 20 63 72 6f 77 64 73 20 73 74 61 72 65 64 20 61 72 6f 75 6e 64 20 77 69 6c 64 6c 79