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

fix(contact-tools): parse_vcard: Support \r\n newlines

Browse Source
This commit is contained in:
iequidoo
2024-05-17 18:26:08 -03:00
committed by link2xt
parent 8c5d8477fb
commit 5f790c1dbc
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
deltachat-contact-tools/src/lib.rs
View File

@@ -155,7 +155,7 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
} }
// Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2 // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
static NEWLINE_AND_SPACE_OR_TAB: Lazy<Regex> = Lazy::new(|| Regex::new("\n[\t ]").unwrap()); static NEWLINE_AND_SPACE_OR_TAB: Lazy<Regex> = Lazy::new(|| Regex::new("\r?\n[\t ]").unwrap());
let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, ""); let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
let mut lines = unfolded_lines.lines().peekable(); let mut lines = unfolded_lines.lines().peekable();
@@ -643,10 +643,10 @@ END:VCARD
} }
#[test] #[test]
fn test_android_vcard_with_base64_avatar() { fn test_vcard_with_base64_avatar() {
// This is not an actual base64-encoded avatar, it's just to test the parsing // This is not an actual base64-encoded avatar, it's just to test the parsing.
let contacts = parse_vcard( // This one is Android-like.
"BEGIN:VCARD let vcard0 = "BEGIN:VCARD
VERSION:2.1 VERSION:2.1
N:;Bob;;; N:;Bob;;;
FN:Bob FN:Bob
@@ -656,13 +656,16 @@ PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q== L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
END:VCARD END:VCARD
", ";
); // This one is DOS-like.
let vcard1 = vcard0.replace('\n', "\r\n");
assert_eq!(contacts.len(), 1); for vcard in [vcard0, vcard1.as_str()] {
assert_eq!(contacts[0].addr, "bob@example.org".to_string()); let contacts = parse_vcard(vcard);
assert_eq!(contacts[0].authname, "Bob".to_string()); assert_eq!(contacts.len(), 1);
assert_eq!(contacts[0].key, None); assert_eq!(contacts[0].addr, "bob@example.org".to_string());
assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q=="); assert_eq!(contacts[0].authname, "Bob".to_string());
assert_eq!(contacts[0].key, None);
assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
}
} }
} }