Ticket #133: ldapplugin_tls.patch

ldapplugin-0.10/ldapplugin/model.py

@@ -36 +36 @@
-LDAP_DIRECTORY_PARAMS = [ 'host', 'port', 'basedn',
-                          'bind_user', 'bind_passwd',
-                          'groupname', 'groupmember',
-
+
+
+
-                          
-GROUP_PREFIX = '@'
-
@@ -511 +513 @@
-        self.bind_user = None
-        self.bind_passwd = None
-        self.basedn = None
+        self.start_tls = False
+        self.cacertdir = '/etc/ssl/certs'
+        self.cacertfile = ''
+        self.keyfile = ''
+        self.certfile = ''
-        for k, v in ldap.items():
-            self.__setattr__(k, v.encode('ascii'))
-        if not isinstance(self.port, int):
@@ -594 +601 @@
-        try:
-            self._ds = ldap.initialize('ldap://%s:%d/' % (self.host, self.port))
-            self._ds.protocol_version = ldap.VERSION3
+            self._ds.x_tls_cacertdir = self.cacertdir
+            self._ds.x_tls_cacertfile = self.cacertfile
+            self._ds.x_tls_keyfile = self.keyfile
+            self._ds.x_tls_certfile = self.certfile
+
+            if self.start_tls == 'true':
+                self.log.debug("Starting TLS encryption.")
+                self._ds.start_tls_s()
+
-            if self.bind:
-                if not self.bind_user:
-                    raise TracError("Bind enabled but credentials not defined")