From 53ab2d2de1402362a788741cfd5cd49c45725866 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Tue, 24 Sep 2024 10:43:10 +0200
Subject: [PATCH] [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 <pmoravec@redhat.com>
---
 sos/cleaner/parsers/mac_parser.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sos/cleaner/parsers/mac_parser.py b/sos/cleaner/parsers/mac_parser.py
index 07704bae4c..35882eb79f 100644
--- 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 = (