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

Update helper for permission protection support

Browse source
This commit is contained in:
Josué Tille 2019-12-22 15:03:29 +01:00
parent 5d4f62b222
commit fe8a0cbcbd
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
data/helpers.d/setting
View file

@ -241,10 +241,12 @@ ynh_webpath_register () {
# #
# example: ynh_permission_create --permission admin --url /admin --allowed alice bob # example: ynh_permission_create --permission admin --url /admin --allowed alice bob
# #
# usage: ynh_permission_create --permission "permission" [--url "url"] [--allowed group1 group2] # usage: ynh_permission_create --permission "permission" [--url "url"] [--allowed group1 group2] [--is_protected "true"|"false"]
# | arg: permission - the name for the permission (by default a permission named "main" already exist) # | arg: permission - the name for the permission (by default a permission named "main" already exist)
# | arg: url - (optional) URL for which access will be allowed/forbidden # | arg: url - (optional) URL for which access will be allowed/forbidden
# | arg: allowed - (optional) A list of group/user to allow for the permission # | arg: allowed - (optional) A list of group/user to allow for the permission
# | arg: is_protected - (optional) Define if this permission is protected. If it is protected the administrator
# | won't be able to add or remove the visitors group of this permission. By default it's 'false'
# #
# If provided, 'url' is assumed to be relative to the app domain/path if they # If provided, 'url' is assumed to be relative to the app domain/path if they
# start with '/'. For example: # start with '/'. For example:
@ -259,10 +261,11 @@ 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= ) declare -Ar args_array=( [p]=permission= [u]=url= [a]=allowed= [p]=is_protected= )
local permission local permission
local url local url
local allowed local allowed
local is_protected
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
if [[ -n ${url:-} ]]; then if [[ -n ${url:-} ]]; then
@ -270,12 +273,18 @@ ynh_permission_create() {
else else
url="None" url="None"
fi fi
if [[ -n ${allowed:-} ]]; then if [[ -n ${allowed:-} ]]; then
allowed=",allowed=['${allowed//';'/"','"}']" allowed=",allowed=['${allowed//';'/"','"}']"
fi fi
if [ -n ${is_protected} ]; then
if [ $is_protected == "true" ]; then
is_protected=",is_protected=$is_protected=True"
else
is_protected=",is_protected=$is_protected=False"
fi
fi
yunohost tools shell -c "from yunohost.permission import permission_create; permission_create('$app.$permission', url=$url ${allowed:-} , sync_perm=False)" yunohost tools shell -c "from yunohost.permission import permission_create; permission_create('$app.$permission', url=$url ${allowed:-} ${is_protected:-} , sync_perm=False)"
} }
# Remove a permission for the app (note that when the app is removed all permission is automatically removed) # Remove a permission for the app (note that when the app is removed all permission is automatically removed)
@ -333,26 +342,36 @@ ynh_permission_url() {
# Update a permission for the app # Update a permission for the app
# #
# usage: ynh_permission_update --permission "permission" --add "group" ["group" ...] --remove "group" ["group" ...] # usage: ynh_permission_update --permission "permission" --add "group" ["group" ...] --remove "group" ["group" ...] [--is_protected "true"|"false"]
# | arg: permission - the name for the permission (by default a permission named "main" already exist) # | arg: permission - the name for the permission (by default a permission named "main" already exist)
# | arg: add - the list of group or users to enable add to the permission # | arg: add - the list of group or users to enable add to the permission
# | arg: remove - the list of group or users to remove from the permission # | arg: remove - the list of group or users to remove from the permission
# | arg: is_protected - (optional) Define if this permission is protected. If it is protected the administrator
# | won't be able to add or remove the visitors group of this permission. By default it's 'false'
# #
# 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= ) declare -Ar args_array=( [p]=permission= [a]=add= [r]=remove= [p]=is_protected= )
local permission local permission
local add local add
local remove local remove
local is_protected
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
if [[ -n ${add:-} ]]; then if [[ -n ${add:-} ]]; then
add="--add ${add//';'/" "}" add=",add=['${add//';'/"','"}']"
fi fi
if [[ -n ${remove:-} ]]; then if [[ -n ${remove:-} ]]; then
remove="--remove ${remove//';'/" "} " remove=",remove=['${remove//';'/"','"}']"
fi
if [ -n ${is_protected} ]; then
if [ $is_protected == "true" ]; then
is_protected=",is_protected=$is_protected=True"
else
is_protected=",is_protected=$is_protected=False"
fi
fi fi
yunohost user permission update "$app.$permission" ${add:-} ${remove:-} yunohost tools shell -c "from yunohost.permission import user_permission_update; user_permission_update('$app.$permission', ${add:-} ${remove} ${is_protected:-} , sync_perm=False)"
} }