githubFork/roundcubemail.git

			@@ -47,7 +47,7 @@
			$html = "<!--[if gte mso 10]><p>p1</p><!--><p>p2</p>";
			$washed = $washer->wash($html);

			$this->assertEquals('<!-- node type 8 --><!-- html ignored --><!-- body ignored --><p>p2</p>', $washed, "HTML conditional comments (#1489004)");
			$this->assertEquals('<!-- html ignored --><!-- body ignored --><p>p2</p>', $washed, "HTML conditional comments (#1489004)");

			$html = "<!--TestCommentInvalid><p>test</p>";
			$washed = $washer->wash($html);
			@@ -57,12 +57,12 @@
			$html = "<p>para1</p><!-- comment --><p>para2</p>";
			$washed = $washer->wash($html);

			$this->assertEquals('<!-- html ignored --><!-- body ignored --><p>para1</p><!-- node type 8 --><p>para2</p>', $washed, "HTML comments - simple comment");
			$this->assertEquals('<!-- html ignored --><!-- body ignored --><p>para1</p><p>para2</p>', $washed, "HTML comments - simple comment");

			$html = "<p>para1</p><!-- <hr> comment --><p>para2</p>";
			$washed = $washer->wash($html);

			$this->assertEquals('<!-- html ignored --><!-- body ignored --><p>para1</p><!-- node type 8 --><p>para2</p>', $washed, "HTML comments - tags inside (#1489904)");
			$this->assertEquals('<!-- html ignored --><!-- body ignored --><p>para1</p><p>para2</p>', $washed, "HTML comments - tags inside (#1489904)");
			}

			/**
			@@ -159,7 +159,7 @@
			$washer = new rcube_washtml;
			$washed = $washer->wash($html);

			$this->assertRegExp('\|style=\'font-family: "新細明體","serif"; color: red\'\|', $washed, "Unicode chars in style attribute - quoted (#1489697)");
			$this->assertRegExp('\|style="font-family: \"新細明體\",\"serif\"; color: red"\|', $washed, "Unicode chars in style attribute - quoted (#1489697)");

			$html = "<html><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
			<body><span style='font-family:新細明體;color:red'>test</span></body></html>";
			@@ -169,4 +169,48 @@

			$this->assertRegExp('\|style="font-family: 新細明體; color: red"\|', $washed, "Unicode chars in style attribute (#1489697)");
			}

			/**
			* Test style item fixes
			*/
			function test_style_wash()
			{
			$html = "<p style=\"line-height: 1; height: 10\">a</p>";

			$washer = new rcube_washtml;
			$washed = $washer->wash($html);

			$this->assertRegExp('\|line-height: 1;\|', $washed, "Untouched line-height (#1489917)");
			$this->assertRegExp('\|; height: 10px\|', $washed, "Fixed height units");

			$html = "<div style=\"padding: 0px\n 20px;border:1px solid #000;\"></div>";
			$expected = "<div style=\"padding: 0px 20px; border: 1px solid #000\"></div>";

			$washer = new rcube_washtml;
			$washed = $washer->wash($html);

			$this->assertTrue(strpos($washed, $expected) !== false, "White-space and new-line characters handling");
			}

			/**
			* Test invalid style cleanup - XSS prevention (#1490227)
			*/
			function test_style_wash_xss()
			{
			$html = "<img style=aaa:'\"/onerror=alert(1)//'>";
			$exp = "<img style=\"aaa: '"/onerror=alert(1)//'\" />";

			$washer = new rcube_washtml;
			$washed = $washer->wash($html);

			$this->assertTrue(strpos($washed, $exp) !== false, "Style quotes XSS issue (#1490227)");

			$html = "<img style=aaa:'"/onerror=alert(1)//'>";
			$exp = "<img style=\"aaa: '"/onerror=alert(1)//'\" />";

			$washer = new rcube_washtml;
			$washed = $washer->wash($html);

			$this->assertTrue(strpos($washed, $exp) !== false, "Style quotes XSS issue (#1490227)");
			}
			}