diff --git a/front/pluginsCore.php b/front/pluginsCore.php index 08e6125d..03557f6d 100755 --- a/front/pluginsCore.php +++ b/front/pluginsCore.php @@ -458,7 +458,8 @@ function shouldBeShown(entry, pluginObj) compare_field_id = dataFilters[i].compare_field_id; compare_column = dataFilters[i].compare_column; compare_operator = dataFilters[i].compare_operator; - compare_field_id_value = $(`#${compare_field_id}`).val(); + compare_js_wrapper = dataFilters[i].compare_js_wrapper; + compare_field_id_value = $(`#${compare_field_id}`).val(); @@ -468,13 +469,26 @@ function shouldBeShown(entry, pluginObj) console.log(compare_field_id_value) console.log(compare_column) console.log(compare_operator) + console.log(entry[compare_column]) - console.log(entry[compare_column]) - console.log(`"${compare_field_id_value}" ${compare_operator} "${entry[compare_column]}"`) + // console.log(entry[compare_column]) + // console.log(`"${compare_field_id_value}" ${compare_operator} "${entry[compare_column]}"`) + // console.log(`${compare_js_wrapper.replace('{value}', `"${compare_field_id_value}"`)} ${compare_operator} ${compare_js_wrapper.replace('{value}', `"${entry[compare_column]}"`)}`) + // console.log(eval(`${compare_js_wrapper.replace('{value}', `"${compare_field_id_value}"`)} ${compare_operator} ${compare_js_wrapper.replace('{value}', `"${entry[compare_column]}"`)}`)) + let left = compare_js_wrapper.replace('{value}', `"${compare_field_id_value}"`) + let right = compare_js_wrapper.replace('{value}', `"${entry[compare_column]}"`) + console.log(`${eval(left)}` + + ` ${compare_operator} ` + + `${eval(right)}`) + result = eval( + `${eval(left)}` + + ` ${compare_operator} ` + + `${eval(right)}` + ); - return eval(`"${compare_field_id_value}" ${compare_operator} "${entry[compare_column]}"`); + return result; } } diff --git a/pialert/plugins/nmap_services/config.json b/pialert/plugins/nmap_services/config.json index 44c53884..7ee84f46 100755 --- a/pialert/plugins/nmap_services/config.json +++ b/pialert/plugins/nmap_services/config.json @@ -7,7 +7,8 @@ { "compare_column" : "Object_PrimaryID", "compare_operator" : "==", - "compare_field_id": "txtMacFilter" + "compare_field_id": "txtMacFilter", + "compare_js_wrapper": "'{value}.toString()'" } ], "localized": ["display_name", "description", "icon"],