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

App install/remove now has sync_perm setting

Browse source
This commit is contained in:
selfhoster1312 2024-05-10 20:22:32 +02:00
parent 288d6b6b47
commit aeda36f610
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app.py
View file

@ -1025,6 +1025,7 @@ def app_install(
args=None, args=None,
no_remove_on_failure=False, no_remove_on_failure=False,
force=False, force=False,
sync_perm=True,
): ):
""" """
Install apps Install apps
@ -1201,6 +1202,7 @@ def app_install(
label=manifest["name"], label=manifest["name"],
show_tile=False, show_tile=False,
protected=False, protected=False,
sync_perm=sync_perm
) )
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
@ -1377,7 +1379,7 @@ def app_install(
@is_unit_operation() @is_unit_operation()
def app_remove(operation_logger, app, purge=False, force_workdir=None): def app_remove(operation_logger, app, purge=False, force_workdir=None, sync_perm=True):
""" """
Remove app Remove app
@ -1476,7 +1478,8 @@ def app_remove(operation_logger, app, purge=False, force_workdir=None):
else: else:
logger.warning(m18n.n("app_not_properly_removed", app=app)) logger.warning(m18n.n("app_not_properly_removed", app=app))
permission_sync_to_user() if sync_perm:
permission_sync_to_user()
_assert_system_is_sane_for_app(manifest, "post") _assert_system_is_sane_for_app(manifest, "post")

27
src/tests/test_sso_and_portalapi.py
View file

@ -43,6 +43,18 @@ def setup_module(module):
assert os.system("systemctl is-active yunohost-portal-api >/dev/null") == 0 assert os.system("systemctl is-active yunohost-portal-api >/dev/null") == 0
domainlist = domain_list()["domains"]
domains = [ domain for domain in [ subdomain, secondarydomain ] if domain not in domainlist ]
domains_add(domains)
# Install app first, permissions will be synced after users_add
app_install(
os.path.join(get_test_apps_dir(), "hellopy_ynh"),
args=f"domain={maindomain}&init_main_permission=visitors",
force=True,
sync_perm=False,
)
userlist = user_list()["users"] userlist = user_list()["users"]
users_to_add = [ user for user in [ users_to_add = [ user for user in [
User("alice", maindomain, dummy_password, fullname="Alice White", admin=True), User("alice", maindomain, dummy_password, fullname="Alice White", admin=True),
@ -50,24 +62,15 @@ def setup_module(module):
] if user.name not in userlist ] ] if user.name not in userlist ]
users_add(users_to_add) users_add(users_to_add)
domainlist = domain_list()["domains"]
domains = [ domain for domain in [ subdomain, secondarydomain ] if domain not in domainlist ]
domains_add(domains)
app_install(
os.path.join(get_test_apps_dir(), "hellopy_ynh"),
args=f"domain={maindomain}&init_main_permission=visitors",
force=True,
)
def teardown_module(module): def teardown_module(module):
# Remove app first, permissions will be synced after users_remove
app_remove("hellopy", sync_perm=False)
userlist = user_list()["users"] userlist = user_list()["users"]
users = [ user for user in [ "alice", "bob" ] if user in userlist ] users = [ user for user in [ "alice", "bob" ] if user in userlist ]
users_remove(users) users_remove(users)
app_remove("hellopy")
domainlist = domain_list()["domains"] domainlist = domain_list()["domains"]
domains = [ domain for domain in [ subdomain, secondarydomain ] if domain in domainlist ] domains = [ domain for domain in [ subdomain, secondarydomain ] if domain in domainlist ]
domains_remove(domains) domains_remove(domains)