Merge pull request #1 from loovjo/master

Validate websocket JSON to make sure the server does not crash upon receiving invalid jSON

1 files changed, 11 insertions, 1 deletions

diff --git a/routes/index.js b/routes/index.js
index 27116d4..b7e9526 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -369,7 +369,17 @@ router.get("/game", checkAuthentication(PAGE_ERROR_OUTPUT), function(req, res, n
 router.ws("/gameUpdate", checkAuthentication(SOCKET_ERROR_OUTPUT), function(ws, req, next) {
     console.log("Opening socket.");
     ws.on("message", function(message) {
-        var tempCommandList = JSON.parse(message);
+        var tempCommandList;
+        try {
+            tempCommandList = JSON.parse(message);
+        } catch (tempErr) {
+            var tempResult = {
+                success: false,
+                message: "Invalid JSON",
+            };
+            ws.send(JSON.stringify(tempResult));
+            return;
+        }
         if (gameUtils.isInDevelopmentMode) {
             setTimeout(function() {
                 performUpdate(tempCommandList);