[cleaner] Improve IPV6 MAC address RE

Current RE obfuscates also UUID strings, let be more strict. Resolves: #3766 Relevant: #3736 Signed-off-by: Pavel Moravec <[email protected]>
sosreport · Sep 24, 2024 · 94c81c6 · 94c81c6
1 parent a0035b6
commit 94c81c6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/sos/cleaner/parsers/mac_parser.py b/sos/cleaner/parsers/mac_parser.py
@@ -20,9 +20,12 @@
     r'[0-9a-fA-F]{2}(\'|\")?(\/|\,|\-|\.|\s|$))'
 )
 # aabb:ccee:ddee:ffaa
+# - but disallow "substrings"
+#   - but allow fe80: or fe80:: prefix for link-local
 IPV6_REG_4HEX = (
-    r'((?<!([0-9a-fA-F\'\"]:)|::)(([^:\-]?[0-9a-fA-F]{4}(:|-)){3}'
-    r'[0-9a-fA-F]{4}(\'|\")?(\/|\,|\-|\.|\s|$)))'
+        r'((?<!(?:([.|^|\b]{5}\w|[.|^|\b]fe80:|fe80::)))'
+        r'(([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 = (