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

fix: narrow the scope of verification exception to 1:1 chats

Browse Source 
Allowing outgoing unencrypted messages in groups with 2 members
breaks the test
`python/tests/test_0_complex_or_slow.py::test_verified_group_vs_delete_server_after`
This commit is contained in:
link2xt
2023-12-02 20:12:16 +00:00
parent 5ca5d95c5e
commit fdd239f61f
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/receive_imf.rs
View File

@@ -1092,7 +1092,15 @@ async fn add_parts(
if !chat_id.is_special() && is_partial_download.is_none() { if !chat_id.is_special() && is_partial_download.is_none() {
let chat = Chat::load_from_db(context, chat_id).await?; let chat = Chat::load_from_db(context, chat_id).await?;
if chat.is_protected() { // For outgoing emails in the 1:1 chat we have an exception that
// they are allowed to be unencrypted:
// 1. They can't be an attack (they are outgoing, not incoming)
// 2. Probably the unencryptedness is just a temporary state, after all
// the user obviously still uses DC
// -> Showing info messages everytime would be a lot of noise
// 3. The info messages that are shown to the user ("Your chat partner
// likely reinstalled DC" or similar) would be wrong.
if chat.is_protected() && (incoming || chat.typ != Chattype::Single) {
if let VerifiedEncryption::NotVerified(err) = verified_encryption { if let VerifiedEncryption::NotVerified(err) = verified_encryption {
warn!(context, "Verification problem: {err:#}."); warn!(context, "Verification problem: {err:#}.");
let s = format!("{err}. See 'Info' for more details"); let s = format!("{err}. See 'Info' for more details");
@@ -2395,19 +2403,6 @@ async fn has_verified_encryption(
.filter(|id| *id != ContactId::SELF) .filter(|id| *id != ContactId::SELF)
.collect::<Vec<ContactId>>(); .collect::<Vec<ContactId>>();
if from_id == ContactId::SELF && to_ids.len() <= 1 {
// For outgoing emails in the 1:1 chat and groups with 2 members,
// we have an exception that
// they are allowed to be unencrypted:
// 1. They can't be an attack (they are outgoing, not incoming)
// 2. Probably the unencryptedness is just a temporary state, after all
// the user obviously still uses DC
// -> Showing info messages everytime would be a lot of noise
// 3. The info messages that are shown to the user ("Your chat partner
// likely reinstalled DC" or similar) would be wrong.
return Ok(Verified);
}
if !mimeparser.was_encrypted() { if !mimeparser.was_encrypted() {
return Ok(NotVerified("This message is not encrypted".to_string())); return Ok(NotVerified("This message is not encrypted".to_string()));
}; };