From 223e54e5f96999bc68264c364758c0dd30b85128 Mon Sep 17 00:00:00 2001
From: Daniel Ruiz Capilla <crd1985@gmail.com>
Date: Thu, 24 Jan 2019 13:02:04 +0100
Subject: [PATCH] Fix improper error handling (#296)

---
 CHANGELOG.md       |  5 +++++
 app.js             |  7 ++-----
 helpers/execute.js | 12 ++++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f242eae..1b2b6628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v3.8.1]
+
+### Fixed
+- Fixed improper error handling ([#296](https://github.com/wazuh/wazuh-api/pull/296))
+
 ## [v3.8.0]
 
 ### Added
diff --git a/app.js b/app.js
index 0db552c8..86eeccb7 100755
--- a/app.js
+++ b/app.js
@@ -208,14 +208,11 @@ app.use (function (err, req, res, next){
     else if ('status' in err && err.status == 400){
         var msg = "";
         if ('body' in err)
-            msg = "Body: " + err.body;
+            msg = "Body is not correct.";
         res_h.bad_request(req, res, "614", msg);
     }
     else if (err == "PayloadTooLargeError: request entity too large"){
-        var msg = "";
-        if ('body' in err)
-            msg = "Body: " + err.body;
-        res_h.bad_request(req, res, "701", msg);
+        res_h.bad_request(req, res, "701");
     }
     else{
         logger.log("Internal Error");
diff --git a/helpers/execute.js b/helpers/execute.js
index baa875ba..9d9cbd9a 100755
--- a/helpers/execute.js
+++ b/helpers/execute.js
@@ -115,8 +115,16 @@ exports.exec = function(cmd, args, stdin, callback) {
                         if ( json_cmd.hasOwnProperty('data') )
                             json_result.data = json_cmd.data;
 
-                        if ( json_cmd.hasOwnProperty('message') )
-                            json_result.message = json_cmd.message;
+                        if ( json_cmd.hasOwnProperty('message') ){
+                            logger.error(json_cmd.message);
+                            if ( json_result.error === 1000)
+                                json_result.message = "Internal error";
+                            else{
+                                if (typeof json_cmd.message === 'string')
+                                    json_result.message = json_cmd.message.split(":", 1)[0];
+                            }
+                            
+			}
                     }
                     else{
                         json_result = {"error": 1, "message": errors.description(1) + ". Wrong keys"}; // JSON Wrong keys