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

Simplify permission_sync_to_user ... force is never set to True so I dropped it...

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-11 20:56:56 +02:00
parent 574e9aea44
commit 853c6a161a
1 changed files with 21 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/yunohost/permission.py
View file

@ -358,70 +358,41 @@ def permission_delete(operation_logger, permission, force=False, sync_perm=True)
raise YunohostError('permission_deletion_failed', permission=permission) raise YunohostError('permission_deletion_failed', permission=permission)
def permission_sync_to_user(force=False): def permission_sync_to_user():
""" """
Sychronise the inheritPermission attribut in the permission object from the Sychronise the inheritPermission attribut in the permission object from the
user<->group link and the group<->permission link user<->group link and the group<->permission link
Keyword argument:
force -- Force to recreate all attributes. Used generally with the
backup which uses "slapadd" which doesnt' use the memberOf overlay.
Note that by removing all value and adding a new time, we force the
overlay to update all attributes
""" """
# Note that a LDAP operation with the same value that is in LDAP crash SLAP.
# So we need to check before each ldap operation that we really change something in LDAP
import os import os
from yunohost.app import app_ssowatconf from yunohost.app import app_ssowatconf
from yunohost.user import user_group_list
from yunohost.utils.ldap import _get_ldap_interface from yunohost.utils.ldap import _get_ldap_interface
ldap = _get_ldap_interface() ldap = _get_ldap_interface()
permission_attrs = [ groups = user_group_list(full=True)["groups"]
'cn', permissions = user_permission_list(full=True)["permissions"]
'member',
]
group_info = ldap.search('ou=groups,dc=yunohost,dc=org',
'(objectclass=groupOfNamesYnh)', permission_attrs)
group_info = {g['cn'][0]: g for g in group_info}
for per in ldap.search('ou=permission,dc=yunohost,dc=org', for permission_name, permission_infos in permissions.items():
'(objectclass=permissionYnh)',
['cn', 'inheritPermission', 'groupPermission', 'memberUid']):
if 'groupPermission' not in per: # These are the users currently allowed because there's an 'inheritPermission' object corresponding to it
per['groupPermission'] = [] currently_allowed_users = set(permission_infos["corresponding_users"])
user_permission = set()
for group in per['groupPermission']: # These are the users that should be allowed because they are member of a group that is allowed for this permission ...
group = group.split("=")[1].split(",")[0] should_be_allowed_users = set([user for group in permission_infos["allowed"] for user in groups[group]["members"]])
if 'member' not in group_info[group]:
# Note that a LDAP operation with the same value that is in LDAP crash SLAP.
# So we need to check before each ldap operation that we really change something in LDAP
if currently_allowed_users == should_be_allowed_users:
# We're all good, this permission is already correctly synchronized !
continue continue
for user in group_info[group]['member']:
user_permission.add(user)
if 'inheritPermission' not in per: new_inherited_perms = {'inheritPermission': ["uid=%s,ou=users,dc=yunohost,dc=org" % u for u in should_be_allowed_users],
per['inheritPermission'] = [] 'memberUid': should_be_allowed_users}
if 'memberUid' not in per:
per['memberUid'] = []
uid_val = [v.split("=")[1].split(",")[0] for v in user_permission] # Commit the change with the new inherited stuff
if user_permission == set(per['inheritPermission']) and set(uid_val) == set(per['memberUid']) and not force: if not ldap.update('cn=%s,ou=permission' % permission_name, new_inherited_perms):
continue
inheritPermission = {'inheritPermission': user_permission, 'memberUid': uid_val}
if force:
if per['groupPermission']:
if not ldap.update('cn=%s,ou=permission' % per['cn'][0], {'groupPermission': []}):
raise YunohostError('permission_update_failed_clear')
if not ldap.update('cn=%s,ou=permission' % per['cn'][0], {'groupPermission': per['groupPermission']}):
raise YunohostError('permission_update_failed_populate')
if per['inheritPermission']:
if not ldap.update('cn=%s,ou=permission' % per['cn'][0], {'inheritPermission': []}):
raise YunohostError('permission_update_failed_clear')
if user_permission:
if not ldap.update('cn=%s,ou=permission' % per['cn'][0], inheritPermission):
raise YunohostError('permission_update_failed')
else:
if not ldap.update('cn=%s,ou=permission' % per['cn'][0], inheritPermission):
raise YunohostError('permission_update_failed') raise YunohostError('permission_update_failed')
logger.debug(m18n.n('permission_generated')) logger.debug(m18n.n('permission_generated'))
app_ssowatconf() app_ssowatconf()