Skip to content

HTML API: Rely on HTML API in oEmbed filtering tests. #9259

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

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+82 −21
Open

HTML API: Rely on HTML API in oEmbed filtering tests. #9259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 79 additions & 18 deletions tests/phpunit/tests/oembed/filterResult.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,57 @@ public function test_filter_oembed_result_trusted_malicious_iframe() {

$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), 'https://www.youtube.com/watch?v=72xdCU__XCk' );

$this->assertSame( $html, $actual );
$this->assertEqualHTML( $html, $actual );
}

public function test_filter_oembed_result_with_untrusted_provider() {
$html = '<p></p><iframe onload="alert(1)" src="http://example.com/sample-page/"></iframe>';
$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), 'http://example.com/sample-page/' );

$matches = array();
preg_match( '|src=".*#\?secret=([\w\d]+)" data-secret="([\w\d]+)"|', $actual, $matches );
$processor = new WP_HTML_Tag_Processor( $actual );

$this->assertArrayHasKey( 1, $matches );
$this->assertArrayHasKey( 2, $matches );
$this->assertSame( $matches[1], $matches[2] );
$this->assertTrue(
$processor->next_tag( 'IFRAME' ),
'Failed to find expected IFRAME element in filtered output.'
);

$src = $processor->get_attribute( 'src' );
$this->assertIsString(
$src,
isset( $src )
? 'Expected "src" attribute on IFRAME with string value but found boolean attribute instead.'
: 'Failed to find expected "src" attribute on IFRAME element.'
);

$query_string = parse_url( $src, PHP_URL_FRAGMENT );
$this->assertStringStartsWith(
'?',
$query_string,
'Should have found URL fragment in "src" attribute resembling a query string.'
);

$query_string = substr( $query_string, 1 );
$query_args = array();
parse_str( $query_string, $query_args );

$this->assertArrayHasKey(
'secret',
$query_args,
'Failed to find expected query arg "secret" in IFRAME "src" attribute.'
);

$this->assertSame(
$query_args['secret'],
$processor->get_attribute( 'data-secret' ),
'Expected to find identical copy of secret from IFRAME "src" in the "data-secret" attribute.'
);
}

public function test_filter_oembed_result_only_one_iframe_is_allowed() {
$html = '<div><iframe></iframe><iframe></iframe><p></p></div>';
$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );

$this->assertSame( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
$this->assertEqualHTML( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
}

public function test_filter_oembed_result_with_newlines() {
Expand All @@ -41,7 +72,7 @@ public function test_filter_oembed_result_with_newlines() {

$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );

$this->assertSame( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
$this->assertEqualHTML( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
}

public function test_filter_oembed_result_without_iframe() {
Expand All @@ -60,18 +91,48 @@ public function test_filter_oembed_result_secret_param_available() {
$html = '<iframe src="https://wordpress.org"></iframe>';
$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );

$matches = array();
preg_match( '|src="https://wordpress.org#\?secret=([\w\d]+)" data-secret="([\w\d]+)"|', $actual, $matches );
$processor = new WP_HTML_Tag_Processor( $actual );

$this->assertArrayHasKey( 1, $matches );
$this->assertArrayHasKey( 2, $matches );
$this->assertSame( $matches[1], $matches[2] );
$this->assertTrue(
$processor->next_tag( 'IFRAME' ),
'Failed to find expected IFRAME element in filtered output.'
);

$src = $processor->get_attribute( 'src' );
$this->assertMatchesRegularExpression(
'~^https://wordpress.org~',
$src,
'Failed to find expected "src" attribute on IFRAME element.'
);

$query_string = parse_url( $src, PHP_URL_FRAGMENT );
$this->assertStringStartsWith(
'?',
$query_string,
'Should have found URL fragment in "src" attribute resembling a query string.'
);

$query_string = substr( $query_string, 1 );
$query_args = array();
parse_str( $query_string, $query_args );

$this->assertArrayHasKey(
'secret',
$query_args,
'Failed to find expected query arg "secret" in IFRAME "src" attribute.'
);

$this->assertSame(
$query_args['secret'],
$processor->get_attribute( 'data-secret' ),
'Expected to find identical copy of secret from IFRAME "src" in the "data-secret" attribute.'
);
}

public function test_filter_oembed_result_wrong_type_provided() {
$actual = wp_filter_oembed_result( 'some string', (object) array( 'type' => 'link' ), '' );

$this->assertSame( 'some string', $actual );
$this->assertEqualHTML( 'some string', $actual );
}

public function test_filter_oembed_result_invalid_result() {
Expand All @@ -83,14 +144,14 @@ public function test_filter_oembed_result_blockquote_adds_style_to_iframe() {
$html = '<blockquote></blockquote><iframe></iframe>';
$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );

$this->assertSame( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; visibility: hidden;"></iframe>', $actual );
$this->assertEqualHTML( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; visibility: hidden;"></iframe>', $actual );
}

public function test_filter_oembed_result_allowed_html() {
$html = '<blockquote class="foo" id="bar"><strong><a href="" target=""></a></strong></blockquote><iframe></iframe>';
$actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );

$this->assertSame( '<blockquote class="wp-embedded-content"><a href=""></a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; visibility: hidden;"></iframe>', $actual );
$this->assertEqualHTML( '<blockquote class="wp-embedded-content"><a href=""></a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; visibility: hidden;"></iframe>', $actual );
}

public function data_wp_filter_pre_oembed_custom_result() {
Expand Down Expand Up @@ -124,7 +185,7 @@ public function test_wp_filter_pre_oembed_custom_result( $html, $expected ) {
'html' => $html,
);
$actual = _wp_oembed_get_object()->data2html( $data, 'https://untrusted.localhost' );
$this->assertSame( $expected, $actual );
$this->assertEqualHTML( $expected, $actual );
}

/**
Expand All @@ -134,6 +195,6 @@ public function test_filter_feed_content() {
$html = '<blockquote></blockquote><iframe></iframe>';
$actual = _oembed_filter_feed_content( wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' ) );

$this->assertSame( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" ></iframe>', $actual );
$this->assertEqualHTML( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" ></iframe>', $actual );
}
}
6 changes: 3 additions & 3 deletions tests/phpunit/tests/oembed/filterTitleAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function data_filter_oembed_iframe_title_attribute() {
public function test_oembed_iframe_title_attribute( $html, $oembed_data, $url, $expected ) {
$actual = wp_filter_oembed_iframe_title_attribute( $html, (object) $oembed_data, $url );

$this->assertSame( $expected, $actual );
$this->assertEqualHTML( $expected, $actual );
}

public function test_filter_oembed_iframe_title_attribute() {
Expand All @@ -84,7 +84,7 @@ public function test_filter_oembed_iframe_title_attribute() {

remove_filter( 'oembed_iframe_title_attribute', array( $this, '_filter_oembed_iframe_title_attribute' ) );

$this->assertSame( '<iframe title="Baz" src=""></iframe>', $actual );
$this->assertEqualHTML( '<iframe title="Baz" src=""></iframe>', $actual );
}

public function test_filter_oembed_iframe_title_attribute_does_not_modify_other_tags() {
Expand All @@ -101,7 +101,7 @@ public function test_filter_oembed_iframe_title_attribute_does_not_modify_other_

remove_filter( 'oembed_iframe_title_attribute', array( $this, '_filter_oembed_iframe_title_attribute' ) );

$this->assertSame( '<p title="Bar">Baz</p><iframe title="Baz" src=""></iframe>', $actual );
$this->assertEqualHTML( '<p title="Bar">Baz</p><iframe title="Baz" src=""></iframe>', $actual );
}

public function _filter_oembed_iframe_title_attribute() {
Expand Down
Loading