Changeset 57506

Timestamp:

02/01/2024 12:10:19 AM (15 months ago)

Author:

dmsnell

Message:

HTML API: Fix CDATA lookalike matching invalid CDATA

When next_token() was introduced to the HTML Tag Processor, it started
classifying comments that look like they were intended to be CDATA sections.
In one of the changes made during development, however, a typo slipped
through code review that treated comments as CDATA even if they only
ended in ]> and not the required ]]>.

The consequences of this defect were minor because in all cases these are
treated as HTML comments from invalid syntax, but this patch adds the
missing check to ensure the proper reporting of CDATA-lookalikes.

Follow-up to [57348]

Props jonsurrell
Fixes #60406

Location:

trunk

Files:

• src/wp-includes/html-api/class-wp-html-tag-processor.php (modified) (1 diff)
• tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php (modified) (2 diffs)

trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php

@@ -1763 +1763 @@
                     'A' === $html[ $this->token_starts_at + 7 ] &&
                     '[' === $html[ $this->token_starts_at + 8 ] &&
-                    ']' === $html[ $closer_at - 1 ]
+                    ']' === $html[ $closer_at - 1 ] &&
+                    ']' === $html[ $closer_at - 2 ]
                 ) {
                     $this->parser_state    = self::STATE_COMMENT;

trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php

@@ -349 +349 @@
 
     /**
+     * Ensures that normative CDATA sections are properly parsed.
+     *
+     * @ticket 60406
+     *
+     * @since 6.5.0
+     *
+     * @covers WP_HTML_Tag_Processor::next_token
+     */
+    public function test_cdata_comment_with_incorrect_closer() {
+        $processor = new WP_HTML_Tag_Processor( '<![CDATA[this is missing a closing square bracket]>' );
+        $processor->next_token();
+
+        $this->assertSame(
+            '#comment',
+            $processor->get_token_name(),
+            "Should have found comment token but found {$processor->get_token_name()} instead."
+        );
+
+        $this->assertSame(
+            WP_HTML_Processor::COMMENT_AS_INVALID_HTML,
+            $processor->get_comment_type(),
+            'Should have detected invalid HTML comment.'
+        );
+
+        $this->assertSame(
+            '[CDATA[this is missing a closing square bracket]',
+            $processor->get_modifiable_text(),
+            'Found incorrect modifiable text.'
+        );
+    }
+
+    /**
      * Ensures that abruptly-closed CDATA sections are properly parsed as comments.
      *
@@ -365 +397 @@
             $processor->get_token_name(),
             "Should have found a bogus comment but found {$processor->get_token_name()} instead."
+        );
+
+        $this->assertSame(
+            WP_HTML_Processor::COMMENT_AS_INVALID_HTML,
+            $processor->get_comment_type(),
+            'Should have detected invalid HTML comment.'
         );