Skip to content

fix: Don't unblock chat on possibly wrongly assigned outgoing encrypted 1:1 message #7079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Don't unblock chat on possibly wrongly assigned outgoing encrypted 1:1 message #7079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/receive_imf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ pub struct ReceivedMsg {
/// don't assign the message to an encrypted
/// group after looking up key-contacts
/// or vice versa.
#[derive(Debug)]
#[derive(Debug, PartialEq)]
enum ChatAssignment {
/// Trash the message.
Trash,
Expand Down Expand Up @@ -1620,8 +1620,24 @@ async fn do_chat_assignment(
}
}

// automatically unblock chat when the user sends a message
if chat_id_blocked != Blocked::Not {
// Automatically unblock the chat when the user sends a message. For encrypted 1:1 messages
// we don't check the recipient fingerprint currently, so check that we don't have multiple
// key-contacts with the given address.
if chat_id_blocked != Blocked::Not
&& (!mime_parser.was_encrypted() || chat_assignment != ChatAssignment::OneOneChat || {
context
.sql
.count(
"SELECT COUNT(*) FROM contacts
WHERE contacts.addr=(SELECT addr FROM contacts WHERE id=?)
AND fingerprint<>''
",
(to_id,),
)
.await?
== 1
})
{
if let Some(chat_id) = chat_id {
chat_id.unblock_ex(context, Nosync).await?;
chat_id_blocked = Blocked::Not;
Expand Down Expand Up @@ -3869,7 +3885,7 @@ async fn lookup_key_contact_by_fingerprint(
.sql
.query_row_optional(
"SELECT id FROM contacts
WHERE fingerprint=? AND fingerprint!=''",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's already a check above

WHERE fingerprint=?",
(fingerprint,),
|row| {
let contact_id: ContactId = row.get(0)?;
Expand Down
Loading