YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] we don't use those filter/offset/limit stuff

Browse source
This commit is contained in:
Laurent Peuch 2017-08-14 00:47:16 +02:00
parent f41c2dd763
commit d0666d86d6
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/yunohost/user.py
View file

@ -40,7 +40,7 @@ from yunohost.service import service_status
logger = getActionLogger('yunohost.user') logger = getActionLogger('yunohost.user')
def user_list(auth, fields=None, filter=None, limit=None, offset=None): def user_list(auth, fields=None):
""" """
List users List users
@ -59,13 +59,6 @@ def user_list(auth, fields=None, filter=None, limit=None, offset=None):
attrs = ['uid'] attrs = ['uid']
users = {} users = {}
# Set default arguments values
if offset is None:
offset = 0
if limit is None:
limit = 1000
if filter is None:
filter = '(&(objectclass=person)(!(uid=root))(!(uid=nobody)))'
if fields: if fields:
keys = user_attrs.keys() keys = user_attrs.keys()
for attr in fields: for attr in fields:
@ -77,10 +70,9 @@ def user_list(auth, fields=None, filter=None, limit=None, offset=None):
else: else:
attrs = ['uid', 'cn', 'mail', 'mailuserquota'] attrs = ['uid', 'cn', 'mail', 'mailuserquota']
result = auth.search('ou=users,dc=yunohost,dc=org', filter, attrs) result = auth.search('ou=users,dc=yunohost,dc=org', '(&(objectclass=person)(!(uid=root))(!(uid=nobody)))', attrs)
if len(result) > offset and limit > 0: for user in result:
for user in result[offset:offset + limit]:
entry = {} entry = {}
for attr, values in user.items(): for attr, values in user.items():
try: try:
@ -89,6 +81,7 @@ def user_list(auth, fields=None, filter=None, limit=None, offset=None):
pass pass
uid = entry[user_attrs['uid']] uid = entry[user_attrs['uid']]
users[uid] = entry users[uid] = entry
return {'users': users} return {'users': users}