Don't forget to handle _regex legacy permission settings

This commit is contained in:
Alexandre Aubin 2020-10-29 19:58:07 +01:00
parent e564ecd3c0
commit 4279c108ba
2 changed files with 12 additions and 3 deletions

View file

@ -1355,9 +1355,15 @@ class RestoreManager():
SetupGroupPermissions.migrate_app_permission(app=app_instance_name)
# Migrate old settings
if app_setting(app_instance_name, 'skipped_uris') is not None or \
app_setting(app_instance_name, 'unprotected_uris') is not None or \
app_setting(app_instance_name, 'protected_uris') is not None:
legacy_permission_settings = [
"skipped_uris",
"unprotected_uris",
"protected_uris",
"skipped_regex",
"unprotected_regex",
"protected_regex"
]
if any(app_setting(app_instance_name, setting) is not None for setting in legacy_permission_settings):
from yunohost.tools import _get_migration_by_name
extends_permissions_features_1 = _get_migration_by_name("extends_permissions_features_1")
extends_permissions_features_1.migrate_skipped_unprotected_protected_uris(app=app_instance_name)

View file

@ -132,6 +132,9 @@ class MyMigration(Migration):
app_setting(app, 'skipped_uris', delete=True)
app_setting(app, 'unprotected_uris', delete=True)
app_setting(app, 'protected_uris', delete=True)
app_setting(app, 'skipped_regex', delete=True)
app_setting(app, 'unprotected_regex', delete=True)
app_setting(app, 'protected_regex', delete=True)
permission_sync_to_user()