From cb4b721cb0460f64adf6077796e8ab33612fcdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 30 Nov 2020 16:22:18 +0100 Subject: [PATCH] gc: log index files found outside of expected scheme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for safety reason, GC finds and marks all index files below the datastore base path. as a result of regular operations, only index files within the expected scheme of // should exist. add a small check + warning if the index list contains index files out side of this expected scheme, so that an admin with shell access can investigate. Signed-off-by: Fabian Grünbichler --- src/backup/datastore.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index b199f11f..2700d6e9 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -3,6 +3,7 @@ use std::io::{self, Write}; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; use std::convert::TryFrom; +use std::str::FromStr; use std::time::Duration; use std::fs::File; @@ -474,12 +475,24 @@ impl DataStore { let mut done = 0; let mut last_percentage: usize = 0; + let mut strange_paths_count: u64 = 0; + for img in image_list { worker.check_abort()?; tools::fail_on_shutdown()?; + if let Some(backup_dir_path) = img.parent() { + let backup_dir_path = backup_dir_path.strip_prefix(self.base_path())?; + if let Some(backup_dir_str) = backup_dir_path.to_str() { + if BackupDir::from_str(backup_dir_str).is_err() { + strange_paths_count += 1; + } + } + } + let path = self.chunk_store.relative_path(&img); + match std::fs::File::open(&path) { Ok(file) => { if let Ok(archive_type) = archive_type(&img) { @@ -514,6 +527,15 @@ impl DataStore { } } + if strange_paths_count > 0 { + crate::task_log!( + worker, + "found (and marked) {} index files outside of expected directory scheme", + strange_paths_count, + ); + } + + Ok(()) }