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

Lowercase the addresses before gossip peerstate update

Browse Source 
Normally it happens in addr_cmp function, but update_gossip_peerstates
forms a HashSet of addresses, so they should be lowercased beforehand.

Also adjust the mail_with_cc.txt to test for non-lowercase addresses.
This commit is contained in:
Alexander Krotov
2020-01-02 03:07:38 +01:00
parent 61833c32e5
commit 91100d3fac
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mimeparser.rs
View File

@@ -825,7 +825,11 @@ fn update_gossip_peerstates(
}))); })));
} }
if recipients.as_ref().unwrap().contains(&header.addr) { if recipients
.as_ref()
.unwrap()
.contains(&header.addr.to_lowercase())
{
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 {
peerstate.apply_gossip(header, message_time); peerstate.apply_gossip(header, message_time);
@@ -981,7 +985,7 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<String> {
Ok(desired_filename) Ok(desired_filename)
} }
// returned addresses are normalized. // returned addresses are normalized and lowercased.
fn get_recipients<S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> HashSet<String> { fn get_recipients<S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> HashSet<String> {
let mut recipients: HashSet<String> = Default::default(); let mut recipients: HashSet<String> = Default::default();
@@ -993,11 +997,11 @@ fn get_recipients<S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> Hash
for addr in addrs.iter() { for addr in addrs.iter() {
match addr { match addr {
mailparse::MailAddr::Single(ref info) => { mailparse::MailAddr::Single(ref info) => {
recipients.insert(addr_normalize(&info.addr).into()); recipients.insert(addr_normalize(&info.addr).to_lowercase());
} }
mailparse::MailAddr::Group(ref infos) => { mailparse::MailAddr::Group(ref infos) => {
for info in &infos.addrs { for info in &infos.addrs {
recipients.insert(addr_normalize(&info.addr).into()); recipients.insert(addr_normalize(&info.addr).to_lowercase());
} }
} }
} }

2
test-data/message/mail_with_cc.txt
View File

@@ -9,6 +9,6 @@ message-id: <2dfdbde7@example.org>
Date: Sat, 14 Sep 2019 19:00:13 +0200 Date: Sat, 14 Sep 2019 19:00:13 +0200
From: lmn <x@tux.org> From: lmn <x@tux.org>
To: abc <abc@bcd.com> To: abc <abc@bcd.com>
CC: def <def@def.de> CC: def <Def@def.de>
hi hi