Merge pull request #11 from gchq/enforce-required-args

Enforce required args

Author: d98762625

.gitignore

@@ -60,4 +60,4 @@ typings/
 # next.js build output
 .next
 
-.vscode
+.vscode/*

lib/errorHandler.js

@@ -1,3 +1,6 @@
+import { OperationError } from "cyberchef/src/node/index.mjs";
+
+
 /**
  * errorHandler
  *
@@ -14,7 +17,7 @@ export default function errorHandler(err, req, res, next) {
         return next(err);
     }
 
-    if (err instanceof TypeError) {
+    if (err instanceof TypeError || err instanceof OperationError) {
         res.status(400).send(err.message).end();
     } else {
         res.status(500).send(err.stack).end();

test/bake.js

@@ -105,4 +105,21 @@ describe("POST /bake", function() {
             .expect("begin_something_anananaaaaak_da_aaak_da_aaaaananaaaaaaan_da_aaaaaaanan_da_aaak_end_something", done);
     });
 
+    it("should return a useful error if we give an input/recipe combination that results in an OperationError", (done) => {
+        request(app)
+            .post("/bake")
+            .set("Content-Type", "application/json")
+            .send({
+                input: "irrelevant",
+                recipe: {
+                    op: "AES Encrypt",
+                    args: {
+                        key: "notsixteencharslong"
+                    }
+                }
+            })
+            .expect(400)
+            .expect("Invalid key length: 2 bytes\n\nThe following algorithms will be used based on the size of the key:\n  16 bytes = AES-128\n  24 bytes = AES-192\n  32 bytes = AES-256", done);
+    });
+
 });