Geary.Imap: Add quirk for Envelope address structure placeholders
Some servers (e.g. Dovecot) use placeholder strings instead of the empty string (e.g. "MISSING_DOMAIN") in FETCH Envelope responses when a required address part (e.g. local part, domain) are empty. This adds a quirk that can be enabled for such servers to check for the placeholders and if found, replace them with empty strings.
This commit is contained in:
Michael Gratton
Michael James Gratton
parent
757c0542dc
commit
31f10e2787
8 changed files with 192 additions and 10 deletions
135
test/engine/imap/response/imap-fetch-data-decoder-test.vala
Normal file
135
test/engine/imap/response/imap-fetch-data-decoder-test.vala
Normal 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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue