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

refactor: lowercase the address in addr_normalize()

Browse Source
This commit is contained in:
link2xt
2023-11-19 16:18:05 +00:00
parent b50761e4d1
commit 03221ea86c
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/contact.rs
View File

@@ -71,7 +71,7 @@ impl ContactAddress {
/// normalizing and validating it. /// normalizing and validating it.
pub fn new(s: &str) -> Result<Self> { pub fn new(s: &str) -> Result<Self> {
let addr = addr_normalize(s); let addr = addr_normalize(s);
if !may_be_valid_addr(addr) { if !may_be_valid_addr(&addr) {
bail!("invalid address {:?}", s); bail!("invalid address {:?}", s);
} }
Ok(Self(addr.to_string())) Ok(Self(addr.to_string()))
@@ -565,7 +565,7 @@ impl Contact {
let addr_normalized = addr_normalize(addr); let addr_normalized = addr_normalize(addr);
if context.is_self_addr(addr_normalized).await? { if context.is_self_addr(&addr_normalized).await? {
return Ok(Some(ContactId::SELF)); return Ok(Some(ContactId::SELF));
} }
@@ -1405,12 +1405,13 @@ pub fn may_be_valid_addr(addr: &str) -> bool {
res.is_ok() res.is_ok()
} }
/// Returns address with whitespace trimmed and `mailto:` prefix removed. /// Returns address lowercased,
pub fn addr_normalize(addr: &str) -> &str { /// with whitespace trimmed and `mailto:` prefix removed.
let norm = addr.trim(); pub fn addr_normalize(addr: &str) -> String {
let norm = addr.trim().to_lowercase();
if norm.starts_with("mailto:") { if norm.starts_with("mailto:") {
norm.get(7..).unwrap_or(norm) norm.get(7..).unwrap_or(&norm).to_string()
} else { } else {
norm norm
} }
@@ -1665,8 +1666,8 @@ fn cat_fingerprint(
/// Compares two email addresses, normalizing them beforehand. /// Compares two email addresses, normalizing them beforehand.
pub fn addr_cmp(addr1: &str, addr2: &str) -> bool { pub fn addr_cmp(addr1: &str, addr2: &str) -> bool {
let norm1 = addr_normalize(addr1).to_lowercase(); let norm1 = addr_normalize(addr1);
let norm2 = addr_normalize(addr2).to_lowercase(); let norm2 = addr_normalize(addr2);
norm1 == norm2 norm1 == norm2
} }
@@ -1864,10 +1865,7 @@ mod tests {
fn test_normalize_addr() { fn test_normalize_addr() {
assert_eq!(addr_normalize("mailto:john@doe.com"), "john@doe.com"); assert_eq!(addr_normalize("mailto:john@doe.com"), "john@doe.com");
assert_eq!(addr_normalize(" hello@world.com "), "hello@world.com"); assert_eq!(addr_normalize(" hello@world.com "), "hello@world.com");
assert_eq!(addr_normalize("John@Doe.com"), "john@doe.com");
// normalisation preserves case to allow user-defined spelling.
// however, case is ignored on addr_cmp()
assert_ne!(addr_normalize("John@Doe.com"), "john@doe.com");
} }
#[test] #[test]

2
src/qr.rs
View File

@@ -789,7 +789,7 @@ fn normalize_address(addr: &str) -> Result<String> {
let new_addr = percent_decode_str(addr).decode_utf8()?; let new_addr = percent_decode_str(addr).decode_utf8()?;
let new_addr = addr_normalize(&new_addr); let new_addr = addr_normalize(&new_addr);
ensure!(may_be_valid_addr(new_addr), "Bad e-mail address"); ensure!(may_be_valid_addr(&new_addr), "Bad e-mail address");
Ok(new_addr.to_string()) Ok(new_addr.to_string())
} }