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

fix(webxdc): check if status update sender is the member of the correct chat

Browse Source
This commit is contained in:
link2xt
2023-07-24 22:07:52 +00:00
parent d52f2883cf
commit a33c91afa9
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/webxdc.rs
View File

@@ -561,7 +561,6 @@ impl Context {
json: &str, json: &str,
) -> Result<()> { ) -> Result<()> {
let msg = Message::load_from_db(self, msg_id).await?; let msg = Message::load_from_db(self, msg_id).await?;
let chat_id = msg.chat_id;
let (timestamp, mut instance, can_info_msg) = if msg.viewtype == Viewtype::Webxdc { let (timestamp, mut instance, can_info_msg) = if msg.viewtype == Viewtype::Webxdc {
(msg.timestamp_sort, msg, false) (msg.timestamp_sort, msg, false)
} else if let Some(parent) = msg.parent(self).await? { } else if let Some(parent) = msg.parent(self).await? {
@@ -575,17 +574,16 @@ impl Context {
} else { } else {
bail!("receive_status_update: status message has no parent.") bail!("receive_status_update: status message has no parent.")
}; };
let chat_id = instance.chat_id;
if from_id != ContactId::SELF if from_id != ContactId::SELF && !chat::is_contact_in_chat(self, chat_id, from_id).await? {
&& !chat::is_contact_in_chat(self, instance.chat_id, from_id).await?
{
let chat_type: Chattype = self let chat_type: Chattype = self
.sql .sql
.query_get_value("SELECT type FROM chats WHERE id=?", (chat_id,)) .query_get_value("SELECT type FROM chats WHERE id=?", (chat_id,))
.await? .await?
.with_context(|| format!("Chat type for chat {chat_id} not found"))?; .with_context(|| format!("Chat type for chat {chat_id} not found"))?;
if chat_type != Chattype::Mailinglist { if chat_type != Chattype::Mailinglist {
bail!("receive_status_update: status sender not chat member.") bail!("receive_status_update: status sender {from_id} is not a member of chat {chat_id}")
} }
} }