Ticket #133: ldapplugin_tls.2.patch

ldapplugin-0.10/ldapplugin/model.py

@@ -33 +33 @@
-                       'group_bind', 'store_bind',
-                       'user_rdn', 'group_rdn' ]
-
-host', 'port
+uri
-                          'bind_user', 'bind_passwd',
-                          'groupname', 'groupmember',
-
+
+
+
-                          
-GROUP_PREFIX = '@'
-
@@ -501 +503 @@
-    def __init__(self, log, bind=False, **ldap):
-        self.log = log
-        self.bind = bind
-
-
+
-        self.groupname = 'groupofnames'
-        self.groupmember = 'member'
-        self.groupattr = 'cn'
@@ -511 +512 @@
-        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):
-            self.port = int(self.port)
-        if self.basedn is None:
-            raise TracError, "No basedn is defined"
-
@@ -592 +596 @@
-    def _open(self):
-        """Open and optionnally bind a new connection to the LDAP directory"""
-        try:
-'ldap://%s:%d/' % (self.host, self.port)
+self.uri
-            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")