YunoHost-Apps/lutim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lutim_ynh.git synced 2024-09-03 19:36:24 +02:00
Code Issues Activity Actions

Use a new permission to allow visitors

Browse source
This commit is contained in:
Kay0u 2020-02-11 15:59:59 +07:00
parent 512d8ef915
commit d3b4829d7c
No known key found for this signature in database
GPG key ID: 7FF262C033518333
5 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hooks/post_app_addaccess
View file

@ -9,7 +9,13 @@ permission=$3
added_groups=$4 added_groups=$4
if [ "$app" == __APP__ ]; then if [ "$app" == __APP__ ]; then
if [ "$added_groups" = "visitors" ]; then if [ "$permission" = "upload images" ]; then
ynh_app_setting_delete --app=$app --key=protected_regex if [ "$added_groups" = "visitors" ]; then
ynh_app_setting_delete --app=$app --key=protected_regex
yunohost app ssowatconf
else
ynh_print_warn --message="This app doesn't support this authorisation, you can only add or remove visitors group."
fi
fi fi
fi fi

16
hooks/post_app_removeaccess
View file

@ -9,10 +9,16 @@ permission=$3
removed_groups=$4 removed_groups=$4
if [ "$app" == __APP__ ]; then if [ "$app" == __APP__ ]; then
if [ "$removed_groups" = "visitors" ]; then if [ "$permission" = "upload images" ]; then
domain=$(ynh_app_setting_get --app=$app --key=domain) if [ "$removed_groups" = "visitors" ]; then
path_url=$(ynh_app_setting_get --app=$app --key=path) domain=$(ynh_app_setting_get --app=$app --key=domain)
domain_regex=$(echo "$domain" | sed 's@-@.@g') path_url=$(ynh_app_setting_get --app=$app --key=path)
ynh_app_setting_set --app=$app --key=protected_regex --value="$domain_regex$path_url/stats/?$","$domain_regex$path_url/manifest.webapp/?$","$domain_regex$path_url/?$","$domain_regex$path_url/[d-m]/.*$" domain_regex=$(echo "$domain" | sed 's@-@.@g')
ynh_app_setting_set --app=$app --key=protected_regex --value="$domain_regex$path_url/stats/?$","$domain_regex$path_url/manifest.webapp/?$","$domain_regex$path_url/?$","$domain_regex$path_url/[d-m]/.*$"
yunohost app ssowatconf
else
ynh_print_warn --message="This app doesn't support this authorisation, you can only add or remove visitors group."
fi
fi fi
fi fi

3
scripts/change_url
View file

@ -27,7 +27,6 @@ app=$YNH_APP_INSTANCE_NAME
ynh_script_progression --message="Loading installation settings..." --weight=2 ynh_script_progression --message="Loading installation settings..." --weight=2
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
port=$(ynh_app_setting_get --app=$app --key=port) port=$(ynh_app_setting_get --app=$app --key=port)
#================================================= #=================================================
@ -122,7 +121,7 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Reconfiguring SSOwat..." ynh_script_progression --message="Reconfiguring SSOwat..."
if [ $is_public -eq 0 ] if [ ! -z $(ynh_app_setting_get --app=$app --key=protected_regex) ] # Only user with a yunohost account can upload an image
then then
# If the app is private, viewing images stays publicly accessible. # If the app is private, viewing images stays publicly accessible.
if [ "$new_path" == "/" ]; then if [ "$new_path" == "/" ]; then

8
scripts/install
View file

@ -198,11 +198,11 @@ yunohost service add $app --log $final_path/log/production.log
#================================================= #=================================================
ynh_script_progression --message="Configuring SSOwat..." ynh_script_progression --message="Configuring SSOwat..."
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" ynh_permission_update --permission="main" --add="visitors"
ynh_permission_url --permission="main" ynh_permission_create --permission="upload images" --allowed="visitors"
if [ $fis_public -eq 0 ] if [ $is_public -eq 0 ]
then then
# If the app is private, viewing images stays publicly accessible. # If the app is private, viewing images stays publicly accessible.
if [ "$path_url" == "/" ]; then if [ "$path_url" == "/" ]; then
@ -212,6 +212,8 @@ then
# Modify the domain to be used in a regex # Modify the domain to be used in a regex
domain_regex=$(echo "$domain" | sed 's@-@.@g') domain_regex=$(echo "$domain" | sed 's@-@.@g')
ynh_app_setting_set --app=$app --key=protected_regex --value="$domain_regex$path_url/stats/?$","$domain_regex$path_url/manifest.webapp/?$","$domain_regex$path_url/?$","$domain_regex$path_url/[d-m]/.*$" ynh_app_setting_set --app=$app --key=protected_regex --value="$domain_regex$path_url/stats/?$","$domain_regex$path_url/manifest.webapp/?$","$domain_regex$path_url/?$","$domain_regex$path_url/[d-m]/.*$"
ynh_permission_update --permission="upload images" --remove="visitors"
fi fi
#================================================= #=================================================

11
scripts/upgrade
View file

@ -49,7 +49,6 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=2
if [ ! -z "$skipped_uris" ]; then if [ ! -z "$skipped_uris" ]; then
ynh_app_setting_delete --app=$app --key=skipped_uris ynh_app_setting_delete --app=$app --key=skipped_uris
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
fi fi
# if final_path isn't set, which can happens with old scripts, set final_path. # if final_path isn't set, which can happens with old scripts, set final_path.
@ -262,7 +261,15 @@ chown $app -R /var/log/$app
#================================================= #=================================================
ynh_script_progression --message="Upgrading permission..." ynh_script_progression --message="Upgrading permission..."
ynh_permission_url --permission="main" if ! ynh_permission_exists --permission="upload images"
then
if [ -z $(ynh_app_setting_get --app=$app --key=protected_regex) ] # Everyone can upload image
then
ynh_permission_create --permission="upload images" --allowed="visitors"
else # Only user with a yunohost account can upload an image
ynh_permission_create --permission="upload images" --allowed="all_users"
fi
fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX