From f590946ecc59878c4f8977395d1e282660403812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20G=C3=B3mez=20Mac=C3=ADas?= Date: Tue, 16 Apr 2019 11:04:59 +0200 Subject: [PATCH 1/3] Return an error if execute stdin is not an object fixes #370 --- helpers/execute.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/helpers/execute.js b/helpers/execute.js index 86ed1588..bfa0143e 100755 --- 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; From 1643ecf5473f731022eb455777befd99c6c7e6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20G=C3=B3mez=20Mac=C3=ADas?= Date: Tue, 16 Apr 2019 11:14:40 +0200 Subject: [PATCH 2/3] Remove useless callback when processing a select parameter fixes #371 --- helpers/filters.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/helpers/filters.js b/helpers/filters.js index 471a2401..1b0adaa1 100755 --- 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; } From c2860874cc3a434976819d47b892e2b1d794a3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20G=C3=B3mez=20Mac=C3=ADas?= Date: Tue, 16 Apr 2019 11:22:33 +0200 Subject: [PATCH 3/3] Fix bug when configuring log level in upper case fixes #372 --- helpers/logger.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/helpers/logger.js b/helpers/logger.js index 66d11e46..c9432e3d 100755 --- 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: