only in patch2: unchanged: --- a/core/modules/dblog/tests/src/Functional/DbLogTest.php +++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php @@ -805,7 +805,7 @@ public function testOverviewLinks() { $this->drupalGet('admin/reports/dblog'); $this->assertResponse(200); // Make sure HTML tags are filtered out. - $this->assertRaw('title="alert('foo');Lorem'); + $this->assertRaw('title="alert('foo');Lorem'); $this->assertNoRaw(""); // Make sure HTML tags are filtered out in admin/reports/dblog/event/ too. only in patch2: unchanged: --- a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php +++ b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php @@ -63,7 +63,7 @@ public function providerTestFilterXss() { // Image XSS using the JavaScript directive. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Image_XSS_using_the_JavaScript_directive - $data[] = ['', '']; + $data[] = ['', '']; // No quotes and no semicolon. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#No_quotes_and_no_semicolon @@ -100,7 +100,7 @@ public function providerTestFilterXss() { // Default SRC tag by leaving it empty. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_by_leaving_it_empty - $data[] = ['', '']; + $data[] = ['', '']; // Default SRC tag by leaving it out entirely. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_by_leaving_it_out_entirely @@ -108,7 +108,7 @@ public function providerTestFilterXss() { // Decimal HTML character references. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Decimal_HTML_character_references - $data[] = ['', '']; + $data[] = ['', '']; // Decimal HTML character references without trailing semicolons. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Decimal_HTML_character_references_without_trailing_semicolons @@ -120,19 +120,19 @@ public function providerTestFilterXss() { // Embedded tab. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_tab - $data[] = ['', '']; + $data[] = ['', '']; // Embedded Encoded tab. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_Encoded_tab - $data[] = ['', '']; + $data[] = ['', '']; // Embedded newline to break up XSS. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_newline_to_break_up_XSS - $data[] = ['', '']; + $data[] = ['', '']; // Embedded carriage return to break up XSS. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_carriage_return_to_break_up_XSS - $data[] = ['', '']; + $data[] = ['', '']; // Null breaks up JavaScript directive. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Null_breaks_up_JavaScript_directive @@ -143,7 +143,7 @@ public function providerTestFilterXss() { // @fixme This dataset currently fails under 5.4 because of // https://www.drupal.org/node/1210798. Restore after it's fixed. if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $data[] = ['', '']; + $data[] = ['', '']; } // Non-alpha-non-digit XSS. @@ -166,7 +166,7 @@ public function providerTestFilterXss() { // Half open HTML/JavaScript XSS vector. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Half_open_HTML.2FJavaScript_XSS_vector - $data[] = ['']; + $data[] = ['']; // Double open angle brackets. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Double_open_angle_brackets @@ -185,19 +185,19 @@ public function providerTestFilterXss() { // INPUT image. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#INPUT_image - $data[] = ['', '']; + $data[] = ['', '']; // BODY image. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BODY_image - $data[] = ['', '']; + $data[] = ['', '']; // IMG Dynsrc. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_Dynsrc - $data[] = ['', '']; + $data[] = ['', '']; // IMG lowsrc. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_lowsrc - $data[] = ['', '']; + $data[] = ['', '']; // List-style-image. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#List-style-image @@ -328,7 +328,7 @@ public function providerTestFilterXss() { // BGSOUND. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BGSOUND - $data[] = ['', '']; + $data[] = ['', '']; // & JavaScript includes. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#.26_JavaScript_includes @@ -393,7 +393,7 @@ public function providerTestFilterXss() { // META. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#META - $data[] = ['', '']; + $data[] = ['', '']; // META using data. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#META_using_data @@ -401,11 +401,11 @@ public function providerTestFilterXss() { // META with additional URL parameter // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#META - $data[] = ['', '']; + $data[] = ['', '']; // IFRAME. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IFRAME - $data[] = ['', '']; + $data[] = ['', '']; // IFRAME Event based. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IFRAME_Event_based @@ -413,15 +413,15 @@ public function providerTestFilterXss() { // FRAME. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#FRAME - $data[] = ['', '']; + $data[] = ['', '']; // TABLE. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#TABLE - $data[] = ['', '
']; + $data[] = ['
', '
']; // TD. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#TD - $data[] = ['
', '
']; + $data[] = ['
', '
']; // DIV background-image. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#DIV_background-image @@ -447,7 +447,7 @@ public function providerTestFilterXss() { // BASE tag. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BASE_tag - $data[] = ['', '']; + $data[] = ['', '']; // OBJECT tag. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#OBJECT_tag only in patch2: unchanged: --- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php @@ -653,7 +653,7 @@ public function testExternalDestinations() { // The external redirect should not fire. $this->assertUrl('admin/structure/types/manage/article/fields/node.article.body/storage', $options); $this->assertResponse(200); - $this->assertRaw('Attempt to update field Body failed: The internal path component 'http://example.com' is external. You are not allowed to specify an external URL together with internal:/..'); + $this->assertRaw('Attempt to update field Body failed: The internal path component 'http://example.com' is external. You are not allowed to specify an external URL together with internal:/..'); } /** only in patch2: unchanged: --- a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php @@ -532,7 +532,7 @@ public function testHtmlEscapeFilter() { $tests = [ " One. Two'.\n

Three.

\n " => [ - "One. <!-- "comment" --> Two'.\n<p>Three.</p>" => TRUE, + "One. <!-- "comment" --> Two'.\n<p>Three.</p>" => TRUE, ' One.' => FALSE, "

\n " => FALSE, ], only in patch2: unchanged: --- a/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php @@ -54,11 +54,11 @@ public function testLocalizedTokenizedString() { $tests_to_do = [ 1 => [ 'original' => 'Go to the frontpage', - 'replaced' => 'Go to the <a href="javascript:alert(&#039;Mooooh!&#039;);">frontpage</a>', + 'replaced' => 'Go to the <a href="javascript:alert(&'Mooooh!&');">frontpage</a>', ], 2 => [ 'original' => 'Hello [locale_test:security_test2]!', - 'replaced' => 'Hello <strong>&lt;script&gt;alert(&#039;Mooooh!&#039;);&lt;/script&gt;</strong>!', + 'replaced' => 'Hello <strong>&lt;script&gt;alert(&'Mooooh!&');&lt;/script&gt;</strong>!', ], ]; only in patch2: unchanged: --- a/core/modules/search/src/Tests/SearchCommentTest.php +++ b/core/modules/search/src/Tests/SearchCommentTest.php @@ -172,7 +172,7 @@ public function testSearchResultsComment() { $this->drupalPostForm('search/node', $edit, t('Search')); // Verify the evil comment subject is escaped in search results. - $this->assertRaw('<script>alert('subjectkeyword');'); + $this->assertRaw('<script>alert('subjectkeyword');'); $this->assertNoRaw(' test"], - ], "This is <script><em>alert('XSS')</em></script> <strong>test</strong>"]; + ], "This is <script><em>alert('XSS')</em></script> <strong>test</strong>"]; // XSS filtering by default test. $data[] = [[ 'child' => ['#markup' => "This is test"], only in patch2: unchanged: --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -206,7 +206,7 @@ public function testSafeStringEscaping() { // Ensure objects that do not implement MarkupInterface are escaped. $string_object = new TwigExtensionTestString(""); - $this->assertSame('<script>alert('here');</script>', $this->systemUnderTest->escapeFilter($twig, $string_object, 'html', 'UTF-8', TRUE)); + $this->assertSame('<script>alert('here');</script>', $this->systemUnderTest->escapeFilter($twig, $string_object, 'html', 'UTF-8', TRUE)); } /**