From b0f553087b85054a031898e253fb2a97b0653363 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Thu, 29 Aug 2024 14:19:49 +0200
Subject: [PATCH] [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 <pmoravec@redhat.com>
---
 sos/cleaner/parsers/mac_parser.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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