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

remove debug logging and fix update_gossip_headers location

Browse Source
This commit is contained in:
holger krekel
2019-12-03 10:59:30 +01:00
parent 25ab59eb93
commit 7a208c4f6b
2 changed files with 9 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mimefactory.rs
View File

@@ -475,11 +475,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
// Add gossip headers // Add gossip headers
if do_gossip { if do_gossip {
info!(
self.context,
"gossiping headers for {} peerstates",
peerstates.len()
);
for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) { for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
if peerstate.peek_key(min_verified).is_some() { if peerstate.peek_key(min_verified).is_some() {
if let Some(header) = peerstate.render_gossip_header(min_verified) { if let Some(header) = peerstate.render_gossip_header(min_verified) {

52
src/mimeparser.rs
View File

@@ -108,11 +108,15 @@ impl<'a> MimeParser<'a> {
if let Some(raw) = raw { if let Some(raw) = raw {
mail_raw = raw; mail_raw = raw;
info!(context, "decrypted: {:?}", std::str::from_utf8(&mail_raw));
let decrypted_mail = mailparse::parse_mail(&mail_raw)?; let decrypted_mail = mailparse::parse_mail(&mail_raw)?;
// Decrypted the mail // Handle any gossip headers if the mail was encrypted. See section
// "3.6 Key Gossip" of https://autocrypt.org/autocrypt-spec-1.1.0.pdf
let gossip_headers =
decrypted_mail.headers.get_all_values("Autocrypt-Gossip")?;
parser.gossipped_addr =
update_gossip_peerstates(context, message_time, &mail, gossip_headers)?;
decrypted_mail decrypted_mail
} else { } else {
// Message was not encrypted // Message was not encrypted
@@ -134,11 +138,6 @@ impl<'a> MimeParser<'a> {
parser.parse_mime_recursive(&mail)?; parser.parse_mime_recursive(&mail)?;
// Handle gossip headers
let gossip_headers = mail.headers.get_all_values("Autocrypt-Gossip")?;
parser.gossipped_addr =
update_gossip_peerstates(context, message_time, &mail, gossip_headers)?;
parser.parse_headers()?; parser.parse_headers()?;
Ok(parser) Ok(parser)
@@ -201,8 +200,6 @@ impl<'a> MimeParser<'a> {
} }
} }
info!(self.context, "checking message parts: {:?}", &self.parts);
if self.is_send_by_messenger && self.parts.len() == 2 { if self.is_send_by_messenger && self.parts.len() == 2 {
let need_drop = { let need_drop = {
let textpart = &self.parts[0]; let textpart = &self.parts[0];
@@ -299,15 +296,12 @@ impl<'a> MimeParser<'a> {
if let Some(dn_field) = self.lookup_field("Chat-Disposition-Notification-To") { if let Some(dn_field) = self.lookup_field("Chat-Disposition-Notification-To") {
if self.get_last_nonmeta().is_some() { if self.get_last_nonmeta().is_some() {
let addrs = mailparse::addrparse(&dn_field).unwrap(); let addrs = mailparse::addrparse(&dn_field).unwrap();
info!(self.context, "last non meta addrs: {:?}", &addrs);
if let Some(dn_to_addr) = addrs.first() { if let Some(dn_to_addr) = addrs.first() {
if let Some(from_field) = self.lookup_field("From") { if let Some(from_field) = self.lookup_field("From") {
info!(self.context, "From {:?}", from_field);
let from_addrs = mailparse::addrparse(&from_field).unwrap(); let from_addrs = mailparse::addrparse(&from_field).unwrap();
if let Some(from_addr) = from_addrs.first() { if let Some(from_addr) = from_addrs.first() {
info!(self.context, "comparing {:?} - {:?}", from_addr, dn_to_addr);
if compare_addrs(from_addr, dn_to_addr) { if compare_addrs(from_addr, dn_to_addr) {
if let Some(part_4) = self.get_last_nonmeta_mut() { if let Some(part_4) = self.get_last_nonmeta_mut() {
part_4.param.set_int(Param::WantsMdn, 1); part_4.param.set_int(Param::WantsMdn, 1);
@@ -350,13 +344,9 @@ impl<'a> MimeParser<'a> {
} }
fn parse_mime_recursive(&mut self, mail: &mailparse::ParsedMail<'_>) -> Result<bool> { fn parse_mime_recursive(&mut self, mail: &mailparse::ParsedMail<'_>) -> Result<bool> {
info!(self.context, "parse mime_recursive {:?}", mail.ctype);
if mail.ctype.params.get("protected-headers").is_some() { if mail.ctype.params.get("protected-headers").is_some() {
info!(self.context, "found protected headers");
if mail.ctype.mimetype == "text/rfc822-headers" { if mail.ctype.mimetype == "text/rfc822-headers" {
info!( warn!(
self.context, self.context,
"Protected headers found in text/rfc822-headers attachment: Will be ignored.", "Protected headers found in text/rfc822-headers attachment: Will be ignored.",
); );
@@ -481,13 +471,10 @@ impl<'a> MimeParser<'a> {
} }
} }
(mime::MULTIPART, "report") => { (mime::MULTIPART, "report") => {
info!(self.context, "got report {}", mail.subparts.len());
/* RFC 6522: the first part is for humans, the second for machines */ /* RFC 6522: the first part is for humans, the second for machines */
if mail.subparts.len() >= 2 { if mail.subparts.len() >= 2 {
info!(self.context, "report: {:?}", &mail.ctype);
if let Some(report_type) = mail.ctype.params.get("report-type") { if let Some(report_type) = mail.ctype.params.get("report-type") {
if report_type == "disposition-notification" { if report_type == "disposition-notification" {
info!(self.context, "processing report");
if let Some(report) = self.process_report(mail)? { if let Some(report) = self.process_report(mail)? {
self.reports.push(report); self.reports.push(report);
} }
@@ -551,11 +538,6 @@ impl<'a> MimeParser<'a> {
let (mime_type, msg_type) = get_mime_type(mail)?; let (mime_type, msg_type) = get_mime_type(mail)?;
let raw_mime = mail.ctype.mimetype.to_lowercase(); let raw_mime = mail.ctype.mimetype.to_lowercase();
info!(
self.context,
"got mime type: {:?} ({})", mime_type, raw_mime
);
let old_part_count = self.parts.len(); let old_part_count = self.parts.len();
// regard `Content-Transfer-Encoding:` // regard `Content-Transfer-Encoding:`
@@ -803,7 +785,6 @@ impl<'a> MimeParser<'a> {
.flatten() .flatten()
.and_then(|v| parse_message_id(&v)) .and_then(|v| parse_message_id(&v))
{ {
info!(self.context, "got report {:?}", original_message_id);
return Ok(Some(Report { return Ok(Some(Report {
original_message_id, original_message_id,
})); }));
@@ -822,7 +803,6 @@ impl<'a> MimeParser<'a> {
server_folder: impl AsRef<str>, server_folder: impl AsRef<str>,
server_uid: u32, server_uid: u32,
) { ) {
info!(self.context, "processing reports {:?}", &self.reports);
for report in &self.reports { for report in &self.reports {
let mut mdn_consumed = false; let mut mdn_consumed = false;
@@ -832,10 +812,6 @@ impl<'a> MimeParser<'a> {
&report.original_message_id, &report.original_message_id,
sent_timestamp, sent_timestamp,
) { ) {
info!(
self.context,
"found message for report {}", report.original_message_id
);
rr_event_to_send.push((chat_id, msg_id)); rr_event_to_send.push((chat_id, msg_id));
mdn_consumed = true; mdn_consumed = true;
} }
@@ -863,21 +839,14 @@ fn update_gossip_peerstates(
let mut recipients: Option<HashSet<String>> = None; let mut recipients: Option<HashSet<String>> = None;
let mut gossipped_addr: HashSet<String> = Default::default(); let mut gossipped_addr: HashSet<String> = Default::default();
info!(
context,
"Updating gossip peerstates: {}",
gossip_headers.len()
);
for value in &gossip_headers { for value in &gossip_headers {
let gossip_header = value.parse::<Aheader>(); let gossip_header = value.parse::<Aheader>();
info!(context, "got gossip header: {:?}", gossip_header);
if let Ok(ref header) = gossip_header { if let Ok(ref header) = gossip_header {
if recipients.is_none() { if recipients.is_none() {
recipients = Some(get_recipients(mail.headers.iter().filter_map(|v| { recipients = Some(get_recipients(mail.headers.iter().filter_map(|v| {
let key = v.get_key(); let key = v.get_key();
let value = v.get_value(); let value = v.get_value();
info!(context, "header: {:?} - {:?}", key, value);
if key.is_err() || value.is_err() { if key.is_err() || value.is_err() {
return None; return None;
} }
@@ -885,9 +854,6 @@ fn update_gossip_peerstates(
}))); })));
} }
info!(context, "got recipients {:?}", recipients);
info!(context, "looking for addr {:?}", &header.addr);
if recipients.as_ref().unwrap().contains(&header.addr) { if recipients.as_ref().unwrap().contains(&header.addr) {
let mut peerstate = Peerstate::from_addr(context, &context.sql, &header.addr); let mut peerstate = Peerstate::from_addr(context, &context.sql, &header.addr);
if let Some(ref mut peerstate) = peerstate { if let Some(ref mut peerstate) = peerstate {
@@ -906,7 +872,7 @@ fn update_gossip_peerstates(
gossipped_addr.insert(header.addr.clone()); gossipped_addr.insert(header.addr.clone());
} else { } else {
info!( warn!(
context, context,
"Ignoring gossipped \"{}\" as the address is not in To/Cc list.", &header.addr, "Ignoring gossipped \"{}\" as the address is not in To/Cc list.", &header.addr,
); );