mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Truncate before sanitize

This commit is contained in:
M66B 2020-02-14 09:04:16 +01:00
parent 6dc5137c06
commit 8b08d2a38d
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -323,6 +323,31 @@ public class HtmlHelper {
} }
} }
// Limit length
int length = 0;
for (Element elm : parsed.select("*")) {
for (Node child : elm.childNodes())
if (child instanceof TextNode)
length += ((TextNode) child).text().length();
if (length > MAX_TEXT_SIZE)
elm.remove();
}
if (length > MAX_TEXT_SIZE) {
parsed.body()
.appendElement("p")
.appendElement("em")
.text(context.getString(R.string.title_too_large));
parsed.body()
.appendElement("p")
.appendElement("big")
.appendElement("a")
.attr("href", "full:")
.text(context.getString(R.string.title_show_full));
}
Whitelist whitelist = Whitelist.relaxed() Whitelist whitelist = Whitelist.relaxed()
.addTags("hr", "abbr", "big", "font", "dfn", "del", "s", "tt") .addTags("hr", "abbr", "big", "font", "dfn", "del", "s", "tt")
.removeTags("col", "colgroup", "thead", "tbody") .removeTags("col", "colgroup", "thead", "tbody")
@ -330,7 +355,8 @@ public class HtmlHelper {
.removeAttributes("td", "colspan", "rowspan", "width") .removeAttributes("td", "colspan", "rowspan", "width")
.removeAttributes("th", "colspan", "rowspan", "width") .removeAttributes("th", "colspan", "rowspan", "width")
.addProtocols("img", "src", "cid") .addProtocols("img", "src", "cid")
.addProtocols("img", "src", "data"); .addProtocols("img", "src", "data")
.addProtocols("a", "href", "full");
if (text_color) if (text_color)
whitelist whitelist
.addAttributes(":all", "style") .addAttributes(":all", "style")
@ -716,34 +742,11 @@ public class HtmlHelper {
if (!TextUtils.isEmpty(span.attr("color"))) if (!TextUtils.isEmpty(span.attr("color")))
span.tagName("font"); span.tagName("font");
int length = 0;
for (Element elm : document.select("*")) {
for (Node child : elm.childNodes())
if (child instanceof TextNode)
length += ((TextNode) child).text().length();
if (length > MAX_TEXT_SIZE)
elm.remove();
}
if (document.body() == null) { if (document.body() == null) {
Log.e("Sanitize without body"); Log.e("Sanitize without body");
document.normalise(); document.normalise();
} }
if (length > MAX_TEXT_SIZE) {
document.body()
.appendElement("p")
.appendElement("em")
.text(context.getString(R.string.title_too_large));
document.body()
.appendElement("p")
.appendElement("big")
.appendElement("a")
.attr("href", "full:")
.text(context.getString(R.string.title_show_full));
}
return document; return document;
} }