Changeset 2191 for pykota/trunk/pykota/storages/ldapstorage.py

Timestamp:

04/01/05 11:27:31 (19 years ago)

Author:

jerome

Message:

Hopefully final fix for LDAP attributes' names case (in)sensitivity

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (7 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -40 +40 @@
     import ldap
     import ldap.modlist
+    import ldap.cidict
 except ImportError :    
     import sys
@@ -158 +159 @@
             else :     
                 self.tool.logdebug("QUERY : Result : %s" % result)
+                result = [ (dn, ldap.cidict.cidict(attrs)) for (dn, attrs) in result ]
                 if self.useldapcache :
                     for (dn, attributes) in result :
@@ -167 +169 @@
     def doAdd(self, dn, fields) :
         """Adds an entry in the LDAP directory."""
-        fields = self.normalizeFields(fields)
+        fields = self.normalizeFields(ldap.cidict.cidict(fields))
         message = ""
         for tryit in range(3) :
@@ -213 +215 @@
     def doModify(self, dn, fields, ignoreold=1, flushcache=0) :
         """Modifies an entry in the LDAP directory."""
+        fields = ldap.cidict.cidict(fields)
         for tryit in range(3) :
             try :
@@ -246 +249 @@
                 modentry = []
                 for (mop, mtyp, mval) in entry :
-                    if mtyp != "createTimestamp" :
+                    if mtyp and (mtyp.lower() != "createtimestamp") :
                         modentry.append((mop, mtyp, mval))
                 self.tool.logdebug("MODIFY : %s ==> %s ==> %s" % (fields, entry, modentry))
@@ -278 +281 @@
         """   
         result = []
-        for record in records :
-            attrval = record[1].get(attribute, [None])[0]
+        for (dn, record) in records :
+            attrval = record.get(attribute, [None])[0]
             if attrval is None :
-                self.tool.printInfo("Object %s has no %s attribute !" % (record[0], attribute), "error")
+                self.tool.printInfo("Object %s has no %s attribute !" % (dn, attribute), "error")
             else :    
                 result.append(attrval)
@@ -690 +693 @@
                 message = _("Unable to find an existing objectClass %s entry with %s=%s to attach pykotaAccount objectClass") % (where, self.info["userrdn"], user.Name)
                 if action.lower() == "warn" :    
-                    self.tool.printInfo("%s. A new entry will be created instead." % message, "warn")
+                    self.tool.printInfo(_("%s. A new entry will be created instead.") % message, "warn")
                 else : # 'fail' or incorrect setting
                     raise PyKotaStorageError, "%s. Action aborted. Please check your configuration." % message