Skip to content

Commit 09c62e9

Browse files
authored
Merge pull request #71 from DanWertheimer/master
updated to get proper groups
2 parents 9c6cb35 + 9449951 commit 09c62e9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

flask_simpleldap/__init__.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ def get_object_details(self, user=None, group=None, query_filter=None,
170170
if not dn_only:
171171
fields = current_app.config['LDAP_USER_FIELDS']
172172
query_filter = query_filter or \
173-
current_app.config['LDAP_USER_OBJECT_FILTER']
173+
current_app.config['LDAP_USER_OBJECT_FILTER']
174174
query = ldap_filter.filter_format(query_filter, (user,))
175175
elif group is not None:
176176
if not dn_only:
177177
fields = current_app.config['LDAP_GROUP_FIELDS']
178178
query_filter = query_filter or \
179-
current_app.config['LDAP_GROUP_OBJECT_FILTER']
179+
current_app.config['LDAP_GROUP_OBJECT_FILTER']
180180
query = ldap_filter.filter_format(query_filter, (group,))
181181
conn = self.bind
182182
try:
@@ -232,8 +232,11 @@ def get_user_groups(self, user):
232232
if current_app.config['LDAP_OPENLDAP']:
233233
group_member_filter = \
234234
current_app.config['LDAP_GROUP_MEMBER_FILTER_FIELD']
235-
groups = [record[1][group_member_filter][0].decode(
236-
'utf-8') for record in records]
235+
record_list = [record[1] for record in records]
236+
record_dicts = [
237+
record for record in record_list if isinstance(record, dict)]
238+
groups = [item.get([group_member_filter][0])[0]
239+
for item in record_dicts]
237240
return groups
238241
else:
239242
if current_app.config['LDAP_USER_GROUPS_FIELD'] in \

0 commit comments

Comments
 (0)