Hide username/password in indexer __str__ representation

Closes #980 (cherry picked from commit ca28902)
gnocchixyz · Oct 5, 2018 · 17f1d51 · 17f1d51
1 parent 3ae763f
commit 17f1d51
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/gnocchi/indexer/sqlalchemy.py b/gnocchi/indexer/sqlalchemy.py
@@ -38,6 +38,7 @@
 except ImportError:
     pymysql = None
 import six
+from six.moves.urllib import parse as urlparse
 import sqlalchemy
 from sqlalchemy.engine import url as sqlalchemy_url
 import sqlalchemy.exc
@@ -291,7 +292,16 @@ def __init__(self, conf):
         self.facade = PerInstanceFacade(conf)
 
     def __str__(self):
-        return "%s: %s" % (self.__class__.__name__, self.conf.indexer.url)
+        parsed = urlparse.urlparse(self.conf.indexer.url)
+        url = urlparse.urlunparse((
+            parsed.scheme,
+            "***:***@%s%s" % (parsed.hostname,
+                              ":%s" % parsed.port if parsed.port else ""),
+            parsed.path,
+            parsed.params,
+            parsed.query,
+            parsed.fragment))
+        return "%s: %s" % (self.__class__.__name__, url)
 
     def disconnect(self):
         self.facade.dispose()

diff --git a/gnocchi/tests/test_indexer.py b/gnocchi/tests/test_indexer.py
@@ -40,7 +40,11 @@ class TestIndexerDriver(tests_base.TestCase):
 
     def test_str(self):
         self.assertEqual("%s: %s" % (self.index.__class__.__name__,
-                         self.conf.indexer.url), str(self.index))
+                                     self.conf.indexer.url.replace(
+                                         "root@", "").replace(
+                                             "localhost", "***:***@localhost"
+                                         )),
+                         str(self.index))
 
     def test_create_archive_policy_already_exists(self):
         # NOTE(jd) This archive policy