dbug

bihealth · Jan 14, 2025 · 9ba7095 · 9ba7095
1 parent 3221fa6
commit 9ba7095
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/adminsec/ldap.py b/adminsec/ldap.py
@@ -1,4 +1,5 @@
 import logging as _logging
+import ssl
 
 import ldap3
 from django.conf import settings
@@ -34,7 +35,20 @@ def connect(self):
 
         if settings.ENABLE_LDAP:
             logger.debug("LDAP enabled")
-            server1 = ldap3.Server(settings.AUTH_LDAP_SERVER_URI)
+            ssl_options = {}
+            url = settings.AUTH_LDAP_SERVER_URI
+
+            if settings.AUTH_LDAP_START_TLS and not self.test_mode:
+                url = settings.AUTH_LDAP_SERVER_URI.replace("ldap://", "ldaps://")
+                ssl_options = {
+                    "tls": ldap3.Tls(
+                        ca_certs_file=settings.AUTH_LDAP_CA_CERT_FILE,
+                        validate=ssl.CERT_REQUIRED,
+                        version=ssl.PROTOCOL_TLSv1,
+                    ),
+                }
+
+            server1 = ldap3.Server(url, **ssl_options)
 
             logger.debug("Connecting to LDAP server: %s", settings.AUTH_LDAP_SERVER_URI)
             self.connection1 = ldap3.Connection(

diff --git a/usersec/forms.py b/usersec/forms.py
@@ -265,7 +265,7 @@ def clean(self):
                     "email",
                     (
                         "This is no institute email address. "
-                        f"Valid domains are: {', '.join(valid_domains)}",
+                        f"Valid domains are: {', '.join(valid_domains)}"
                     ),
                 )
                 return