From 0845b7f4453ac9d8bf6bcc66ceb483af011c496d Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Wed, 5 Nov 2025 15:25:53 +1100 Subject: [PATCH] BE: name resolution did not apply regex cleanup Signed-off-by: jokob-sk --- server/helper.py | 10 ++++++---- server/scan/name_resolution.py | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/helper.py b/server/helper.py index 88d20f67..db678ffd 100755 --- a/server/helper.py +++ b/server/helper.py @@ -381,10 +381,12 @@ def get_setting_value(key): value = setting_value_to_python_type(set_type, set_value) else: value = setting_value_to_python_type(set_type, str(set_value)) + SETTINGS_SECONDARYCACHE[key] = value + return value - # Otherwise fall back to retrive from json + # Otherwise fall back to retrieve from json setting = get_setting(key) if setting is not None: @@ -458,9 +460,6 @@ def setting_value_to_python_type(set_type, set_value): if isinstance(set_value, str): try: value = json.loads(set_value.replace("'", "\"")) - - # reverse transformations to all entries - value = reverseTransformers(value, transformers) except json.JSONDecodeError as e: mylog('none', [f'[setting_value_to_python_type] Error decoding JSON object: {e}']) @@ -470,6 +469,9 @@ def setting_value_to_python_type(set_type, set_value): elif isinstance(set_value, list): value = set_value + # Always apply transformers (base64, etc.) to array entries + value = reverseTransformers(value, transformers) + elif dataType == 'object' and elementType == 'input': if isinstance(set_value, str): try: diff --git a/server/scan/name_resolution.py b/server/scan/name_resolution.py index efa4371d..6c26c417 100755 --- a/server/scan/name_resolution.py +++ b/server/scan/name_resolution.py @@ -72,6 +72,7 @@ class NameResolver: name += " (IP match)" regexes = get_setting_value('NEWDEV_NAME_CLEANUP_REGEX') or [] + mylog('trace', [f"[cleanDeviceName] applying regexes: {regexes}"]) for rgx in regexes: mylog('trace', [f"[cleanDeviceName] applying regex: {rgx}"]) name = re.sub(rgx, "", name)