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 helper

Browse source
This commit is contained in:
Josué Tille 2019-12-27 16:22:57 +01:00
parent 45966c8ebd
commit 414fe1926a
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/helpers.d/setting
View file

@ -262,7 +262,7 @@ ynh_webpath_register () {
# #
# Requires YunoHost version 3.7.0 or higher. # Requires YunoHost version 3.7.0 or higher.
ynh_permission_create() { ynh_permission_create() {
declare -Ar args_array=( [p]=permission= [u]=url= [a]=allowed= [p]=protected= ) declare -Ar args_array=( [p]=permission= [u]=url= [a]=allowed= [P]=protected= )
local permission local permission
local url local url
local allowed local allowed
@ -277,7 +277,7 @@ ynh_permission_create() {
if [[ -n ${allowed:-} ]]; then if [[ -n ${allowed:-} ]]; then
allowed=",allowed=['${allowed//';'/"','"}']" allowed=",allowed=['${allowed//';'/"','"}']"
fi fi
if [ -n ${protected} ]; then if [[ -n ${protected:-} ]]; then
if [ $protected == "true" ]; then if [ $protected == "true" ]; then
protected=",protected=True" protected=",protected=True"
else else
@ -353,7 +353,7 @@ ynh_permission_url() {
# example: ynh_permission_update --permission admin --add samdoe --remove all_users # example: ynh_permission_update --permission admin --add samdoe --remove all_users
# Requires YunoHost version 3.7.0 or higher. # Requires YunoHost version 3.7.0 or higher.
ynh_permission_update() { ynh_permission_update() {
declare -Ar args_array=( [p]=permission= [a]=add= [r]=remove= [p]=protected= ) declare -Ar args_array=( [p]=permission= [a]=add= [r]=remove= [P]=protected= )
local permission local permission
local add local add
local remove local remove
@ -366,7 +366,7 @@ ynh_permission_update() {
if [[ -n ${remove:-} ]]; then if [[ -n ${remove:-} ]]; then
remove=",remove=['${remove//';'/"','"}']" remove=",remove=['${remove//';'/"','"}']"
fi fi
if [ -n ${protected} ]; then if [[ -n ${protected:-} ]]; then
if [ $protected == "true" ]; then if [ $protected == "true" ]; then
protected=",protected=True" protected=",protected=True"
else else
@ -374,5 +374,5 @@ ynh_permission_update() {
fi fi
fi fi
yunohost tools shell -c "from yunohost.permission import user_permission_update; user_permission_update('$app.$permission', ${add:-} ${remove} ${protected:-} , force=True, sync_perm=False)" yunohost tools shell -c "from yunohost.permission import user_permission_update; user_permission_update('$app.$permission' ${add:-} ${remove:-} ${protected:-} , force=True, sync_perm=False)"
} }

6
src/yunohost/tests/test_permission.py
View file

@ -33,8 +33,8 @@ def setup_function(function):
user_create("alice", "Alice", "White", "alice@" + maindomain, dummy_password) user_create("alice", "Alice", "White", "alice@" + maindomain, dummy_password)
user_create("bob", "Bob", "Snow", "bob@" + maindomain, dummy_password) user_create("bob", "Bob", "Snow", "bob@" + maindomain, dummy_password)
permission_create("wiki.main", url="/", allowed=["all_users"] , sync_perm=False) permission_create("wiki.main", url="/", allowed=["all_users"], protected=False, sync_perm=False)
permission_create("blog.main", allowed=["all_users"], sync_perm=False) permission_create("blog.main", allowed=["all_users"], protected=False, sync_perm=False)
user_permission_update("blog.main", remove="all_users", add="alice") user_permission_update("blog.main", remove="all_users", add="alice")
@ -326,7 +326,7 @@ def test_permission_adding_visitors_implicitly_add_all_users(mocker):
def test_permission_cant_remove_all_users_if_visitors_allowed(mocker): def test_permission_cant_remove_all_users_if_visitors_allowed(mocker):
with message(mocker, "permission_updated", permission="blog.main"): with message(mocker, "permission_updated", permission="blog.main"):
user_permission_update("blog.main", add=["visitors", "all_users"]) user_permission_update("blog.main", add=["visitors", "all_users"], )
with raiseYunohostError(mocker, 'permission_cannot_remove_all_users_while_visitors_allowed'): with raiseYunohostError(mocker, 'permission_cannot_remove_all_users_while_visitors_allowed'):
user_permission_update("blog.main", remove="all_users") user_permission_update("blog.main", remove="all_users")