From 71045cc05bda0c2649702d94ed3e0e526b1d6a92 Mon Sep 17 00:00:00 2001 From: Allison Tielking Date: Wed, 3 Mar 2021 14:20:06 -0800 Subject: [PATCH 1/5] upgrade composer --- composer.json | 12 +- composer.lock | 123 +++++++++--------- src/AttrTransform/ImgRequired.hack | 74 ++++++----- tests/HTMLPurifierTest.hack | 194 ++++++++++++++++------------- 4 files changed, 212 insertions(+), 191 deletions(-) diff --git a/composer.json b/composer.json index 3bb5112..f4af81b 100644 --- a/composer.json +++ b/composer.json @@ -2,13 +2,13 @@ "name": "slackhq/htmlsanitizer-hack", "description": "Slack Hack HTML Sanitizer", "require": { - "hhvm/hhast": "^4.33.5", - "facebook/fbexpect": "^2.7.3", + "hhvm/hhast": "^4.53.4", + "facebook/fbexpect": "^2.7.4", "hhvm/hhvm-autoload": "^2.0|^3.0", - "hhvm/hacktest": "^2.0.0", - "hhvm/hsl": "^4.36.0", - "hhvm/hsl-experimental": "^4.37.3", - "facebook/hack-codegen": "^4.3.2" + "hhvm/hacktest": "^2.1.0", + "hhvm/hsl": "^4.41.0", + "hhvm/hsl-experimental": "^4.50.0", + "facebook/hack-codegen": "^4.3.8" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index 31b890d..158fb33 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "80a3618a8de99214feef1aca647928a0", + "content-hash": "3ba1c3481c620b9904fcc53f023dc360", "packages": [ { "name": "facebook/difflib", @@ -48,21 +48,21 @@ }, { "name": "facebook/fbexpect", - "version": "v2.7.5", + "version": "v2.7.8", "source": { "type": "git", "url": "https://github.com/hhvm/fbexpect.git", - "reference": "62e2c39741e1c86c373da3ab75617dbedfaed419" + "reference": "edae1a4d746bb4af21fd8f65431ba467ebf34cc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/fbexpect/zipball/62e2c39741e1c86c373da3ab75617dbedfaed419", - "reference": "62e2c39741e1c86c373da3ab75617dbedfaed419", + "url": "https://api.github.com/repos/hhvm/fbexpect/zipball/edae1a4d746bb4af21fd8f65431ba467ebf34cc1", + "reference": "edae1a4d746bb4af21fd8f65431ba467ebf34cc1", "shasum": "" }, "require": { "facebook/difflib": "^1.0.0", - "hhvm": "^4.25", + "hhvm": "^4.45", "hhvm/hacktest": "^1.0|^2.0", "hhvm/hsl": "^4.0" }, @@ -78,9 +78,9 @@ "description": "Unit test helpers for Facebook projects", "support": { "issues": "https://github.com/hhvm/fbexpect/issues", - "source": "https://github.com/hhvm/fbexpect/tree/v2.7.5" + "source": "https://github.com/hhvm/fbexpect/tree/v2.7.8" }, - "time": "2020-07-29T17:03:08+00:00" + "time": "2020-12-11T21:53:22+00:00" }, { "name": "facebook/hack-codegen", @@ -149,27 +149,28 @@ }, { "name": "facebook/hh-clilib", - "version": "v2.2.4", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/hhvm/hh-clilib.git", - "reference": "7e5a0acdae42ab33b332f94f43cfcf25636bddee" + "reference": "77bef1f893d77f8b7711fa83d72f2a11508f5888" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hh-clilib/zipball/7e5a0acdae42ab33b332f94f43cfcf25636bddee", - "reference": "7e5a0acdae42ab33b332f94f43cfcf25636bddee", + "url": "https://api.github.com/repos/hhvm/hh-clilib/zipball/77bef1f893d77f8b7711fa83d72f2a11508f5888", + "reference": "77bef1f893d77f8b7711fa83d72f2a11508f5888", "shasum": "" }, "require": { - "hhvm": "^4.13", + "hhvm": "^4.41", "hhvm/hsl": "^4.0", - "hhvm/hsl-experimental": "^4.0", - "hhvm/type-assert": "^3.2" + "hhvm/hsl-experimental": "^4.52", + "hhvm/hsl-io": "^0.1.0", + "hhvm/type-assert": "^3.0|^4.0" }, "require-dev": { "facebook/fbexpect": "^2.6.1", - "hhvm/hacktest": "^1.0.0", + "hhvm/hacktest": "^2.0", "hhvm/hhast": "^4.0.2" }, "type": "library", @@ -184,30 +185,32 @@ ], "support": { "issues": "https://github.com/hhvm/hh-clilib/issues", - "source": "https://github.com/hhvm/hh-clilib/tree/v2.2.4" + "source": "https://github.com/hhvm/hh-clilib/tree/v2.4.2" }, - "time": "2019-11-07T21:21:31+00:00" + "time": "2020-05-21T15:52:05+00:00" }, { "name": "hhvm/hacktest", - "version": "v2.0.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/hhvm/hacktest.git", - "reference": "cde86b675923d56955a2f0f95840206e52bd8618" + "reference": "27e507447d7a115004ddb1d20c9ee0ab561c4153" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hacktest/zipball/cde86b675923d56955a2f0f95840206e52bd8618", - "reference": "cde86b675923d56955a2f0f95840206e52bd8618", + "url": "https://api.github.com/repos/hhvm/hacktest/zipball/27e507447d7a115004ddb1d20c9ee0ab561c4153", + "reference": "27e507447d7a115004ddb1d20c9ee0ab561c4153", "shasum": "" }, "require": { - "facebook/hh-clilib": "^2.0.0", - "hhvm": "^4.15", + "facebook/hh-clilib": "^2.3.0", + "hhvm": "^4.41", "hhvm/hhvm-autoload": "^2.0.2|^3.0", "hhvm/hsl": "^4.0", - "hhvm/type-assert": "^3.2" + "hhvm/hsl-experimental": "^4.50", + "hhvm/hsl-io": "^0.1.0", + "hhvm/type-assert": "^3.0|^4.0" }, "require-dev": { "facebook/fbexpect": "^2.3.0", @@ -232,30 +235,30 @@ "issues": "https://github.com/hhvm/hacktest/issues", "source": "https://github.com/hhvm/hacktest/tree/master" }, - "time": "2020-02-07T21:57:16+00:00" + "time": "2020-05-21T15:48:09+00:00" }, { "name": "hhvm/hhast", - "version": "v4.33.9", + "version": "v4.53.4", "source": { "type": "git", "url": "https://github.com/hhvm/hhast.git", - "reference": "9f586c80055f73c17b95742ec97627c1d11a1deb" + "reference": "2a9e8ce25568d6cce861821ff69831c43838fe6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hhast/zipball/9f586c80055f73c17b95742ec97627c1d11a1deb", - "reference": "9f586c80055f73c17b95742ec97627c1d11a1deb", + "url": "https://api.github.com/repos/hhvm/hhast/zipball/2a9e8ce25568d6cce861821ff69831c43838fe6e", + "reference": "2a9e8ce25568d6cce861821ff69831c43838fe6e", "shasum": "" }, "require": { "facebook/difflib": "^1.0.0", "facebook/hh-clilib": "^2.0.0", - "hhvm": "^4.33", + "hhvm": "^4.53", "hhvm/hhvm-autoload": "^2.0.4|^3.0", "hhvm/hsl": "^4.25", - "hhvm/hsl-experimental": "^4.25", - "hhvm/type-assert": "^3.4" + "hhvm/hsl-experimental": "^4.50", + "hhvm/type-assert": "^3.0|^4.0" }, "require-dev": { "facebook/fbexpect": "^2.1.1", @@ -283,9 +286,9 @@ "description": "A mutable AST library for Hack with linting and code migrations", "support": { "issues": "https://github.com/hhvm/hhast/issues", - "source": "https://github.com/hhvm/hhast/tree/v4.33.9" + "source": "https://github.com/hhvm/hhast/tree/v4.53.4" }, - "time": "2020-02-28T18:38:22+00:00" + "time": "2020-05-21T15:55:34+00:00" }, { "name": "hhvm/hhvm-autoload", @@ -341,26 +344,26 @@ }, { "name": "hhvm/hsl", - "version": "v4.40.0", + "version": "v4.41.0", "source": { "type": "git", "url": "https://github.com/hhvm/hsl.git", - "reference": "b14a430062ad95c378765899f955457f3454f2f9" + "reference": "80a42c02f036f72a42f0415e80d6b847f4bf62d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hsl/zipball/b14a430062ad95c378765899f955457f3454f2f9", - "reference": "b14a430062ad95c378765899f955457f3454f2f9", + "url": "https://api.github.com/repos/hhvm/hsl/zipball/80a42c02f036f72a42f0415e80d6b847f4bf62d5", + "reference": "80a42c02f036f72a42f0415e80d6b847f4bf62d5", "shasum": "" }, "require": { - "hhvm": "^4.25" + "hhvm": "^4.41" }, "require-dev": { "facebook/fbexpect": "^2.5.1", "hhvm/hacktest": "^1.0|^2.0", - "hhvm/hhvm-autoload": "^2.0", - "hhvm/hsl-experimental": "dev-master" + "hhvm/hhvm-autoload": "^2.0|^3.0", + "hhvm/hsl-experimental": "^4.37|dev-master" }, "type": "library", "extra": { @@ -375,31 +378,33 @@ "description": "The Hack Standard Library", "support": { "issues": "https://github.com/hhvm/hsl/issues", - "source": "https://github.com/hhvm/hsl/tree/master" + "source": "https://github.com/hhvm/hsl/tree/v4.41.0" }, - "time": "2020-01-08T23:12:08+00:00" + "time": "2020-05-01T23:05:23+00:00" }, { "name": "hhvm/hsl-experimental", - "version": "v4.37.3", + "version": "v4.52.1", "source": { "type": "git", "url": "https://github.com/hhvm/hsl-experimental.git", - "reference": "e0306dc237d0b3a92eddefb8b4d6b6047a43229d" + "reference": "ba8cfb8b920af493c51ed11b3a7ac09f8d7f67c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hsl-experimental/zipball/e0306dc237d0b3a92eddefb8b4d6b6047a43229d", - "reference": "e0306dc237d0b3a92eddefb8b4d6b6047a43229d", + "url": "https://api.github.com/repos/hhvm/hsl-experimental/zipball/ba8cfb8b920af493c51ed11b3a7ac09f8d7f67c6", + "reference": "ba8cfb8b920af493c51ed11b3a7ac09f8d7f67c6", "shasum": "" }, "require": { - "hhvm": "^4.25", + "hhvm": "^4.52", "hhvm/hsl": "^4.15" }, + "provide": { + "hhvm/hsl-io": "0.1.0" + }, "require-dev": { "facebook/fbexpect": "^2.7.0", - "facebook/hh-clilib": ">= v2.2.4 <2.3.0", "hhvm/hacktest": "^2.0", "hhvm/hhvm-autoload": "^2.0|^3.0" }, @@ -416,22 +421,22 @@ "description": "The Hack Standard Library - Experimental Additions", "support": { "issues": "https://github.com/hhvm/hsl-experimental/issues", - "source": "https://github.com/hhvm/hsl-experimental/tree/v4.37" + "source": "https://github.com/hhvm/hsl-experimental/tree/v4.52.x" }, - "time": "2020-04-16T21:25:40+00:00" + "time": "2020-05-19T21:08:17+00:00" }, { "name": "hhvm/type-assert", - "version": "v3.7.3", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/hhvm/type-assert.git", - "reference": "e076c42ed718929dbea96c0b354ebe96cccc2335" + "reference": "3aa45a566dce60277462853a0dc84f439ecb33bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/type-assert/zipball/e076c42ed718929dbea96c0b354ebe96cccc2335", - "reference": "e076c42ed718929dbea96c0b354ebe96cccc2335", + "url": "https://api.github.com/repos/hhvm/type-assert/zipball/3aa45a566dce60277462853a0dc84f439ecb33bf", + "reference": "3aa45a566dce60277462853a0dc84f439ecb33bf", "shasum": "" }, "require": { @@ -442,7 +447,7 @@ "facebook/fbexpect": "^2.0.0", "hhvm/hacktest": "^2.0", "hhvm/hhast": "^4.0", - "hhvm/hhvm-autoload": "^2.0" + "hhvm/hhvm-autoload": "^2.0|^3.0" }, "type": "library", "extra": { @@ -461,9 +466,9 @@ ], "support": { "issues": "https://github.com/hhvm/type-assert/issues", - "source": "https://github.com/hhvm/type-assert/tree/v3.7.3" + "source": "https://github.com/hhvm/type-assert/tree/master" }, - "time": "2020-01-13T21:48:58+00:00" + "time": "2020-05-20T18:49:02+00:00" } ], "packages-dev": [], diff --git a/src/AttrTransform/ImgRequired.hack b/src/AttrTransform/ImgRequired.hack index 90e2c5b..e77e341 100644 --- a/src/AttrTransform/ImgRequired.hack +++ b/src/AttrTransform/ImgRequired.hack @@ -2,49 +2,47 @@ namespace HTMLPurifier\AttrTransform; use namespace HTMLPurifier; use namespace HH\Lib\C; -use namespace HH\Lib\Experimental\File; +use namespace HH\Lib\File; /** * Transform that supplies default values for the src and alt attributes * in img tags, as well as prevents the img tag from being removed * because of a missing alt tag. This needs to be registered as both * a pre and post attribute transform. */ -class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier\HTMLPurifier_AttrTransform -{ - /** - * @param array $attr - * @param HTMLPurifier_Config $config - * @param HTMLPurifier_Context $context - * @return array - */ - public function transform( - dict $attr, - HTMLPurifier\HTMLPurifier_Config $config, - HTMLPurifier\HTMLPurifier_Context $context - ): dict - { - $src = true; - if (!C\contains_key($attr, 'src')) { - if ($config->def->defaults['Core.RemoveInvalidImg']) { - return $attr; - } - $attr['src'] = $config->def->defaults['Attr.DefaultInvalidImage']; - $src = false; - } +class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier\HTMLPurifier_AttrTransform { + /** + * @param array $attr + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return array + */ + public function transform( + dict $attr, + HTMLPurifier\HTMLPurifier_Config $config, + HTMLPurifier\HTMLPurifier_Context $context, + ): dict { + $src = true; + if (!C\contains_key($attr, 'src')) { + if ($config->def->defaults['Core.RemoveInvalidImg']) { + return $attr; + } + $attr['src'] = $config->def->defaults['Attr.DefaultInvalidImage']; + $src = false; + } - if (!C\contains_key($attr, 'alt')) { - if ($src) { - $alt = $config->def->defaults['Attr.DefaultImageAlt']; - if ($alt === '') { - $src_path = new File\Path((string) $attr['src']); - $attr['alt'] = $src_path->getBaseName(); - } else { - $attr['alt'] = $alt; - } - } else { - $attr['alt'] = $config->def->defaults['Attr.DefaultInvalidImageAlt']; - } - } - return $attr; - } + if (!C\contains_key($attr, 'alt')) { + if ($src) { + $alt = $config->def->defaults['Attr.DefaultImageAlt']; + if ($alt === '') { + $src_path = new File\Path((string)$attr['src']); + $attr['alt'] = $src_path->getBaseName(); + } else { + $attr['alt'] = $alt; + } + } else { + $attr['alt'] = $config->def->defaults['Attr.DefaultInvalidImageAlt']; + } + } + return $attr; + } } diff --git a/tests/HTMLPurifierTest.hack b/tests/HTMLPurifierTest.hack index d8302ec..e972695 100644 --- a/tests/HTMLPurifierTest.hack +++ b/tests/HTMLPurifierTest.hack @@ -8,8 +8,8 @@ use namespace HTMLPurifier; use namespace HTMLPurifier\{Strategy, Token, Lexer}; class HTMLPurifierTest extends HackTest { - - public function testMissingEndTags() : void { + + public function testMissingEndTags(): void { echo "\nrunning testMissingEndTags()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -21,7 +21,7 @@ class HTMLPurifierTest extends HackTest { echo "finished.\n\n"; } - public function testMaliciousCodeRemoved() : void { + public function testMaliciousCodeRemoved(): void { echo "\ntestMaliciousCodeRemoved()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -33,7 +33,7 @@ class HTMLPurifierTest extends HackTest { echo "finished.\n\n"; } - public function testMaliciousCodeRemovedWithText() : void { + public function testMaliciousCodeRemovedWithText(): void { echo "\ntestMaliciousCodeRemovedWithText()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -45,7 +45,7 @@ class HTMLPurifierTest extends HackTest { echo "finished.\n\n"; } - public function testIllegalNestingFixed() : void { + public function testIllegalNestingFixed(): void { echo "\ntestIllegalNestingFixed()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -57,7 +57,7 @@ class HTMLPurifierTest extends HackTest { echo "finished.\n\n"; } - public function testDeprecatedTagsConverted() : void { + public function testDeprecatedTagsConverted(): void { echo "\ntestDeprecatedTagsConverted()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -69,7 +69,7 @@ class HTMLPurifierTest extends HackTest { echo "finished.\n\n"; } - public function testCSSValidated() : void { + public function testCSSValidated(): void { echo "\ntestCSSValidated()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -84,7 +84,7 @@ class HTMLPurifierTest extends HackTest { public function testMaintainSuperfluousDivs(): void { echo "\ntestMaintainSuperfluousDivs()..."; // porting over first config classes.... - $policy = new HTMLPurifier\HTMLPurifier_Policy(dict["h2"=>vec[], "div"=>vec[]]); + $policy = new HTMLPurifier\HTMLPurifier_Policy(dict["h2" => vec[], "div" => vec[]]); $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $dirty_html = '
@@ -97,7 +97,7 @@ class HTMLPurifierTest extends HackTest { expect($clean_html)->toEqual($dirty_html); } - public function testRichFormattingPreserved() : void { + public function testRichFormattingPreserved(): void { echo "\ntestRichFormattingPreserved()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); @@ -127,7 +127,7 @@ class HTMLPurifierTest extends HackTest { '); } - public function testDOM() : void { + public function testDOM(): void { echo "\nrunning testDOM()..."; $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $context = new HTMLPurifier\HTMLPurifier_Context(); @@ -135,17 +135,18 @@ class HTMLPurifierTest extends HackTest { $html = "Bold"; $lexer = new Lexer\HTMLPurifier_Lexer_DOMLex(); $tokens = $lexer->tokenizeHTML($html, $config, $context); - + $expected_tokens = vec[ new Token\HTMLPurifier_Token_Start("b", dict[]), new Token\HTMLPurifier_Token_Text("Bold"), - new Token\HTMLPurifier_Token_End("b", dict[])]; + new Token\HTMLPurifier_Token_End("b", dict[]), + ]; expect($tokens)->toHaveSameContentAs($expected_tokens); echo "finished.\n"; } - public function testStrategies() : void { + public function testStrategies(): void { echo "\nrunning testStrategies()..."; $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $context = new HTMLPurifier\HTMLPurifier_Context(); @@ -155,9 +156,11 @@ class HTMLPurifierTest extends HackTest { $fix_nesting = new Strategy\HTMLPurifier_Strategy_FixNesting(); $validate_attributes = new Strategy\HTMLPurifier_Strategy_ValidateAttributes(); - $tokens = vec[new Token\HTMLPurifier_Token_Start("b", dict[]), + $tokens = vec[ + new Token\HTMLPurifier_Token_Start("b", dict[]), new Token\HTMLPurifier_Token_Text("Text"), - new Token\HTMLPurifier_Token_End("b", dict[])]; + new Token\HTMLPurifier_Token_End("b", dict[]), + ]; $rfe_tokens = $remove_foreign_elements->execute($tokens, $config, $context); $mwf_tokens = $make_well_formed->execute($tokens, $config, $context); @@ -187,7 +190,7 @@ class HTMLPurifierTest extends HackTest { echo "\nrunning testPolicyAllowListUnCleanWithPolicyDict()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); - $policy = new HTMLPurifier\HTMLPurifier_Policy(dict["a"=>vec[]]); + $policy = new HTMLPurifier\HTMLPurifier_Policy(dict["a" => vec[]]); $dirty_html = 'Hello'; $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); $clean_html = $purifier->purify($dirty_html); @@ -223,8 +226,8 @@ class HTMLPurifierTest extends HackTest { echo "\nrunning testPolicyAllowListClean()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); - $config->def->defaults['HTML.Allowed'] = "div[align]"; - $dirty_html = '
Hello'; + $config->def->defaults['HTML.Allowed'] = "div[align]"; + $dirty_html = '
Hello'; $purifier = new HTMLPurifier\HTMLPurifier($config); $clean_html = $purifier->purify($dirty_html); expect($clean_html)->toEqual('
Hello
'); @@ -236,13 +239,17 @@ class HTMLPurifierTest extends HackTest { echo "\nrunning testSanitizeHtmlWithIframeForVideoPolicySet()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); - $policy = new HTMLPurifier\HTMLPurifier_Policy(dict["iframe"=>vec["title","width","height","src","allowfullscreen"]]); + $policy = new HTMLPurifier\HTMLPurifier_Policy( + dict["iframe" => vec["title", "width", "height", "src", "allowfullscreen"]], + ); $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); $dirty_html = ''; $clean_html = $purifier->purify($dirty_html); - expect($clean_html)->toEqual(''); + expect($clean_html)->toEqual( + '', + ); echo "finished.\n\n"; } @@ -250,7 +257,9 @@ class HTMLPurifierTest extends HackTest { echo "\nrunning testSanitizeHtmlWithIframeForSearchProtocolsPolicySet()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); - $policy = new HTMLPurifier\HTMLPurifier_Policy(dict["iframe"=>vec["title","width","height","src","allowfullscreen"]]); + $policy = new HTMLPurifier\HTMLPurifier_Policy( + dict["iframe" => vec["title", "width", "height", "src", "allowfullscreen"]], + ); $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); // Test1 clean iframe with usertesting domain with no protocol @@ -262,7 +271,9 @@ class HTMLPurifierTest extends HackTest { allowfullscreen=true >'; $clean_html = $purifier->purify($dirty_html); - expect($clean_html)->toEqual(''); + expect($clean_html)->toEqual( + '', + ); $dirty_html = ''; + >'; $clean_html = $purifier->purify($dirty_html); - expect($clean_html)->toEqual(''); + expect($clean_html)->toEqual( + '', + ); echo "finished.\n\n"; } @@ -286,65 +299,71 @@ class HTMLPurifierTest extends HackTest { $dirty_html = 'foo'; $purifier = new HTMLPurifier\HTMLPurifier($config); $clean_html = $purifier->purify($dirty_html); - expect($clean_html)->toEqual('foo'); + expect($clean_html)->toEqual( + 'foo', + ); } - public function testPercentageHeightWidth() : void { + public function testPercentageHeightWidth(): void { echo "\nrunning testPercentageHeightWidth()..."; //porting over first config classes.... $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); - $dirty_html = ''; + $dirty_html = + ''; $purifier = new HTMLPurifier\HTMLPurifier($config); $clean_html = $purifier->purify($dirty_html); - $expected_html = ''; + $expected_html = + ''; expect($clean_html)->toEqual($expected_html); echo "finished.\n\n"; } - public function testImagePolicyWithMissingAltAttribute() : void { + public function testImagePolicyWithMissingAltAttribute(): void { echo "\nrunning testImagePolicyWithMissingAltAttribute()..."; $policy = new HTMLPurifier\HTMLPurifier_Policy(dict[ - 'img' => vec['src', 'alt', 'class', 'width', 'height', 'srcset', 'sizes'] + 'img' => vec['src', 'alt', 'class', 'width', 'height', 'srcset', 'sizes'], ]); $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); $dirty_html = ''; $clean_html = $purifier->purify($dirty_html); - $expected_html = 'request-unlimited-pto@2x.jpg?w=360'; + $expected_html = + 'request-unlimited-pto@2x.jpg?w=360'; // do not remove images without alt attributes, add the basename as alt expect($clean_html)->toEqual($expected_html); echo "finished.\n\n"; } - public function testWebappPolicy() : void { + public function testWebappPolicy(): void { echo "\nrunning testWebappPolicy()..."; - $policy = new HTMLPurifier\HTMLPurifier_Policy(dict[ - 'b' => vec[], - 'ul'=> vec[], - 'li' => vec[], - 'ol' => vec[], - 'h2' => vec[], - 'h4' => vec[], - 'br' => vec[], - 'div' => vec[], - 'strong' => vec[], - 'del' => vec[], - 'em' => vec[], - 'pre' => vec[], - 'code' => vec[], - 'table' => vec[], - 'tbody' => vec[], - 'td' => vec[], - 'th' => vec[], - 'thead' => vec[], - 'tr' => vec[], - 'a' => vec['id', 'name', 'href', 'target', 'rel'], - 'h3' => vec['class'], - 'p' => vec['class'], - 'aside' => vec['class'], - 'img' => vec['src', 'alt', 'class', 'width', 'height', 'srcset', 'sizes'] - ] + $policy = new HTMLPurifier\HTMLPurifier_Policy( + dict[ + 'b' => vec[], + 'ul' => vec[], + 'li' => vec[], + 'ol' => vec[], + 'h2' => vec[], + 'h4' => vec[], + 'br' => vec[], + 'div' => vec[], + 'strong' => vec[], + 'del' => vec[], + 'em' => vec[], + 'pre' => vec[], + 'code' => vec[], + 'table' => vec[], + 'tbody' => vec[], + 'td' => vec[], + 'th' => vec[], + 'thead' => vec[], + 'tr' => vec[], + 'a' => vec['id', 'name', 'href', 'target', 'rel'], + 'h3' => vec['class'], + 'p' => vec['class'], + 'aside' => vec['class'], + 'img' => vec['src', 'alt', 'class', 'width', 'height', 'srcset', 'sizes'], + ], ); $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); @@ -352,34 +371,35 @@ class HTMLPurifierTest extends HackTest { echo "finished.\n\n"; } - public function testSpecialCharacterValidateUTF8() : void { + public function testSpecialCharacterValidateUTF8(): void { echo "\nrunning testSpecialCharacterValidateUTF8()..."; - $policy = new HTMLPurifier\HTMLPurifier_Policy(dict[ - 'b' => vec[], - 'ul'=> vec[], - 'li' => vec[], - 'ol' => vec[], - 'h2' => vec[], - 'h4' => vec[], - 'br' => vec[], - 'div' => vec[], - 'strong' => vec[], - 'del' => vec[], - 'em' => vec[], - 'pre' => vec[], - 'code' => vec[], - 'table' => vec[], - 'tbody' => vec[], - 'td' => vec[], - 'th' => vec[], - 'thead' => vec[], - 'tr' => vec[], - 'a' => vec['id', 'name', 'href', 'target', 'rel'], - 'h3' => vec['class'], - 'p' => vec['class'], - 'aside' => vec['class'], - 'img' => vec['src', 'alt', 'class', 'width', 'height', 'srcset', 'sizes'] - ] + $policy = new HTMLPurifier\HTMLPurifier_Policy( + dict[ + 'b' => vec[], + 'ul' => vec[], + 'li' => vec[], + 'ol' => vec[], + 'h2' => vec[], + 'h4' => vec[], + 'br' => vec[], + 'div' => vec[], + 'strong' => vec[], + 'del' => vec[], + 'em' => vec[], + 'pre' => vec[], + 'code' => vec[], + 'table' => vec[], + 'tbody' => vec[], + 'td' => vec[], + 'th' => vec[], + 'thead' => vec[], + 'tr' => vec[], + 'a' => vec['id', 'name', 'href', 'target', 'rel'], + 'h3' => vec['class'], + 'p' => vec['class'], + 'aside' => vec['class'], + 'img' => vec['src', 'alt', 'class', 'width', 'height', 'srcset', 'sizes'], + ], ); $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); @@ -704,9 +724,7 @@ class HTMLPurifierTest extends HackTest { public function testDisabledTargetBlankTransform(): void { echo "\nrunning testAtagNoTarget()..."; - $policy = new HTMLPurifier\HTMLPurifier_Policy( - dict['a' => vec['id', 'name', 'href', 'target', 'rel']], - ); + $policy = new HTMLPurifier\HTMLPurifier_Policy(dict['a' => vec['id', 'name', 'href', 'target', 'rel']]); $config = HTMLPurifier\HTMLPurifier_Config::createDefault(); $purifier = new HTMLPurifier\HTMLPurifier($config, $policy); $dirty_html = ''; From 18c65a79d975f79623e4adc37b430ebcc9c51860 Mon Sep 17 00:00:00 2001 From: Allison Tielking Date: Wed, 3 Mar 2021 15:11:22 -0800 Subject: [PATCH 2/5] update build and test --- .github/workflows/build-and-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e1b29d2..8fd028f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -12,8 +12,7 @@ jobs: matrix: os: [ ubuntu ] hhvm: - - '4.39' - - '4.41' + - '4.56' runs-on: ${{matrix.os}}-latest steps: - uses: actions/checkout@v2 From 3b9bf8be15e3ab0a95274f2e3502e20ef3378bc9 Mon Sep 17 00:00:00 2001 From: Jack Wilson Date: Wed, 3 Mar 2021 15:46:36 -0800 Subject: [PATCH 3/5] Fix whitespace related issues with tests locally --- tests/HTMLPurifierTest.hack | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/tests/HTMLPurifierTest.hack b/tests/HTMLPurifierTest.hack index e972695..3514423 100644 --- a/tests/HTMLPurifierTest.hack +++ b/tests/HTMLPurifierTest.hack @@ -119,12 +119,19 @@ class HTMLPurifierTest extends HackTest { '; $purifier = new HTMLPurifier\HTMLPurifier($config); $clean_html = $purifier->purify($dirty_html); - expect($clean_html)->toEqual(' + + + + + + + +
+ expect($clean_html)->toEqual(' + - - -
Cool table
I can do so much!
Wow
'); +
I can do so much!
Wow
'); } public function testDOM(): void { @@ -425,15 +432,19 @@ class HTMLPurifierTest extends HackTest {

 

[aside headline="Security" description="" bullets="a sentence" /]'; $clean_html = $purifier->purify($dirty_html); - $expected_html = '
  • Just a sentence.
    • + $expected_html = '
      +
    • Just a sentence.
    • Just a sentence.
    • Just a sentence.
    • Just a sentence.
      • -

    Should I?

    +
+

Should I?

If you’re working with…

-
  • An individual – abc
    • +
      +
    • An individual – abc
    • A team – abc
      • -

    p tags.

    +
+

p tags.

header 2

[aside headline="Who are you working with?" description="" bullets="a sentence. " /]

 

From feedd41df737179c4ad0366da2060c0391ca0fd3 Mon Sep 17 00:00:00 2001 From: Allison Tielking Date: Wed, 3 Mar 2021 16:32:11 -0800 Subject: [PATCH 4/5] cherrypick From a4017c83a05e1681169a0c04fecaed2d94b97e46 Mon Sep 17 00:00:00 2001 From: Allison Tielking Date: Wed, 3 Mar 2021 16:36:11 -0800 Subject: [PATCH 5/5] email