Skip to content

Fix(LDAPObject): Prevent search attrlist memory error #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix(LDAPObject): Prevent search attrlist memory error #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1bdf47
test: Test valid and invalid attrlist parameters
jkoeniger Jan 7, 2024
0859ed8
fix(LDAPObject): Prevent memory errors in attrs_from_List
jkoeniger Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Modules/LDAPObject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,10 @@ attrs_from_List(PyObject *attrlist, char ***attrsp)
if (seq == NULL)
goto error;

len = PySequence_Length(attrlist);
len = PySequence_Size(seq);
if (len == -1) {
goto error;
}

attrs = PyMem_NEW(char *, len + 1);

Expand Down
33 changes: 33 additions & 0 deletions Tests/t_ldapobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ def test_dse(self):
[self.server.suffix.encode('utf-8')]
)


def test_compare_s_true(self):
base = self.server.suffix
l = self._ldap_conn
Expand Down Expand Up @@ -565,6 +566,38 @@ def test_slapadd(self):
("myAttribute", b'foobar'),
])

def test_valid_attrlist_parameter_types(self):
"""Tests the case when a valid parameter type is passed to search_ext

Any iterable which only contains strings should not raise any errors.
"""

l = self._ldap_conn

valid_attrlist_parameters = [{"a": "2"}, ["a", "b"], {}, set(), set(["a", "b"])]

for attrlist in valid_attrlist_parameters:
out = l.search_ext(
"%s" % self.server.suffix, ldap.SCOPE_SUBTREE, attrlist=attrlist
)

def test_invalid_attrlist_parameter_types(self):
"""Tests the case when an invalid parameter type is passed to search_ext

Any object type that is either not a interable or does contain something
that isn't a string should raise a TypeError. The exception is the string type itself.
"""

invalid_attrlist_parameters = [{1: 2}, 0, object(), "string"]

l = self._ldap_conn

for attrlist in invalid_attrlist_parameters:
with self.assertRaises(TypeError):
l.search_ext(
"%s" % self.server.suffix, ldap.SCOPE_SUBTREE, attrlist=attrlist
)


class Test01_ReconnectLDAPObject(Test00_SimpleLDAPObject):
"""
Expand Down