From 2c6d075e2a9749d2805fb52ec5a2c7274f73dfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=2ES?= Date: Thu, 11 Jan 2018 11:24:42 +0100 Subject: [PATCH 001/157] Add IS_MELTDOWN We check kaiser flags in /proc/cpuinfo and CONFIG_PAGE_TABLE_ISOLATION in kernel config file. --- evocheck.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index 529d89f..f5dc5a1 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -97,6 +97,7 @@ IS_REDIS_BACKUP=1 IS_ELASTIC_BACKUP=1 IS_MONGO_BACKUP=1 IS_MOUNT_FSTAB=1 +IS_MELTDOWN=1 #Proper to OpenBSD IS_SOFTDEP=1 @@ -704,6 +705,18 @@ if [ -e /etc/debian_version ]; then && test -f /etc/squid/evolinux-custom.conf) || echo 'IS_SQUIDEVOLINUXCONF FAILED!' fi fi + + if [ "$IS_MELTDOWN" = 1 ]; then + if grep -q BOOT_IMAGE= /proc/cmdline; then + # We check if the current running kernel has CONFIG_PAGE_TABLE_ISOLATION enabled + kernelPath=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) + kernelVer=${kernelPath##*/vmlinuz-} + kernelConfig="config-${kernelVer}" + grep -Eq '^(CONFIG_PAGE_TABLE_ISOLATION|CONFIG_KAISER)=y' /boot/$kernelConfig || echo 'IS_MELTDOWN FAILED!' + fi + # We check if the running kernel has kaiser loaded + grep -Eq '^flags\s+:\s+.+(kaiser).+' /proc/cpuinfo || echo 'IS_MELTDOWN FAILED!' + fi fi From 1418d4306e81152fa949821484a7d1226e1f2d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=2ES?= Date: Thu, 11 Jan 2018 11:52:43 +0100 Subject: [PATCH 002/157] Modified Meltdown check to handle kaiser and pti --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index f5dc5a1..97008ab 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -715,7 +715,7 @@ if [ -e /etc/debian_version ]; then grep -Eq '^(CONFIG_PAGE_TABLE_ISOLATION|CONFIG_KAISER)=y' /boot/$kernelConfig || echo 'IS_MELTDOWN FAILED!' fi # We check if the running kernel has kaiser loaded - grep -Eq '^flags\s+:\s+.+(kaiser).+' /proc/cpuinfo || echo 'IS_MELTDOWN FAILED!' + grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' fi fi From d2278292ccf4340913ac6982961e0f011e077a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=2ES?= Date: Thu, 11 Jan 2018 14:45:12 +0100 Subject: [PATCH 003/157] Diffrent test for Jessie kernel --- evocheck.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 97008ab..46982cb 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -712,10 +712,16 @@ if [ -e /etc/debian_version ]; then kernelPath=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) kernelVer=${kernelPath##*/vmlinuz-} kernelConfig="config-${kernelVer}" - grep -Eq '^(CONFIG_PAGE_TABLE_ISOLATION|CONFIG_KAISER)=y' /boot/$kernelConfig || echo 'IS_MELTDOWN FAILED!' + grep -Eq '^(CONFIG_PAGE_TABLE_ISOLATION|CONFIG_KAISER)=y' "/boot/${kernelConfig}" \ + || echo 'IS_MELTDOWN FAILED!' fi # We check if the running kernel has kaiser loaded - grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' + if is_debianversion stretch; then + grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' + elif is_debianversion jessie; then + dmesg | grep -Eq 'Kernel/User page tables isolation: enabled|Kernel page table isolation enabled' \ + || echo 'IS_MELTDOWN FAILED!' + fi fi fi From 57bd4312cea6ce1d5b9c23e3e8307f1bc42852cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=2ES?= Date: Thu, 11 Jan 2018 14:46:46 +0100 Subject: [PATCH 004/157] Breakline indentation --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 46982cb..53a70a4 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -720,7 +720,7 @@ if [ -e /etc/debian_version ]; then grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' elif is_debianversion jessie; then dmesg | grep -Eq 'Kernel/User page tables isolation: enabled|Kernel page table isolation enabled' \ - || echo 'IS_MELTDOWN FAILED!' + || echo 'IS_MELTDOWN FAILED!' fi fi fi From a6b54d99e9b5b95e9d508747b1e1b6892b0ae9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Fri, 25 May 2018 17:55:12 +0200 Subject: [PATCH 005/157] Add IS_EVOACME_LIVELINKS check --- evocheck.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index cc19104..661ddbb 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -102,6 +102,7 @@ IS_EVOBACKUP=1 IS_DUPLICATE_FS_LABEL=1 IS_EVOMAINTENANCE_FW=1 IS_EVOLIX_USER=1 +IS_EVOACME_LIVELINKS=1 #Proper to OpenBSD IS_SOFTDEP=1 @@ -766,6 +767,21 @@ if [ -e /etc/debian_version ]; then if [ "$IS_EVOLIX_USER" = 1 ]; then getent passwd evolix >/dev/null && echo 'IS_EVOLIX_USER FAILED!' fi + + if [ "$IS_EVOACME_LIVELINKS" = 1 ]; then + for live in /etc/letsencrypt/*/live; do + actualLink=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 11) + actualCertDate=$(cut -d'/' -f5 <<< $actualLink) + liveDir=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 9) + certDir=${liveDir%%/live} + lastCertDir=$(stat -c %n ${certDir}/[0-9]* | tail -1) + lastCertDate=$(cut -d'/' -f5 <<< $lastCertDir) + if [[ "$actualCertDate" != "$lastCertDate" ]]; then + echo 'IS_EVOACME_LIVELINKS FAILED!' + break + fi + done + fi fi From 9c5f8653fd4dd596e7e884693e8e0416a09075e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Mon, 28 May 2018 11:49:57 +0200 Subject: [PATCH 006/157] IS_EVOACME_LIVELINKS: Only executed if evoacme installed --- evocheck.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 661ddbb..e9715a7 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -769,18 +769,20 @@ if [ -e /etc/debian_version ]; then fi if [ "$IS_EVOACME_LIVELINKS" = 1 ]; then - for live in /etc/letsencrypt/*/live; do - actualLink=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 11) - actualCertDate=$(cut -d'/' -f5 <<< $actualLink) - liveDir=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 9) - certDir=${liveDir%%/live} - lastCertDir=$(stat -c %n ${certDir}/[0-9]* | tail -1) - lastCertDate=$(cut -d'/' -f5 <<< $lastCertDir) - if [[ "$actualCertDate" != "$lastCertDate" ]]; then - echo 'IS_EVOACME_LIVELINKS FAILED!' - break - fi - done + if [ -x "$(which evoacme)" ]; then + for live in /etc/letsencrypt/*/live; do + actualLink=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 11) + actualCertDate=$(cut -d'/' -f5 <<< $actualLink) + liveDir=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 9) + certDir=${liveDir%%/live} + lastCertDir=$(stat -c %n ${certDir}/[0-9]* | tail -1) + lastCertDate=$(cut -d'/' -f5 <<< $lastCertDir) + if [[ "$actualCertDate" != "$lastCertDate" ]]; then + echo 'IS_EVOACME_LIVELINKS FAILED!' + break + fi + done + fi fi fi From 5fc12657d32a7950198931820003dd32f018791b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 13 Jun 2018 18:03:14 +0200 Subject: [PATCH 007/157] Check evoacme file cron --- evocheck.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index cc19104..43a827b 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -102,6 +102,7 @@ IS_EVOBACKUP=1 IS_DUPLICATE_FS_LABEL=1 IS_EVOMAINTENANCE_FW=1 IS_EVOLIX_USER=1 +IS_EVOACME_CRON=1 #Proper to OpenBSD IS_SOFTDEP=1 @@ -766,6 +767,15 @@ if [ -e /etc/debian_version ]; then if [ "$IS_EVOLIX_USER" = 1 ]; then getent passwd evolix >/dev/null && echo 'IS_EVOLIX_USER FAILED!' fi + + if [ "$IS_EVOACME_CRON" = 1 ]; then + if [ -f "/usr/local/sbin/evoacme" ]; then + # Old cron file, should be deleted + test -f /etc/cron.daily/certbot && echo 'IS_EVOACME_CRON FAILED!' + # evoacme cron file should be present + test -f /etc/cron.daily/evoacme || echo 'IS_EVOACME_CRON FAILED!' + fi + fi fi From e5ca035516690dc3504cf36d20764169482f2ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 13 Jun 2018 18:09:48 +0200 Subject: [PATCH 008/157] Add a line --- evocheck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/evocheck.sh b/evocheck.sh index f00cb63..7b7d6c7 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -777,6 +777,7 @@ if [ -e /etc/debian_version ]; then test -f /etc/cron.daily/evoacme || echo 'IS_EVOACME_CRON FAILED!' fi fi + if [ "$IS_EVOACME_LIVELINKS" = 1 ]; then if [ -x "$(which evoacme)" ]; then for live in /etc/letsencrypt/*/live; do From d914dd90033611c14373a2585d315c190b01b533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 27 Jun 2018 15:20:39 +0200 Subject: [PATCH 009/157] Implement IS_APACHE_CONFENABLED --- evocheck.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index 7b7d6c7..c7e6d20 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -104,6 +104,7 @@ IS_EVOMAINTENANCE_FW=1 IS_EVOLIX_USER=1 IS_EVOACME_CRON=1 IS_EVOACME_LIVELINKS=1 +IS_APACHE_CONFENABLED=1 #Proper to OpenBSD IS_SOFTDEP=1 @@ -794,6 +795,15 @@ if [ -e /etc/debian_version ]; then done fi fi + + if [ "$IS_APACHE_CONFENABLED" = 1 ]; then + # Starting from Jessie and Apache 2.4, /etc/apache2/conf.d/ + # must be replaced by conf-available/ and config files symlinked + # to conf-enabled/ + test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!' + grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ + echo 'IS_APACHE_CONFENABLED FAILED!' + fi fi From ee60e28a5add36fb6b55231f8e39f275b5592409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 27 Jun 2018 17:30:18 +0200 Subject: [PATCH 010/157] We cannot rely on dmesg --- evocheck.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 53a70a4..0d23dfe 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -718,9 +718,6 @@ if [ -e /etc/debian_version ]; then # We check if the running kernel has kaiser loaded if is_debianversion stretch; then grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' - elif is_debianversion jessie; then - dmesg | grep -Eq 'Kernel/User page tables isolation: enabled|Kernel page table isolation enabled' \ - || echo 'IS_MELTDOWN FAILED!' fi fi fi From 3451218a167e5b2efebed1f80234c9d2596546d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 27 Jun 2018 17:33:24 +0200 Subject: [PATCH 011/157] Do not use the BOOT_IMAGE trick --- evocheck.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 0d23dfe..b4984bb 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -707,14 +707,6 @@ if [ -e /etc/debian_version ]; then fi if [ "$IS_MELTDOWN" = 1 ]; then - if grep -q BOOT_IMAGE= /proc/cmdline; then - # We check if the current running kernel has CONFIG_PAGE_TABLE_ISOLATION enabled - kernelPath=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) - kernelVer=${kernelPath##*/vmlinuz-} - kernelConfig="config-${kernelVer}" - grep -Eq '^(CONFIG_PAGE_TABLE_ISOLATION|CONFIG_KAISER)=y' "/boot/${kernelConfig}" \ - || echo 'IS_MELTDOWN FAILED!' - fi # We check if the running kernel has kaiser loaded if is_debianversion stretch; then grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' From 33b19090e6c2462228f9f650f1e83da0b5928406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 27 Jun 2018 17:45:11 +0200 Subject: [PATCH 012/157] Add check for spectre v2 --- evocheck.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index b4984bb..9c11b1a 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -97,7 +97,7 @@ IS_REDIS_BACKUP=1 IS_ELASTIC_BACKUP=1 IS_MONGO_BACKUP=1 IS_MOUNT_FSTAB=1 -IS_MELTDOWN=1 +IS_MELTDOWN_SPECTRE=1 #Proper to OpenBSD IS_SOFTDEP=1 @@ -706,10 +706,11 @@ if [ -e /etc/debian_version ]; then fi fi - if [ "$IS_MELTDOWN" = 1 ]; then + if [ "$IS_MELTDOWN_SPECTRE" = 1 ]; then # We check if the running kernel has kaiser loaded if is_debianversion stretch; then - grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN FAILED!' + grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN_SPECTRE FAILED!' + test -f /sys/devices/system/cpu/vulnerabilities/spectre_v2 || echo 'IS_MELTDOWN_SPECTRE FAILED!' fi fi fi From 62b61aabf169ebc9e7e741f4190507f177a9642d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 27 Jun 2018 17:49:44 +0200 Subject: [PATCH 013/157] Well... For Stretch use only /sys/devices/system/cpu/vulnerabilities/ --- evocheck.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 9c11b1a..e634be4 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -707,10 +707,10 @@ if [ -e /etc/debian_version ]; then fi if [ "$IS_MELTDOWN_SPECTRE" = 1 ]; then - # We check if the running kernel has kaiser loaded if is_debianversion stretch; then - grep '^flags' /proc/cpuinfo | grep -qEw '(kaiser|pti)' || echo 'IS_MELTDOWN_SPECTRE FAILED!' - test -f /sys/devices/system/cpu/vulnerabilities/spectre_v2 || echo 'IS_MELTDOWN_SPECTRE FAILED!' + for vuln in meltdown spectre_v1 spectre_v2; do + test -f /sys/devices/system/cpu/vulnerabilities/$vuln || echo 'IS_MELTDOWN_SPECTRE FAILED!' + done fi fi fi From ae1ec7b2b9f3bd2d1c78af544562dd207ef5f330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 27 Jun 2018 18:01:07 +0200 Subject: [PATCH 014/157] Redo the jessie part --- evocheck.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index e634be4..f5c88a3 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -707,10 +707,21 @@ if [ -e /etc/debian_version ]; then fi if [ "$IS_MELTDOWN_SPECTRE" = 1 ]; then + # For Stretch, detection is easy as the kernel use + # /sys/devices/system/cpu/vulnerabilities/ if is_debianversion stretch; then for vuln in meltdown spectre_v1 spectre_v2; do test -f /sys/devices/system/cpu/vulnerabilities/$vuln || echo 'IS_MELTDOWN_SPECTRE FAILED!' done + # For Jessie this is quite complicated to verify and we need to use kernel config file + elif is_debianversion jessie; then + if grep -q BOOT_IMAGE= /proc/cmdline; then + kernelPath=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) + kernelVer=${kernelPath##*/vmlinuz-} + kernelConfig="config-${kernelVer}" + grep -Eq '^CONFIG_PAGE_TABLE_ISOLATION=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + grep -Eq '^CONFIG_RETPOLINE=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + fi fi fi fi From db23167246678114668d640f88ed9e2f6397ded2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Thu, 28 Jun 2018 11:48:22 +0200 Subject: [PATCH 015/157] Add a check for kernel config gile --- evocheck.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index f5c88a3..da39630 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -719,8 +719,11 @@ if [ -e /etc/debian_version ]; then kernelPath=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) kernelVer=${kernelPath##*/vmlinuz-} kernelConfig="config-${kernelVer}" - grep -Eq '^CONFIG_PAGE_TABLE_ISOLATION=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' - grep -Eq '^CONFIG_RETPOLINE=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + # Sometimes autodetection of kernel config file fail, so we test if the file really exists. + if [ -f /boot/$kernelConfig ]; then + grep -Eq '^CONFIG_PAGE_TABLE_ISOLATION=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + grep -Eq '^CONFIG_RETPOLINE=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + fi fi fi fi From 8e2741dd99bc4c1941e410b6309111c782925d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Thu, 28 Jun 2018 11:52:31 +0200 Subject: [PATCH 016/157] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit db23167246678114668d640f88ed9e2f6397ded2 Author: Benoît S Date: Thu Jun 28 11:48:22 2018 +0200 Add a check for kernel config gile commit ae1ec7b2b9f3bd2d1c78af544562dd207ef5f330 Author: Benoît S Date: Wed Jun 27 18:01:07 2018 +0200 Redo the jessie part commit 62b61aabf169ebc9e7e741f4190507f177a9642d Author: Benoît S Date: Wed Jun 27 17:49:44 2018 +0200 Well... For Stretch use only /sys/devices/system/cpu/vulnerabilities/ commit 33b19090e6c2462228f9f650f1e83da0b5928406 Author: Benoît S Date: Wed Jun 27 17:45:11 2018 +0200 Add check for spectre v2 commit 3451218a167e5b2efebed1f80234c9d2596546d3 Author: Benoît S Date: Wed Jun 27 17:33:24 2018 +0200 Do not use the BOOT_IMAGE trick commit ee60e28a5add36fb6b55231f8e39f275b5592409 Author: Benoît S Date: Wed Jun 27 17:30:18 2018 +0200 We cannot rely on dmesg commit 57bd4312cea6ce1d5b9c23e3e8307f1bc42852cb Author: Benoît.S Date: Thu Jan 11 14:46:46 2018 +0100 Breakline indentation commit d2278292ccf4340913ac6982961e0f011e077a3a Author: Benoît.S Date: Thu Jan 11 14:45:12 2018 +0100 Diffrent test for Jessie kernel commit 1418d4306e81152fa949821484a7d1226e1f2d5b Author: Benoît.S Date: Thu Jan 11 11:52:43 2018 +0100 Modified Meltdown check to handle kaiser and pti commit 2c6d075e2a9749d2805fb52ec5a2c7274f73dfc7 Author: Benoît.S Date: Thu Jan 11 11:24:42 2018 +0100 Add IS_MELTDOWN We check kaiser flags in /proc/cpuinfo and CONFIG_PAGE_TABLE_ISOLATION in kernel config file. --- evocheck.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index c7e6d20..b347cda 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -105,6 +105,7 @@ IS_EVOLIX_USER=1 IS_EVOACME_CRON=1 IS_EVOACME_LIVELINKS=1 IS_APACHE_CONFENABLED=1 +IS_MELTDOWN_SPECTRE=1 #Proper to OpenBSD IS_SOFTDEP=1 @@ -804,6 +805,28 @@ if [ -e /etc/debian_version ]; then grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ echo 'IS_APACHE_CONFENABLED FAILED!' fi + + if [ "$IS_MELTDOWN_SPECTRE" = 1 ]; then + # For Stretch, detection is easy as the kernel use + # /sys/devices/system/cpu/vulnerabilities/ + if is_debianversion stretch; then + for vuln in meltdown spectre_v1 spectre_v2; do + test -f /sys/devices/system/cpu/vulnerabilities/$vuln || echo 'IS_MELTDOWN_SPECTRE FAILED!' + done + # For Jessie this is quite complicated to verify and we need to use kernel config file + elif is_debianversion jessie; then + if grep -q BOOT_IMAGE= /proc/cmdline; then + kernelPath=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) + kernelVer=${kernelPath##*/vmlinuz-} + kernelConfig="config-${kernelVer}" + # Sometimes autodetection of kernel config file fail, so we test if the file really exists. + if [ -f /boot/$kernelConfig ]; then + grep -Eq '^CONFIG_PAGE_TABLE_ISOLATION=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + grep -Eq '^CONFIG_RETPOLINE=y' /boot/$kernelConfig || echo 'IS_MELTDOWN_SPECTRE FAILED!' + fi + fi + fi + fi fi From 7ddb75fb5b59dd32753748edb5048412af721e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Fri, 29 Jun 2018 14:17:05 +0200 Subject: [PATCH 017/157] Fix: IS_APACHE_CONFENABLED is only for Jessie or Stretch --- evocheck.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index b347cda..669a35a 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -801,9 +801,11 @@ if [ -e /etc/debian_version ]; then # Starting from Jessie and Apache 2.4, /etc/apache2/conf.d/ # must be replaced by conf-available/ and config files symlinked # to conf-enabled/ - test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!' - grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ - echo 'IS_APACHE_CONFENABLED FAILED!' + if is_debianversion jessie || is_debianversion stretch; then + test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!' + grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ + echo 'IS_APACHE_CONFENABLED FAILED!' + fi fi if [ "$IS_MELTDOWN_SPECTRE" = 1 ]; then From 08b5ae08198ee9c0a71204722716458b53202d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Mon, 2 Jul 2018 15:41:15 +0200 Subject: [PATCH 018/157] Fix: IS_APACHE_CONFENABLED only when apache2.conf exists. --- evocheck.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 669a35a..8698ffe 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -802,9 +802,11 @@ if [ -e /etc/debian_version ]; then # must be replaced by conf-available/ and config files symlinked # to conf-enabled/ if is_debianversion jessie || is_debianversion stretch; then - test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!' - grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ - echo 'IS_APACHE_CONFENABLED FAILED!' + if [ -f /etc/apache2/apache2.conf ]; then + test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!' + grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ + echo 'IS_APACHE_CONFENABLED FAILED!' + fi fi fi From cd38bbaab4fe28684af93a996a505decc92a037a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Thu, 5 Jul 2018 10:19:43 +0200 Subject: [PATCH 019/157] IS_EVOACME_LIVELINKS: Add a condition when there is no certificates --- evocheck.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 8698ffe..d85f4c2 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -782,18 +782,22 @@ if [ -e /etc/debian_version ]; then if [ "$IS_EVOACME_LIVELINKS" = 1 ]; then if [ -x "$(which evoacme)" ]; then - for live in /etc/letsencrypt/*/live; do - actualLink=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 11) - actualCertDate=$(cut -d'/' -f5 <<< $actualLink) - liveDir=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 9) - certDir=${liveDir%%/live} - lastCertDir=$(stat -c %n ${certDir}/[0-9]* | tail -1) - lastCertDate=$(cut -d'/' -f5 <<< $lastCertDir) - if [[ "$actualCertDate" != "$lastCertDate" ]]; then - echo 'IS_EVOACME_LIVELINKS FAILED!' - break - fi - done + # Sometimes evoacme is installed but no certificates has been generated + numberOfLinks=$(find /etc/letsencrypt/ -type l | wc -l) + if [ $numberOfLinks -gt 0 ]; then + for live in /etc/letsencrypt/*/live; do + actualLink=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 11) + actualCertDate=$(cut -d'/' -f5 <<< $actualLink) + liveDir=$(ls -lhad $live | tr -s ' ' | cut -d' ' -f 9) + certDir=${liveDir%%/live} + lastCertDir=$(stat -c %n ${certDir}/[0-9]* | tail -1) + lastCertDate=$(cut -d'/' -f5 <<< $lastCertDir) + if [[ "$actualCertDate" != "$lastCertDate" ]]; then + echo 'IS_EVOACME_LIVELINKS FAILED!' + break + fi + done + fi fi fi From 38beacc87b9da8c275ecff8da38352a5843a0393 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Fri, 27 Jul 2018 01:53:27 +0200 Subject: [PATCH 020/157] Improve IS_EVOMAINTENANCE_FW : lower rules number to 2 Closes #42 --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index d85f4c2..0853f3e 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -360,7 +360,7 @@ if [ -e /etc/debian_version ]; then if [ "$IS_EVOMAINTENANCE_FW" = 1 ]; then if [ -f "$MINIFW_FILE" ]; then rulesNumber=$(grep -c "/sbin/iptables -A INPUT -p tcp --sport 5432 --dport 1024:65535 -s .* -m state --state ESTABLISHED,RELATED -j ACCEPT" "$MINIFW_FILE") - if [ "$rulesNumber" -lt 4 ]; then + if [ "$rulesNumber" -lt 2 ]; then echo 'IS_EVOMAINTENANCE_FW FAILED!' fi fi From 87d98dc8d07b30b0e66465b610ba0c535ca7c776 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 17 Aug 2018 14:57:25 +0200 Subject: [PATCH 021/157] Evocheck detects installed packages even if they are "held" by APT. --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 0853f3e..c3cb6be 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -144,7 +144,7 @@ is_pack_samba(){ is_installed(){ for pkg in $*; do - dpkg -l $pkg 2>/dev/null |grep -q ^ii || return 1 + dpkg -l $pkg 2>/dev/null | grep -q -E ^(i|h)i || return 1 done } From ffecb8a7c43e8c9b0e3fb39fa175fabb10f8f93a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 17 Aug 2018 15:26:55 +0200 Subject: [PATCH 022/157] grep regular expressions must be quoted --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index c3cb6be..4fc9a8c 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -144,7 +144,7 @@ is_pack_samba(){ is_installed(){ for pkg in $*; do - dpkg -l $pkg 2>/dev/null | grep -q -E ^(i|h)i || return 1 + dpkg -l $pkg 2>/dev/null | grep -q -E '^(i|h)i' || return 1 done } From 956877442a3f43243fed89c491d9bdddd1ac77cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Fri, 14 Sep 2018 15:52:08 +0200 Subject: [PATCH 023/157] WIP: Removes /var/log/evolinux/00_prepare_system.log TODO: Workaround in special case when the server was never installed TODO: be sure that the final check with and logic is OK. --- evocheck.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 4fc9a8c..0493033 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -522,7 +522,9 @@ if [ -e /etc/debian_version ]; then # Check if no package has been upgraded since $limit. if [ "$IS_NOTUPGRADED" = 1 ]; then - last_upgrade=$(date +%s -d $(zgrep -h upgrade /var/log/dpkg.log* |sort -n |tail -1 |cut -f1 -d ' ')) + if zgrep -hq upgrade /var/log/dpkg.log*; then + last_upgrade=$(date +%s -d $(zgrep -h upgrade /var/log/dpkg.log* |sort -n |tail -1 |cut -f1 -d ' ')) + fi if grep -q '^mailto="listupgrade-todo@' /etc/evolinux/listupgrade.cnf \ || grep -q -E '^[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[^\*]' /etc/cron.d/listupgrade; then # Manual upgrade process @@ -531,8 +533,8 @@ if [ -e /etc/debian_version ]; then # Regular process limit=$(date +%s -d "now - 90 days") fi - if [ -f /var/log/evolinux/00_prepare_system.log ]; then - install_date=$(stat -c %Z /var/log/evolinux/00_prepare_system.log) + if [ -d /var/log/installer ]; then + install_date=$(stat -c %Z /var/log/installer) else install_date=0 fi From 22d835b73356e0454b6a96082ae874472644a457 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Wed, 19 Dec 2018 16:18:50 +0100 Subject: [PATCH 024/157] Follow symlink for IS_PRIVKEYWOLRDREADABLE check --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 4fc9a8c..94b5211 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -983,7 +983,7 @@ fi if [ "$IS_PRIVKEYWOLRDREADABLE" = 1 ]; then for f in /etc/ssl/private/*; do - perms=$(stat -c "%a" $f) + perms=$(stat -L -c "%a" $f) if [ ${perms: -1} != "0" ]; then echo 'IS_PRIVKEYWOLRDREADABLE FAILED!' fi From 7ea1bc444de9179f859e6720a80516214fddc2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Thu, 20 Dec 2018 11:14:34 +0100 Subject: [PATCH 025/157] Add LICENSE: GNU GENERAL PUBLIC LICENSE v3 --- LICENSE | 675 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 675 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..53d1f3d --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + From 7179cfefc8e754c7fff5dffbb9e4f0ec30256761 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Fri, 21 Dec 2018 15:21:08 +0100 Subject: [PATCH 026/157] Remove "No such file or directory" error on IS_NOTUPGRADED check --- evocheck.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 94b5211..1730999 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -523,8 +523,8 @@ if [ -e /etc/debian_version ]; then # Check if no package has been upgraded since $limit. if [ "$IS_NOTUPGRADED" = 1 ]; then last_upgrade=$(date +%s -d $(zgrep -h upgrade /var/log/dpkg.log* |sort -n |tail -1 |cut -f1 -d ' ')) - if grep -q '^mailto="listupgrade-todo@' /etc/evolinux/listupgrade.cnf \ - || grep -q -E '^[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[^\*]' /etc/cron.d/listupgrade; then + if grep -sq '^mailto="listupgrade-todo@' /etc/evolinux/listupgrade.cnf \ + || grep -sq -E '^[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[^\*]' /etc/cron.d/listupgrade; then # Manual upgrade process limit=$(date +%s -d "now - 180 days") else From 5dfc941172b3553a71cc5bf3c9c233bd7be3543c Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Fri, 21 Dec 2018 15:23:17 +0100 Subject: [PATCH 027/157] Add a Vagrantfile for testing --- .gitignore | 1 + Vagrantfile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 .gitignore create mode 100644 Vagrantfile diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8000dd9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vagrant diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..8015e29 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,45 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') + +# Load ~/.VagrantFile if exist, permit local config provider +vagrantfile = File.join("#{Dir.home}", '.VagrantFile') +load File.expand_path(vagrantfile) if File.exists?(vagrantfile) + +Vagrant.configure('2') do |config| + config.vm.synced_folder "./", "/vagrant", type: "rsync", rsync__exclude: [ '.vagrant', '.git', 'config/config.ini' ] + + config.vm.network "forwarded_port", guest: 80, host: 8080, auto_correct: true + config.vm.network "forwarded_port", guest: 443, host: 8443, auto_correct: true + + $deps = <