Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-15 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Sql::import: Detach backup db if any step of the import fails

Browse Source 
Otherwise we continue to work with an incompletely imported db... but only until restart -- after
that all changes to the db are lost.
This commit is contained in:
iequidoo
2023-12-05 21:09:07 -03:00
committed by iequidoo
parent cccefe15b3
commit bfc7ae1eff
1 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/sql.rs
View File

@@ -137,46 +137,50 @@ impl Sql {
.to_str() .to_str()
.with_context(|| format!("path {path:?} is not valid unicode"))? .with_context(|| format!("path {path:?} is not valid unicode"))?
.to_string(); .to_string();
let res = self
.call_write(move |conn| {
// Check that backup passphrase is correct before resetting our database.
conn.execute("ATTACH DATABASE ? AS backup KEY ?", (path_str, passphrase))
.context("failed to attach backup database")?;
if let Err(err) = conn
.query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
.context("backup passphrase is not correct")
{
conn.execute("DETACH DATABASE backup", [])
.context("failed to detach backup database")?;
return Err(err);
}
// Reset the database without reopening it. We don't want to reopen the database because we // Keep `config_cache` locked all the time the db is imported so that nobody can use invalid
// don't have main database passphrase at this point. // values from there. And clear it immediately so as not to forget in case of errors.
// See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation. let mut config_cache = self.config_cache.write().await;
// Without resetting import may fail due to existing tables. config_cache.clear();
self.call_write(move |conn| {
// Check that backup passphrase is correct before resetting our database.
conn.execute("ATTACH DATABASE ? AS backup KEY ?", (path_str, passphrase))
.context("failed to attach backup database")?;
let res = conn
.query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
.context("backup passphrase is not correct");
// Reset the database without reopening it. We don't want to reopen the database because we
// don't have main database passphrase at this point.
// See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation.
// Without resetting import may fail due to existing tables.
let res = res.and_then(|_| {
conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, true) conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, true)
.context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")?; .context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")
});
let res = res.and_then(|_| {
conn.execute("VACUUM", []) conn.execute("VACUUM", [])
.context("failed to vacuum the database")?; .context("failed to vacuum the database")
});
let res = res.and(
conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false) conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false)
.context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE")?; .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE"),
let res = conn );
.query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| { let res = res.and_then(|_| {
Ok(()) conn.query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
}) Ok(())
.context("failed to import from attached backup database"); })
.context("failed to import from attached backup database")
});
let res = res.and(
conn.execute("DETACH DATABASE backup", []) conn.execute("DETACH DATABASE backup", [])
.context("failed to detach backup database")?; .context("failed to detach backup database"),
res?; );
Ok(()) res?;
}) Ok(())
.await; })
.await
// The config cache is wrong now that we have a different database
self.config_cache.write().await.clear();
res
} }
/// Creates a new connection pool. /// Creates a new connection pool.