Skip to content
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

Fix handling of response when it is not HTML #947

Merged
merged 2 commits into from
Feb 9, 2018
Merged

Fix handling of response when it is not HTML #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9877b
Prevent PHP error in style sanitizer when no head element is present
westonruter Feb 9, 2018
2e8b4a2
Prevent preparing AMP HTML for output-buffered response when it is no…
westonruter Feb 9, 2018
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
9 changes: 9 additions & 0 deletions includes/class-amp-theme-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,15 @@ public static function finish_output_buffering() {
public static function prepare_response( $response, $args = array() ) {
global $content_width;

/*
* Check if the response starts with HTML markup.
* Without this check, JSON responses will be erroneously corrupted,
* being wrapped in HTML documents.
*/
if ( '<' !== substr( ltrim( $response ), 0, 1 ) ) {
return $response;
}

$args = array_merge(
array(
'content_max_width' => ! empty( $content_width ) ? $content_width : AMP_Post_Template::CONTENT_MAX_WIDTH, // Back-compat.
Expand Down
7 changes: 6 additions & 1 deletion includes/sanitizers/class-amp-style-sanitizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,12 @@ public function sanitize() {
if ( ! $this->amp_custom_style_element ) {
$this->amp_custom_style_element = $this->dom->createElement( 'style' );
$this->amp_custom_style_element->setAttribute( 'amp-custom', '' );
$this->dom->getElementsByTagName( 'head' )->item( 0 )->appendChild( $this->amp_custom_style_element );
$head = $this->dom->getElementsByTagName( 'head' )->item( 0 );
if ( ! $head ) {
$head = $this->dom->createElement( 'head' );
$this->dom->documentElement->insertBefore( $head, $this->dom->documentElement->firstChild );
}
$head->appendChild( $this->amp_custom_style_element );
}

// Gather stylesheets to print as long as they don't surpass the limit.
Expand Down
8 changes: 7 additions & 1 deletion tests/test-amp-style-sanitizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function get_link_and_style_test_data() {
's {color:yellow}',
),
),
'style_eleemnts_with_link_elements' => array(
'style_elements_with_link_elements' => array(
sprintf(
'<html amp><head><meta charset="utf-8"><style type="text/css">strong.before-dashicon {color:green}</style><link rel="stylesheet" href="%s"><style type="text/css">strong.after-dashicon {color:green}</style></head><body><style>s {color:yellow !important}</style></body></html>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
includes_url( 'css/dashicons.css' )
Expand All @@ -172,6 +172,12 @@ public function get_link_and_style_test_data() {
's {color:yellow}',
),
),
'style_with_no_head' => array(
'<html amp><body>Not good!<style>body{color:red}</style></body>',
array(
'body{color:red}',
),
),
);
}

Expand Down
23 changes: 23 additions & 0 deletions tests/test-class-amp-theme-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,29 @@ public function test_prepare_response() {
$this->assertContains( '<script async custom-element="amp-ad"', $sanitized_html );
}

/**
* Test prepare_response for bad/non-HTML.
*
* @covers AMP_Theme_Support::prepare_response()
*/
public function test_prepare_response_bad_html() {
add_theme_support( 'amp' );
AMP_Theme_Support::init();

// JSON.
$input = '{"success":true}';
$this->assertEquals( $input, AMP_Theme_Support::prepare_response( $input ) );

// Nothing, for redirect.
$input = '';
$this->assertEquals( $input, AMP_Theme_Support::prepare_response( $input ) );

// HTML, but very stripped down.
$input = '<html>Hello</html>';
$output = AMP_Theme_Support::prepare_response( $input );
$this->assertContains( '<html amp', $output );
}

/**
* Test prepare_response to inject html[amp] attribute and ensure HTML5 doctype.
*
Expand Down