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

test_utils: fix Alice's address in alice_keypair()

Browse Source 
The key stored in test-data has @example.org identity.
This commit is contained in:
link2xt
2021-12-05 09:09:29 +00:00
parent 8ad9db5572
commit 01db8d0130
28 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/tests/test_account.py
View File

@@ -57,7 +57,7 @@ class TestOfflineAccountBasic:
alice_public = data.read_path("key/alice-public.asc") alice_public = data.read_path("key/alice-public.asc")
alice_secret = data.read_path("key/alice-secret.asc") alice_secret = data.read_path("key/alice-secret.asc")
assert alice_public and alice_secret assert alice_public and alice_secret
ac._preconfigure_keypair("alice@example.com", alice_public, alice_secret) ac._preconfigure_keypair("alice@example.org", alice_public, alice_secret)
def test_getinfo(self, acfactory): def test_getinfo(self, acfactory):
ac1 = acfactory.get_unconfigured_account() ac1 = acfactory.get_unconfigured_account()
@@ -1359,7 +1359,7 @@ class TestOnlineAccount:
If the draft email is sent out later (i.e. moved to "Sent"), it must be shown.""" If the draft email is sent out later (i.e. moved to "Sent"), it must be shown."""
ac1 = acfactory.get_online_configuring_account() ac1 = acfactory.get_online_configuring_account()
ac1.set_config("show_emails", "2") ac1.set_config("show_emails", "2")
ac1.create_contact("alice@example.com").create_chat() ac1.create_contact("alice@example.org").create_chat()
acfactory.wait_configure(ac1) acfactory.wait_configure(ac1)
ac1.direct_imap.create_folder("Drafts") ac1.direct_imap.create_folder("Drafts")
@@ -1373,7 +1373,7 @@ class TestOnlineAccount:
ac1.direct_imap.append("Drafts", """ ac1.direct_imap.append("Drafts", """
From: ac1 <{}> From: ac1 <{}>
Subject: subj Subject: subj
To: alice@example.com To: alice@example.org
Message-ID: <aepiors@example.org> Message-ID: <aepiors@example.org>
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset=utf-8
@@ -1382,7 +1382,7 @@ class TestOnlineAccount:
ac1.direct_imap.append("Sent", """ ac1.direct_imap.append("Sent", """
From: ac1 <{}> From: ac1 <{}>
Subject: subj Subject: subj
To: alice@example.com To: alice@example.org
Message-ID: <hsabaeni@example.org> Message-ID: <hsabaeni@example.org>
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset=utf-8

8
src/chat.rs
View File

@@ -4135,7 +4135,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: bob@example.org\n\ b"From: bob@example.org\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <1@example.org>\n\ Message-ID: <1@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Date: Fri, 23 Apr 2021 10:00:57 +0000\n\ Date: Fri, 23 Apr 2021 10:00:57 +0000\n\
@@ -4184,7 +4184,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: bob@example.org\n\ b"From: bob@example.org\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <1@example.org>\n\ Message-ID: <1@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Date: Sun, 22 Mar 2021 19:37:57 +0000\n\ Date: Sun, 22 Mar 2021 19:37:57 +0000\n\
@@ -4233,7 +4233,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: bob@example.org\n\ b"From: bob@example.org\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <2@example.org>\n\ Message-ID: <2@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Date: Sun, 22 Mar 2021 19:37:57 +0000\n\ Date: Sun, 22 Mar 2021 19:37:57 +0000\n\
@@ -4282,7 +4282,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: bob@example.org\n\ b"From: bob@example.org\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <1@example.org>\n\ Message-ID: <1@example.org>\n\
Date: Sun, 22 Mar 2021 19:37:57 +0000\n\ Date: Sun, 22 Mar 2021 19:37:57 +0000\n\
\n\ \n\

4
src/chatlist.rs
View File

@@ -499,7 +499,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Bob Authname <bob@example.org>\n\ b"From: Bob Authname <bob@example.org>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: <msg1234@example.org>\n\ Message-ID: <msg1234@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -561,7 +561,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: bob@example.org\n\ b"From: bob@example.org\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: <msg5678@example.org>\n\ Message-ID: <msg5678@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\

12
src/contact.rs
View File

@@ -1890,7 +1890,7 @@ mod tests {
let alice = TestContext::new_alice().await; let alice = TestContext::new_alice().await;
let id = Contact::lookup_id_by_addr(&alice.ctx, "alice@example.com", Origin::Unknown) let id = Contact::lookup_id_by_addr(&alice.ctx, "alice@example.org", Origin::Unknown)
.await .await
.unwrap(); .unwrap();
assert_eq!(id, Some(DC_CONTACT_ID_SELF)); assert_eq!(id, Some(DC_CONTACT_ID_SELF));
@@ -1915,7 +1915,7 @@ mod tests {
let bob = TestContext::new_bob().await; let bob = TestContext::new_bob().await;
let chat_alice = bob let chat_alice = bob
.create_chat_with_contact("Alice", "alice@example.com") .create_chat_with_contact("Alice", "alice@example.org")
.await; .await;
send_text_msg(&bob, chat_alice.id, "Hello".to_string()).await?; send_text_msg(&bob, chat_alice.id, "Hello".to_string()).await?;
let msg = bob.pop_sent_msg().await; let msg = bob.pop_sent_msg().await;
@@ -1927,7 +1927,7 @@ mod tests {
"End-to-end encryption preferred. "End-to-end encryption preferred.
Fingerprints: Fingerprints:
alice@example.com: alice@example.org:
2E6F A2CB 23B5 32D7 2863 2E6F A2CB 23B5 32D7 2863
4B58 64B0 8F61 A9ED 9443 4B58 64B0 8F61 A9ED 9443
@@ -1978,7 +1978,7 @@ CCCB 5AA9 F6E1 141C 9431
// Bob replies. // Bob replies.
let chat = bob let chat = bob
.create_chat_with_contact("Alice", "alice@example.com") .create_chat_with_contact("Alice", "alice@example.org")
.await; .await;
send_text_msg(&bob, chat.id, "Reply".to_string()).await?; send_text_msg(&bob, chat.id, "Reply".to_string()).await?;
@@ -2034,7 +2034,7 @@ CCCB 5AA9 F6E1 141C 9431
// Bob sends a message so that Alice can encrypt to him. // Bob sends a message so that Alice can encrypt to him.
let chat = bob let chat = bob
.create_chat_with_contact("Alice", "alice@example.com") .create_chat_with_contact("Alice", "alice@example.org")
.await; .await;
send_text_msg(&bob, chat.id, "Reply".to_string()).await?; send_text_msg(&bob, chat.id, "Reply".to_string()).await?;
@@ -2077,7 +2077,7 @@ CCCB 5AA9 F6E1 141C 9431
let mime = br#"Subject: Hello let mime = br#"Subject: Hello
Message-ID: message@example.net Message-ID: message@example.net
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob <bob@example.net> From: Bob <bob@example.net>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
Chat-Version: 1.0 Chat-Version: 1.0

2
src/context.rs
View File

@@ -668,7 +668,7 @@ mod tests {
.unwrap(); .unwrap();
let msg = format!( let msg = format!(
"From: {}\n\ "From: {}\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <{}>\n\ Message-ID: <{}>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\

68
src/dc_receive_imf.rs
View File

@@ -2336,7 +2336,7 @@ mod tests {
#[async_std::test] #[async_std::test]
async fn test_dc_create_incoming_rfc724_mid() { async fn test_dc_create_incoming_rfc724_mid() {
let context = TestContext::new().await; let context = TestContext::new().await;
let raw = b"From: Alice <alice@example.com>\n\ let raw = b"From: Alice <alice@example.org>\n\
To: Bob <bob@example.org>\n\ To: Bob <bob@example.org>\n\
Subject: Some subject\n\ Subject: Some subject\n\
hello\n"; hello\n";
@@ -2346,14 +2346,14 @@ mod tests {
assert_eq!( assert_eq!(
dc_create_incoming_rfc724_mid(&mimeparser), dc_create_incoming_rfc724_mid(&mimeparser),
"08d11318608d5191@stub" "ca971a2eefd651f6@stub"
); );
} }
static MSGRMSG: &[u8] = static MSGRMSG: &[u8] =
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Bob <bob@example.com>\n\ From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Subject: Chat: hello\n\ Subject: Chat: hello\n\
Message-ID: <Mr.1111@example.com>\n\ Message-ID: <Mr.1111@example.com>\n\
@@ -2364,7 +2364,7 @@ mod tests {
static ONETOONE_NOREPLY_MAIL: &[u8] = static ONETOONE_NOREPLY_MAIL: &[u8] =
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Bob <bob@example.com>\n\ From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Chat: hello\n\ Subject: Chat: hello\n\
Message-ID: <2222@example.com>\n\ Message-ID: <2222@example.com>\n\
Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
@@ -2374,7 +2374,7 @@ mod tests {
static GRP_MAIL: &[u8] = static GRP_MAIL: &[u8] =
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com, claire@example.com\n\ To: alice@example.org, claire@example.com\n\
Subject: group with Alice, Bob and Claire\n\ Subject: group with Alice, Bob and Claire\n\
Message-ID: <3333@example.com>\n\ Message-ID: <3333@example.com>\n\
Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
@@ -2554,14 +2554,14 @@ mod tests {
&t, &t,
format!( format!(
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: alice@example.com\n\ From: alice@example.org\n\
To: bob@example.com\n\ To: bob@example.com\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: <Gr.{}.12345678901@example.com>\n\ Message-ID: <Gr.{}.12345678901@example.com>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Chat-Group-ID: {}\n\ Chat-Group-ID: {}\n\
Chat-Group-Name: foo\n\ Chat-Group-Name: foo\n\
Chat-Disposition-Notification-To: alice@example.com\n\ Chat-Disposition-Notification-To: alice@example.org\n\
Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
\n\ \n\
hello\n", hello\n",
@@ -2586,7 +2586,7 @@ mod tests {
format!( format!(
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: message opened\n\ Subject: message opened\n\
Date: Sun, 22 Mar 2020 23:37:57 +0000\n\ Date: Sun, 22 Mar 2020 23:37:57 +0000\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -2679,7 +2679,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= <foobar@example.com>\n\ b"From: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= <foobar@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: <asdklfjjaweofi@example.com>\n\ Message-ID: <asdklfjjaweofi@example.com>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -2720,7 +2720,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Foobar <foobar@example.com>\n\ b"From: Foobar <foobar@example.com>\n\
To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= alice@example.com\n\ To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= alice@example.org\n\
Cc: =?utf-8?q?=3Ch2=3E?= <carl@host.tld>\n\ Cc: =?utf-8?q?=3Ch2=3E?= <carl@host.tld>\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: <asdklfjjaweofi@example.com>\n\ Message-ID: <asdklfjjaweofi@example.com>\n\
@@ -2765,7 +2765,7 @@ mod tests {
&t, &t,
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Foobar <foobar@example.com>\n\ From: Foobar <foobar@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Cc: Carl <carl@host.tld>\n\ Cc: Carl <carl@host.tld>\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: <asdklfjjaweofi@example.com>\n\ Message-ID: <asdklfjjaweofi@example.com>\n\
@@ -2941,7 +2941,7 @@ mod tests {
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Chat-Group-ID: abcde\n\ Chat-Group-ID: abcde\n\
Chat-Group-Name: foo\n\ Chat-Group-Name: foo\n\
Chat-Disposition-Notification-To: alice@example.com\n\ Chat-Disposition-Notification-To: alice@example.org\n\
Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
\n\ \n\
hello\n", hello\n",
@@ -3559,7 +3559,7 @@ mod tests {
To: {} To: {}
References: <deltachat/deltachat-core-rust/pull/1625@github.com> References: <deltachat/deltachat-core-rust/pull/1625@github.com>
<deltachat/deltachat-core-rust/pull/1625/c644661857@github.com> <deltachat/deltachat-core-rust/pull/1625/c644661857@github.com>
From: alice@example.com From: alice@example.org
Message-ID: <d2717387-0ba7-7b60-9b09-fd89a76ea8a0@gmx.de> Message-ID: <d2717387-0ba7-7b60-9b09-fd89a76ea8a0@gmx.de>
Date: Tue, 16 Jun 2020 12:04:20 +0200 Date: Tue, 16 Jun 2020 12:04:20 +0200
MIME-Version: 1.0 MIME-Version: 1.0
@@ -4077,7 +4077,7 @@ YEAAAAAA!.
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Nu Bar <nu@bar.org>\n\ b"From: Nu Bar <nu@bar.org>\n\
To: alice@example.com, bob@example.org\n\ To: alice@example.org, bob@example.org\n\
Subject: Hi\n\ Subject: Hi\n\
Message-ID: <4444@example.org>\n\ Message-ID: <4444@example.org>\n\
\n\ \n\
@@ -4104,7 +4104,7 @@ YEAAAAAA!.
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Nu Bar <nu@bar.org>\n\ b"From: Nu Bar <nu@bar.org>\n\
To: alice@example.com, bob@example.org\n\ To: alice@example.org, bob@example.org\n\
Subject: Re: Hi\n\ Subject: Re: Hi\n\
Message-ID: <5555@example.org>\n\ Message-ID: <5555@example.org>\n\
In-Reply-To: <4444@example.org\n\ In-Reply-To: <4444@example.org\n\
@@ -4212,13 +4212,13 @@ YEAAAAAA!.
dc_receive_imf( dc_receive_imf(
&t, &t,
b"Bcc: alice@example.com b"Bcc: alice@example.org
Received: from [127.0.0.1] Received: from [127.0.0.1]
Subject: s Subject: s
Chat-Version: 1.0 Chat-Version: 1.0
Message-ID: <abcd@gmail.com> Message-ID: <abcd@gmail.com>
To: <me@other.maildomain.com> To: <me@other.maildomain.com>
From: <alice@example.com> From: <alice@example.org>
Message content", Message content",
"Inbox", "Inbox",
@@ -4249,7 +4249,7 @@ Message content",
Subject: Subj Subject: Subj
Message-ID: <abcd@example.com> Message-ID: <abcd@example.com>
To: <bob@example.org> To: <bob@example.org>
From: <alice@example.com> From: <alice@example.org>
Message content", Message content",
"Sent", "Sent",
@@ -4281,7 +4281,7 @@ Message content",
let first_message = b"Received: from [127.0.0.1] let first_message = b"Received: from [127.0.0.1]
Subject: First message Subject: First message
Message-ID: <first@example.org> Message-ID: <first@example.org>
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob1 <bob@example.org> From: Bob1 <bob@example.org>
Chat-Version: 1.0 Chat-Version: 1.0
@@ -4293,7 +4293,7 @@ First signature";
let second_message = b"Received: from [127.0.0.1] let second_message = b"Received: from [127.0.0.1]
Subject: Second message Subject: Second message
Message-ID: <second@example.org> Message-ID: <second@example.org>
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob2 <bob@example.org> From: Bob2 <bob@example.org>
Chat-Version: 1.0 Chat-Version: 1.0
@@ -4337,7 +4337,7 @@ Subject: =?utf-8?q?single_reply-to?=
{} {}
Date: Fri, 28 May 2021 10:15:05 +0000 Date: Fri, 28 May 2021 10:15:05 +0000
To: Bob <bob@example.com>, <claire@example.com> To: Bob <bob@example.com>, <claire@example.com>
From: Alice <alice@example.com> From: Alice <alice@example.org>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
@@ -4377,7 +4377,7 @@ Message-ID: <Gr.eJ_llQIXf0K.buxmrnMmG0Y@gmx.de>"
&t, &t,
format!( format!(
r#"Subject: Re: single reply-to r#"Subject: Re: single reply-to
To: "Alice" <alice@example.com> To: "Alice" <alice@example.org>
References: <{0}> References: <{0}>
<{0}> <{0}>
From: Bob <bob@example.com> From: Bob <bob@example.com>
@@ -4427,7 +4427,7 @@ Subject: =?utf-8?q?single_reply-to?=
{} {}
Date: Fri, 28 May 2021 10:15:05 +0000 Date: Fri, 28 May 2021 10:15:05 +0000
To: Bob <bob@example.com>{} To: Bob <bob@example.com>{}
From: Alice <alice@example.com> From: Alice <alice@example.org>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
@@ -4476,7 +4476,7 @@ In-Reply-To: <{0}>
Date: Sat, 03 Jul 2021 20:00:26 +0000 Date: Sat, 03 Jul 2021 20:00:26 +0000
Chat-Version: 1.0 Chat-Version: 1.0
Message-ID: <Mr.CJFwF5hwn8W.Pd-GGH5m32k@gmx.de> Message-ID: <Mr.CJFwF5hwn8W.Pd-GGH5m32k@gmx.de>
To: <alice@example.com> To: <alice@example.org>
From: <bob@example.com> From: <bob@example.com>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
@@ -4524,7 +4524,7 @@ Sent with my Delta Chat Messenger: https://delta.chat
Subject: =?utf-8?q?single_reply-to?= Subject: =?utf-8?q?single_reply-to?=
{} {}
To: Bob <bob@example.com>, <claire@example.com> To: Bob <bob@example.com>, <claire@example.com>
From: Alice <alice@example.com> From: Alice <alice@example.org>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
@@ -4567,7 +4567,7 @@ Message-ID: <Gr.eJ_llQIXf0K.buxmrnMmG0Y@gmx.de>"
r#"Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) r#"Received: from mout.gmx.net (mout.gmx.net [212.227.17.22])
Subject: Out subj Subject: Out subj
To: "Bob" <bob@example.com>, "Claire" <claire@example.com> To: "Bob" <bob@example.com>, "Claire" <claire@example.com>
From: Alice <alice@example.com> From: Alice <alice@example.org>
Message-ID: <outgoing@testrun.org> Message-ID: <outgoing@testrun.org>
MIME-Version: 1.0 MIME-Version: 1.0
In-Reply-To: <{0}> In-Reply-To: <{0}>
@@ -4599,7 +4599,7 @@ Outgoing reply to all"#,
br#"Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) br#"Received: from mout.gmx.net (mout.gmx.net [212.227.17.22])
Subject: In subj Subject: In subj
To: "Bob" <bob@example.com>, "Claire" <claire@example.com> To: "Bob" <bob@example.com>, "Claire" <claire@example.com>
From: alice <alice@example.com> From: alice <alice@example.org>
Message-ID: <xyz@testrun.org> Message-ID: <xyz@testrun.org>
MIME-Version: 1.0 MIME-Version: 1.0
In-Reply-To: <outgoing@testrun.org> In-Reply-To: <outgoing@testrun.org>
@@ -4635,14 +4635,14 @@ Reply to all"#,
let first_thread_mime = br#"Subject: First thread let first_thread_mime = br#"Subject: First thread
Message-ID: first@example.org Message-ID: first@example.org
To: Alice <alice@example.com>, Bob <bob@example.net> To: Alice <alice@example.org>, Bob <bob@example.net>
From: Claire <claire@example.org> From: Claire <claire@example.org>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
First thread."#; First thread."#;
let second_thread_mime = br#"Subject: Second thread let second_thread_mime = br#"Subject: Second thread
Message-ID: second@example.org Message-ID: second@example.org
To: Alice <alice@example.com>, Bob <bob@example.net> To: Alice <alice@example.org>, Bob <bob@example.net>
From: Claire <claire@example.org> From: Claire <claire@example.org>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
@@ -4735,7 +4735,7 @@ Second thread."#;
let msg = t.get_last_msg().await; let msg = t.get_last_msg().await;
assert!(msg.has_html()); assert!(msg.has_html());
assert_eq!(msg.id.get_html(&t).await?.unwrap().replace("\r\n", "\n"), "<html><head></head><body><div style=\"font-family: Verdana;font-size: 12.0px;\"><div>&nbsp;</div>\n\n<div>&nbsp;\n<div>&nbsp;\n<div data-darkreader-inline-border-left=\"\" name=\"quote\" style=\"margin: 10px 5px 5px 10px; padding: 10px 0px 10px 10px; border-left: 2px solid rgb(195, 217, 229); overflow-wrap: break-word; --darkreader-inline-border-left:#274759;\">\n<div style=\"margin:0 0 10px 0;\"><b>Gesendet:</b>&nbsp;Donnerstag, 12. August 2021 um 15:52 Uhr<br/>\n<b>Von:</b>&nbsp;&quot;Claire&quot; &lt;claire@example.org&gt;<br/>\n<b>An:</b>&nbsp;alice@example.com<br/>\n<b>Betreff:</b>&nbsp;subject</div>\n\n<div name=\"quoted-content\">bodytext</div>\n</div>\n</div>\n</div></div></body></html>\n\n"); assert_eq!(msg.id.get_html(&t).await?.unwrap().replace("\r\n", "\n"), "<html><head></head><body><div style=\"font-family: Verdana;font-size: 12.0px;\"><div>&nbsp;</div>\n\n<div>&nbsp;\n<div>&nbsp;\n<div data-darkreader-inline-border-left=\"\" name=\"quote\" style=\"margin: 10px 5px 5px 10px; padding: 10px 0px 10px 10px; border-left: 2px solid rgb(195, 217, 229); overflow-wrap: break-word; --darkreader-inline-border-left:#274759;\">\n<div style=\"margin:0 0 10px 0;\"><b>Gesendet:</b>&nbsp;Donnerstag, 12. August 2021 um 15:52 Uhr<br/>\n<b>Von:</b>&nbsp;&quot;Claire&quot; &lt;claire@example.org&gt;<br/>\n<b>An:</b>&nbsp;alice@example.org<br/>\n<b>Betreff:</b>&nbsp;subject</div>\n\n<div name=\"quoted-content\">bodytext</div>\n</div>\n</div>\n</div></div></body></html>\n\n");
Ok(()) Ok(())
} }
@@ -4769,7 +4769,7 @@ Second thread."#;
let mime = br#"Subject: First let mime = br#"Subject: First
Message-ID: first@example.net Message-ID: first@example.net
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob <bob@example.net> From: Bob <bob@example.net>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
@@ -4778,7 +4778,7 @@ First."#;
let first = t.get_last_msg().await; let first = t.get_last_msg().await;
let mime = br#"Subject: Second let mime = br#"Subject: Second
Message-ID: second@example.net Message-ID: second@example.net
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob <bob@example.net> From: Bob <bob@example.net>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
@@ -4787,7 +4787,7 @@ First."#;
let second = t.get_last_msg().await; let second = t.get_last_msg().await;
let mime = br#"Subject: Third let mime = br#"Subject: Third
Message-ID: third@example.net Message-ID: third@example.net
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob <bob@example.net> From: Bob <bob@example.net>
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
@@ -4797,7 +4797,7 @@ First."#;
let mime = br#"Subject: Message with references. let mime = br#"Subject: Message with references.
Message-ID: second@example.net Message-ID: second@example.net
To: Alice <alice@example.com> To: Alice <alice@example.org>
From: Bob <bob@example.net> From: Bob <bob@example.net>
In-Reply-To: <third@example.net> In-Reply-To: <third@example.net>
References: <second@example.net> <nonexistent@example.net> <first@example.net> References: <second@example.net> <nonexistent@example.net> <first@example.net>

2
src/download.rs
View File

@@ -360,7 +360,7 @@ mod tests {
dc_receive_imf_inner( dc_receive_imf_inner(
&t, &t,
b"From: Bob <bob@example.org>\n\ b"From: Bob <bob@example.org>\n\
To: Alice <alice@example.com>\n\ To: Alice <alice@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Subject: subject\n\ Subject: subject\n\
Message-ID: <first@example.org>\n\ Message-ID: <first@example.org>\n\

8
src/e2ee.rs
View File

@@ -464,7 +464,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
assert!(!msg.was_encrypted()); assert!(!msg.was_encrypted());
// Parsing a message is enough to update peerstate // Parsing a message is enough to update peerstate
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual);
@@ -495,7 +495,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
let msg = bob.parse_msg(&sent).await; let msg = bob.parse_msg(&sent).await;
assert!(msg.was_encrypted()); assert!(msg.was_encrypted());
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual);
@@ -509,7 +509,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
let msg = bob.parse_msg(&sent).await; let msg = bob.parse_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.was_encrypted());
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual);
@@ -524,7 +524,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
let msg = bob.parse_msg(&sent).await; let msg = bob.parse_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.was_encrypted());
let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
.await? .await?
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Reset); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Reset);

6
src/ephemeral.rs
View File

@@ -936,7 +936,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: Bob <bob@example.com>\n\ b"From: Bob <bob@example.com>\n\
To: Alice <alice@example.com>\n\ To: Alice <alice@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Subject: Subject\n\ Subject: Subject\n\
Message-ID: <first@example.com>\n\ Message-ID: <first@example.com>\n\
@@ -957,7 +957,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: Bob <bob@example.com>\n\ b"From: Bob <bob@example.com>\n\
To: Alice <alice@example.com>\n\ To: Alice <alice@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Subject: Subject\n\ Subject: Subject\n\
Message-ID: <second@example.com>\n\ Message-ID: <second@example.com>\n\
@@ -994,7 +994,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: Bob <bob@example.com>\n\ b"From: Bob <bob@example.com>\n\
To: Alice <alice@example.com>\n\ To: Alice <alice@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Subject: Subject\n\ Subject: Subject\n\
Message-ID: <third@example.com>\n\ Message-ID: <third@example.com>\n\

2
src/html.rs
View File

@@ -468,7 +468,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
// bob: check that bob also got the html-part of the forwarded message // bob: check that bob also got the html-part of the forwarded message
let bob = TestContext::new_bob().await; let bob = TestContext::new_bob().await;
let chat = bob.create_chat_with_contact("", "alice@example.com").await; let chat = bob.create_chat_with_contact("", "alice@example.org").await;
bob.recv_msg(&alice.pop_sent_msg().await).await; bob.recv_msg(&alice.pop_sent_msg().await).await;
let msg = bob.get_last_msg_in(chat.get_id()).await; let msg = bob.get_last_msg_in(chat.get_id()).await;
assert_ne!(msg.get_from_id(), DC_CONTACT_ID_SELF); assert_ne!(msg.get_from_id(), DC_CONTACT_ID_SELF);

6
src/key.rs
View File

@@ -521,7 +521,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
#[async_std::test] #[async_std::test]
async fn test_load_self_generate_public() { async fn test_load_self_generate_public() {
let t = TestContext::new().await; let t = TestContext::new().await;
t.set_config(Config::ConfiguredAddr, Some("alice@example.com")) t.set_config(Config::ConfiguredAddr, Some("alice@example.org"))
.await .await
.unwrap(); .unwrap();
let key = SignedPublicKey::load_self(&t).await; let key = SignedPublicKey::load_self(&t).await;
@@ -531,7 +531,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
#[async_std::test] #[async_std::test]
async fn test_load_self_generate_secret() { async fn test_load_self_generate_secret() {
let t = TestContext::new().await; let t = TestContext::new().await;
t.set_config(Config::ConfiguredAddr, Some("alice@example.com")) t.set_config(Config::ConfiguredAddr, Some("alice@example.org"))
.await .await
.unwrap(); .unwrap();
let key = SignedSecretKey::load_self(&t).await; let key = SignedSecretKey::load_self(&t).await;
@@ -543,7 +543,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
use std::thread; use std::thread;
let t = TestContext::new().await; let t = TestContext::new().await;
t.set_config(Config::ConfiguredAddr, Some("alice@example.com")) t.set_config(Config::ConfiguredAddr, Some("alice@example.org"))
.await .await
.unwrap(); .unwrap();
let thr0 = { let thr0 = {

4
src/login_param.rs
View File

@@ -413,7 +413,7 @@ mod tests {
let t = TestContext::new().await; let t = TestContext::new().await;
let param = LoginParam { let param = LoginParam {
addr: "alice@example.com".to_string(), addr: "alice@example.org".to_string(),
imap: ServerLoginParam { imap: ServerLoginParam {
server: "imap.example.com".to_string(), server: "imap.example.com".to_string(),
user: "alice".to_string(), user: "alice".to_string(),
@@ -424,7 +424,7 @@ mod tests {
}, },
smtp: ServerLoginParam { smtp: ServerLoginParam {
server: "smtp.example.com".to_string(), server: "smtp.example.com".to_string(),
user: "alice@example.com".to_string(), user: "alice@example.org".to_string(),
password: "bar".to_string(), password: "bar".to_string(),
port: 456, port: 456,
security: Socket::Ssl, security: Socket::Ssl,

10
src/message.rs
View File

@@ -1972,9 +1972,9 @@ mod tests {
\n\ \n\
hello\n", hello\n",
if outgoing { if outgoing {
"From: alice@example.com\nTo: bob@example.net\n" "From: alice@example.org\nTo: bob@example.net\n"
} else { } else {
"From: bob@example.net\nTo: alice@example.com\n" "From: bob@example.net\nTo: alice@example.org\n"
}, },
if chat_msg { "Chat-Version: 1.0\n" } else { "" }, if chat_msg { "Chat-Version: 1.0\n" } else { "" },
); );
@@ -2187,7 +2187,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: Bob <bob@example.com>\n\ b"From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <123@example.com>\n\ Message-ID: <123@example.com>\n\
Date: Fri, 29 Jan 2021 21:37:55 +0000\n\ Date: Fri, 29 Jan 2021 21:37:55 +0000\n\
@@ -2396,7 +2396,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: Bob <bob@example.com>\n\ b"From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <123@example.com>\n\ Message-ID: <123@example.com>\n\
Auto-Submitted: auto-generated\n\ Auto-Submitted: auto-generated\n\
@@ -2416,7 +2416,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&alice, &alice,
b"From: Bob <bob@example.com>\n\ b"From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <456@example.com>\n\ Message-ID: <456@example.com>\n\
Date: Fri, 29 Jan 2021 21:37:55 +0000\n\ Date: Fri, 29 Jan 2021 21:37:55 +0000\n\

24
src/mimefactory.rs
View File

@@ -1528,7 +1528,7 @@ mod tests {
msg_to_subject_str( msg_to_subject_str(
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Bob <bob@example.com>\n\ From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Antw: Chat: hello\n\ Subject: Antw: Chat: hello\n\
Message-ID: <2222@example.com>\n\ Message-ID: <2222@example.com>\n\
Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
@@ -1543,7 +1543,7 @@ mod tests {
msg_to_subject_str( msg_to_subject_str(
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Bob <bob@example.com>\n\ From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Infos: 42\n\ Subject: Infos: 42\n\
Message-ID: <2222@example.com>\n\ Message-ID: <2222@example.com>\n\
Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
@@ -1562,7 +1562,7 @@ mod tests {
msg_to_subject_str( msg_to_subject_str(
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Chat: hello\n\ Subject: Chat: hello\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <2223@example.com>\n\ Message-ID: <2223@example.com>\n\
@@ -1580,7 +1580,7 @@ mod tests {
// 3. Send the first message to a new contact // 3. Send the first message to a new contact
let t = TestContext::new_alice().await; let t = TestContext::new_alice().await;
assert_eq!(first_subject_str(t).await, "Message from alice@example.com"); assert_eq!(first_subject_str(t).await, "Message from alice@example.org");
let t = TestContext::new_alice().await; let t = TestContext::new_alice().await;
t.set_config(Config::Displayname, Some("Alice")) t.set_config(Config::Displayname, Some("Alice"))
@@ -1595,7 +1595,7 @@ mod tests {
msg_to_subject_str( msg_to_subject_str(
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: äääää\n\ Subject: äääää\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <2893@example.com>\n\ Message-ID: <2893@example.com>\n\
@@ -1609,7 +1609,7 @@ mod tests {
msg_to_subject_str( msg_to_subject_str(
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: aäääää\n\ Subject: aäääää\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <2893@example.com>\n\ Message-ID: <2893@example.com>\n\
@@ -1628,7 +1628,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: alice@example.com\n\ From: alice@example.org\n\
To: bob@example.com\n\ To: bob@example.com\n\
Subject: Hello, Bob\n\ Subject: Hello, Bob\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -1645,7 +1645,7 @@ mod tests {
let new_msg = incoming_msg_to_reply_msg( let new_msg = incoming_msg_to_reply_msg(
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: message opened\n\ Subject: message opened\n\
Date: Sun, 22 Mar 2020 23:37:57 +0000\n\ Date: Sun, 22 Mar 2020 23:37:57 +0000\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -1720,7 +1720,7 @@ mod tests {
format!( format!(
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: bob@example.com\n\ From: bob@example.com\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Different subject\n\ Subject: Different subject\n\
In-Reply-To: {}\n\ In-Reply-To: {}\n\
Message-ID: <2893@example.com>\n\ Message-ID: <2893@example.com>\n\
@@ -1775,7 +1775,7 @@ mod tests {
mf.subject_str(&t).await.unwrap() mf.subject_str(&t).await.unwrap()
} }
// In `imf_raw`, From has to be bob@example.com, To has to be alice@example.com // In `imf_raw`, From has to be bob@example.com, To has to be alice@example.org
async fn msg_to_subject_str(imf_raw: &[u8]) -> String { async fn msg_to_subject_str(imf_raw: &[u8]) -> String {
let subject_str = msg_to_subject_str_inner(imf_raw, false, false, false).await; let subject_str = msg_to_subject_str_inner(imf_raw, false, false, false).await;
@@ -1836,7 +1836,7 @@ mod tests {
&t, &t,
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Bob <bob@example.com>\n\ From: Bob <bob@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Some other, completely unrelated subject\n\ Subject: Some other, completely unrelated subject\n\
Message-ID: <3cl4@example.com>\n\ Message-ID: <3cl4@example.com>\n\
Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
@@ -1896,7 +1896,7 @@ mod tests {
let msg = incoming_msg_to_reply_msg( let msg = incoming_msg_to_reply_msg(
b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Charlie <charlie@example.com>\n\ From: Charlie <charlie@example.com>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: Chat: hello\n\ Subject: Chat: hello\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <2223@example.com>\n\ Message-ID: <2223@example.com>\n\

12
src/mimeparser.rs
View File

@@ -3034,9 +3034,9 @@ Some reply
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Message-ID: <foobarbaz@example.org> Message-ID: <foobarbaz@example.org>
To: Bob <bob@example.org> To: Bob <bob@example.org>
From: Alice <alice@example.com> From: Alice <alice@example.org>
Subject: subject Subject: subject
Chat-Disposition-Notification-To: alice@example.com Chat-Disposition-Notification-To: alice@example.org
Message. Message.
"###; "###;
@@ -3064,12 +3064,12 @@ Message.
dc_receive_imf( dc_receive_imf(
&alice, &alice,
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: alice@example.com\n\ From: alice@example.org\n\
To: bob@example.net\n\ To: bob@example.net\n\
Subject: foo\n\ Subject: foo\n\
Message-ID: first@example.com\n\ Message-ID: first@example.com\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Chat-Disposition-Notification-To: alice@example.com\n\ Chat-Disposition-Notification-To: alice@example.org\n\
Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
\n\ \n\
hello\n" hello\n"
@@ -3087,8 +3087,8 @@ Message.
dc_receive_imf( dc_receive_imf(
&alice, &alice,
"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: alice@example.com\n\ From: alice@example.org\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: message opened\n\ Subject: message opened\n\
Date: Sun, 22 Mar 2020 23:37:57 +0000\n\ Date: Sun, 22 Mar 2020 23:37:57 +0000\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\

8
src/qr.rs
View File

@@ -792,12 +792,12 @@ mod tests {
async fn test_decode_openpgp_fingerprint() -> Result<()> { async fn test_decode_openpgp_fingerprint() -> Result<()> {
let ctx = TestContext::new().await; let ctx = TestContext::new().await;
let alice_contact_id = Contact::create(&ctx, "Alice", "alice@example.com") let alice_contact_id = Contact::create(&ctx, "Alice", "alice@example.org")
.await .await
.context("failed to create contact")?; .context("failed to create contact")?;
let pub_key = alice_keypair().public; let pub_key = alice_keypair().public;
let peerstate = Peerstate { let peerstate = Peerstate {
addr: "alice@example.com".to_string(), addr: "alice@example.org".to_string(),
last_seen: 1, last_seen: 1,
last_seen_autocrypt: 1, last_seen_autocrypt: 1,
prefer_encrypt: EncryptPreference::Mutual, prefer_encrypt: EncryptPreference::Mutual,
@@ -818,7 +818,7 @@ mod tests {
let qr = check_qr( let qr = check_qr(
&ctx.ctx, &ctx.ctx,
"OPENPGP4FPR:1234567890123456789012345678901234567890#a=alice@example.com", "OPENPGP4FPR:1234567890123456789012345678901234567890#a=alice@example.org",
) )
.await?; .await?;
if let Qr::FprMismatch { contact_id, .. } = qr { if let Qr::FprMismatch { contact_id, .. } = qr {
@@ -829,7 +829,7 @@ mod tests {
let qr = check_qr( let qr = check_qr(
&ctx.ctx, &ctx.ctx,
&format!("OPENPGP4FPR:{}#a=alice@example.com", pub_key.fingerprint()), &format!("OPENPGP4FPR:{}#a=alice@example.org", pub_key.fingerprint()),
) )
.await?; .await?;
if let Qr::FprOk { contact_id, .. } = qr { if let Qr::FprOk { contact_id, .. } = qr {

22
src/securejoin.rs
View File

@@ -975,7 +975,7 @@ mod tests {
let sent = bob.pop_sent_msg().await; let sent = bob.pop_sent_msg().await;
assert!(!bob.ctx.has_ongoing().await); assert!(!bob.ctx.has_ongoing().await);
assert_eq!(sent.recipient(), "alice@example.com".parse().unwrap()); assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap());
let msg = alice.parse_msg(&sent).await; let msg = alice.parse_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.was_encrypted());
assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vc-request"); assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vc-request");
@@ -1010,7 +1010,7 @@ mod tests {
progress, progress,
} => { } => {
let alice_contact_id = let alice_contact_id =
Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown)
.await .await
.expect("Error looking up contact") .expect("Error looking up contact")
.expect("Contact not found"); .expect("Contact not found");
@@ -1095,7 +1095,7 @@ mod tests {
// Bob should not yet have Alice verified // Bob should not yet have Alice verified
let contact_alice_id = let contact_alice_id =
Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown)
.await .await
.expect("Error looking up contact") .expect("Error looking up contact")
.expect("Contact not found"); .expect("Contact not found");
@@ -1130,7 +1130,7 @@ mod tests {
let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap(); let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
assert!(msg.is_info()); assert!(msg.is_info());
let text = msg.get_text().unwrap(); let text = msg.get_text().unwrap();
assert!(text.contains("alice@example.com verified")); assert!(text.contains("alice@example.org verified"));
} }
// Check Bob sent the final message // Check Bob sent the final message
@@ -1171,7 +1171,7 @@ mod tests {
// Ensure Bob knows Alice_FP // Ensure Bob knows Alice_FP
let alice_pubkey = SignedPublicKey::load_self(&alice.ctx).await?; let alice_pubkey = SignedPublicKey::load_self(&alice.ctx).await?;
let peerstate = Peerstate { let peerstate = Peerstate {
addr: "alice@example.com".into(), addr: "alice@example.org".into(),
last_seen: 10, last_seen: 10,
last_seen_autocrypt: 10, last_seen_autocrypt: 10,
prefer_encrypt: EncryptPreference::Mutual, prefer_encrypt: EncryptPreference::Mutual,
@@ -1207,7 +1207,7 @@ mod tests {
progress, progress,
} => { } => {
let alice_contact_id = let alice_contact_id =
Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown)
.await .await
.expect("Error looking up contact") .expect("Error looking up contact")
.expect("Contact not found"); .expect("Contact not found");
@@ -1265,7 +1265,7 @@ mod tests {
// Bob should not yet have Alice verified // Bob should not yet have Alice verified
let contact_alice_id = let contact_alice_id =
Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown)
.await .await
.expect("Error looking up contact") .expect("Error looking up contact")
.expect("Contact not found"); .expect("Contact not found");
@@ -1317,7 +1317,7 @@ mod tests {
.pop_sent_msg() .pop_sent_msg()
.await .await
.payload() .payload()
.contains("alice@example.com")); .contains("alice@example.org"));
Ok(()) Ok(())
} }
@@ -1354,7 +1354,7 @@ mod tests {
assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1); assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1);
let sent = bob.pop_sent_msg().await; let sent = bob.pop_sent_msg().await;
assert_eq!(sent.recipient(), "alice@example.com".parse().unwrap()); assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap());
let msg = alice.parse_msg(&sent).await; let msg = alice.parse_msg(&sent).await;
assert!(!msg.was_encrypted()); assert!(!msg.was_encrypted());
assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vg-request"); assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vg-request");
@@ -1389,7 +1389,7 @@ mod tests {
progress, progress,
} => { } => {
let alice_contact_id = let alice_contact_id =
Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown)
.await .await
.expect("Error looking up contact") .expect("Error looking up contact")
.expect("Contact not found"); .expect("Contact not found");
@@ -1442,7 +1442,7 @@ mod tests {
// Bob should not yet have Alice verified // Bob should not yet have Alice verified
let contact_alice_id = let contact_alice_id =
Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown)
.await .await
.expect("Error looking up contact") .expect("Error looking up contact")
.expect("Contact not found"); .expect("Contact not found");

16
src/stock_str.rs
View File

@@ -1229,20 +1229,20 @@ mod tests {
async fn test_stock_system_msg_add_member_by_me() { async fn test_stock_system_msg_add_member_by_me() {
let t = TestContext::new().await; let t = TestContext::new().await;
assert_eq!( assert_eq!(
msg_add_member(&t, "alice@example.com", DC_CONTACT_ID_SELF).await, msg_add_member(&t, "alice@example.org", DC_CONTACT_ID_SELF).await,
"Member alice@example.com added by me." "Member alice@example.org added by me."
) )
} }
#[async_std::test] #[async_std::test]
async fn test_stock_system_msg_add_member_by_me_with_displayname() { async fn test_stock_system_msg_add_member_by_me_with_displayname() {
let t = TestContext::new().await; let t = TestContext::new().await;
Contact::create(&t, "Alice", "alice@example.com") Contact::create(&t, "Alice", "alice@example.org")
.await .await
.expect("failed to create contact"); .expect("failed to create contact");
assert_eq!( assert_eq!(
msg_add_member(&t, "alice@example.com", DC_CONTACT_ID_SELF).await, msg_add_member(&t, "alice@example.org", DC_CONTACT_ID_SELF).await,
"Member Alice (alice@example.com) added by me." "Member Alice (alice@example.org) added by me."
); );
} }
@@ -1250,7 +1250,7 @@ mod tests {
async fn test_stock_system_msg_add_member_by_other_with_displayname() { async fn test_stock_system_msg_add_member_by_other_with_displayname() {
let t = TestContext::new().await; let t = TestContext::new().await;
let contact_id = { let contact_id = {
Contact::create(&t, "Alice", "alice@example.com") Contact::create(&t, "Alice", "alice@example.org")
.await .await
.expect("Failed to create contact Alice"); .expect("Failed to create contact Alice");
Contact::create(&t, "Bob", "bob@example.com") Contact::create(&t, "Bob", "bob@example.com")
@@ -1258,8 +1258,8 @@ mod tests {
.expect("failed to create bob") .expect("failed to create bob")
}; };
assert_eq!( assert_eq!(
msg_add_member(&t, "alice@example.com", contact_id,).await, msg_add_member(&t, "alice@example.org", contact_id,).await,
"Member Alice (alice@example.com) added by Bob (bob@example.com)." "Member Alice (alice@example.org) added by Bob (bob@example.com)."
); );
} }

6
src/test_utils.rs
View File

@@ -195,7 +195,7 @@ impl TestContext {
sinks.push(Box::new(move |evt| Box::pin(sink(evt)))); sinks.push(Box::new(move |evt| Box::pin(sink(evt))));
} }
/// Configure with alice@example.com. /// Configure with alice@example.org.
/// ///
/// The context will be fake-configured as the alice user, with a pre-generated secret /// The context will be fake-configured as the alice user, with a pre-generated secret
/// key. The email address of the user is returned as a string. /// key. The email address of the user is returned as a string.
@@ -544,13 +544,13 @@ impl SentMessage {
} }
} }
/// Load a pre-generated keypair for alice@example.com from disk. /// Load a pre-generated keypair for alice@example.org from disk.
/// ///
/// This saves CPU cycles by avoiding having to generate a key. /// This saves CPU cycles by avoiding having to generate a key.
/// ///
/// The keypair was created using the crate::key::tests::gen_key test. /// The keypair was created using the crate::key::tests::gen_key test.
pub fn alice_keypair() -> key::KeyPair { pub fn alice_keypair() -> key::KeyPair {
let addr = EmailAddress::new("alice@example.com").unwrap(); let addr = EmailAddress::new("alice@example.org").unwrap();
let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/alice-public.asc")) let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/alice-public.asc"))
.unwrap() .unwrap()

10
src/update_helper.rs
View File

@@ -92,7 +92,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Bob Authname <bob@example.org>\n\ b"From: Bob Authname <bob@example.org>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: updated subject\n\ Subject: updated subject\n\
Message-ID: <msg2@example.org>\n\ Message-ID: <msg2@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -107,7 +107,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Bob Authname <bob@example.org>\n\ b"From: Bob Authname <bob@example.org>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Subject: original subject\n\ Subject: original subject\n\
Message-ID: <msg1@example.org>\n\ Message-ID: <msg1@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
@@ -137,7 +137,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Bob Authname <bob@example.org>\n\ b"From: Bob Authname <bob@example.org>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <msg1@example.org>\n\ Message-ID: <msg1@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Chat-Group-ID: abcde\n\ Chat-Group-ID: abcde\n\
@@ -157,7 +157,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Bob Authname <bob@example.org>\n\ b"From: Bob Authname <bob@example.org>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <msg3@example.org>\n\ Message-ID: <msg3@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Chat-Group-ID: abcde\n\ Chat-Group-ID: abcde\n\
@@ -174,7 +174,7 @@ mod tests {
dc_receive_imf( dc_receive_imf(
&t, &t,
b"From: Bob Authname <bob@example.org>\n\ b"From: Bob Authname <bob@example.org>\n\
To: alice@example.com\n\ To: alice@example.org\n\
Message-ID: <msg2@example.org>\n\ Message-ID: <msg2@example.org>\n\
Chat-Version: 1.0\n\ Chat-Version: 1.0\n\
Chat-Group-ID: abcde\n\ Chat-Group-ID: abcde\n\

12
test-data/message/AutocryptSetupMessage.eml
View File

@@ -1,10 +1,10 @@
Return-Path: <alice@example.com> Return-Path: <alice@example.org>
Delivered-To: alice@example.com Delivered-To: alice@example.org
Received: from hq5.merlinux.eu Received: from hq5.merlinux.eu
by hq5.merlinux.eu with LMTP by hq5.merlinux.eu with LMTP
id gNKpOrrTvF+tVAAAPzvFDg id gNKpOrrTvF+tVAAAPzvFDg
(envelope-from <alice@example.com>) (envelope-from <alice@example.org>)
for <alice@example.com>; Tue, 24 Nov 2020 10:34:50 +0100 for <alice@example.org>; Tue, 24 Nov 2020 10:34:50 +0100
Subject: Autocrypt Setup Message Subject: Autocrypt Setup Message
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=testrun.org; DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=testrun.org;
s=testrun; t=1606210490; s=testrun; t=1606210490;
@@ -21,8 +21,8 @@ Date: Tue, 24 Nov 2020 09:34:48 +0000
Chat-Version: 1.0 Chat-Version: 1.0
Autocrypt-Setup-Message: v1 Autocrypt-Setup-Message: v1
Message-ID: <abc@example.com> Message-ID: <abc@example.com>
To: <alice@example.com> To: <alice@example.org>
From: <alice@example.com> From: <alice@example.org>
Content-Type: multipart/mixed; boundary="dKhu3bbmBniQsT8W8w58YRCCiBK2YY" Content-Type: multipart/mixed; boundary="dKhu3bbmBniQsT8W8w58YRCCiBK2YY"

8
test-data/message/gmx-forward.eml
View File

@@ -1,9 +1,9 @@
Return-Path: <alice@example.com> Return-Path: <alice@example.org>
Delivered-To: bob@example.org Delivered-To: bob@example.org
Received: from hq5.merlinux.eu Received: from hq5.merlinux.eu
by hq5.merlinux.eu with LMTP by hq5.merlinux.eu with LMTP
id GJ4eNagpFWF5UwAAPzvFDg id GJ4eNagpFWF5UwAAPzvFDg
(envelope-from <alice@example.com>) (envelope-from <alice@example.org>)
for <bob@example.org>; Thu, 12 Aug 2021 16:01:12 +0200 for <bob@example.org>; Thu, 12 Aug 2021 16:01:12 +0200
Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22])
by hq5.merlinux.eu (Postfix) with ESMTPS id 3033227A0003 by hq5.merlinux.eu (Postfix) with ESMTPS id 3033227A0003
@@ -24,7 +24,7 @@ Received: from [193.96.224.73] ([193.96.224.73]) by web-mail.gmx.net
16:01:11 +0200 16:01:11 +0200
MIME-Version: 1.0 MIME-Version: 1.0
Message-ID: <trinity-18545f24-4f02-4dc8-9f80-8d2646646d03-1628776871644@3c-app-gmx-bap57> Message-ID: <trinity-18545f24-4f02-4dc8-9f80-8d2646646d03-1628776871644@3c-app-gmx-bap57>
From: Alice <alice@example.com> From: Alice <alice@example.org>
To: bob@example.org To: bob@example.org
Subject: Fw: subject Subject: Fw: subject
Content-Type: text/html; charset=UTF-8 Content-Type: text/html; charset=UTF-8
@@ -60,7 +60,7 @@ X-UI-Out-Filterresults: notjunk:1;V03:K0:pksZU4GoRZI=:jPKwLt7m9sSdgel28Ha/o7
<div data-darkreader-inline-border-left="" name="quote" style="margin: 10px 5px 5px 10px; padding: 10px 0px 10px 10px; border-left: 2px solid rgb(195, 217, 229); overflow-wrap: break-word; --darkreader-inline-border-left:#274759;"> <div data-darkreader-inline-border-left="" name="quote" style="margin: 10px 5px 5px 10px; padding: 10px 0px 10px 10px; border-left: 2px solid rgb(195, 217, 229); overflow-wrap: break-word; --darkreader-inline-border-left:#274759;">
<div style="margin:0 0 10px 0;"><b>Gesendet:</b>&nbsp;Donnerstag, 12. August 2021 um 15:52 Uhr<br/> <div style="margin:0 0 10px 0;"><b>Gesendet:</b>&nbsp;Donnerstag, 12. August 2021 um 15:52 Uhr<br/>
<b>Von:</b>&nbsp;&quot;Claire&quot; &lt;claire@example.org&gt;<br/> <b>Von:</b>&nbsp;&quot;Claire&quot; &lt;claire@example.org&gt;<br/>
<b>An:</b>&nbsp;alice@example.com<br/> <b>An:</b>&nbsp;alice@example.org<br/>
<b>Betreff:</b>&nbsp;subject</div> <b>Betreff:</b>&nbsp;subject</div>
<div name="quoted-content">bodytext</div> <div name="quoted-content">bodytext</div>

10
test-data/message/many_images_amazon_via_apple_mail.eml
View File

@@ -1,16 +1,16 @@
Return-Path: <paula@example.org> Return-Path: <paula@example.org>
Delivered-To: alice@example.com Delivered-To: alice@example.org
Received: from hq5.merlinux.eu Received: from hq5.merlinux.eu
by hq5.merlinux.eu with LMTP by hq5.merlinux.eu with LMTP
id t5IeKWSbkV+eZAAAPzvFDg id t5IeKWSbkV+eZAAAPzvFDg
(envelope-from <paula@example.org>) (envelope-from <paula@example.org>)
for <alice@example.com>; Thu, 22 Oct 2020 16:47:00 +0200 for <alice@example.org>; Thu, 22 Oct 2020 16:47:00 +0200
Received: from dd37930.kasserver.com (dd37930.kasserver.com [85.13.154.127]) Received: from dd37930.kasserver.com (dd37930.kasserver.com [85.13.154.127])
by hq5.merlinux.eu (Postfix) with ESMTPS id E942727A0011 by hq5.merlinux.eu (Postfix) with ESMTPS id E942727A0011
for <alice@example.com>; Thu, 22 Oct 2020 16:46:59 +0200 (CEST) for <alice@example.org>; Thu, 22 Oct 2020 16:46:59 +0200 (CEST)
Received: from macbook.fritz.box (i59F5C9C2.versanet.de [89.245.201.194]) Received: from macbook.fritz.box (i59F5C9C2.versanet.de [89.245.201.194])
by dd37930.kasserver.com (Postfix) with ESMTPSA id C1EAC53C066B by dd37930.kasserver.com (Postfix) with ESMTPSA id C1EAC53C066B
for <alice@example.com>; Thu, 22 Oct 2020 16:46:58 +0200 (CEST) for <alice@example.org>; Thu, 22 Oct 2020 16:46:58 +0200 (CEST)
From: paula <paula@example.org> From: paula <paula@example.org>
Content-Type: multipart/alternative; Content-Type: multipart/alternative;
boundary="Apple-Mail=_9A2A284B-D732-46ED-9F21-7E32AE214CE9" boundary="Apple-Mail=_9A2A284B-D732-46ED-9F21-7E32AE214CE9"
@@ -22,7 +22,7 @@ Subject: =?utf-8?Q?Anker_SoundCore_2_Bluetooth_Lautsprecher=2C_Fantastisch?=
=?utf-8?Q?_=26_HiFi?= =?utf-8?Q?_=26_HiFi?=
Message-Id: <7D32DF54-6498-48A6-B0F9-952499061C19@kadeifalong.de> Message-Id: <7D32DF54-6498-48A6-B0F9-952499061C19@kadeifalong.de>
Date: Thu, 22 Oct 2020 16:46:56 +0200 Date: Thu, 22 Oct 2020 16:46:56 +0200
To: alice@example.com To: alice@example.org
X-Mailer: Apple Mail (2.3445.104.11) X-Mailer: Apple Mail (2.3445.104.11)
X-Spam: Yes X-Spam: Yes

6
test-data/message/protonmail-mixed-up.eml
View File

@@ -1,9 +1,9 @@
Return-Path: <alice@example.com> Return-Path: <alice@example.org>
Delivered-To: bob@example.org Delivered-To: bob@example.org
Date: Mon, 29 Mar 2021 11:30:57 +0000 Date: Mon, 29 Mar 2021 11:30:57 +0000
To: Bob <bob@example.org> To: Bob <bob@example.org>
From: Alice <alice@example.com> From: Alice <alice@example.org>
Reply-To: Alice <alice@example.com> Reply-To: Alice <alice@example.org>
Subject: ... Subject: ...
Message-ID: <Mr.AkmaxDNOYj0.oNPtoFR8EHC@example.com> Message-ID: <Mr.AkmaxDNOYj0.oNPtoFR8EHC@example.com>
In-Reply-To: <Mr.Y1EWG9-FLhN.KUZ4cu74MYR@example.org> In-Reply-To: <Mr.Y1EWG9-FLhN.KUZ4cu74MYR@example.org>

6
test-data/message/protonmail-repaired.eml
View File

@@ -1,9 +1,9 @@
Return-Path: <alice@example.com> Return-Path: <alice@example.org>
Delivered-To: bob@example.org Delivered-To: bob@example.org
Date: Mon, 29 Mar 2021 11:30:57 +0000 Date: Mon, 29 Mar 2021 11:30:57 +0000
To: Bob <bob@example.org> To: Bob <bob@example.org>
From: Alice <alice@example.com> From: Alice <alice@example.org>
Reply-To: Alice <alice@example.com> Reply-To: Alice <alice@example.org>
Subject: ... Subject: ...
Message-ID: <Mr.AkmaxDNOYj0.oNPtoFR8EHC@example.com> Message-ID: <Mr.AkmaxDNOYj0.oNPtoFR8EHC@example.com>
In-Reply-To: <Mr.Y1EWG9-FLhN.KUZ4cu74MYR@example.org> In-Reply-To: <Mr.Y1EWG9-FLhN.KUZ4cu74MYR@example.org>

2
test-data/message/subj_with_multimedia_msg.eml
View File

@@ -1,7 +1,7 @@
Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
From: Hocuri <hocuri1@testrun.org> From: Hocuri <hocuri1@testrun.org>
Subject: subj with important info Subject: subj with important info
To: alice@example.com To: alice@example.org
Message-ID: <6e107266-b2bd-e87f-4996-29b000abcfb0@testrun.org> Message-ID: <6e107266-b2bd-e87f-4996-29b000abcfb0@testrun.org>
Date: Thu, 17 Dec 2020 15:38:45 +0100 Date: Thu, 17 Dec 2020 15:38:45 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101

2
test-data/message/text_alt_plain_html.eml
View File

@@ -1,7 +1,7 @@
Subject: mime-modified test Subject: mime-modified test
Message-ID: 12345@testrun.org Message-ID: 12345@testrun.org
Date: Sat, 07 Dec 2019 19:00:27 +0000 Date: Sat, 07 Dec 2019 19:00:27 +0000
To: alice@example.com To: alice@example.org
From: sender@testrun.org From: sender@testrun.org
Content-Type: multipart/alternative; boundary="==BREAK==" Content-Type: multipart/alternative; boundary="==BREAK=="

4
test-data/message/wrong-html.eml
View File

@@ -1,5 +1,5 @@
Return-Path: <camping@otherdomain.eu> Return-Path: <camping@otherdomain.eu>
X-Original-To: alice@example.com X-Original-To: alice@example.org
Delivered-To: m045a7e8@dd37930.kasserver.com Delivered-To: m045a7e8@dd37930.kasserver.com
Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131])
by dd37930.kasserver.com (Postfix) with ESMTPS id 271F34B4258C by dd37930.kasserver.com (Postfix) with ESMTPS id 271F34B4258C
@@ -11,7 +11,7 @@ Received: from oxbsltgw18.schlund.de ([172.19.249.35]) by
Date: Thu, 6 Aug 2020 18:40:30 +0200 (CEST) Date: Thu, 6 Aug 2020 18:40:30 +0200 (CEST)
From: Camping <camping@otherdomain.eu> From: Camping <camping@otherdomain.eu>
Reply-To: Camping <camping@otherdomain.eu> Reply-To: Camping <camping@otherdomain.eu>
To: Alice <alice@example.com> To: Alice <alice@example.org>
Message-ID: <512278196.1287440.1596732031020@email.ionos.fr> Message-ID: <512278196.1287440.1596732031020@email.ionos.fr>
Subject: Re: subj? Subject: Re: subj?
MIME-Version: 1.0 MIME-Version: 1.0