From 55440090fe0cd0018ce2663719816b8a783b305c Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sat, 6 Jul 2024 10:22:50 +1000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8C=20Omada=20work=20=20#708?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/device.py | 2 +- server/helper.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/device.py b/server/device.py index 790419c8..c1e56557 100755 --- a/server/device.py +++ b/server/device.py @@ -506,7 +506,7 @@ def update_devices_names (db): # Check if the variable contains a valid MAC address or "Internet" def check_mac_or_internet(input_str): # Regular expression pattern for matching a MAC address - mac_pattern = r'^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' + mac_pattern = r'([0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2})' if input_str.lower() == 'internet': return True diff --git a/server/helper.py b/server/helper.py index 92362f39..ebfb17f3 100755 --- a/server/helper.py +++ b/server/helper.py @@ -739,7 +739,7 @@ def extract_between_strings(text, start, end): #------------------------------------------------------------------------------- def extract_mac_addresses(text): - mac_pattern = r"([0-9A-Fa-f]{2}(?:[:-][0-9A-Fa-f]{2}){5})" + mac_pattern = r"([0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2}[:-][0-9A-Fa-f]{2})" mac_addresses = re.findall(mac_pattern, text) return mac_addresses