|
|
|
@ -6,6 +6,7 @@ use crate::{ |
|
|
|
SERVICES, |
|
|
|
SERVICES, |
|
|
|
}; |
|
|
|
}; |
|
|
|
use abstraction::{KeyValueDatabaseEngine, KvTree}; |
|
|
|
use abstraction::{KeyValueDatabaseEngine, KvTree}; |
|
|
|
|
|
|
|
use base64::{engine::general_purpose, Engine}; |
|
|
|
use directories::ProjectDirs; |
|
|
|
use directories::ProjectDirs; |
|
|
|
use lru_cache::LruCache; |
|
|
|
use lru_cache::LruCache; |
|
|
|
|
|
|
|
|
|
|
|
@ -424,7 +425,7 @@ impl KeyValueDatabase { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// If the database has any data, perform data migrations before starting
|
|
|
|
// If the database has any data, perform data migrations before starting
|
|
|
|
let latest_database_version = 13; |
|
|
|
let latest_database_version = 16; |
|
|
|
|
|
|
|
|
|
|
|
if services().users.count()? > 0 { |
|
|
|
if services().users.count()? > 0 { |
|
|
|
// MIGRATIONS
|
|
|
|
// MIGRATIONS
|
|
|
|
@ -941,6 +942,86 @@ impl KeyValueDatabase { |
|
|
|
warn!("Migration: 12 -> 13 finished"); |
|
|
|
warn!("Migration: 12 -> 13 finished"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if services().globals.database_version()? < 16 { |
|
|
|
|
|
|
|
// Reconstruct all media using the filesystem
|
|
|
|
|
|
|
|
db.mediaid_file.clear().unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for file in fs::read_dir(services().globals.get_media_folder()).unwrap() { |
|
|
|
|
|
|
|
let file = file.unwrap(); |
|
|
|
|
|
|
|
let mediaid = general_purpose::URL_SAFE_NO_PAD |
|
|
|
|
|
|
|
.decode(file.file_name().into_string().unwrap()) |
|
|
|
|
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut parts = mediaid.rsplit(|&b| b == 0xff); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut removed_bytes = 0; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let content_type_bytes = parts.next().unwrap(); |
|
|
|
|
|
|
|
removed_bytes += content_type_bytes.len() + 1; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let content_disposition_bytes = parts |
|
|
|
|
|
|
|
.next() |
|
|
|
|
|
|
|
.ok_or_else(|| Error::bad_database("Media ID in db is invalid."))?; |
|
|
|
|
|
|
|
removed_bytes += content_disposition_bytes.len(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut content_disposition = |
|
|
|
|
|
|
|
utils::string_from_bytes(content_disposition_bytes).map_err(|_| { |
|
|
|
|
|
|
|
Error::bad_database("Content Disposition in mediaid_file is invalid.") |
|
|
|
|
|
|
|
})?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if content_disposition.contains("filename=") |
|
|
|
|
|
|
|
&& !content_disposition.contains("filename=\"") |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
println!("{}", &content_disposition); |
|
|
|
|
|
|
|
content_disposition = |
|
|
|
|
|
|
|
content_disposition.replacen("filename=", "filename=\"", 1); |
|
|
|
|
|
|
|
content_disposition.push('"'); |
|
|
|
|
|
|
|
println!("{}", &content_disposition); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut new_key = mediaid[..(mediaid.len() - removed_bytes)].to_vec(); |
|
|
|
|
|
|
|
assert!(*new_key.last().unwrap() == 0xff); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut shorter_key = new_key.clone(); |
|
|
|
|
|
|
|
shorter_key.extend( |
|
|
|
|
|
|
|
ruma::http_headers::ContentDisposition::new( |
|
|
|
|
|
|
|
ruma::http_headers::ContentDispositionType::Inline, |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
.to_string() |
|
|
|
|
|
|
|
.as_bytes(), |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
shorter_key.push(0xff); |
|
|
|
|
|
|
|
shorter_key.extend_from_slice(content_type_bytes); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
new_key.extend_from_slice(content_disposition.to_string().as_bytes()); |
|
|
|
|
|
|
|
new_key.push(0xff); |
|
|
|
|
|
|
|
new_key.extend_from_slice(content_type_bytes); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Some file names are too long. Ignore those.
|
|
|
|
|
|
|
|
match fs::rename( |
|
|
|
|
|
|
|
services().globals.get_media_file(&mediaid), |
|
|
|
|
|
|
|
services().globals.get_media_file(&new_key), |
|
|
|
|
|
|
|
) { |
|
|
|
|
|
|
|
Ok(_) => { |
|
|
|
|
|
|
|
db.mediaid_file.insert(&new_key, &[])?; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Err(_) => { |
|
|
|
|
|
|
|
fs::rename( |
|
|
|
|
|
|
|
services().globals.get_media_file(&mediaid), |
|
|
|
|
|
|
|
services().globals.get_media_file(&shorter_key), |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
db.mediaid_file.insert(&shorter_key, &[])?; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
db.mediaid_file.insert(&mediaid, &[])?; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
services().globals.bump_database_version(16)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
warn!("Migration: 13 -> 16 finished"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
assert_eq!( |
|
|
|
assert_eq!( |
|
|
|
services().globals.database_version().unwrap(), |
|
|
|
services().globals.database_version().unwrap(), |
|
|
|
latest_database_version |
|
|
|
latest_database_version |
|
|
|
|
Timo Kösters
1 year ago