diff --git a/front/plugins/arp_scan/script.py b/front/plugins/arp_scan/script.py index b25fa216..7bcc4c74 100755 --- a/front/plugins/arp_scan/script.py +++ b/front/plugins/arp_scan/script.py @@ -28,6 +28,7 @@ CUR_PATH = str(pathlib.Path(__file__).parent.resolve()) LOG_FILE = os.path.join(CUR_PATH, 'script.log') RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log') +pluginName = 'ARPSCAN' def main(): @@ -58,7 +59,7 @@ def main(): userSubnetsParam = base64.b64decode(userSubnetsParamBase64).decode('ascii') # Print the decoded subnet information. - mylog('verbose', ['[ARP Scan] userSubnetsParam: ', userSubnetsParam]) + mylog('verbose', [f'[{pluginName}] userSubnetsParam: ', userSubnetsParam]) # Check if the decoded subnet information contains multiple subnets separated by commas. # If it does, split the string into a list of individual subnets. @@ -86,7 +87,7 @@ def main(): watched2 = handleEmpty(device.get('hw', '')), # Vendor (assuming it's in the 'hw' field) watched3 = handleEmpty(device.get('interface', '')), # Add the interface watched4 = '', - extra = 'arp-scan', + extra = pluginName, foreignKey = "") plugin_objects.write_result_file() @@ -105,7 +106,7 @@ def execute_arpscan(userSubnets): arpscan_output = execute_arpscan_on_interface (interface) - mylog('verbose', ['[ARP Scan] arpscan_output: ', arpscan_output]) + mylog('verbose', [f'[{pluginName}] arpscan_output: ', arpscan_output]) # Search IP + MAC + Vendor as regular expresion re_ip = r'(?P((2[0-5]|1[0-9]|[0-9])?[0-9]\.){3}((2[0-5]|1[0-9]|[0-9])?[0-9]))' @@ -132,10 +133,10 @@ def execute_arpscan(userSubnets): unique_devices.append(device) # return list - mylog('verbose', ['[ARP Scan] Found: Devices without duplicates ', len(unique_devices) ]) + mylog('verbose', [f'[{pluginName}] Found: Devices without duplicates ', len(unique_devices) ]) - mylog('verbose', ["Devices List len:", len(devices_list)]) # Add this line to print devices_list - mylog('verbose',["Devices List:", devices_list]) # Add this line to print devices_list + mylog('verbose', [f'[{pluginName}] Devices List len:', len(devices_list)]) + mylog('verbose', [f'[{pluginName}] Devices List:', devices_list]) return devices_list diff --git a/front/plugins/avahi_scan/config.json b/front/plugins/avahi_scan/config.json index 21091ecc..8839ab72 100755 --- a/front/plugins/avahi_scan/config.json +++ b/front/plugins/avahi_scan/config.json @@ -6,6 +6,15 @@ "data_source": "script", "execution_order" : "Layer_3", "show_ui": true, + "data_filters": [ + { + "compare_column": "Object_PrimaryID", + "compare_operator": "==", + "compare_field_id": "txtMacFilter", + "compare_js_template": "'{value}'.toString()", + "compare_use_quotes": true + } + ], "localized": ["display_name", "description", "icon"], "display_name": [ { diff --git a/front/plugins/nbtscan_scan/config.json b/front/plugins/nbtscan_scan/config.json index dca01697..41573cac 100755 --- a/front/plugins/nbtscan_scan/config.json +++ b/front/plugins/nbtscan_scan/config.json @@ -6,6 +6,15 @@ "data_source": "script", "execution_order" : "Layer_3", "show_ui": true, + "data_filters": [ + { + "compare_column": "Object_PrimaryID", + "compare_operator": "==", + "compare_field_id": "txtMacFilter", + "compare_js_template": "'{value}'.toString()", + "compare_use_quotes": true + } + ], "localized": ["display_name", "description", "icon"], "display_name": [ { diff --git a/front/plugins/nslookup_scan/config.json b/front/plugins/nslookup_scan/config.json index adb67255..e0325c32 100755 --- a/front/plugins/nslookup_scan/config.json +++ b/front/plugins/nslookup_scan/config.json @@ -6,6 +6,15 @@ "enabled": true, "data_source": "script", "show_ui": true, + "data_filters": [ + { + "compare_column": "Object_PrimaryID", + "compare_operator": "==", + "compare_field_id": "txtMacFilter", + "compare_js_template": "'{value}'.toString()", + "compare_use_quotes": true + } + ], "localized": ["display_name", "description", "icon"], "display_name": [ {