YunoHost-Apps/ffsync_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ffsync_ynh.git synced 2024-09-03 18:26:38 +02:00
Code Issues Activity Actions

fix alias_traversal and change maintainer

Browse source
This commit is contained in:
Jean-Baptiste Holcroft 2018-01-29 22:44:33 +01:00
parent 23645f9f33
commit 3b3cabbad4
5 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
check_process
View file

@ -1,5 +1,4 @@
;; Test complet
auto_remove=1
;; Test name
; Manifest
domain="domain.tld" (DOMAIN)
path="/path" (PATH)
@ -11,21 +10,32 @@
setup_private=0
setup_public=1
upgrade=1
# test upgrade from latest published version
upgrade=1 from_commit=fd6350495d5a1d864ae30e1a61e18939fdb6a428
# test upgrade from latest git commit before Jibec's rewriting
upgrade=1 from_commit=267ccc21f7b52d22bc3d5b9cd6239857b9a82aad
backup_restore=1
multi_instance=1
incorrect_path=1
port_already_use=0
change_url=0
;;; Levels
Level 1=auto
Level 2=auto
Level 3=auto
Level 4=1
# impossible with Firefox Sync (it uses Firefox Accounts)
Level 4=na
Level 5=auto
Level 6=auto
Level 7=auto
Level 8=0
Level 9=0
Level 10=0
;;; Options
Email=jean-baptiste@holcroft.fr
Notification=fail
;;; Upgrade options
; commit=fd6350495d5a1d864ae30e1a61e18939fdb6a428
name=latest published version
manifest_arg=domain=DOMAIN&path=PATH
; commit=267ccc21f7b52d22bc3d5b9cd6239857b9a82aad
name=latest git commit before Jibec's rewriting
manifest_arg=domain=DOMAIN&path=PATH

4
conf/nginx.conf
View file

@ -1,4 +1,6 @@
location __PATH__ {
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ {
# Path to source
alias __FINALPATH__/ ;

5
manifest.json
View file

@ -9,9 +9,8 @@
"fr": "Le serveur de synchronisation de Mozilla, pour héberger vos données Firefox"
},
"maintainer": {
"name": "beudbeud",
"email": "beudbeud@beudibox.fr",
"url": "https://github.com/balu-/FSyncMS"
"name": "jibec",
"email": "jean-baptiste@holcroft.fr"
},
"requirements": {
"yunohost": ">=2.7.0"

3
scripts/install
View file

@ -100,6 +100,9 @@ then
ynh_replace_string "uwsgi_modifier1 " "#uwsgi_modifier1 " "$finalnginxconf"
ynh_store_file_checksum "$finalnginxconf"
else
# add rewrite for alias_traversal protection
ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
fi
#=================================================

10
scripts/upgrade
View file

@ -47,6 +47,13 @@ if [ -z "$final_path" ]; then
ynh_app_setting_set "$app" final_path "$final_path"
fi
# If path_url doesn't exist, create it
if [ -z "$path_url" ]; then
path_url=$(ynh_app_setting_get "$app" path)
ynh_app_setting_set "$app" path_url "$final_path"
ynh_app_setting_delete "$app" path
fi
# Detect old installation style
if [ -e /opt/yunohost/ffsync ]; then
service ffsync stop
@ -111,6 +118,9 @@ then
ynh_replace_string "uwsgi_modifier1 " "#uwsgi_modifier1 " "$finalnginxconf"
ynh_store_file_checksum "$finalnginxconf"
else
# add rewrite for alias_traversal protection
ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
fi