0003-ldap-only-wrap-LDAPObject.result4-31273.patch

Benjamin Dauvergne, 11 mars 2019 20:54

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/5] ldap: only wrap LDAPObject.result4 (#31273)

result4() is the only function in python-ldap really handling results from LDAP requests,
all other methods calls it; if we encode attributes from other function we
duplicate work.

 src/authentic2/backends/ldap_backend.py | 64 +++++++++++--------------
 1 file changed, 28 insertions(+), 36 deletions(-)

                         attrs = {attribute: filter_non_unicode_values(attrs[attribute]) for attribute in attrs}
                         yield dn, attrs
             def search_s(self, base, scope, filterstr='(objectclass=*)', attrlist=None, attrsonly=0):
                 return self._convert_results_to_unicode(
                     NativeLDAPObject.search_s(self, base, scope,
                                               filterstr=filterstr,
                                               attrlist=attrlist,
                                               attrsonly=attrsonly))
             def modify_s(self, dn, modlist):
                 new_modlist = []
                 for mod_op, mod_typ, mod_vals in modlist:
-...
                     new_modlist.append((mod_op, mod_typ, mod_vals))
                 return NativeLDAPObject.modify_s(self, dn, new_modlist)
         def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None, resp_ctrl_classes=None):
             result_type, data, msgid, serverctrls = NativeLDAPObject.result3(self,
                                                                              msgid=msgid,
                                                                              all=all,
                                                                              timeout=timeout,
                                                                              resp_ctrl_classes=resp_ctrl_classes)
             if data:
                 data = self._convert_results_to_unicode(data)
             return result_type, data, msgid, serverctrls
             def result4(self, msgid=ldap.RES_ANY, all=1, timeout=None, add_ctrls=0,
                         add_intermediates=0, add_extop=0, resp_ctrl_classes=None):
                 resp_type, resp_data, resp_msgid, decoded_resp_ctrls, resp_name, resp_value = NativeLDAPObject.result4(
                     self,
                     msgid=msgid,
                     all=all,
                     timeout=timeout,
                     add_ctrls=add_ctrls,
                     add_intermediates=add_intermediates,
                     add_extop=add_extop,
                     resp_ctrl_classes=resp_ctrl_classes)
                 if resp_data:
                     resp_data = self._convert_results_to_unicode(resp_data)
                 return resp_type, resp_data, resp_msgid, decoded_resp_ctrls, resp_name, resp_value
     elif PYTHON_LDAP3 is False:
         class LDAPObject(NativeLDAPObject):
-...
                         attrs = {attribute: filter_non_unicode_values(attrs[attribute]) for attribute in attrs}
                         yield force_text(dn), attrs
             def search_s(self, base, scope, filterstr='(objectclass=*)', attrlist=None, attrsonly=0):
                 base = force_bytes(base)
                 filterstr = force_bytes(filterstr)
                 if attrlist:
                     attrlist = map(force_bytes, attrlist)
                 return self._convert_results_to_unicode(
                     NativeLDAPObject.search_s(self, base, scope,
                                               filterstr=filterstr,
                                               attrlist=attrlist,
                                               attrsonly=attrsonly))
             def search_ext(self, base, scope, filterstr='(objectclass=*)',
                            attrlist=None, attrsonly=0, serverctrls=None,
                            clientctrls=None, timeout=-1, sizelimit=0):
-...
                     new_modlist.append((mod_op, mod_typ, mod_vals))
                 return NativeLDAPObject.modify_s(self, dn, new_modlist)
         def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None, resp_ctrl_classes=None):
             result_type, data, msgid, serverctrls = NativeLDAPObject.result3(self,
                                                                              msgid=msgid,
                                                                              all=all,
                                                                              timeout=timeout,
                                                                              resp_ctrl_classes=resp_ctrl_classes)
             if data:
                 data = self._convert_results_to_unicode(data)
             return result_type, data, msgid, serverctrls
             def result4(self, msgid=ldap.RES_ANY, all=1, timeout=None, add_ctrls=0,
                         add_intermediates=0, add_extop=0, resp_ctrl_classes=None):
                 resp_type, resp_data, resp_msgid, decoded_resp_ctrls, resp_name, resp_value = NativeLDAPObject.result4(
                     self,
                     msgid=msgid,
                     all=all,
                     timeout=timeout,
                     add_ctrls=add_ctrls,
                     add_intermediates=add_intermediates,
                     add_extop=add_extop,
                     resp_ctrl_classes=resp_ctrl_classes)
                 if resp_data:
                     resp_data = self._convert_results_to_unicode(resp_data)
                 return resp_type, resp_data, resp_msgid, decoded_resp_ctrls, resp_name, resp_value
     def map_text(d):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0003-ldap-only-wrap-LDAPObject.result4-31273.patch