Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c4c266c5 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #3051 from philipwhiuk/testIframeUpdateJsoup 

Html Sanitization: Update JSoup, test iframe removal & allow center
parents 9e181e31 40081b43

k9mail/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ dependencies { 
    compile "com.squareup.okio:okio:${okioVersion}"

    compile 'commons-io:commons-io:2.4'

    compile "com.android.support:support-v4:${androidSupportLibraryVersion}"

    compile 'org.jsoup:jsoup:1.10.2'

    compile 'org.jsoup:jsoup:1.11.2'

    compile 'de.cketti.library.changelog:ckchangelog:1.2.1'

    compile 'com.github.bumptech.glide:glide:3.6.1'

    compile 'com.splitwise:tokenautocomplete:2.0.7'

k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ public class HtmlSanitizer { 


    HtmlSanitizer() {

        Whitelist whitelist = Whitelist.relaxed()

                .addTags("font", "hr", "ins", "del")

                .addTags("font", "hr", "ins", "del", "center")

                .addAttributes("font", "color", "face", "size")

                .addAttributes("table", "align", "background", "bgcolor", "border", "cellpadding", "cellspacing",

                        "width")

k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java

+24 −0
Original line number Diff line number Diff line
@@ -189,4 +189,28 @@ public class HtmlSanitizerTest { 


        assertEquals("<html><head><style>keep this</style></head><body></body></html>", toCompactString(result));

    }



    @Test

    public void shouldRemoveIFrames() {

        String html = "<html><body>" +

                "<iframe src=\"http://www.google.com\" />" +

                "</body></html>";



        Document result = htmlSanitizer.sanitize(html);



        assertEquals("<html><head></head><body></body></html>", toCompactString(result));

    }



    @Test

    public void shouldKeepFormattingTags() {

        String html = "<html><body>" +

                "<center><font face=\"Arial\" color=\"red\" size=\"12\">A</font></center>" +

                "</body></html>";



        Document result = htmlSanitizer.sanitize(html);



        assertEquals("<html><head></head><body>" +

                "<center><font face=\"Arial\" color=\"red\" size=\"12\">A</font></center>" +

                "</body></html>", toCompactString(result));

    }

}