mirror of
https://github.com/YunoHost-Apps/cac-proxy_ynh.git
synced 2024-09-03 18:16:07 +02:00
Merge pull request #7 from YunoHost-Apps/dev
Latest version with chrome sandbox bypass
This commit is contained in:
commit
641bc56135
8 changed files with 46 additions and 9 deletions
|
@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
|
|||
- Two engines: a lightweight and one based on chrome to support websites running javascript
|
||||
|
||||
|
||||
**Shipped version:** 1.1.6~ynh3
|
||||
**Shipped version:** 1.1.11~ynh1
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
|
|||
- Two engines: a lightweight and one based on chrome to support websites running javascript
|
||||
|
||||
|
||||
**Version incluse :** 1.1.6~ynh3
|
||||
**Version incluse :** 1.1.11~ynh1
|
||||
|
||||
## Captures d’écran
|
||||
|
||||
|
|
|
@ -3,3 +3,4 @@ CACP_REDIRECT_HOST=https://__DOMAIN__
|
|||
CACP_REDIRECT_PATH=__PATH_URL__
|
||||
CACP_DEBUG=FALSE
|
||||
CACP_LOG=FALSE
|
||||
CACP_BYPASS_SANDBOX=__BYPASS_SANDBOX__
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=https://github.com/gcollin/cookie-aware-cors-proxy/releases/download/v1.1.6/cookie-aware-cors-proxy.tgz
|
||||
SOURCE_SUM=110dd1dc2014dcc6c9d05ff947aa365f4ee960bf93ec7b9abf965ad892e2b2d5
|
||||
SOURCE_URL=https://github.com/gcollin/cookie-aware-cors-proxy/releases/download/v1.1.11/cookie-aware-cors-proxy.tgz
|
||||
SOURCE_SUM=93a2564a9d244c0087a8103f68be31ef48d592180f37dd3e496feb438cc7e1c8
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=tar.gz
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"en": "An advanced https proxy allowing you to call other websites from your own web application.",
|
||||
"fr": "Un proxy https avancé vous permettant d'appeler d'autres sites depuis votre propre application web."
|
||||
},
|
||||
"version": "1.1.6~ynh3",
|
||||
"version": "1.1.11~ynh1",
|
||||
"url": "https://github.com/gcollin/cookie-aware-cors-proxy",
|
||||
"upstream": {
|
||||
"license": "MIT",
|
||||
|
|
|
@ -29,6 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
|
|||
# Needed for helper "ynh_add_nginx_config"
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
port=$(ynh_app_setting_get --app=$app --key=port)
|
||||
install_chromium=$(ynh_app_setting_get --app=$app --key=install_chromium)
|
||||
|
||||
#=================================================
|
||||
# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
|
||||
|
@ -109,6 +110,20 @@ ynh_script_progression --message="Updating .env configuration..."
|
|||
ynh_backup_if_checksum_is_different --file="$final_path/.env"
|
||||
domain=$new_domain
|
||||
path_url=$new_path
|
||||
|
||||
# We must use chrome sandbox for kernels 5.x, 6.x doesn't need it anymore
|
||||
kernel_release=$(uname -r)
|
||||
if [[ $kernel_release == 5.* ]]
|
||||
then
|
||||
bypass_sandbox="TRUE"
|
||||
if [ $install_chromium -eq 1 ]
|
||||
then
|
||||
ynh_print_warn --message="Using non sandboxed chromium as kernel release is less than 6.x"
|
||||
fi
|
||||
else
|
||||
bypass_sandbox="FALSE"
|
||||
fi
|
||||
|
||||
ynh_add_config --template=".env" --destination="$final_path/.env"
|
||||
|
||||
# FIXME: this should be handled by the core in the future
|
||||
|
|
|
@ -208,6 +208,19 @@ ynh_add_nginx_config
|
|||
#=================================================
|
||||
ynh_script_progression --message="Adding a configuration file..." --weight=1
|
||||
|
||||
# We must use chrome sandbox for kernels 5.x, 6.x doesn't need it anymore
|
||||
kernel_release=$(uname -r)
|
||||
if [[ $kernel_release == 5.* ]]
|
||||
then
|
||||
bypass_sandbox="TRUE"
|
||||
if [ $install_chromium -eq 1 ]
|
||||
then
|
||||
ynh_print_warn --message="Using non sandboxed chromium as kernel release is less than 6.x"
|
||||
fi
|
||||
else
|
||||
bypass_sandbox="FALSE"
|
||||
fi
|
||||
|
||||
ynh_add_config --template=".env" --destination="$final_path/.env"
|
||||
|
||||
# FIXME: this should be handled by the core in the future
|
||||
|
|
|
@ -192,10 +192,18 @@ ynh_add_nginx_config
|
|||
#=================================================
|
||||
ynh_script_progression --message="Updating a configuration file..." --weight=1
|
||||
|
||||
### Same as during install
|
||||
###
|
||||
### The file will automatically be backed-up if it's found to be manually modified (because
|
||||
### ynh_add_config keeps track of the file's checksum)
|
||||
# We must use chrome sandbox for kernels 5.x, 6.x doesn't need it anymore
|
||||
kernel_release=$(uname -r)
|
||||
if [[ $kernel_release == 5.* ]]
|
||||
then
|
||||
bypass_sandbox="TRUE"
|
||||
if [ $install_chromium -eq 1 ]
|
||||
then
|
||||
ynh_print_warn --message="Using non sandboxed chromium as kernel release is less than 6.x"
|
||||
fi
|
||||
else
|
||||
bypass_sandbox="FALSE"
|
||||
fi
|
||||
|
||||
ynh_add_config --template=".env" --destination="$final_path/.env"
|
||||
|
||||
|
|
Loading…
Reference in a new issue