Fix improper error handling (#296)

wazuh · Jan 24, 2019 · 223e54e · 223e54e
1 parent 69d7e8e
commit 223e54e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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