Merge branch 'master' into feature/tls-settings

Author: Freddo3000

CHANGELOG.rst

@@ -1,6 +1,12 @@
 django-python3-ldap changelog
 =============================
 
+0.15.7
+------
+
+- Added ``LDAP_AUTH_POOL_ACTIVE`` setting (@borislaviv).
+
+
 0.15.6
 ------
 

README.rst

@@ -106,6 +106,8 @@ Available settings
     # Unspecified keyword arguments to apply to the connection in the underlying `ldap3` library.
     LDAP_AUTH_CONNECT_ARGS = {}
 
+    # Set connection pool `active` parameter on the underlying `ldap3` library.
+    LDAP_AUTH_POOL_ACTIVE = True
 
 Microsoft Active Directory support
 ----------------------------------

django_python3_ldap/__init__.py

@@ -2,5 +2,4 @@
 Django LDAP user authentication backend for Python 3.
 """
 
-
-__version__ = (0, 15, 6)
+__version__ = (0, 15, 7)

django_python3_ldap/conf.py

@@ -156,5 +156,10 @@ def __init__(self, settings):
         default=None
     )
 
+    LDAP_AUTH_POOL_ACTIVE = LazySetting(
+        name="LDAP_AUTH_POOL_ACTIVE",
+        default=True
+    )
+
 
 settings = LazySettings(settings)

django_python3_ldap/ldap.py

@@ -162,7 +162,11 @@ def connection(**kwargs):
         password = kwargs.pop("password")
         username = format_username(kwargs)
     # Build server pool
-    server_pool = ldap3.ServerPool(None, ldap3.RANDOM, active=True, exhaust=5)
+    server_pool = ldap3.ServerPool(
+        None, ldap3.RANDOM,
+        active=settings.LDAP_AUTH_POOL_ACTIVE,
+        exhaust=5
+    )
     auth_url = settings.LDAP_AUTH_URL
     if not isinstance(auth_url, list):
         auth_url = [auth_url]

django_python3_ldap/tests.py

@@ -149,6 +149,18 @@ def testAuthenticateWithFailedRebind(self):
             )
             self.assertIs(user, None)
 
+    def testAuthenticateWithLimitedRetries(self):
+        # simulate offline server
+        with self.settings(
+            LDAP_AUTH_URL=["ldap://example.com:389"],
+            LDAP_AUTH_POOL_ACTIVE=1,
+        ):
+            user = authenticate(
+                username=settings.LDAP_AUTH_TEST_USER_USERNAME,
+                password=settings.LDAP_AUTH_TEST_USER_PASSWORD,
+            )
+        self.assertEqual(user, None)
+
     # User synchronisation.
 
     def testSyncUsersCreatesUsers(self):