diff --git a/README.md b/README.md index 8b8674f..62cf27b 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ 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.219~ynh1 +**Shipped version:** 2.5.219~ynh2 **Demo:** https://docs-beta.requarks.io/ diff --git a/README_fr.md b/README_fr.md index 7288993..a882e98 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,9 +11,9 @@ 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.219~ynh1 +**Version incluse :** 2.5.219~ynh2 **Démo :** https://docs-beta.requarks.io/ diff --git a/check_process b/check_process index b2a8049..0762bb1 100644 --- a/check_process +++ b/check_process @@ -40,6 +40,8 @@ upgrade=1 from_commit=16d047d802582d0d6db6d0d7343bd1fc0fb2eebf # 2.5.214~ynh1 upgrade=1 from_commit=078ffc6ade0df8efd2e035c25e36218c163d158d + # 2.5.219~ynh1 + upgrade=1 from_commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924 backup_restore=1 multi_instance=1 port_already_use=0 @@ -78,3 +80,5 @@ Notification=yes name=2.5.201~ynh3 ; commit=078ffc6ade0df8efd2e035c25e36218c163d158d name=2.5.214~ynh1 + ; commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924 + name=2.5.219~ynh1 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 6dd12c0..c24455d 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "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.219~ynh1", + "version": "2.5.219~ynh2", "url": "https://wiki.js.org/", "upstream": { "license": "AGPL-3.0-or-later", 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 "