Changeset 174

Timestamp:

12/08/05 18:04:07 (3 years ago)

Author:

eblot

Message:

LdapPlugin:

Apply patch from <wichert@wiggy.net> with minor changes. Thanks !

Files:

• ldapplugin/0.9/AUTHORS (added)
• ldapplugin/0.9/ldapplugin/model.py (modified) (9 diffs)

ldapplugin/0.9/ldapplugin/model.py

@@ -34 +34 @@
-                       'store_bind', 'store_user', 'store_passwd' ]
-
-
+
+
-                          'groupname','groupmember',
-                          'groupattr','uidattr' ]
@@ -62 +63 @@
-
-    def get_permission_groups(self, username):
-        self.env.log.debug('get_permission_group ' + username)
-
-        groups = ['anonymous']
-        if username and username != 'anonymous':
@@ -109 +108 @@
-                    # the less recently uses entries
-                    cache_keys = self._cache.keys()
-
+
+
-                    # discards the 5% oldest
-                    old_keys = cache_keys[:(5*self._cache_size)/100]
@@ -297 +297 @@
-        self.port = 389
-        self.basedn = ''
+        self.user_basedn = None
+        self.group_basedn = None
-        self.groupname = 'groupofnames'
-        self.groupmember = 'member'
@@ -303 +305 @@
-        for key in ldap.keys():
-            self.__setattr__(key, ldap[key])
+        if not self.user_basedn:
+            self.user_basedn = self.basedn
+        if not self.group_basedn:
+            self.group_basedn = self.basedn
-        self._uid = None
-        self._password = None
-
-    def basedn(self):
-
+
+
+
+
+
+
+
-
-    def set_credentials(self, uid, password):
@@ -329 +341 @@
-                if ( self._uid.find('=') == -1 ):
-                    self._uid = '%s=%s' % (self.uidattr, self._uid)
-
+
+
-            else:
-                self._ds.simple_bind_s()
@@ -341 +354 @@
-            if not self.__dict__.has_key('_ds') or not self.__dict__['_ds']:
-                self._open()
-
+
+
-            return sr
-
@@ -352 +366 @@
-            if not self.__dict__.has_key('_ds') or not self.__dict__['_ds']:
-                self._open()
- + "," + self.basedn
+
-            return cr
-        
@@ -376 +390 @@
-    
-    def is_in_group(self, uid, group):
-self.groupattr + "=" + group
-self.uidattr + "=" + uid + "," + self.basedn
+'%s=%s,%s' % (self.groupattr, group, self.group_basedn)
+'%s=%s,%s' % (self.uidattr, uid, self.user_basedn)
-        for attempt in range(2):
-            cr = self._compare(dn, self.groupmember, value)