Skip to content

LDAP paging support #175

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: master
Choose a base branch
from
Open

LDAP paging support #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a77d9be
clean up pycodestyle
helix84 Feb 13, 2019
f4255c9
LDAP paging support
helix84 Feb 13, 2019
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
58 changes: 33 additions & 25 deletions python/multicorn/ldapfdw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@
);

CREATE FOREIGN TABLE ldapexample (
mail character varying,
cn character varying,
description character varying
mail character varying,
cn character varying,
description character varying
) server ldap_srv options (
uri 'ldap://localhost',
path 'dc=lab,dc=example,dc=com',
scope 'sub',
binddn 'cn=Admin,dc=example,dc=com',
bindpwd 'admin',
objectClass '*'
uri 'ldap://localhost',
path 'dc=lab,dc=example,dc=com',
scope 'sub',
binddn 'cn=Admin,dc=example,dc=com',
bindpwd 'admin',
objectClass '*'
);

select * from ldapexample;
Expand Down Expand Up @@ -150,24 +150,32 @@ def execute(self, quals, columns):
val = qual.value
request = unicode_("(&%s(%s=%s))") % (
request, qual.field_name, val)
self.ldap.search(
self.path, request, self.scope,
attributes=list(self.field_definitions))
for entry in self.ldap.response:
# Case insensitive lookup for the attributes
litem = dict()
for key, value in entry["attributes"].items():
if key.lower() in self.field_definitions:
pgcolname = self.field_definitions[key.lower()].column_name
if ldap3.version.__version__ > '2.0.0':
value = value
else:
if pgcolname in self.array_columns:
cookie = None
while True:
self.ldap.search(
self.path, request, self.scope,
attributes=list(self.field_definitions),
paged_size=1000,
paged_cookie=cookie)
for entry in self.ldap.response:
# Case insensitive lookup for the attributes
litem = dict()
for key, value in entry["attributes"].items():
if key.lower() in self.field_definitions:
pgcolname = self.field_definitions[key.lower()].column_name
if ldap3.version.__version__ > '2.0.0':
value = value
else:
value = value[0]
litem[pgcolname] = value
yield litem
if pgcolname in self.array_columns:
value = value
else:
value = value[0]
litem[pgcolname] = value
yield litem
# pagedResultsControl, see RFC 2696
cookie = self.ldap.result['controls']['1.2.840.113556.1.4.319']['value']['cookie']
if not cookie:
break

def parse_scope(self, scope=None):
if scope in (None, "", "one"):
Expand Down