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

fix: apply_group_changes(): Check whether From is key-contact

Browse Source 
If From is an address-contact, it mustn't be able to modify an encrypted group. If From is a
key-contact, it mustn't be added to members of an unencrypted group.
This commit is contained in:
iequidoo
2026-01-22 03:09:59 -03:00
committed by iequidoo
parent 8d32d3ae0c
commit b563064b26
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/receive_imf.rs
View File

@@ -3005,6 +3005,8 @@ async fn apply_group_changes(
to_ids: &[Option<ContactId>], to_ids: &[Option<ContactId>],
past_ids: &[Option<ContactId>], past_ids: &[Option<ContactId>],
) -> Result<GroupChangesInfo> { ) -> Result<GroupChangesInfo> {
let from_is_key_contact = Contact::get_by_id(context, from_id).await?.is_key_contact();
ensure!(from_is_key_contact || chat.grpid.is_empty());
let to_ids_flat: Vec<ContactId> = to_ids.iter().filter_map(|x| *x).collect(); let to_ids_flat: Vec<ContactId> = to_ids.iter().filter_map(|x| *x).collect();
ensure!(chat.typ == Chattype::Group); ensure!(chat.typ == Chattype::Group);
ensure!(!chat.id.is_special()); ensure!(!chat.id.is_special());
@@ -3086,7 +3088,10 @@ async fn apply_group_changes(
) )
.await?; .await?;
if chat.member_list_is_stale(context).await? { // Avoid insertion of `from_id` into a group with inappropriate encryption state.
if from_is_key_contact != chat.grpid.is_empty()
&& chat.member_list_is_stale(context).await?
{
info!(context, "Member list is stale."); info!(context, "Member list is stale.");
let mut new_members: HashSet<ContactId> = let mut new_members: HashSet<ContactId> =
HashSet::from_iter(to_ids_flat.iter().copied()); HashSet::from_iter(to_ids_flat.iter().copied());
@@ -3144,7 +3149,7 @@ async fn apply_group_changes(
if self_added { if self_added {
new_members = HashSet::from_iter(to_ids_flat.iter().copied()); new_members = HashSet::from_iter(to_ids_flat.iter().copied());
new_members.insert(ContactId::SELF); new_members.insert(ContactId::SELF);
if !from_id.is_special() { if !from_id.is_special() && from_is_key_contact != chat.grpid.is_empty() {
new_members.insert(from_id); new_members.insert(from_id);
} }
} else { } else {