From b2be5ca2e0222071509a2deace9df7f7acce81d8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Sep 2021 10:51:21 +0200 Subject: [PATCH 1/2] Fix --- conf/systemd.service | 30 ++++++++++++++++++++++++++++++ manifest.json | 4 ++-- scripts/restore | 2 -- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index ec9e7d4..f3535b2 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -12,5 +12,35 @@ Restart=always Environment=__YNH_NODE_LOAD_PATH__ Environment=NODE_ENV=production +# Sandboxing options to harden security +# Depending on specificities of your service/app, you may need to tweak these +# .. but this should be a good baseline +# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html +NoNewPrivileges=yes +PrivateTmp=yes +PrivateDevices=yes +RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 +RestrictNamespaces=yes +RestrictRealtime=yes +DevicePolicy=closed +ProtectSystem=full +ProtectControlGroups=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +LockPersonality=yes +SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap + +# 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_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW +CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG + [Install] WantedBy=multi-user.target diff --git a/manifest.json b/manifest.json index 92398aa..a819218 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "wikijs", "packaging_format": 1, "description": { - "en": "Open source, modern and powerful wiki app built on Node.js, Git and Markdown.", - "fr": "Wiki moderne et open source propulsé Node.js, Git et Markdown." + "en": "Open source powerful wiki app built on Node.js, Git and Markdown", + "fr": "Wiki open source propulsé par Node.js, Git et Markdown" }, "version": "2.5.201~ynh3", "url": "https://wiki.js.org/", diff --git a/scripts/restore b/scripts/restore index bd3e6e0..e5111e1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -41,8 +41,6 @@ ldap_password=$(ynh_app_setting_get --app=$app --key=ldap_password) #================================================= 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 " From 5334e90c39332d4d974ecc478b6327813680b024 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 8 Sep 2021 08:51:27 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2724f43..307982d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Open source, modern and powerful wiki app built on Node.js, Git and Markdown. +Open source powerful wiki app built on Node.js, Git and Markdown **Shipped version:** 2.5.201~ynh3 diff --git a/README_fr.md b/README_fr.md index 95a3557..0235a00 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Wiki moderne et open source propulsé Node.js, Git et Markdown. +Wiki open source propulsé par Node.js, Git et Markdown **Version incluse :** 2.5.201~ynh3