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

remove reverse "check_self" return

Browse Source
This commit is contained in:
holger krekel
2019-12-09 19:41:58 +01:00
parent f242b40d0a
commit c33797ff84
2 changed files with 53 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/dc_receive_imf.rs
View File

@@ -64,9 +64,6 @@ pub fn dc_receive_imf(
// the function returns the number of created messages in the database
let mut incoming = true;
let mut incoming_origin = Origin::Unknown;
let mut to_self = false;
let mut from_id = 0u32;
let mut from_id_blocked = false;
let mut to_id = 0u32;
let mut chat_id = 0;
let mut hidden = false;
@@ -114,34 +111,6 @@ pub fn dc_receive_imf(
sent_timestamp = mailparse::dateparse(value).unwrap_or_default();
}
// get From: and check if it is known (for known From:'s we add the other To:/Cc: in the 3rd pass)
// or if From: is equal to SELF (in this case, it is any outgoing messages,
// we do not check Return-Path any more as this is unreliable, see issue #150
if let Some(field_from) = mime_parser.get(HeaderDef::From_) {
let mut check_self = false;
let mut from_contact_ids = ContactIds::new();
dc_add_or_lookup_contacts_by_address_list(
context,
&field_from,
Origin::IncomingUnknownFrom,
&mut from_contact_ids,
&mut check_self,
)?;
if check_self {
incoming = false;
if mime_parser.sender_equals_recipient() {
from_id = DC_CONTACT_ID_SELF;
}
} else if !from_contact_ids.is_empty() {
from_id = from_contact_ids.get_index(0).cloned().unwrap_or_default();
incoming_origin = Contact::get_origin_by_id(context, from_id, &mut from_id_blocked)
} else {
// if there is no from given, from_id stays 0 which is just fine. These messages
// are very rare, however, we have to add them to the database (they go to the
// "deaddrop" chat) to avoid a re-download from the server. See also [**]
}
}
// Make sure, to_ids starts with the first To:-address (Cc: is added in the loop below pass)
if let Some(field) = mime_parser.get(HeaderDef::To) {
dc_add_or_lookup_contacts_by_address_list(
@@ -155,10 +124,44 @@ pub fn dc_receive_imf(
Origin::IncomingUnknownTo
},
&mut to_ids,
&mut to_self,
)?;
}
// get From: (it can be an address list!) and check if it is known (for known From:'s we add
// the other To:/Cc: in the 3rd pass)
// or if From: is equal to SELF (in this case, it is any outgoing messages,
// we do not check Return-Path any more as this is unreliable, see issue #150)
let mut from_id = 0;
let mut from_id_blocked = false;
if let Some(field_from) = mime_parser.get(HeaderDef::From_) {
let mut from_ids = ContactIds::new();
dc_add_or_lookup_contacts_by_address_list(
context,
&field_from,
Origin::IncomingUnknownFrom,
&mut from_ids,
)?;
if from_ids.len() > 1 {
warn!(context, "mail has more than one address in From: {:?}", field_from);
}
if from_ids.contains(&DC_CONTACT_ID_SELF) {
incoming = false;
if to_ids.len() == 1 && to_ids.contains(&DC_CONTACT_ID_SELF) {
from_id = DC_CONTACT_ID_SELF;
}
} else if !from_ids.is_empty() {
from_id = from_ids.get_index(0).cloned().unwrap_or_default();
incoming_origin = Contact::get_origin_by_id(context, from_id, &mut from_id_blocked)
} else {
warn!(context, "mail has an empty From header: {:?}", field_from);
// if there is no from given, from_id stays 0 which is just fine. These messages
// are very rare, however, we have to add them to the database (they go to the
// "deaddrop" chat) to avoid a re-download from the server. See also [**]
}
}
// Add parts
let rfc724_mid = match mime_parser.get_rfc724_mid() {
@@ -170,13 +173,7 @@ pub fn dc_receive_imf(
match dc_create_incoming_rfc724_mid(sent_timestamp, from_id, &to_ids) {
Some(x) => x,
None => {
cleanup(
context,
&create_event_to_send,
&created_db_entries,
&rr_event_to_send,
);
bail!("could not create incoming rfc724_mid");
bail!("No Message-Id found and could not create incoming rfc724_mid");
}
}
}
@@ -200,7 +197,6 @@ pub fn dc_receive_imf(
&mut to_id,
flags,
&mut needs_delete_job,
to_self,
&mut insert_msg_id,
&mut created_db_entries,
&mut create_event_to_send,
@@ -286,7 +282,6 @@ fn add_parts(
to_id: &mut u32,
flags: u32,
needs_delete_job: &mut bool,
to_self: bool,
insert_msg_id: &mut MsgId,
created_db_entries: &mut Vec<(usize, MsgId)>,
create_event_to_send: &mut Option<CreateEvent>,
@@ -314,7 +309,6 @@ fn add_parts(
Origin::IncomingUnknownCc
},
to_ids,
&mut false,
)?;
}
@@ -539,7 +533,11 @@ fn add_parts(
}
}
}
if *chat_id == 0 && to_ids.is_empty() && to_self {
let self_sent = *from_id == DC_CONTACT_ID_SELF
&& to_ids.len() == 1
&& to_ids.contains(&DC_CONTACT_ID_SELF);
if *chat_id == 0 && self_sent {
// from_id==to_id==DC_CONTACT_ID_SELF - this is a self-sent messages,
// maybe an Autocrypt Setup Messag
let (id, bl) =
@@ -1579,7 +1577,6 @@ fn dc_add_or_lookup_contacts_by_address_list(
addr_list_raw: &str,
origin: Origin,
to_ids: &mut ContactIds,
check_self: &mut bool,
) -> Result<()> {
let addrs = match mailparse::addrparse(addr_list_raw) {
Ok(addrs) => addrs,
@@ -1595,25 +1592,20 @@ fn dc_add_or_lookup_contacts_by_address_list(
for addr in addrs.iter() {
match addr {
mailparse::MailAddr::Single(info) => {
let contact_id =
add_or_lookup_contact_by_addr(context, &info.display_name, &info.addr, origin)?;
to_ids.insert(contact_id);
if contact_id == DC_CONTACT_ID_SELF {
*check_self = true;
}
to_ids.insert(
add_or_lookup_contact_by_addr(context, &info.display_name, &info.addr, origin)?
);
}
mailparse::MailAddr::Group(infos) => {
for info in &infos.addrs {
let contact_id = add_or_lookup_contact_by_addr(
context,
&info.display_name,
&info.addr,
origin,
)?;
to_ids.insert(contact_id);
if contact_id == DC_CONTACT_ID_SELF {
*check_self = true;
}
to_ids.insert(
add_or_lookup_contact_by_addr(
context,
&info.display_name,
&info.addr,
origin,
)?
);
}
}
}

21
src/mimeparser.rs
View File

@@ -527,7 +527,7 @@ impl<'a> MimeParser<'a> {
let filename = get_attachment_filename(mail);
info!(
self.context,
"add_single_part_if_known {:?} {:?} {:?}", mime_type, msg_type, filename
"add_single_part_if_known {:?} {:?}", mime_type, msg_type
);
let old_part_count = self.parts.len();
@@ -665,25 +665,6 @@ impl<'a> MimeParser<'a> {
}
}
pub fn sender_equals_recipient(&self) -> bool {
/* get From: and check there is exactly one sender */
if let Some(field) = self.get(HeaderDef::From_) {
if let Ok(addrs) = mailparse::addrparse(field) {
if addrs.len() != 1 {
return false;
}
if let mailparse::MailAddr::Single(ref info) = addrs[0] {
let from_addr_norm = addr_normalize(&info.addr);
let recipients = get_recipients(self.header.iter());
if recipients.len() == 1 && recipients.contains(from_addr_norm) {
return true;
}
}
}
}
false
}
pub fn repl_msg_by_error(&mut self, error_msg: impl AsRef<str>) {
if self.parts.is_empty() {
return;