From e556d010bc2f5a6057a35e47d7004f56aad4db0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 27 Jul 2019 11:03:16 +0200 Subject: [PATCH 1/2] Fix variable definition for permission in backup --- src/yunohost/backup.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 98055cd04..b11433a41 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -1250,7 +1250,9 @@ class RestoreManager(): '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.metronome))(!(cn=main.sftp)))', ['cn']): if not ldap.remove('cn=%s,ou=permission' % per['cn'][0]): - raise YunohostError('permission_deletion_failed', permission=permission, app=app) + raise YunohostError('permission_deletion_failed', + permission=per['cn'][0].split('.')[0], + app=per['cn'][0].split('.')[1]) # Restore permission for the app which is installed for per in old_apps_permission: @@ -1370,7 +1372,7 @@ class RestoreManager(): # Restore permissions if os.path.isfile(app_settings_in_archive + '/permission.ldif'): filtred_entries = ['entryUUID', 'creatorsName', 'createTimestamp', 'entryCSN', 'structuralObjectClass', - 'modifiersName', 'modifyTimestamp', 'inheritPermission', 'memberUid'] + 'modifiersName', 'modifyTimestamp', 'inheritPermission', 'memberUid'] entries = read_ldif('%s/permission.ldif' % app_settings_in_archive, filtred_entries) group_list = user_group_list(['cn'])['groups'] for dn, entry in entries: @@ -1379,9 +1381,10 @@ class RestoreManager(): group_name = group.split(',')[0].split('=')[1] if group_name not in group_list: entry['groupPermission'].remove(group) - print(entry) if not ldap.add('cn=%s,ou=permission' % entry['cn'][0], entry): - raise YunohostError('apps_permission_restoration_failed', permission=permission_name, app=app_name) + raise YunohostError('apps_permission_restoration_failed', + permission=entry['cn'][0].split('.')[0], + app=entry['cn'][0].split('.')[1]) else: from yunohost.tools import _get_migration_by_name setup_group_permission = _get_migration_by_name("setup_group_permission") From 7349c428864890dc3ebc57e4a273b64a39462cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 28 Jul 2019 17:05:34 +0200 Subject: [PATCH 2/2] Fix identation --- src/yunohost/backup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index b11433a41..bd5d5750d 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -1438,7 +1438,7 @@ class RestoreManager(): # Remove all permission in LDAP result = ldap.search(base='ou=permission,dc=yunohost,dc=org', - filter='(&(objectclass=permissionYnh)(cn=*.%s))' % app_instance_name, attrs=['cn']) + filter='(&(objectclass=permissionYnh)(cn=*.%s))' % app_instance_name, attrs=['cn']) permission_list = [p['cn'][0] for p in result] for l in permission_list: permission_remove(app_instance_name, l.split('.')[0], force=True)