Merge pull request #207 from harlov/AuthSource_ignored_on_connect

Auth using authsource db

docs/source/NEWS.rst

@@ -8,6 +8,7 @@ Bugfixes
 ^^^^^^^^
 
 - Memory leak fixed in `Collection.bulk_write()`
+- Use authSource as auth database if specify in connect uri
 
 Release 16.3.0 (2016-11-25)
 ---------------------------

tests/test_auth.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import, division
+from mock import patch
 from pymongo.errors import OperationFailure
 import os
 import shutil
@@ -163,6 +164,18 @@ def test_AuthConnectionPoolUri(self):
             self.assertEqual(cnt, n)
         finally:
             yield conn.disconnect()
+
+    @defer.inlineCallbacks
+    def test_AuthConnectionPoolUriAuthSource(self):
+        def authenticate(database, username, password, mechanism):
+            self.assertEqual(database, self.db2)
+
+        with patch('txmongo.connection.ConnectionPool.authenticate', side_effect=authenticate):
+            conn = connection.ConnectionPool(
+                "mongodb://{0}:{1}@{2}:{3}/{4}?authSource={5}".format(self.login1, self.password1, mongo_host,
+                                                                      mongo_port, self.db1, self.db2)
+            )
+            yield conn.disconnect()
 
     @defer.inlineCallbacks
     def test_AuthFailAtStartup(self):

txmongo/connection.py

@@ -272,7 +272,8 @@ def __init__(self, uri="mongodb://127.0.0.1:27017", pool_size=1, ssl_context_fac
         ]
 
         if self.__uri['database'] and self.__uri['username'] and self.__uri['password']:
-            self.authenticate(self.__uri['database'], self.__uri['username'],
+            auth_db = self.__uri['options'].get('authsource') or self.__uri['database']
+            self.authenticate(auth_db, self.__uri['username'],
                               self.__uri['password'],
                               self.__uri['options'].get('authmechanism', 'DEFAULT'))