Fix hiding pass value in logging connection string

MarketSquare · Sep 25, 2024 · 36e2550 · 36e2550
1 parent 501164b
commit 36e2550
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/DatabaseLibrary/connection_manager.py b/src/DatabaseLibrary/connection_manager.py
@@ -142,14 +142,14 @@ def __init__(self):
         self.connection_store: ConnectionStore = ConnectionStore()
 
     @staticmethod
-    def _hide_password_values(string_with_pass):
+    def _hide_password_values(string_with_pass, params_separator=","):
         string_with_hidden_pass = string_with_pass
         for pass_param_name in ["pass", "passwd", "password", "pwd", "PWD"]:
             pass_param_name += "="
             splitted = string_with_hidden_pass.split(pass_param_name)
             if len(splitted) < 2:
                 continue
-            splitted = splitted[1].split(",")
+            splitted = splitted[1].split(params_separator)
             value_to_hide = splitted[0]
             string_with_hidden_pass = string_with_hidden_pass.replace(
                 f"{pass_param_name}{value_to_hide}", f"{pass_param_name}***"
@@ -223,8 +223,10 @@ def _build_connection_params(custom_params=True, **basic_params):
         def _log_all_connection_params(*, connection_object=None, connection_string=None, **connection_params):
             connection_object = connection_object or dbapiModuleName
             msg = f"Connect to DB using : {connection_object}.connect("
+            params_separator = ","
             if connection_string:
                 msg += f'"{connection_string}"'
+                params_separator = ";"
             for param_name, param_value in connection_params.items():
                 msg += f", {param_name}="
                 if isinstance(param_value, str):
@@ -233,7 +235,7 @@ def _log_all_connection_params(*, connection_object=None, connection_string=None
                     msg += f"{param_value}"
             if dbPassword:
                 msg = msg.replace(f"'{dbPassword}'", "***")
-            msg = self._hide_password_values(msg)
+            msg = self._hide_password_values(msg, params_separator)
             msg = msg.replace("connect(, ", "connect(")
             msg += ")"
             logger.info(msg)