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

test: refine test_encrypted_no_autocrypt()

Browse Source 
- Use TestContextManager
- Actually run receive_imf rather than only mimeparser on "received" messages
- Check that received message parts actually have a padlock
This commit is contained in:
link2xt
2023-12-07 02:25:43 +00:00
parent aca34379e0
commit 0c8f967391
1 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/e2ee.rs
View File

@@ -169,11 +169,10 @@ pub async fn ensure_secret_key_exists(context: &Context) -> Result<()> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::chat;
use crate::key::DcKey; use crate::key::DcKey;
use crate::message::{Message, Viewtype}; use crate::message::{Message, Viewtype};
use crate::param::Param; use crate::param::Param;
use crate::test_utils::{bob_keypair, TestContext}; use crate::test_utils::{bob_keypair, TestContext, TestContextManager};
mod ensure_secret_key_exists { mod ensure_secret_key_exists {
use super::*; use super::*;
@@ -217,37 +216,35 @@ Sent with my Delta Chat Messenger: https://delta.chat";
#[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_encrypted_no_autocrypt() -> anyhow::Result<()> { async fn test_encrypted_no_autocrypt() -> anyhow::Result<()> {
let alice = TestContext::new_alice().await; let mut tcm = TestContextManager::new();
let bob = TestContext::new_bob().await; let alice = tcm.alice().await;
let bob = tcm.bob().await;
let chat_alice = alice.create_chat(&bob).await.id; let chat_alice = alice.create_chat(&bob).await.id;
let chat_bob = bob.create_chat(&alice).await.id; let chat_bob = bob.create_chat(&alice).await.id;
// Alice sends unencrypted message to Bob // Alice sends unencrypted message to Bob
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.send_msg(chat_alice, &mut msg).await;
chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
let sent = alice.pop_sent_msg().await;
// Bob receives unencrypted message from Alice // Bob receives unencrypted message from Alice
let msg = bob.parse_msg(&sent).await; let msg = bob.recv_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.get_showpadlock());
// Parsing a message is enough to update peerstate
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual);
// Bob sends encrypted message to Alice // Bob sends empty encrypted message to Alice
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
chat::prepare_msg(&bob.ctx, chat_bob, &mut msg).await?; let sent = bob.send_msg(chat_bob, &mut msg).await;
chat::send_msg(&bob.ctx, chat_bob, &mut msg).await?;
let sent = bob.pop_sent_msg().await;
// Alice receives encrypted message from Bob // Alice receives an empty encrypted message from Bob.
let msg = alice.parse_msg(&sent).await; // This is also a regression test for previously existing bug
assert!(msg.was_encrypted()); // that resulted in no padlock on encrypted empty messages.
let msg = alice.recv_msg(&sent).await;
assert!(msg.get_showpadlock());
let peerstate_bob = Peerstate::from_addr(&alice.ctx, "bob@example.net") let peerstate_bob = Peerstate::from_addr(&alice.ctx, "bob@example.net")
.await? .await?
@@ -259,12 +256,10 @@ Sent with my Delta Chat Messenger: https://delta.chat";
// Alice sends encrypted message without Autocrypt header. // Alice sends encrypted message without Autocrypt header.
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
msg.param.set_int(Param::SkipAutocrypt, 1); msg.param.set_int(Param::SkipAutocrypt, 1);
chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.send_msg(chat_alice, &mut msg).await;
chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
let sent = alice.pop_sent_msg().await;
let msg = bob.parse_msg(&sent).await; let msg = bob.recv_msg(&sent).await;
assert!(msg.was_encrypted()); assert!(msg.get_showpadlock());
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
@@ -273,12 +268,10 @@ Sent with my Delta Chat Messenger: https://delta.chat";
// Alice sends plaintext message with Autocrypt header. // Alice sends plaintext message with Autocrypt header.
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
msg.force_plaintext(); msg.force_plaintext();
chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.send_msg(chat_alice, &mut msg).await;
chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
let sent = alice.pop_sent_msg().await;
let msg = bob.parse_msg(&sent).await; let msg = bob.recv_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.get_showpadlock());
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
@@ -288,12 +281,10 @@ Sent with my Delta Chat Messenger: https://delta.chat";
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
msg.force_plaintext(); msg.force_plaintext();
msg.param.set_int(Param::SkipAutocrypt, 1); msg.param.set_int(Param::SkipAutocrypt, 1);
chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.send_msg(chat_alice, &mut msg).await;
chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
let sent = alice.pop_sent_msg().await;
let msg = bob.parse_msg(&sent).await; let msg = bob.recv_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.get_showpadlock());
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");