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

imex: use param2 for passphrase

Browse Source
This commit is contained in:
link2xt
2022-01-16 13:22:08 +00:00
parent 9b562eebcd
commit a1f04d2129
10 changed files with 212 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/context.rs
View File

@@ -109,8 +109,8 @@ impl Context {
let context = Self::new_closed(dbfile, id).await?;
// Open the database if is not encrypted.
if context.set_passphrase("".to_string()).await? {
context.sql.open(&context).await?;
if context.check_passphrase("".to_string()).await? {
context.sql.open(&context, "".to_string()).await?;
}
Ok(context)
}
@@ -133,8 +133,8 @@ impl Context {
/// Returns true if passphrase is correct, false is passphrase is not correct. Fails on other
/// errors.
pub async fn open(&self, passphrase: String) -> Result<bool> {
if self.sql.set_passphrase(passphrase).await? {
self.sql.open(self).await?;
if self.sql.check_passphrase(passphrase.clone()).await? {
self.sql.open(self, passphrase).await?;
Ok(true)
} else {
Ok(false)
@@ -146,13 +146,13 @@ impl Context {
self.sql.is_open().await
}
/// Sets the database passphrase.
/// Tests the database passphrase.
///
/// Returns true if passphrase is correct.
///
/// Fails if database is already open.
pub async fn set_passphrase(&self, passphrase: String) -> Result<bool> {
self.sql.set_passphrase(passphrase).await
pub(crate) async fn check_passphrase(&self, passphrase: String) -> Result<bool> {
self.sql.check_passphrase(passphrase).await
}
pub(crate) async fn with_blobdir(
@@ -1039,7 +1039,7 @@ mod tests {
}
#[async_std::test]
async fn test_set_passphrase() -> Result<()> {
async fn test_check_passphrase() -> Result<()> {
let dir = tempdir()?;
let dbfile = dir.path().join("db.sqlite");
@@ -1056,7 +1056,7 @@ mod tests {
.await
.context("failed to create context")?;
assert_eq!(context.is_open().await, false);
assert_eq!(context.set_passphrase("bar".to_string()).await?, false);
assert_eq!(context.check_passphrase("bar".to_string()).await?, false);
assert_eq!(context.open("false".to_string()).await?, false);
assert_eq!(context.open("foo".to_string()).await?, true);