Merge pull request #373 from wazuh/fix-js-bugs

Fix JavaScript code bugs
wazuh · Apr 16, 2019 · c1cfa6c · c1cfa6c
2 parents e9dbce0 + c286087
commit c1cfa6c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/helpers/execute.js b/helpers/execute.js
@@ -27,8 +27,15 @@ var disable_timeout = false;
 exports.exec = function(cmd, args, stdin, callback) {
     const child_process  = require('child_process');
 
-    if (stdin != null)
-        stdin['ossec_path'] = config.ossec_path;
+    if (!(stdin instanceof Object)) {
+        err = "Error executing command: stdin value must be an object: " + stdin
+        logger.error("CMD - " + err);
+        error = true;
+        callback({"error": 1, "message": err});
+        return;
+    }
+
+    stdin['ossec_path'] = config.ossec_path;
 
     // log
     stdin['arguments']['wait_for_complete'] = disable_timeout;

diff --git a/helpers/filters.js b/helpers/filters.js
@@ -156,9 +156,7 @@ exports.select_param_to_json = function (select_param){
     var select = {"fields": []};
 
     if (typeof select_param == 'string') {
-        select_param.split(',').map(function(x) {
-            select['fields'].push(x);
-        });
+        select['fields'] = select_param.split(',');
     } else {
         select['fields'] = select_param;
     }

diff --git a/helpers/logger.js b/helpers/logger.js
@@ -38,20 +38,20 @@ var LEVEL_DEBUG = 4;
 var user = "";
 
 var logger_level = LEVEL_INFO;
-switch (config.logs) {
-    case "INFO", "info":
+switch (config.logs.toLowerCase()) {
+    case "info":
         logger_level = LEVEL_INFO;
         break;
-    case "WARNING", "warning":
+    case "warning":
         logger_level = LEVEL_WARNING;
         break;
-    case "ERROR", "error":
+    case "error":
         logger_level = LEVEL_ERROR;
         break;
-    case "DEBUG", "debug":
+    case "debug":
         logger_level = LEVEL_DEBUG;
         break;
-    case "DISABLED", "disabled":
+    case "disabled":
         logger_level = LEVEL_DISABLED;
         break;
     default: