diff --git a/README.md b/README.md index aef1686..23885a7 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in CI runner of YunoHost -**Shipped version:** 2021-09-22~ynh2 +**Shipped version:** 2021.09.22~ynh3 ## Screenshots -![](./doc/screenshots/screenshot1.png) +![](./doc/screenshots/screenshot.png) ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 07b170d..b2095e6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,13 +13,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Runner d'intégration continue de YunoHost -**Version incluse :** 2021-09-22~ynh2 +**Version incluse :** 2021.09.22~ynh3 ## Captures d'écran -![](./doc/screenshots/screenshot1.png) +![](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes diff --git a/check_process b/check_process index b1c6db7..f0f31f4 100644 --- a/check_process +++ b/check_process @@ -12,10 +12,6 @@ setup_private=0 setup_public=1 upgrade=1 - # 03 Sep 2018 - # upgrade=1 from_commit=04cb5f0ec18def9d50fa861c16d491275843b9e7 - # 041120 - # upgrade=1 from_commit=7b3acfc9b28b6ed33a1590ae16261d7dd3b5b06a # 2021-03-05~ynh1 upgrade=1 from_commit=f0e9373aa2403bf04f84c67646ac5d34376b7959 # 2021-09-22~ynh1 @@ -28,11 +24,6 @@ Email= Notification=down ;;; Upgrade options - ; commit=04cb5f0ec18def9d50fa861c16d491275843b9e7 - name=03 Sep 2018 04cb5f0ec18def9d50fa861c16d491275843b9e7 - manifest_arg=domain=DOMAIN&path=PATH& - ; commit=7b3acfc9b28b6ed33a1590ae16261d7dd3b5b06a - name=041120 ; commit=f0e9373aa2403bf04f84c67646ac5d34376b7959 name=2021-03-05~ynh1 ; commit=fea498cd83a7da12a102efe2f47397dace3cddda diff --git a/conf/nginx.conf b/conf/nginx.conf index 9995880..4f337a3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__/; proxy_http_version 1.1; diff --git a/conf/systemd.service b/conf/systemd.service index 0921e3d..ad977e3 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,5 +10,22 @@ Group=__APP__ WorkingDirectory=__FINALPATH__/ ExecStart=__FINALPATH__/venv/bin/python ./run.py +# Sandboxing options to harden security +# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html +DevicePolicy=closed +ProtectSystem=full +ProtectControlGroups=yes + +# Denying access to capabilities that should not be relevant for webapps +# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html +CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD +CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE +CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT +CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK +CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM +CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG +CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE +CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG + [Install] WantedBy=multi-user.target diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png new file mode 100644 index 0000000..32b0f32 Binary files /dev/null and b/doc/screenshots/screenshot.png differ diff --git a/doc/screenshots/screenshot1.png b/doc/screenshots/screenshot1.png deleted file mode 100644 index 099048d..0000000 Binary files a/doc/screenshots/screenshot1.png and /dev/null differ diff --git a/manifest.json b/manifest.json index 0cd1b55..f3fd036 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CI runner of YunoHost", "fr": "Runner d'intégration continue de YunoHost" }, - "version": "2021-09-22~ynh2", + "version": "2021.09.22~ynh3", "url": "https://github.com/YunoHost/yunorunner", "upstream": { "license": "GPL-3.0-or-later", @@ -21,7 +21,7 @@ "email": "maniackc_dev@crudelis.fr" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index ff8d889..67bef3d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,10 +36,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # ACTIVATE MAINTENANCE MODE