vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-09 03:31:51 -07:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

BE: name resolution did not apply regex cleanup

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2025-11-05 15:25:53 +11:00
parent ea8cea16c5
commit 0845b7f445
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/helper.py
View File

@@ -381,10 +381,12 @@ def get_setting_value(key):
value = setting_value_to_python_type(set_type, set_value) value = setting_value_to_python_type(set_type, set_value)
else: else:
value = setting_value_to_python_type(set_type, str(set_value)) value = setting_value_to_python_type(set_type, str(set_value))
SETTINGS_SECONDARYCACHE[key] = value SETTINGS_SECONDARYCACHE[key] = value
return value return value
# Otherwise fall back to retrive from json # Otherwise fall back to retrieve from json
setting = get_setting(key) setting = get_setting(key)
if setting is not None: if setting is not None:
@@ -459,9 +461,6 @@ def setting_value_to_python_type(set_type, set_value):
try: try:
value = json.loads(set_value.replace("'", "\"")) value = json.loads(set_value.replace("'", "\""))
# reverse transformations to all entries
value = reverseTransformers(value, transformers)
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
mylog('none', [f'[setting_value_to_python_type] Error decoding JSON object: {e}']) mylog('none', [f'[setting_value_to_python_type] Error decoding JSON object: {e}'])
mylog('none', [set_value]) mylog('none', [set_value])
@@ -470,6 +469,9 @@ def setting_value_to_python_type(set_type, set_value):
elif isinstance(set_value, list): elif isinstance(set_value, list):
value = set_value value = set_value
# Always apply transformers (base64, etc.) to array entries
value = reverseTransformers(value, transformers)
elif dataType == 'object' and elementType == 'input': elif dataType == 'object' and elementType == 'input':
if isinstance(set_value, str): if isinstance(set_value, str):
try: try:

1
server/scan/name_resolution.py
View File

@@ -72,6 +72,7 @@ class NameResolver:
name += " (IP match)" name += " (IP match)"
regexes = get_setting_value('NEWDEV_NAME_CLEANUP_REGEX') or [] regexes = get_setting_value('NEWDEV_NAME_CLEANUP_REGEX') or []
mylog('trace', [f"[cleanDeviceName] applying regexes: {regexes}"])
for rgx in regexes: for rgx in regexes:
mylog('trace', [f"[cleanDeviceName] applying regex: {rgx}"]) mylog('trace', [f"[cleanDeviceName] applying regex: {rgx}"])
name = re.sub(rgx, "", name) name = re.sub(rgx, "", name)