From ba77a193815a220272bb60c2b3194da01887d498 Mon Sep 17 00:00:00 2001 From: Till Krischer Date: Mon, 23 Sep 2019 19:35:27 +0200 Subject: [PATCH 1/3] ability to blacklist mounts --- server/services/diskUsageService.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/server/services/diskUsageService.js b/server/services/diskUsageService.js index 13f6a6ebe..2d20de92a 100644 --- a/server/services/diskUsageService.js +++ b/server/services/diskUsageService.js @@ -11,12 +11,20 @@ const diskUsageServiceEvents = require('../constants/diskUsageServiceEvents'); const PLATFORMS_SUPPORTED = ['darwin', 'linux', 'freebsd']; const MAX_BUFFER_SIZE = 65536; -const filterMountPoint = - config.diskUsageService && config.diskUsageService.watchMountPoints - ? // if user has configured watchPartitions filter each line output for given - // array - mountpoint => config.diskUsageService.watchMountPoints.includes(mountpoint) - : () => true; // include all mounted file systems by default +const filterMountPoint = mountpoint => + { + // include all mounted file systems by default + if (!config.diskUsageService) + return true; + const {watchMountPoints, dontWatchMountPoints} = config.diskUsageService; + // whitelist + if (watchMountPoints) + return watchMountPoints.includes(mountpoint) + // blacklist + if (dontWatchMountPoints) + return !dontWatchMountPoints.includes(mountpoint) + return true; + } const linuxDfParsing = () => execFile('df | tail -n+2', { From 882559f1c50c05e3050e69fe3655b0be60941179 Mon Sep 17 00:00:00 2001 From: Till Krischer Date: Mon, 23 Sep 2019 19:35:45 +0200 Subject: [PATCH 2/3] hide docker mounts by default --- config.docker.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/config.docker.js b/config.docker.js index 6968621d4..01225c1d8 100644 --- a/config.docker.js +++ b/config.docker.js @@ -15,6 +15,24 @@ const CONFIG = { ssl: process.env.FLOOD_ENABLE_SSL === 'true' || process.env.FLOOD_ENABLE_SSL === true, sslKey: '/data/flood_ssl.key', sslCert: '/data/flood_ssl.cert', + diskUsageService: { + dontWatchMountPoints: [ + "/dev", + "/sys/fs/cgroup", + "/etc/resolv.conf", + "/etc/hostname", + "/etc/hosts", + "/dev/shm", + "/proc/asound", + "/proc/acpi", + "/proc/kcore", + "/proc/keys", + "/proc/timer_list", + "/proc/sched_debug", + "/proc/scsi", + "/sys/firmware", + ], + }, }; module.exports = CONFIG; From 6d99463b0b76f1b656501d64204c3d67e2b2302e Mon Sep 17 00:00:00 2001 From: Till Krischer Date: Mon, 23 Sep 2019 19:53:35 +0200 Subject: [PATCH 3/3] prettier --- server/services/diskUsageService.js | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/server/services/diskUsageService.js b/server/services/diskUsageService.js index 2d20de92a..7a11c5602 100644 --- a/server/services/diskUsageService.js +++ b/server/services/diskUsageService.js @@ -11,20 +11,16 @@ const diskUsageServiceEvents = require('../constants/diskUsageServiceEvents'); const PLATFORMS_SUPPORTED = ['darwin', 'linux', 'freebsd']; const MAX_BUFFER_SIZE = 65536; -const filterMountPoint = mountpoint => - { - // include all mounted file systems by default - if (!config.diskUsageService) - return true; - const {watchMountPoints, dontWatchMountPoints} = config.diskUsageService; - // whitelist - if (watchMountPoints) - return watchMountPoints.includes(mountpoint) - // blacklist - if (dontWatchMountPoints) - return !dontWatchMountPoints.includes(mountpoint) - return true; - } +const filterMountPoint = mountpoint => { + // include all mounted file systems by default + if (!config.diskUsageService) return true; + const {watchMountPoints, dontWatchMountPoints} = config.diskUsageService; + // whitelist + if (watchMountPoints) return watchMountPoints.includes(mountpoint); + // blacklist + if (dontWatchMountPoints) return !dontWatchMountPoints.includes(mountpoint); + return true; +}; const linuxDfParsing = () => execFile('df | tail -n+2', {