Prints configuration during debug, but with passwords redacted, including in URLs

Author: erezsh

data_diff/__main__.py

@@ -5,6 +5,8 @@
 import logging
 from itertools import islice
 
+from .utils import remove_password_from_url
+
 from .diff_tables import (
     TableSegment,
     TableDiffer,
@@ -33,6 +35,8 @@ def _remove_passwords_in_dict(d: dict):
             d[k] = "*" * len(v)
         elif isinstance(v, dict):
             _remove_passwords_in_dict(v)
+        elif k.startswith("database"):
+            d[k] = remove_password_from_url(v)
 
 
 @click.command()
@@ -120,11 +124,10 @@ def _main(
 
     if debug:
         logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT, datefmt=DATE_FORMAT)
-        # XXX Temporarily commented out, until we remove the passwords from URIs as well. See issue #150.
-        # if __conf__:
-        #     __conf__ = deepcopy(__conf__)
-        #     _remove_passwords_in_dict(__conf__)
-        #     logging.debug(f"Applied run configuration: {__conf__}")
+        if __conf__:
+            __conf__ = deepcopy(__conf__)
+            _remove_passwords_in_dict(__conf__)
+            logging.debug(f"Applied run configuration: {__conf__}")
     elif verbose:
         logging.basicConfig(level=logging.INFO, format=LOG_FORMAT, datefmt=DATE_FORMAT)
 

data_diff/utils.py

@@ -1,6 +1,7 @@
 import math
+from urllib.parse import urlparse
 
-from typing import Sequence, Optional, Tuple, Union, Dict, Any
+from typing import Union
 from uuid import UUID
 
 
@@ -51,3 +52,9 @@ def number_to_human(n):
     )
 
     return "{:.0f}{}".format(n / 10 ** (3 * millidx), millnames[millidx])
+
+
+def remove_password_from_url(url, replace_with="***"):
+    parsed = urlparse(url)
+    replaced = parsed._replace(netloc="{}:{}@{}".format(parsed.username, replace_with, parsed.hostname or ""))
+    return replaced.geturl()