diff --git a/front/plugins/adguard_import/adguard_import.py b/front/plugins/adguard_import/adguard_import.py index 46fc86ae..87b668d5 100644 --- a/front/plugins/adguard_import/adguard_import.py +++ b/front/plugins/adguard_import/adguard_import.py @@ -11,7 +11,7 @@ sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"]) from const import logPath # noqa: E402, E261 from plugin_helper import Plugin_Objects # noqa: E402, E261 -from utils.crypto_utils import string_to_mac_hash # noqa: E402 [flake8 lint suppression] +from utils.crypto_utils import string_to_fake_mac # noqa: E402 [flake8 lint suppression] from logger import mylog, Logger # noqa: E402, E261 from helper import get_setting_value # noqa: E402, E261 import conf # noqa: E402, E261 @@ -120,7 +120,7 @@ def main(): if not mac and fake_mac_enabled: mylog("verbose", [f"[{pluginName}] Generating FAKE MAC for ip: {ip}"]) - mac = string_to_mac_hash(ip) + mac = string_to_fake_mac(ip) if not mac: # Skip devices without MAC if fake MAC not allowed diff --git a/front/plugins/icmp_scan/icmp.py b/front/plugins/icmp_scan/icmp.py index c98db91b..7246b86d 100755 --- a/front/plugins/icmp_scan/icmp.py +++ b/front/plugins/icmp_scan/icmp.py @@ -16,7 +16,7 @@ from logger import mylog, Logger # noqa: E402 [flake8 lint suppression] from helper import get_setting_value # noqa: E402 [flake8 lint suppression] from const import logPath # noqa: E402 [flake8 lint suppression] from models.device_instance import DeviceInstance # noqa: E402 [flake8 lint suppression] -from utils.crypto_utils import string_to_mac_hash # noqa: E402 [flake8 lint suppression] +from utils.crypto_utils import string_to_fake_mac # noqa: E402 [flake8 lint suppression] import conf # noqa: E402 [flake8 lint suppression] from pytz import timezone # noqa: E402 [flake8 lint suppression] @@ -228,7 +228,7 @@ def execute_fping(timeout, args, all_devices, plugin_objects, subnets, interface else: mylog("none", [f"[{pluginName}] ERROR reverse device lookup failed unexpectedly for {onlineIp}"]) elif fakeMac: - fakeMacFromIp = string_to_mac_hash(onlineIp) + fakeMacFromIp = string_to_fake_mac(onlineIp) plugin_objects.add_object( primaryId = fakeMacFromIp, secondaryId = onlineIp, diff --git a/front/plugins/nmap_dev_scan/nmap_dev.py b/front/plugins/nmap_dev_scan/nmap_dev.py index 90d7f030..421ed3ec 100755 --- a/front/plugins/nmap_dev_scan/nmap_dev.py +++ b/front/plugins/nmap_dev_scan/nmap_dev.py @@ -16,7 +16,7 @@ from plugin_helper import Plugin_Objects # noqa: E402 [flake8 lint suppression] from logger import mylog, Logger # noqa: E402 [flake8 lint suppression] from helper import get_setting_value # noqa: E402 [flake8 lint suppression] from const import logPath # noqa: E402 [flake8 lint suppression] -from utils.crypto_utils import string_to_mac_hash # noqa: E402 [flake8 lint suppression] +from utils.crypto_utils import string_to_fake_mac # noqa: E402 [flake8 lint suppression] import conf # noqa: E402 [flake8 lint suppression] from pytz import timezone # noqa: E402 [flake8 lint suppression] @@ -159,7 +159,7 @@ def parse_nmap_xml(xml_output, interface, fakeMac): if (ip != '' and mac != '') or (ip != '' and fakeMac): if mac == '' and fakeMac: - mac = string_to_mac_hash(ip) + mac = string_to_fake_mac(ip) devices_list.append({ 'name': hostname, diff --git a/front/plugins/pihole_api_scan/pihole_api_scan.py b/front/plugins/pihole_api_scan/pihole_api_scan.py index 70a33018..c8a9aa75 100644 --- a/front/plugins/pihole_api_scan/pihole_api_scan.py +++ b/front/plugins/pihole_api_scan/pihole_api_scan.py @@ -23,7 +23,7 @@ from helper import get_setting_value # noqa: E402 [flake8 lint suppression] from const import logPath # noqa: E402 [flake8 lint suppression] import conf # noqa: E402 [flake8 lint suppression] from pytz import timezone # noqa: E402 [flake8 lint suppression] -from utils.crypto_utils import string_to_mac_hash # noqa: E402 [flake8 lint suppression] +from utils.crypto_utils import string_to_fake_mac # noqa: E402 [flake8 lint suppression] # Setup timezone & logger using standard NAX helpers conf.tz = timezone(get_setting_value('TIMEZONE')) @@ -228,7 +228,7 @@ def gather_device_entries(): # ensure fake mac if enabled if PIHOLEAPI_FAKE_MAC and is_mac(tmpMac) is False: - tmpMac = string_to_mac_hash(ip) + tmpMac = string_to_fake_mac(ip) entries.append({ 'mac': tmpMac,