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

fix: Mark all email chats as unprotected in the migration (#7026)

Browse Source 
Previously, chat protection was only removed if the chat became an
email-chat because the key-contact has a different email, but not if the
chat became an email-chat for a different reason.

Therefore, it could happen that the migration produced a protected,
unencrypted chat, where you couldn't write any messages.

I tested that applying this fix actually fixes the bug I had.
This commit is contained in:
Hocuri
2025-07-21 22:15:59 +02:00
committed by GitHub
parent 615a1b3f4e
commit edd8008650
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sql/migrations.rs
View File

@@ -1651,7 +1651,7 @@ fn migrate_key_contacts(
.collect::<Result<Vec<_>, _>>() .collect::<Result<Vec<_>, _>>()
.context("Step 26")?; .context("Step 26")?;
let mut keep_address_contacts = |reason: &str| { let mut keep_address_contacts = |reason: &str| -> Result<()> {
info!( info!(
context, context,
"Chat {chat_id} will be an unencrypted chat with contacts identified by email address: {reason}." "Chat {chat_id} will be an unencrypted chat with contacts identified by email address: {reason}."
@@ -1659,6 +1659,15 @@ fn migrate_key_contacts(
for (m, _) in &old_members { for (m, _) in &old_members {
orphaned_contacts.remove(m); orphaned_contacts.remove(m);
} }
// Unprotect this chat if it was protected.
//
// Otherwise we get protected chat with address-contact(s).
transaction
.execute("UPDATE chats SET protected=0 WHERE id=?", (chat_id,))
.context("Step 26.0")?;
Ok(())
}; };
let old_and_new_members: Vec<(u32, bool, Option<u32>)> = match typ { let old_and_new_members: Vec<(u32, bool, Option<u32>)> = match typ {
// 1:1 chats retain: // 1:1 chats retain:
@@ -1678,19 +1687,13 @@ fn migrate_key_contacts(
}; };
let Some(new_contact) = map_to_key_contact(old_member) else { let Some(new_contact) = map_to_key_contact(old_member) else {
keep_address_contacts("No peerstate, or peerstate in 'reset' state"); keep_address_contacts("No peerstate, or peerstate in 'reset' state")?;
continue; continue;
}; };
if !addr_cmp_stmt if !addr_cmp_stmt
.query_row((old_member, new_contact), |row| row.get::<_, bool>(0))? .query_row((old_member, new_contact), |row| row.get::<_, bool>(0))?
{ {
// Unprotect this 1:1 chat if it was protected. keep_address_contacts("key contact has different email")?;
//
// Otherwise we get protected chat with address-contact.
transaction
.execute("UPDATE chats SET protected=0 WHERE id=?", (chat_id,))?;
keep_address_contacts("key contact has different email");
continue; continue;
} }
vec![(*old_member, true, Some(new_contact))] vec![(*old_member, true, Some(new_contact))]
@@ -1701,7 +1704,7 @@ fn migrate_key_contacts(
if grpid.is_empty() { if grpid.is_empty() {
// Ad-hoc group that has empty Chat-Group-ID // Ad-hoc group that has empty Chat-Group-ID
// because it was created in response to receiving a non-chat email. // because it was created in response to receiving a non-chat email.
keep_address_contacts("Empty chat-Group-ID"); keep_address_contacts("Empty chat-Group-ID")?;
continue; continue;
} else if protected == 1 { } else if protected == 1 {
old_members old_members
@@ -1720,7 +1723,7 @@ fn migrate_key_contacts(
// Mailinglist // Mailinglist
140 => { 140 => {
keep_address_contacts("Mailinglist"); keep_address_contacts("Mailinglist")?;
continue; continue;
} }
@@ -1759,7 +1762,7 @@ fn migrate_key_contacts(
transaction transaction
.execute("UPDATE chats SET grpid='' WHERE id=?", (chat_id,)) .execute("UPDATE chats SET grpid='' WHERE id=?", (chat_id,))
.context("Step 26.1")?; .context("Step 26.1")?;
keep_address_contacts("Group contains contact without peerstate"); keep_address_contacts("Group contains contact without peerstate")?;
continue; continue;
} }