backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-19 00:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

reject overlapping media and database paths

Browse source
This commit is contained in:
Charles Hall 2025-02-28 11:14:52 -08:00
parent 81a449d1d2
commit b01b70fc20
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
20 changed files with 146 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/config.rs
View file

@ -538,5 +538,27 @@ where
return Err(Error::RegistrationTokenEmpty);
}
match &config.media.backend {
MediaBackendConfig::Filesystem(x) => {
let media_path = x
.path
.canonicalize()
.map_err(|e| Error::Canonicalize(e, x.path.clone()))?;
let database_path =
config.database.path.canonicalize().map_err(|e| {
Error::Canonicalize(e, config.database.path.clone())
})?;
let overlap = media_path == database_path
|| media_path.starts_with(&database_path)
|| database_path.starts_with(&media_path);
if overlap {
return Err(Error::DatabaseMediaOverlap);
}
}
}
Ok(config)
}