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

Fix the legacy permission fix after app install, sometimes the setting ain't None

Browse source
This commit is contained in:
Alexandre Aubin 2019-10-29 17:38:05 +01:00
parent 572b003e29
commit 83b45d7894
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/app.py
View file

@ -1126,16 +1126,16 @@ def _migrate_legacy_permissions(app):
app_settings = _get_app_settings(app) app_settings = _get_app_settings(app)
app_perm_currently_allowed = user_permission_list()["permissions"][app + ".main"]["allowed"] app_perm_currently_allowed = user_permission_list()["permissions"][app + ".main"]["allowed"]
settings_say_it_should_be_public = (app_settings.get("unprotected_uris", None) == "/"
or app_settings.get("skipped_uris", None) == "/")
# If the current permission says app is protected, but there are legacy rules saying it should be public... # If the current permission says app is protected, but there are legacy rules saying it should be public...
if app_perm_currently_allowed == ["all_users"] \ if app_perm_currently_allowed == ["all_users"] and settings_say_it_should_be_public:
and (app_settings.get("unprotected_uris", None) == "/"
or app_settings.get("skipped_uris", None) == "/"):
# Make it public # Make it public
user_permission_update(app + ".main", remove="all_users", add="visitors", sync_perm=False) user_permission_update(app + ".main", remove="all_users", add="visitors", sync_perm=False)
# If the current permission says app is public, but there are no setting saying it should be public... # If the current permission says app is public, but there are no setting saying it should be public...
if app_perm_currently_allowed == ["visitors"] \ if app_perm_currently_allowed == ["visitors"] and not settings_say_it_should_be_public:
and (app_settings.get("unprotected_uris", None) is None
and app_settings.get("skipped_uris", None) is None):
# Make is private # Make is private
user_permission_update(app + ".main", remove="visitors", add="all_users", sync_perm=False) user_permission_update(app + ".main", remove="visitors", add="all_users", sync_perm=False)