👌 IMPROVE: try new sensitive filter

unl0ck · Dec 24, 2024 · 71db961 · 71db961
1 parent b528fa5
commit 71db961
Showing 1 changed file with 27 additions and 18 deletions.
diff --git a/GridboxConnectorAddon-edge/GridboxConnector/utils.py b/GridboxConnectorAddon-edge/GridboxConnector/utils.py
@@ -2,27 +2,36 @@
 import logging
 import ast
 import os
+import re
 class SensitiveDataFilter(logging.Filter):
     def filter(self, record):
         message = record.getMessage()
-        try:
-            literal_msg = ast.literal_eval(message)
-            # Sensible Daten filtern, falls vorhanden
-            if 'username' in literal_msg:
-                literal_msg['username'] = '***'
-            if 'password' in literal_msg:
-                literal_msg['password'] = '***'
-            if 'id_token' in literal_msg:
-                literal_msg['id_token'] = '***'
-            if 'access_token' in literal_msg:
-                literal_msg['access_token'] = '***'
-            if 'client_id' in literal_msg:
-                literal_msg['client_id'] = '***'
-            # Das modifizierte Dictionary zurück in einen String konvertieren
-            record.msg = json.dumps(literal_msg)
-        except Exception as e:
-            logging.error(f"Error filtering sensitive data: {e}")
-            pass
+        # try:
+        #     literal_msg = ast.literal_eval(message)
+        #     # Sensible Daten filtern, falls vorhanden
+        #     if 'username' in literal_msg:
+        #         literal_msg['username'] = '***'
+        #     if 'password' in literal_msg:
+        #         literal_msg['password'] = '***'
+        #     if 'id_token' in literal_msg:
+        #         literal_msg['id_token'] = '***'
+        #     if 'access_token' in literal_msg:
+        #         literal_msg['access_token'] = '***'
+        #     if 'client_id' in literal_msg:
+        #         literal_msg['client_id'] = '***'
+        #     # Das modifizierte Dictionary zurück in einen String konvertieren
+        #     record.msg = json.dumps(literal_msg)
+        # except Exception as e:
+        #     logging.error(f"Error filtering sensitive data: {e}")
+        #     pass
+        message = record.getMessage()
+        # Sensible Daten filtern, falls vorhanden
+        message = re.sub(r'username=[\'"].+?[\'"]', 'username="***"', message)
+        message = re.sub(r'password=[\'"].+?[\'"]', 'password="***"', message)
+        message = re.sub(r'id_token=[\'"].+?[\'"]', 'id_token="***"', message)
+        message = re.sub(r'access_token=[\'"].+?[\'"]', 'access_token="***"', message)
+        message = re.sub(r'client_id=[\'"].+?[\'"]', 'client_id="***"', message)
+        record.msg = message
         return True
 
 def get_bool_env(var, default=False):