nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/dovecot-envelope-mailbox-quirk' into 'mainline'

Browse source 
Dovecot envelope mailbox quirk

See merge request GNOME/geary!546
This commit is contained in:
Michael Gratton 2020-08-18 07:07:35 +00:00
commit 67a2d32a6c
21 changed files with 490 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

135
test/engine/imap/response/imap-fetch-data-decoder-test.vala Normal file
View file

@ -0,0 +1,135 @@
/*
* Copyright 2019 Michael Gratton <mike@vee.net>
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
*/
class Geary.Imap.FetchDataDecoderTest : TestCase {
public FetchDataDecoderTest() {
base("Geary.Imap.FetchDataDecoderTest");
add_test("envelope_basic", envelope_basic);
add_test(
"envelope_mailbox_missing_mailbox_name_quirk",
envelope_mailbox_missing_mailbox_name_quirk
);
add_test(
"envelope_mailbox_missing_host_name_quirk",
envelope_mailbox_missing_host_name_quirk
);
}
public void envelope_basic() throws GLib.Error {
ListParameter env = new ListParameter();
env.add(new QuotedStringParameter("Wed, 17 Jul 1996 02:23:25 -0700 (PDT)"));
env.add(new QuotedStringParameter("Test subject"));
// From
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
// Sender
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
// Reply-To
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("To", "to", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("Cc", "cc", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("Bcc", "bcc", "example.com")));
// In-Reply-To
env.add(new QuotedStringParameter("<1234@example.com>"));
// Message-Id
env.add(new QuotedStringParameter("<5678@example.com>"));
var test_article = new EnvelopeDecoder(new Quirks());
var decoded_generic = test_article.decode(env);
var decoded = decoded_generic as Envelope;
assert_non_null(decoded, "decoded type");
assert_non_null(decoded.sent, "decoded sent");
assert_equal(decoded.subject.value, "Test subject");
assert_equal(decoded.from.to_rfc822_string(), "From <from@example.com>");
assert_equal(decoded.sender.to_rfc822_string(), "From <from@example.com>");
assert_equal(decoded.reply_to.to_rfc822_string(), "From <from@example.com>");
assert_non_null(decoded.to, "to");
assert_equal(decoded.to.to_rfc822_string(), "To <to@example.com>");
assert_non_null(decoded.cc, "cc");
assert_equal(decoded.cc.to_rfc822_string(), "Cc <cc@example.com>");
assert_non_null(decoded.bcc, "bcc");
assert_equal(decoded.bcc.to_rfc822_string(), "Bcc <bcc@example.com>");
assert_non_null(decoded.in_reply_to, "in_reply_to");
assert_equal(decoded.in_reply_to.to_rfc822_string(), "<1234@example.com>");
assert_non_null(decoded.message_id, "message_id");
assert_equal(decoded.message_id.to_rfc822_string(), "<5678@example.com>");
}
public void envelope_mailbox_missing_mailbox_name_quirk() throws GLib.Error {
ListParameter env = new ListParameter();
env.add(new QuotedStringParameter("Wed, 17 Jul 1996 02:23:25 -0700 (PDT)"));
env.add(new QuotedStringParameter("Test subject"));
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("To", "BOGUS", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("Cc", "cc", "example.com")));
env.add(NilParameter.instance);
env.add(NilParameter.instance);
env.add(NilParameter.instance);
var quirks = new Quirks();
quirks.empty_envelope_mailbox_name = "BOGUS";
var test_article = new EnvelopeDecoder(quirks);
var decoded = test_article.decode(env) as Envelope;
assert_non_null(decoded.to, "to");
assert_equal(decoded.to.to_rfc822_string(), "To <@example.com>");
assert_non_null(decoded.cc, "cc");
assert_equal(decoded.cc.to_rfc822_string(), "Cc <cc@example.com>");
}
public void envelope_mailbox_missing_host_name_quirk() throws GLib.Error {
ListParameter env = new ListParameter();
env.add(new QuotedStringParameter("Wed, 17 Jul 1996 02:23:25 -0700 (PDT)"));
env.add(new QuotedStringParameter("Test subject"));
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("From", "from", "example.com")));
env.add(new ListParameter.single(new_mailbox_structure("To name", "to", "BOGUS")));
env.add(new ListParameter.single(new_mailbox_structure("Cc", "cc", "example.com")));
env.add(NilParameter.instance);
env.add(NilParameter.instance);
env.add(NilParameter.instance);
var quirks = new Quirks();
quirks.empty_envelope_host_name = "BOGUS";
var test_article = new EnvelopeDecoder(quirks);
var decoded = test_article.decode(env) as Envelope;
assert_non_null(decoded.to, "to");
assert_equal(decoded.to.to_rfc822_string(), "To name <to>");
assert_non_null(decoded.cc, "cc");
assert_equal(decoded.cc.to_rfc822_string(), "Cc <cc@example.com>");
}
private ListParameter new_mailbox_structure(string name, string local, string domain) {
ListParameter mailbox = new ListParameter();
mailbox.add(new QuotedStringParameter(name));
mailbox.add(NilParameter.instance);
mailbox.add(new QuotedStringParameter(local));
mailbox.add(new QuotedStringParameter(domain));
return mailbox;
}
}

2
test/engine/imap/response/imap-namespace-response-test.vala
View file

@ -126,7 +126,7 @@ class Geary.Imap.NamespaceResponseTest : TestCase {
else
root.add(shared);
return new ServerData.migrate(root);
return new ServerData.migrate(root, new Quirks());
}
private ListParameter newNamespace(string prefix, string? delim) {

10
test/engine/imap/transport/imap-deserializer-test.vala
View file

@ -202,7 +202,6 @@ class Geary.Imap.DeserializerTest : TestCase {
string greeting = "* OK Gimap ready for requests from 115.187.245.46 c194mb399904375ivc";
this.stream.add_data(greeting.data);
this.stream.add_data(EOL.data);
this.deser.quirks = ClientService.new_quirks_for_provider(GMAIL);
this.process.begin(Expect.MESSAGE, this.async_completion);
RootParameters? message = this.process.end(async_result());
@ -249,7 +248,8 @@ class Geary.Imap.DeserializerTest : TestCase {
string flags = """* FLAGS (\Answered \Flagged \Draft \Deleted \Seen $NotPhishing $Phishing)""";
this.stream.add_data(flags.data);
this.stream.add_data(EOL.data);
this.deser.quirks = ClientService.new_quirks_for_provider(GMAIL);
this.deser.quirks = new Imap.Quirks();
this.deser.quirks.update_for_gmail();
this.process.begin(Expect.MESSAGE, this.async_completion);
RootParameters? message = this.process.end(async_result());
@ -261,7 +261,8 @@ class Geary.Imap.DeserializerTest : TestCase {
string flags = """* OK [PERMANENTFLAGS (\Answered \Flagged \Draft \Deleted \Seen $NotPhishing $Phishing \*)] Flags permitted.""";
this.stream.add_data(flags.data);
this.stream.add_data(EOL.data);
this.deser.quirks = ClientService.new_quirks_for_provider(GMAIL);
this.deser.quirks = new Imap.Quirks();
this.deser.quirks.update_for_gmail();
this.process.begin(Expect.MESSAGE, this.async_completion);
RootParameters? message = this.process.end(async_result());
@ -275,7 +276,8 @@ class Geary.Imap.DeserializerTest : TestCase {
string flags = """* FLAGS (\Answered \Flagged \Draft \Deleted \Seen $Forwarded $MDNSent $NotPhishing $Phishing Junk LoadRemoteImages NonJunk OIB-Seen-INBOX OIB-Seen-Unsubscribe OIB-Seen-[Gmail]/Important OIB-Seen-[Gmail]/Spam OIB-Seen-[Gmail]/Tous les messages)""";
this.stream.add_data(flags.data);
this.stream.add_data(EOL.data);
this.deser.quirks = ClientService.new_quirks_for_provider(GMAIL);
this.deser.quirks = new Imap.Quirks();
this.deser.quirks.update_for_gmail();
this.process.begin(Expect.MESSAGE, this.async_completion);
RootParameters? message = this.process.end(async_result());

177
test/engine/rfc822/rfc822-mailbox-address-test.vala
View file

@ -9,6 +9,7 @@ class Geary.RFC822.MailboxAddressTest : TestCase {
public MailboxAddressTest() {
base("Geary.RFC822.MailboxAddressTest");
add_test("imap_address", imap_address);
add_test("is_valid_address", is_valid_address);
add_test("unescaped_constructor", unescaped_constructor);
add_test("from_rfc822_string_encoded", from_rfc822_string_encoded);
@ -24,6 +25,25 @@ class Geary.RFC822.MailboxAddressTest : TestCase {
add_test("equal_to", equal_to);
}
public void imap_address() throws GLib.Error {
assert_equal(
new MailboxAddress.imap(null, null, "test", "example.com").address,
"test@example.com"
);
assert_equal(
new MailboxAddress.imap(null, null, "test", "").address,
"test"
);
assert_equal(
new MailboxAddress.imap(null, null, "", "example.com").address,
"example.com"
);
assert_equal(
new MailboxAddress.imap(null, null, "", "").address,
""
);
}
public void is_valid_address() throws GLib.Error {
assert(Geary.RFC822.MailboxAddress.is_valid_address("john@dep.aol.museum") == true);
assert(Geary.RFC822.MailboxAddress.is_valid_address("test@example.com") == true);
@ -73,84 +93,93 @@ class Geary.RFC822.MailboxAddressTest : TestCase {
}
public void from_rfc822_string_encoded() throws GLib.Error {
try {
MailboxAddress addr = new MailboxAddress.from_rfc822_string("test@example.com");
assert(addr.name == null);
assert(addr.mailbox == "test");
assert(addr.domain == "example.com");
var encoded = "test@example.com";
var addr = new MailboxAddress.from_rfc822_string(encoded);
assert_null(addr.name, encoded);
assert_equal(addr.mailbox, "test", encoded);
assert_equal(addr.domain, "example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("\"test\"@example.com");
assert(addr.name == null);
assert(addr.address == "test@example.com");
assert(addr.mailbox == "test");
assert(addr.domain == "example.com");
encoded = "\"test\"@example.com";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_null(addr.name, encoded);
assert_equal(addr.mailbox, "test", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("=?UTF-8?b?dGVzdA==?=@example.com");
assert(addr.name == null);
assert(addr.address == "test@example.com");
assert(addr.mailbox == "test");
assert(addr.domain == "example.com");
encoded = "=?UTF-8?b?dGVzdA==?=@example.com";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_null(addr.name, encoded);
assert_equal(addr.mailbox, "test", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("\"=?UTF-8?b?dGVzdA==?=\"@example.com");
assert(addr.name == null);
assert(addr.address == "test@example.com");
assert(addr.mailbox == "test");
assert(addr.domain == "example.com");
encoded = "\"=?UTF-8?b?dGVzdA==?=\"@example.com";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_null(addr.name, encoded);
assert_equal(addr.mailbox, "test", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("<test@example.com>");
assert(addr.name == null);
assert(addr.address == "test@example.com");
assert(addr.mailbox == "test");
assert(addr.domain == "example.com");
encoded = "<test@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_null(addr.name, encoded);
assert_equal(addr.mailbox, "test");
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("<\"test\"@example.com>");
assert(addr.name == null);
assert(addr.address == "test@example.com");
assert(addr.mailbox == "test");
assert(addr.domain == "example.com");
encoded = "<\"test\"@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_null(addr.name, encoded);
assert_equal(addr.mailbox, "test", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("Test 1 <test2@example.com>");
assert(addr.name == "Test 1");
assert(addr.address == "test2@example.com");
assert(addr.mailbox == "test2");
assert(addr.domain == "example.com");
encoded = "Test 1 <test2@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, "Test 1", encoded);
assert_equal(addr.mailbox, "test2", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test2@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("\"Test 1\" <test2@example.com>");
assert(addr.name == "Test 1");
assert(addr.address == "test2@example.com");
assert(addr.mailbox == "test2");
assert(addr.domain == "example.com");
encoded = "\"Test 1\" <test2@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, "Test 1", encoded);
assert_equal(addr.mailbox, "test2", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test2@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("Test 1 <\"test2\"@example.com>");
assert(addr.name == "Test 1");
assert(addr.address == "test2@example.com");
assert(addr.mailbox == "test2");
assert(addr.domain == "example.com");
encoded = "Test 1 <\"test2\"@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, "Test 1", encoded);
assert_equal(addr.mailbox, "test2", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test2@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("=?UTF-8?b?VGVzdCAx?= <test2@example.com>");
assert(addr.name == "Test 1");
assert(addr.address == "test2@example.com");
assert(addr.mailbox == "test2");
assert(addr.domain == "example.com");
encoded = "=?UTF-8?b?VGVzdCAx?= <test2@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, "Test 1", encoded);
assert_equal(addr.mailbox, "test2", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test2@example.com", encoded);
addr = new MailboxAddress.from_rfc822_string("\"=?UTF-8?b?VGVzdCAx?=\" <test2@example.com>");
assert(addr.name == "Test 1");
assert(addr.address == "test2@example.com");
assert(addr.mailbox == "test2");
assert(addr.domain == "example.com");
encoded = "\"=?UTF-8?b?VGVzdCAx?=\" <test2@example.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, "Test 1", encoded);
assert_equal(addr.mailbox, "test2", encoded);
assert_equal(addr.domain, "example.com", encoded);
assert_equal(addr.address, "test2@example.com", encoded);
// Courtesy Mailsploit https://www.mailsploit.com
addr = new MailboxAddress.from_rfc822_string("\"=?utf-8?b?dGVzdCIgPHBvdHVzQHdoaXRlaG91c2UuZ292Pg==?==?utf-8?Q?=00=0A?=\" <demo@mailsploit.com>");
assert(addr.name == "test <potus@whitehouse.gov>?");
assert(addr.address == "demo@mailsploit.com");
// Courtesy Mailsploit https://www.mailsploit.com
encoded = "\"=?utf-8?b?dGVzdCIgPHBvdHVzQHdoaXRlaG91c2UuZ292Pg==?==?utf-8?Q?=00=0A?=\" <demo@mailsploit.com>";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, "test <potus@whitehouse.gov>?", encoded);
assert_equal(addr.address, "demo@mailsploit.com", encoded);
// Courtesy Mailsploit https://www.mailsploit.com
addr = new MailboxAddress.from_rfc822_string("\"=?utf-8?Q?=42=45=47=49=4E=20=2F=20=28=7C=29=7C=3C=7C=3E=7C=40=7C=2C=7C=3B=7C=3A=7C=5C=7C=22=7C=2F=7C=5B=7C=5D=7C=3F=7C=2E=7C=3D=20=2F=20=00=20=50=41=53=53=45=44=20=4E=55=4C=4C=20=42=59=54=45=20=2F=20=0D=0A=20=50=41=53=53=45=44=20=43=52=4C=46=20=2F=20?==?utf-8?b?RU5E=?=\"");
assert(addr.name == null);
assert(addr.address == "BEGIN / (|)|<|>|@|,|;|:|\\|\"|/|[|]|?|.|= / ? PASSED NULL BYTE / \r\n PASSED CRLF / END");
} catch (Error err) {
assert_not_reached();
}
// Courtesy Mailsploit https://www.mailsploit.com
encoded = "\"=?utf-8?Q?=42=45=47=49=4E=20=2F=20=28=7C=29=7C=3C=7C=3E=7C=40=7C=2C=7C=3B=7C=3A=7C=5C=7C=22=7C=2F=7C=5B=7C=5D=7C=3F=7C=2E=7C=3D=20=2F=20=00=20=50=41=53=53=45=44=20=4E=55=4C=4C=20=42=59=54=45=20=2F=20=0D=0A=20=50=41=53=53=45=44=20=43=52=4C=46=20=2F=20?==?utf-8?b?RU5E=?=\"";
addr = new MailboxAddress.from_rfc822_string(encoded);
assert_equal(addr.name, null, encoded);
assert_equal(addr.address, "BEGIN / (|)|<|>|@|,|;|:|\\|\"|/|[|]|?|.|= / ? PASSED NULL BYTE / \r\n PASSED CRLF / END", encoded);
}
public void prepare_header_text_part() throws GLib.Error {
@ -286,6 +315,22 @@ class Geary.RFC822.MailboxAddressTest : TestCase {
"😸@example.com"
);
assert_equal(
new MailboxAddress(null, "example1").to_rfc822_address(),
"example1"
);
assert_equal(
new MailboxAddress.imap(null, null, "example2", "").to_rfc822_address(),
"example2"
);
assert_equal(
new MailboxAddress.imap(null, null, "", "example3").to_rfc822_address(),
"@example3"
);
assert_equal(
new MailboxAddress.imap(null, null, "", "").to_rfc822_address(),
""
);
}
public void to_rfc822_string() throws GLib.Error {

4
test/integration/imap/client-session.vala
View file

@ -29,9 +29,7 @@ class Integration.Imap.ClientSession : TestCase {
public override void set_up() {
this.session = new Geary.Imap.ClientSession(
this.config.target,
Geary.Imap.ClientService.new_quirks_for_provider(
this.config.provider
)
new Geary.Imap.Quirks()
);
}

1
test/meson.build
View file

@ -43,6 +43,7 @@ test_engine_sources = [
'engine/imap/message/imap-data-format-test.vala',
'engine/imap/message/imap-mailbox-specifier-test.vala',
'engine/imap/parameter/imap-list-parameter-test.vala',
'engine/imap/response/imap-fetch-data-decoder-test.vala',
'engine/imap/response/imap-namespace-response-test.vala',
'engine/imap/transport/imap-client-connection-test.vala',
'engine/imap/transport/imap-client-session-test.vala',

1
test/test-engine.vala
View file

@ -56,6 +56,7 @@ int main(string[] args) {
engine.add_suite(new Geary.Imap.CreateCommandTest().suite);
engine.add_suite(new Geary.Imap.FetchCommandTest().suite);
engine.add_suite(new Geary.Imap.FetchDataDecoderTest().suite);
engine.add_suite(new Geary.Imap.ListParameterTest().suite);
engine.add_suite(new Geary.Imap.MailboxSpecifierTest().suite);
engine.add_suite(new Geary.Imap.NamespaceResponseTest().suite);