Skip to content

HTML API: Fix CDATA lookalike matching invalid CDATA #5992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sirreal wants to merge 8 commits into from
Closed

HTML API: Fix CDATA lookalike matching invalid CDATA #5992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b1c43e
Add failing test
sirreal Jan 31, 2024
7b370bb
fixup! Add failing test
sirreal Jan 31, 2024
fc01129
Fix bad CDATA comment
sirreal Jan 31, 2024
058e29a
Fix up test, add ticket number
sirreal Jan 31, 2024
b24f42d
Add invalid html comment type assertion to another test
sirreal Jan 31, 2024
4caaebf
Describe indicies example comment
sirreal Jan 31, 2024
d4150b0
Remove diagram in comment.
dmsnell Jan 31, 2024
31ade96
Merge remote-tracking branch 'upstream/trunk' into html-api/fix-cdata…
dmsnell Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/wp-includes/html-api/class-wp-html-tag-processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,8 @@ private function parse_next_tag() {
'T' === $html[ $this->token_starts_at + 6 ] &&
'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;
$this->comment_type = self::COMMENT_AS_CDATA_LOOKALIKE;
Expand Down
38 changes: 38 additions & 0 deletions tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,38 @@ public function test_basic_assertion_cdata_section() {
);
}

/**
* 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.
*
Expand All @@ -366,6 +398,12 @@ public function test_basic_assertion_abruptly_closed_cdata_section() {
"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.'
);

$this->assertNull(
$processor->get_tag(),
'Should not have been able to query tag name on non-element token.'
Expand Down