From 51a1c153d2966f92d2bf80622a353885ab52330b Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Tue, 28 Feb 2012 14:48:15 +0100
Subject: [PATCH] MDL-31785 fix and improve htmlpurifier tests

---
 lib/simpletest/testhtmlpurifier.php | 159 ++++++++++++++++++++++++++--
 lib/simpletest/testpurifier.php     | 128 ----------------------
 2 files changed, 150 insertions(+), 137 deletions(-)
 delete mode 100644 lib/simpletest/testpurifier.php

diff --git a/lib/simpletest/testhtmlpurifier.php b/lib/simpletest/testhtmlpurifier.php
index 889fd42bb11..b138becfb77 100644
--- a/lib/simpletest/testhtmlpurifier.php
+++ b/lib/simpletest/testhtmlpurifier.php
@@ -29,29 +29,170 @@ defined('MOODLE_INTERNAL') || die();
 
 class htmlpurifier_test extends UnitTestCase {
 
+
+    public static $includecoverage = array('lib/htmlpurifier/HTMLPurifier.php');
+
+    private $cachetext = null;
+
+    function setUp() {
+        global $CFG;
+        $this->cachetext = $CFG->cachetext;
+        $CFG->cachetext = 0;
+    }
+
+    function tearDown() {
+        global $CFG;
+        $CFG->cachetext = $this->cachetext;
+    }
+
     /**
-     * Tests the installation of event handlers from file
+     * Verify _blank target is allowed
+     * @return void
      */
-    function test_our_tags() {
+    public function test_allow_blank_target() {
+        $text = '<a href="http://moodle.org" target="_blank">Some link</a>';
+        $result = format_text($text, FORMAT_HTML);
+        $this->assertIdentical($text, $result);
+
+        $result = format_text('<a href="http://moodle.org" target="some">Some link</a>', FORMAT_HTML);
+        $this->assertIdentical('<a href="http://moodle.org">Some link</a>', $result);
+    }
+
+    /**
+     * Verify our nolink tag accepted
+     * @return void
+     */
+    public function test_nolink() {
+        // we can not use format text because nolink changes result
+        $text = '<nolink><div>no filters</div></nolink>';
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+
         $text = '<nolink>xxx<em>xx</em><div>xxx</div></nolink>';
-        $this->assertIdentical($text, purify_html($text));
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+    }
 
-        $text = '<tex>xxxxxx</tex>';
-        $this->assertIdentical($text, purify_html($text));
+    /**
+     * Verify our tex tag accepted
+     * @return void
+     */
+    public function test_tex() {
+        $text = '<tex>a+b=c</tex>';
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+    }
 
-        $text = '<algebra>xxxxxx</algebra>';
-        $this->assertIdentical($text, purify_html($text));
+    /**
+     * Verify our algebra tag accepted
+     * @return void
+     */
+    public function test_algebra() {
+        $text = '<algebra>a+b=c</algebra>';
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+    }
+
+    /**
+     * Verify our hacky multilang works
+     * @return void
+     */
+    public function test_multilang() {
+        $text = '<lang lang="en">hmmm</lang><lang lang="anything">hm</lang>';
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+
+        $text = '<span lang="en" class="multilang">hmmm</span><span lang="anything" class="multilang">hm</span>';
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+
+        $text = '<span lang="en">hmmm</span>';
+        $result = purify_html($text, array());
+        $this->assertNotIdentical($text, $result);
+
+        // keep standard lang tags
 
         $text = '<span lang="de_DU" class="multilang">asas</span>';
-        $this->assertIdentical($text, purify_html($text));
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
 
         $text = '<lang lang="de_DU">xxxxxx</lang>';
-        $this->assertIdentical($text, purify_html($text));
+        $result = purify_html($text, array());
+        $this->assertIdentical($text, $result);
+    }
 
+    /**
+     * Tests the 'allowid' option for format_text.
+     */
+    public function test_format_text_allowid() {
+        // Start off by not allowing ids (default)
+        $options = array(
+            'nocache' => true
+        );
+        $result = format_text('<div id="example">Frog</div>', FORMAT_HTML, $options);
+        $this->assertIdentical('<div>Frog</div>', $result);
+
+        // Now allow ids
+        $options['allowid'] = true;
+        $result = format_text('<div id="example">Frog</div>', FORMAT_HTML, $options);
+        $this->assertIdentical('<div id="example">Frog</div>', $result);
+    }
+
+    /**
+     * Test if linebreaks kept unchanged.
+     */
+    function test_line_breaking() {
         $text = "\n\raa\rsss\nsss\r";
         $this->assertIdentical($text, purify_html($text));
     }
 
+    /**
+     * Test fixing of strict problems.
+     */
+    function test_tidy() {
+        $text = "<p>xx";
+        $this->assertIdentical('<p>xx</p>', purify_html($text));
+
+        $text = "<P>xx</P>";
+        $this->assertIdentical('<p>xx</p>', purify_html($text));
+
+        $text = "xx<br>";
+        $this->assertIdentical('xx<br />', purify_html($text));
+    }
+
+    /**
+     * Test nesting - this used to cause problems in earlier versions
+     */
+    function test_nested_lists() {
+        $text = "<ul><li>One<ul><li>Two</li></ul></li><li>Three</li></ul>";
+        $this->assertIdentical($text, purify_html($text));
+    }
+
+    /**
+     * Test that XSS protection works, complete smoke tests are in htmlpurifier itself.
+     */
+    function test_cleaning_nastiness() {
+        $text = "x<SCRIPT>alert('XSS')</SCRIPT>x";
+        $this->assertIdentical('xx', purify_html($text));
+
+        $text = '<DIV STYLE="background-image:url(javascript:alert(\'XSS\'))">xx</DIV>';
+        $this->assertIdentical('<div>xx</div>', purify_html($text));
+
+        $text = '<DIV STYLE="width:expression(alert(\'XSS\'));">xx</DIV>';
+        $this->assertIdentical('<div>xx</div>', purify_html($text));
+
+        $text = 'x<IFRAME SRC="javascript:alert(\'XSS\');"></IFRAME>x';
+        $this->assertIdentical('xx', purify_html($text));
+
+        $text = 'x<OBJECT TYPE="text/x-scriptlet" DATA="http://ha.ckers.org/scriptlet.html"></OBJECT>x';
+        $this->assertIdentical('xx', purify_html($text));
+
+        $text = 'x<EMBED SRC="http://ha.ckers.org/xss.swf" AllowScriptAccess="always"></EMBED>x';
+        $this->assertIdentical('xx', purify_html($text));
+
+        $text = 'x<form></form>x';
+        $this->assertIdentical('xx', purify_html($text));
+    }
 }
 
 
diff --git a/lib/simpletest/testpurifier.php b/lib/simpletest/testpurifier.php
deleted file mode 100644
index e066d263dd7..00000000000
--- a/lib/simpletest/testpurifier.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Unit tests for the HTMLPurifier integration
- *
- * @package    core
- * @subpackage simpletest
- * @copyright  2011 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-
-class purifier_test extends UnitTestCase {
-
-    public static $includecoverage = array('lib/htmlpurifier/HTMLPurifier.php');
-
-    private $cachetext = null;
-
-    function setUp() {
-        global $CFG;
-        $this->cachetext = $CFG->cachetext;
-        $CFG->cachetext = 0;
-    }
-
-    function tearDown() {
-        global $CFG;
-        $CFG->cachetext = $this->cachetext;
-    }
-
-    /**
-     * Verify _blank target is allowed
-     * @return void
-     */
-    public function test_allow_blank_target() {
-        $text = '<a href="http://moodle.org" target="_blank">Some link</a>';
-        $result = format_text($text, FORMAT_HTML);
-        $this->assertIdentical($text, $result);
-
-        $result = format_text('<a href="http://moodle.org" target="some">Some link</a>', FORMAT_HTML);
-        $this->assertIdentical('<a href="http://moodle.org">Some link</a>', $result);
-    }
-
-    /**
-     * Verify our nolink tag accepted
-     * @return void
-     */
-    public function test_nolink() {
-        // we can not use format text because nolink changes result
-        $text = '<nolink><div>no filters</div></nolink>';
-        $result = purify_html($text, array());
-        $this->assertIdentical($text, $result);
-    }
-
-    /**
-     * Verify our tex tag accepted
-     * @return void
-     */
-    public function test_tex() {
-        $text = '<tex>a+b=c</tex>';
-        $result = purify_html($text, array());
-        $this->assertIdentical($text, $result);
-    }
-
-    /**
-     * Verify our algebra tag accepted
-     * @return void
-     */
-    public function test_algebra() {
-        $text = '<algebra>a+b=c</algebra>';
-        $result = purify_html($text, array());
-        $this->assertIdentical($text, $result);
-    }
-
-    /**
-     * Verify our hacky multilang works
-     * @return void
-     */
-    public function test_multilang() {
-        $text = '<lang lang="en">hmmm</lang><lang lang="anything">hm</lang>';
-        $result = purify_html($text, array());
-        $this->assertIdentical($text, $result);
-
-        $text = '<span lang="en" class="multilang">hmmm</span><span lang="anything" class="multilang">hm</span>';
-        $result = purify_html($text, array());
-        $this->assertIdentical($text, $result);
-
-        $text = '<span lang="en">hmmm</span>';
-        $result = purify_html($text, array());
-        $this->assertNotIdentical($text, $result);
-    }
-
-    /**
-     * Tests the 'allowid' option for format_text.
-     */
-    public function test_format_text_allowid() {
-        // Start off by not allowing ids (default)
-        $options = array(
-            'nocache' => true
-        );
-        $result = format_text('<div id="example">Frog</div>', FORMAT_HTML, $options);
-        $this->assertIdentical('<div>Frog</div>', $result);
-
-        // Now allow ids
-        $options['allowid'] = true;
-        $result = format_text('<div id="example">Frog</div>', FORMAT_HTML, $options);
-        $this->assertIdentical('<div id="example">Frog</div>', $result);
-    }
-
-
-    //TODO: add XSS smoke tests here
-}
-