[mac_parser] Skip over redundant matches

In the event we get a match on an already-obfuscated MAC address, skip
the match instead of double-obfuscating the address.

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/sos/cleaner/parsers/mac_parser.py b/sos/cleaner/parsers/mac_parser.py
index f986a809..618c43f8 100644
--- a/sos/cleaner/parsers/mac_parser.py
+++ b/sos/cleaner/parsers/mac_parser.py
@@ -25,6 +25,10 @@ class SoSMacParser(SoSCleanerParser):
         # IPv4, avoiding matching a substring within IPv6 addresses
         r'(([^:|-])([0-9a-fA-F]{2}([:-])){5}([0-9a-fA-F]){2}(.)?(\s|$|\W))'
     ]
+    obfuscated_patterns = (
+        '53:4f:53',
+        '534f:53'
+    )
     map_file_key = 'mac_map'
     prep_map_file = 'sos_commands/networking/ip_-d_address'
 
@@ -53,6 +57,9 @@ class SoSMacParser(SoSCleanerParser):
             if matches:
                 count += len(matches)
                 for match in matches:
+                    if match.startswith(self.obfuscated_patterns):
+                        # avoid double scrubbing
+                        continue
                     stripped_match = self.reduce_mac_match(match)
                     new_match = self.mapping.get(stripped_match)
                     line = line.replace(stripped_match, new_match)