mirror of
https://github.com/YunoHost-Apps/ffsync_ynh.git
synced 2024-09-03 18:26:38 +02:00
fix alias_traversal and change maintainer
This commit is contained in:
parent
23645f9f33
commit
3b3cabbad4
5 changed files with 33 additions and 9 deletions
|
@ -1,5 +1,4 @@
|
||||||
;; Test complet
|
;; Test name
|
||||||
auto_remove=1
|
|
||||||
; Manifest
|
; Manifest
|
||||||
domain="domain.tld" (DOMAIN)
|
domain="domain.tld" (DOMAIN)
|
||||||
path="/path" (PATH)
|
path="/path" (PATH)
|
||||||
|
@ -11,21 +10,32 @@
|
||||||
setup_private=0
|
setup_private=0
|
||||||
setup_public=1
|
setup_public=1
|
||||||
upgrade=1
|
upgrade=1
|
||||||
# test upgrade from latest published version
|
|
||||||
upgrade=1 from_commit=fd6350495d5a1d864ae30e1a61e18939fdb6a428
|
upgrade=1 from_commit=fd6350495d5a1d864ae30e1a61e18939fdb6a428
|
||||||
# test upgrade from latest git commit before Jibec's rewriting
|
|
||||||
upgrade=1 from_commit=267ccc21f7b52d22bc3d5b9cd6239857b9a82aad
|
upgrade=1 from_commit=267ccc21f7b52d22bc3d5b9cd6239857b9a82aad
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=1
|
multi_instance=1
|
||||||
|
incorrect_path=1
|
||||||
port_already_use=0
|
port_already_use=0
|
||||||
|
change_url=0
|
||||||
;;; Levels
|
;;; Levels
|
||||||
Level 1=auto
|
Level 1=auto
|
||||||
Level 2=auto
|
Level 2=auto
|
||||||
Level 3=auto
|
Level 3=auto
|
||||||
Level 4=1
|
# impossible with Firefox Sync (it uses Firefox Accounts)
|
||||||
|
Level 4=na
|
||||||
Level 5=auto
|
Level 5=auto
|
||||||
Level 6=auto
|
Level 6=auto
|
||||||
Level 7=auto
|
Level 7=auto
|
||||||
Level 8=0
|
Level 8=0
|
||||||
Level 9=0
|
Level 9=0
|
||||||
Level 10=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
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
location __PATH__ {
|
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
|
||||||
|
|
||||||
|
location __PATH__/ {
|
||||||
# Path to source
|
# Path to source
|
||||||
alias __FINALPATH__/ ;
|
alias __FINALPATH__/ ;
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,8 @@
|
||||||
"fr": "Le serveur de synchronisation de Mozilla, pour héberger vos données Firefox"
|
"fr": "Le serveur de synchronisation de Mozilla, pour héberger vos données Firefox"
|
||||||
},
|
},
|
||||||
"maintainer": {
|
"maintainer": {
|
||||||
"name": "beudbeud",
|
"name": "jibec",
|
||||||
"email": "beudbeud@beudibox.fr",
|
"email": "jean-baptiste@holcroft.fr"
|
||||||
"url": "https://github.com/balu-/FSyncMS"
|
|
||||||
},
|
},
|
||||||
"requirements": {
|
"requirements": {
|
||||||
"yunohost": ">=2.7.0"
|
"yunohost": ">=2.7.0"
|
||||||
|
|
|
@ -100,6 +100,9 @@ then
|
||||||
ynh_replace_string "uwsgi_modifier1 " "#uwsgi_modifier1 " "$finalnginxconf"
|
ynh_replace_string "uwsgi_modifier1 " "#uwsgi_modifier1 " "$finalnginxconf"
|
||||||
|
|
||||||
ynh_store_file_checksum "$finalnginxconf"
|
ynh_store_file_checksum "$finalnginxconf"
|
||||||
|
else
|
||||||
|
# add rewrite for alias_traversal protection
|
||||||
|
ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -47,6 +47,13 @@ if [ -z "$final_path" ]; then
|
||||||
ynh_app_setting_set "$app" final_path "$final_path"
|
ynh_app_setting_set "$app" final_path "$final_path"
|
||||||
fi
|
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
|
# Detect old installation style
|
||||||
if [ -e /opt/yunohost/ffsync ]; then
|
if [ -e /opt/yunohost/ffsync ]; then
|
||||||
service ffsync stop
|
service ffsync stop
|
||||||
|
@ -111,6 +118,9 @@ then
|
||||||
ynh_replace_string "uwsgi_modifier1 " "#uwsgi_modifier1 " "$finalnginxconf"
|
ynh_replace_string "uwsgi_modifier1 " "#uwsgi_modifier1 " "$finalnginxconf"
|
||||||
|
|
||||||
ynh_store_file_checksum "$finalnginxconf"
|
ynh_store_file_checksum "$finalnginxconf"
|
||||||
|
else
|
||||||
|
# add rewrite for alias_traversal protection
|
||||||
|
ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue