[cleaner] Improve IPV6 MAC address RE

Current RE obfuscates also UUID strings, let be more strict. Resolves: #3767 Relevant: #3736 Signed-off-by: Pavel Moravec <[email protected]>
sosreport · Aug 29, 2024 · b0f5530 · b0f5530
1 parent 3886534
commit b0f5530
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sos/cleaner/parsers/mac_parser.py b/sos/cleaner/parsers/mac_parser.py
@@ -20,9 +20,9 @@
     r'[0-9a-fA-F]{2}(\'|\")?(\/|\,|\-|\.|\s|$))'
 )
 # aabb:ccee:ddee:ffaa
-IPV6_REG_4HEX = (
-    r'((?<!([0-9a-fA-F\'\"]:)|::)(([^:\-]?[0-9a-fA-F]{4}(:|-)){3}'
-    r'[0-9a-fA-F]{4}(\'|\")?(\/|\,|\-|\.|\s|$)))'
+IPV6_REG_4HEX_NEW = (
+        r'((?<!\w)(([0-9a-fA-F]{4}:){3}[0-9a-fA-F]{4})(?!\w))|'
+        r'((?<!\w)(([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{4})(?!\w))'
 )
 # aa:bb:cc:dd:ee:ff avoiding ipv6 substring matches
 IPV4_REG = (