PYTHON-1327 - No credentials in repr(client)

ajdavis · ajdavis · commit 75b2b1fc41a7 · 2017-07-28T21:38:59.000-04:00
diff --git a/pymongo/mongo_client.py b/pymongo/mongo_client.py
@@ -998,7 +998,8 @@ def option_repr(option, value):
         options.extend(
             option_repr(key, self.__options._options[key])
             for key in self.__options._options
-            if key not in set(self._constructor_args))
+            if key not in set(self._constructor_args)
+            and key != 'username' and key != 'password')
         return ', '.join(options)
 
     def __repr__(self):
diff --git a/test/test_client.py b/test/test_client.py
@@ -597,7 +597,16 @@ def test_username_and_password(self):
         self.client.admin.add_user("ad min", "pa/ss", roles=["root"])
         self.addCleanup(self.client.admin.remove_user, "ad min")
 
-        rs_or_single_client(username="ad min", password="pa/ss").server_info()
+        c = rs_or_single_client(username="ad min", password="pa/ss")
+
+        # Username and password aren't in strings that will likely be logged.
+        self.assertNotIn("ad min", repr(c))
+        self.assertNotIn("ad min", str(c))
+        self.assertNotIn("pa/ss", repr(c))
+        self.assertNotIn("pa/ss", str(c))
+
+        # Auth succeeds.
+        c.server_info()
 
         with self.assertRaises(OperationFailure):
             rs_or_single_client(username="ad min", password="foo").server_info()
