From 6e11ac34cdff8f968e4dce1041c4ea3adcc73c8f Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 26 Nov 2021 16:30:24 +0100 Subject: [PATCH] Update to 3.4.0, fixes RHBZ#2026947 --- .gitignore | 1 + ...-set-options-on-big-endian-platforms.patch | 169 ------------------ python-ldap.spec | 6 +- sources | 2 +- 4 files changed, 5 insertions(+), 173 deletions(-) delete mode 100644 0001-Fix-SASL-get-set-options-on-big-endian-platforms.patch diff --git a/.gitignore b/.gitignore index ae6d0ab..34874de 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ python-ldap-2.3.10.tar.gz /python-ldap-3.0.0.tar.gz /python-ldap-3.1.0.tar.gz /python-ldap-3.3.1.tar.gz +/python-ldap-3.4.0.tar.gz diff --git a/0001-Fix-SASL-get-set-options-on-big-endian-platforms.patch b/0001-Fix-SASL-get-set-options-on-big-endian-platforms.patch deleted file mode 100644 index a3f215f..0000000 --- a/0001-Fix-SASL-get-set-options-on-big-endian-platforms.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 30fb0a8bda8fbedc22de87b21b8b1b64de310a6b Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Mon, 28 Jun 2021 11:03:02 +0200 -Subject: [PATCH] Fix SASL get/set options on big endian platforms - -The options OPT_X_SASL_SSF_MIN, OPT_X_SASL_SSF_MAX, and OPT_X_SASL_SSF -take *ber_len_t as input and output arguments. ber_len_t is defined as -unsigned long: - -``` - /* LBER lengths (32 bits or larger) */ - #define LBER_LEN_T long - - typedef unsigned LBER_LEN_T ber_len_t; -``` - -Wrong type handling is causing issues on big endian platforms. - -Signed-off-by: Christian Heimes ---- - Modules/options.c | 41 ++++++++++++++++++++++++++++++----------- - Tests/t_ldapobject.py | 23 ++++++++++++++++++++++- - 2 files changed, 52 insertions(+), 12 deletions(-) - -diff --git a/Modules/options.c b/Modules/options.c -index 549a672..67511e8 100644 ---- a/Modules/options.c -+++ b/Modules/options.c -@@ -43,6 +43,10 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value) - double doubleval; - char *strval; - struct timeval tv; -+#if HAVE_SASL -+ /* unsigned long */ -+ ber_len_t blen; -+#endif - void *ptr; - LDAP *ld; - LDAPControl **controls = NULL; -@@ -89,10 +93,6 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value) - case LDAP_OPT_X_TLS_PROTOCOL_MIN: - #endif - #endif --#ifdef HAVE_SASL -- case LDAP_OPT_X_SASL_SSF_MIN: -- case LDAP_OPT_X_SASL_SSF_MAX: --#endif - #ifdef LDAP_OPT_X_KEEPALIVE_IDLE - case LDAP_OPT_X_KEEPALIVE_IDLE: - #endif -@@ -108,6 +108,16 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value) - return 0; - ptr = &intval; - break; -+ -+#ifdef HAVE_SASL -+ case LDAP_OPT_X_SASL_SSF_MIN: -+ case LDAP_OPT_X_SASL_SSF_MAX: -+ if (!PyArg_Parse(value, "k:set_option", &blen)) -+ return 0; -+ ptr = &blen; -+ break; -+#endif -+ - case LDAP_OPT_HOST_NAME: - case LDAP_OPT_URI: - #ifdef LDAP_OPT_DEFBASE -@@ -135,6 +145,7 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value) - return 0; - ptr = strval; - break; -+ - case LDAP_OPT_TIMEOUT: - case LDAP_OPT_NETWORK_TIMEOUT: - /* Float valued timeval options */ -@@ -239,6 +250,10 @@ LDAP_get_option(LDAPObject *self, int option) - LDAPAPIInfo apiinfo; - LDAPControl **lcs; - char *strval; -+#if HAVE_SASL -+ /* unsigned long */ -+ ber_len_t blen; -+#endif - PyObject *extensions, *v; - Py_ssize_t i, num_extensions; - -@@ -277,9 +292,6 @@ LDAP_get_option(LDAPObject *self, int option) - - return v; - --#ifdef HAVE_SASL -- case LDAP_OPT_X_SASL_SSF: --#endif - case LDAP_OPT_REFERRALS: - case LDAP_OPT_RESTART: - case LDAP_OPT_DEREF: -@@ -299,10 +311,6 @@ LDAP_get_option(LDAPObject *self, int option) - case LDAP_OPT_X_TLS_PROTOCOL_MIN: - #endif - #endif --#ifdef HAVE_SASL -- case LDAP_OPT_X_SASL_SSF_MIN: -- case LDAP_OPT_X_SASL_SSF_MAX: --#endif - #ifdef LDAP_OPT_X_SASL_NOCANON - case LDAP_OPT_X_SASL_NOCANON: - #endif -@@ -324,6 +332,17 @@ LDAP_get_option(LDAPObject *self, int option) - return option_error(res, "ldap_get_option"); - return PyInt_FromLong(intval); - -+#ifdef HAVE_SASL -+ case LDAP_OPT_X_SASL_SSF: -+ case LDAP_OPT_X_SASL_SSF_MIN: -+ case LDAP_OPT_X_SASL_SSF_MAX: -+#endif -+ /* ber_len_t options (unsigned long)*/ -+ res = LDAP_int_get_option(self, option, &blen); -+ if (res != LDAP_OPT_SUCCESS) -+ return option_error(res, "ldap_get_option"); -+ return PyLong_FromUnsignedLong(blen); -+ - case LDAP_OPT_HOST_NAME: - case LDAP_OPT_URI: - #ifdef LDAP_OPT_DEFBASE -diff --git a/Tests/t_ldapobject.py b/Tests/t_ldapobject.py -index e54bbfd..0a089c9 100644 ---- a/Tests/t_ldapobject.py -+++ b/Tests/t_ldapobject.py -@@ -334,7 +334,7 @@ class Test00_SimpleLDAPObject(SlapdTestCase): - - @requires_sasl() - @requires_ldapi() -- def test006_sasl_extenal_bind_s(self): -+ def test006_sasl_external_bind_s(self): - l = self.ldap_object_class(self.server.ldapi_uri) - l.sasl_external_bind_s() - self.assertEqual(l.whoami_s(), 'dn:'+self.server.root_dn.lower()) -@@ -343,6 +343,27 @@ class Test00_SimpleLDAPObject(SlapdTestCase): - l.sasl_external_bind_s(authz_id=authz_id) - self.assertEqual(l.whoami_s(), authz_id.lower()) - -+ @requires_sasl() -+ @requires_ldapi() -+ def test006_sasl_options(self): -+ l = self.ldap_object_class(self.server.ldapi_uri) -+ -+ minssf = l.get_option(ldap.OPT_X_SASL_SSF_MIN) -+ self.assertGreaterEqual(minssf, 0) -+ self.assertLessEqual(minssf, 256) -+ maxssf = l.get_option(ldap.OPT_X_SASL_SSF_MAX) -+ self.assertGreaterEqual(maxssf, 0) -+ # libldap sets SSF_MAX to INT_MAX -+ self.assertLessEqual(maxssf, 2**31 - 1) -+ -+ l.set_option(ldap.OPT_X_SASL_SSF_MIN, 56) -+ l.set_option(ldap.OPT_X_SASL_SSF_MAX, 256) -+ self.assertEqual(l.get_option(ldap.OPT_X_SASL_SSF_MIN), 56) -+ self.assertEqual(l.get_option(ldap.OPT_X_SASL_SSF_MAX), 256) -+ -+ l.sasl_external_bind_s() -+ self.assertEqual(l.whoami_s(), 'dn:' + self.server.root_dn.lower()) -+ - def test007_timeout(self): - l = self.ldap_object_class(self.server.ldap_uri) - m = l.search_ext(self.server.suffix, ldap.SCOPE_SUBTREE, '(objectClass=*)') --- -2.31.1 - diff --git a/python-ldap.spec b/python-ldap.spec index 8999e8c..948d196 100644 --- a/python-ldap.spec +++ b/python-ldap.spec @@ -2,16 +2,16 @@ # global prerelease b4 %global openldap_version 2.4.45-4 +%global pypi_name python-ldap Name: python-ldap -Version: 3.3.1 +Version: 3.4.0 Release: %autorelease License: Python Summary: An object-oriented API to access LDAP directory servers URL: https://python-ldap.org/ -Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}%{?prerelease}.tar.gz +Source0: %{pypi_source} -Patch0001: 0001-Fix-SASL-get-set-options-on-big-endian-platforms.patch ### Build Dependencies ### BuildRequires: gcc diff --git a/sources b/sources index 2619b29..2ca957e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-ldap-3.3.1.tar.gz) = 2a1222bf5bbc1d885611fc4f2a25d0b1b64b49ae379f1212f1b3b70fc12fdc547eb6c4af4060a20bf082547b7df8f1824bb1fdfafa37ab21acf2f1e231c4d2d1 +SHA512 (python-ldap-3.4.0.tar.gz) = d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605