fix(core-api): handle null url and malformed JSON payloads (#2797)

ArkEcosystem · Jul 11, 2019 · 9ea7fed · 9ea7fed
1 parent 009e815
commit 9ea7fed
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/packages/core-api/src/server.ts b/packages/core-api/src/server.ts
@@ -15,13 +15,6 @@ export class Server {
         const options = {
             host: this.config.host,
             port: this.config.port,
-            routes: {
-                validate: {
-                    async failAction(request, h, err) {
-                        throw err;
-                    },
-                },
-            },
         };
 
         if (this.config.enabled) {
@@ -140,9 +133,10 @@ export class Server {
 
         // @TODO: remove this with the release of 3.0 - adds support for /api and /api/v2
         server.ext("onRequest", (request: Hapi.Request, h: Hapi.ResponseToolkit) => {
-            const path: string = request.url.pathname.replace("/v2", "");
-
-            request.setUrl(request.url.search ? `${path}${request.url.search}` : path);
+            if (request.url) {
+                const path: string = request.url.pathname.replace("/v2", "");
+                request.setUrl(request.url.search ? `${path}${request.url.search}` : path);
+            }
 
             return h.continue;
         });

diff --git a/packages/core-elasticsearch/src/server.ts b/packages/core-elasticsearch/src/server.ts
@@ -7,13 +7,6 @@ export const startServer = async config => {
     const server = await createServer({
         host: config.host,
         port: config.port,
-        routes: {
-            validate: {
-                async failAction(request, h, err) {
-                    throw err;
-                },
-            },
-        },
     });
 
     server.route([

diff --git a/packages/core-http-utils/package.json b/packages/core-http-utils/package.json
@@ -26,6 +26,7 @@
         "@hapi/good-console": "^8.1.0",
         "@hapi/good-squeeze": "^5.2.0",
         "@hapi/hapi": "^18.3.1",
+        "deepmerge": "^3.3.0",
         "expand-home-dir": "^0.0.3",
         "hapi-trailing-slash": "^3.1.0",
         "nanomatch": "^1.2.13"

diff --git a/packages/core-http-utils/src/server/create.ts b/packages/core-http-utils/src/server/create.ts
@@ -1,4 +1,6 @@
+import Boom from "@hapi/boom";
 import Hapi from "@hapi/hapi";
+import deepmerge from "deepmerge";
 import expandHomeDir from "expand-home-dir";
 import { readFileSync } from "fs";
 import { monitorServer } from "./monitor";
@@ -9,6 +11,24 @@ export const createServer = async (options, callback?: any, plugins?: any[]) =>
         options.tls.cert = readFileSync(expandHomeDir(options.tls.cert));
     }
 
+    options = deepmerge(
+        {
+            routes: {
+                payload: {
+                    async failAction(request, h, err) {
+                        return Boom.badData(err.message);
+                    },
+                },
+                validate: {
+                    async failAction(request, h, err) {
+                        return Boom.badData(err.message);
+                    },
+                },
+            },
+        },
+        options,
+    );
+
     const server = new Hapi.Server(options);
 
     if (Array.isArray(plugins)) {

diff --git a/packages/core-webhooks/src/server/index.ts b/packages/core-webhooks/src/server/index.ts
@@ -12,11 +12,6 @@ export const startServer = async config => {
         port: config.port,
         routes: {
             cors: true,
-            validate: {
-                async failAction(request, h, err) {
-                    throw err;
-                },
-            },
         },
     });