f3e8b26227
Geary previously wrapped plain text sigs (i.e. those that did not contain any HTML elements) in a DIV styled to preserve whitespace. This is all perfectly fine, except that certain Microsoft products munged the email for presentation and destroy the whitespace present in the message body, causing the sig to be mis-rendered. This works around their shitty software by using BRs instead of the DIV, also escapes other control chars and sequential whitespace as well when using a plain text sig. It also stops trying to smart-escape quoted reply text, since we know it's going to be HTML from the conversation viewer, meaning smart escaping only needs to be used for sigs. See issue #29
166 lines
6.1 KiB
Vala
166 lines
6.1 KiB
Vala
/*
|
||
* Copyright 2016 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.HTML.UtilTest : TestCase {
|
||
|
||
public UtilTest() {
|
||
base("Geary.HTML.Util");
|
||
add_test("preserve_whitespace", preserve_whitespace);
|
||
add_test("smart_escape_div", smart_escape_div);
|
||
add_test("smart_escape_no_closing_tag", smart_escape_no_closing_tag);
|
||
add_test("smart_escape_img", smart_escape_img);
|
||
add_test("smart_escape_xhtml_img", smart_escape_xhtml_img);
|
||
add_test("smart_escape_mixed", smart_escape_mixed);
|
||
add_test("smart_escape_text", smart_escape_text);
|
||
add_test("smart_escape_text_url", smart_escape_text_url);
|
||
add_test("remove_html_tags", remove_html_tags);
|
||
}
|
||
|
||
public void preserve_whitespace() throws GLib.Error {
|
||
assert_string("some text", Geary.HTML.smart_escape("some text"));
|
||
assert_string("some text", Geary.HTML.smart_escape("some text"));
|
||
assert_string("some text", Geary.HTML.smart_escape("some text"));
|
||
assert_string("some text", Geary.HTML.smart_escape("some\ttext"));
|
||
|
||
assert_string("some<br>text", Geary.HTML.smart_escape("some\ntext"));
|
||
assert_string("some<br>text", Geary.HTML.smart_escape("some\rtext"));
|
||
assert_string("some<br>text", Geary.HTML.smart_escape("some\r\ntext"));
|
||
|
||
assert_string("some<br><br>text", Geary.HTML.smart_escape("some\n\ntext"));
|
||
assert_string("some<br><br>text", Geary.HTML.smart_escape("some\r\rtext"));
|
||
assert_string("some<br><br>text", Geary.HTML.smart_escape("some\n\rtext"));
|
||
assert_string("some<br><br>text", Geary.HTML.smart_escape("some\r\n\r\ntext"));
|
||
}
|
||
|
||
public void smart_escape_div() throws Error {
|
||
string html = "<div>ohhai</div>";
|
||
assert(Geary.HTML.smart_escape(html) == html);
|
||
}
|
||
|
||
public void smart_escape_no_closing_tag() throws Error {
|
||
string html = "<div>ohhai";
|
||
assert(Geary.HTML.smart_escape(html) == html);
|
||
}
|
||
|
||
public void smart_escape_img() throws Error {
|
||
string html = "<img src=\"http://example.com/lol.gif\">";
|
||
assert(Geary.HTML.smart_escape(html) == html);
|
||
}
|
||
|
||
public void smart_escape_xhtml_img() throws Error {
|
||
string html = "<img src=\"http://example.com/lol.gif\"/>";
|
||
assert(Geary.HTML.smart_escape(html) == html);
|
||
}
|
||
|
||
public void smart_escape_mixed() throws Error {
|
||
string html = "mixed <div>ohhai</div> text";
|
||
assert(Geary.HTML.smart_escape(html) == html);
|
||
}
|
||
|
||
public void smart_escape_text() throws GLib.Error {
|
||
assert_string("some text", Geary.HTML.smart_escape("some text"));
|
||
assert_string("<some text", Geary.HTML.smart_escape("<some text"));
|
||
assert_string("some text>", Geary.HTML.smart_escape("some text>"));
|
||
}
|
||
|
||
public void smart_escape_text_url() throws GLib.Error {
|
||
assert_string(
|
||
"<http://example.com>",
|
||
Geary.HTML.smart_escape("<http://example.com>")
|
||
);
|
||
assert_string(
|
||
"<http://example.com>",
|
||
Geary.HTML.smart_escape("<http://example.com>")
|
||
);
|
||
}
|
||
|
||
public void remove_html_tags() throws Error {
|
||
string blockquote_body = """<blockquote>hello</blockquote> <p>there</p>""";
|
||
|
||
string style_complete = """<style>
|
||
.bodyblack { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:
|
||
12px; }
|
||
td { font-size: 12px; }
|
||
.footer { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10
|
||
px; }
|
||
</style>""";
|
||
|
||
string style_truncated = """<html><head>
|
||
<meta http-equiv=Content-Type content="text/html; charset=utf-8">
|
||
<style>
|
||
.bodyblack { font-family: Verdana, """;
|
||
|
||
assert(Geary.HTML.html_to_text(HTML_BODY_COMPLETE) == HTML_BODY_COMPLETE_EXPECTED);
|
||
assert(Geary.HTML.html_to_text(blockquote_body) == "hello\n there\n");
|
||
assert(Geary.HTML.html_to_text(blockquote_body, false) == " there\n");
|
||
assert(Geary.HTML.html_to_text(HTML_ENTITIES_BODY) == HTML_ENTITIES_EXPECTED);
|
||
assert(Geary.HTML.html_to_text(style_complete) == "");
|
||
assert(Geary.HTML.html_to_text(style_complete) == "");
|
||
assert(Geary.HTML.html_to_text(style_truncated) == "");
|
||
}
|
||
|
||
private static string HTML_BODY_COMPLETE = """<html><head>
|
||
<meta http-equiv=Content-Type content="text/html; charset=utf-8">
|
||
<style>
|
||
.bodyblack { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; }
|
||
td { font-size: 12px; }
|
||
.footer { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; }
|
||
</style>
|
||
</head>
|
||
<body><table cellSpacing="0" cellPadding="0" width="450" border="0" class="bodyblack"><tr><td>
|
||
<p><br />Hi Kenneth, <br /> <br /> We xxxxx xxxx xx xxx xxx xx xxxx x xxxxxxxx xxxxxxxx.
|
||
<br /> <br /> <br /> <br />Thank you, <br /> <br />XXXXX
|
||
X XXXXXX<br /><br />You can reply directly to this message or click the following link:<br /><a href="https://app.foobar.com/xxxxxxxx752a0ab01641966deff6c48623aba">https://app.foobar.com/xxxxxxxxxxxxxxxx1641966deff6c48623aba</a><br /><br />You can change your email preferences at:<br /><a href="https://app.foobar.com/xxxxxxxxxxxxx">https://app.foobar.com/xxxxxxxxxxx</a></p></td></tr>
|
||
</table></body></html>
|
||
""";
|
||
|
||
private static string HTML_BODY_COMPLETE_EXPECTED = """
|
||
|
||
Hi Kenneth,
|
||
|
||
We xxxxx xxxx xx xxx xxx xx xxxx x xxxxxxxx xxxxxxxx.
|
||
|
||
|
||
|
||
|
||
Thank you,
|
||
|
||
XXXXX
|
||
X XXXXXX
|
||
|
||
You can reply directly to this message or click the following link:
|
||
https://app.foobar.com/xxxxxxxxxxxxxxxx1641966deff6c48623aba
|
||
|
||
You can change your email preferences at:
|
||
https://app.foobar.com/xxxxxxxxxxx
|
||
|
||
""";
|
||
|
||
private static string HTML_ENTITIES_BODY = """<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>
|
||
<div style="font-family: Verdana;font-size: 12.0px;">
|
||
<div>What if I said that I'd like to go to the theater tomorrow night.</div>
|
||
|
||
<div> </div>
|
||
|
||
<div>I think we could do that!</div>
|
||
""";
|
||
|
||
private static string HTML_ENTITIES_EXPECTED = """
|
||
|
||
What if I said that I'd like to go to the theater tomorrow night.
|
||
|
||
|
||
|
||
|
||
|
||
I think we could do that!
|
||
|
||
|
||
|
||
""";
|
||
|
||
}
|