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

check protected properties for all chats

Browse Source 
before, checks were done for groups only.
moreover, apply protection-changes only when the check passes.
This commit is contained in:
B. Petersen
2020-10-15 16:04:43 +02:00
parent d8a7a178c2
commit 010be693e1
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/dc_receive_imf.rs
View File

@@ -714,7 +714,18 @@ async fn add_parts(
ephemeral_timer = EphemeralTimer::Disabled; ephemeral_timer = EphemeralTimer::Disabled;
} }
// change chat protection // if a chat is protected, check additional properties
if !chat_id.is_special() {
let chat = Chat::load_from_db(context, *chat_id).await?;
if chat.is_protected() {
if let Err(err) =
check_verified_properties(context, mime_parser, from_id as u32, to_ids).await
{
warn!(context, "verification problem: {}", err);
let s = format!("{}. See 'Info' for more details", err);
mime_parser.repl_msg_by_error(s);
} else {
// change chat protection only when verification check passes
if let Some(new_status) = match mime_parser.is_system_message { if let Some(new_status) = match mime_parser.is_system_message {
SystemMessage::ChatProtectionEnabled => Some(ProtectionStatus::Protected), SystemMessage::ChatProtectionEnabled => Some(ProtectionStatus::Protected),
SystemMessage::ChatProtectionDisabled => Some(ProtectionStatus::Unprotected), SystemMessage::ChatProtectionDisabled => Some(ProtectionStatus::Unprotected),
@@ -726,6 +737,9 @@ async fn add_parts(
context.stock_protection_msg(new_status, from_id).await, context.stock_protection_msg(new_status, from_id).await,
); );
} }
}
}
}
// correct message_timestamp, it should not be used before, // correct message_timestamp, it should not be used before,
// however, we cannot do this earlier as we need from_id to be set // however, we cannot do this earlier as we need from_id to be set
@@ -1167,19 +1181,10 @@ async fn create_or_lookup_group(
set_better_msg(mime_parser, &better_msg); set_better_msg(mime_parser, &better_msg);
// check, if we have a chat with this group ID // check, if we have a chat with this group ID
let (mut chat_id, chat_id_verified, _blocked) = chat::get_chat_id_by_grpid(context, &grpid) let (mut chat_id, _, _blocked) = chat::get_chat_id_by_grpid(context, &grpid)
.await .await
.unwrap_or((ChatId::new(0), false, Blocked::Not)); .unwrap_or((ChatId::new(0), false, Blocked::Not));
if !chat_id.is_unset() { if !chat_id.is_unset() {
if chat_id_verified {
if let Err(err) =
check_verified_properties(context, mime_parser, from_id as u32, to_ids).await
{
warn!(context, "verification problem: {}", err);
let s = format!("{}. See 'Info' for more details", err);
mime_parser.repl_msg_by_error(s);
}
}
if !chat::is_contact_in_chat(context, chat_id, from_id as u32).await { if !chat::is_contact_in_chat(context, chat_id, from_id as u32).await {
// The From-address is not part of this group. // The From-address is not part of this group.
// It could be a new user or a DSN from a mailer-daemon. // It could be a new user or a DSN from a mailer-daemon.
@@ -1299,11 +1304,6 @@ async fn create_or_lookup_group(
} }
} else if mime_parser.is_system_message == SystemMessage::ChatProtectionEnabled { } else if mime_parser.is_system_message == SystemMessage::ChatProtectionEnabled {
recreate_member_list = true; recreate_member_list = true;
if let Err(e) = check_verified_properties(context, mime_parser, from_id, to_ids).await {
warn!(context, "checking verified properties failed: {}", e);
let s = format!("{}. See 'Info' for more details", e);
mime_parser.repl_msg_by_error(s);
}
} }
if let Some(avatar_action) = &mime_parser.group_avatar { if let Some(avatar_action) = &mime_parser.group_avatar {