Merge pull request #1382 from Automattic/fix/cors-requests

Fix handling responses to form submissions from an AMP Cache
ampproject · Aug 30, 2018 · 64cad60 · 64cad60
2 parents 853f7fb + d73ab0d
commit 64cad60
Show file tree

Hide file tree

Showing 11 changed files with 982 additions and 747 deletions.
diff --git a/amp.php b/amp.php
@@ -144,6 +144,10 @@ function amp_init() {
 
 	add_rewrite_endpoint( amp_get_slug(), EP_PERMALINK );
 
+	add_filter( 'allowed_redirect_hosts', array( 'AMP_HTTP', 'filter_allowed_redirect_hosts' ) );
+	AMP_HTTP::purge_amp_query_vars();
+	AMP_HTTP::send_cors_headers();
+	AMP_HTTP::handle_xhr_request();
 	AMP_Theme_Support::init();
 	AMP_Validation_Manager::init();
 	AMP_Post_Type_Support::add_post_type_support();

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
@@ -888,3 +888,17 @@ function amp_print_schemaorg_metadata() {
 	<script type="application/ld+json"><?php echo wp_json_encode( $metadata ); ?></script>
 	<?php
 }
+
+/**
+ * Filters content and keeps only allowable HTML elements by amp-mustache.
+ *
+ * @see wp_kses()
+ * @since 1.0
+ *
+ * @param string $markup Markup to sanitize.
+ * @return string HTML markup with tags allowed by amp-mustache.
+ */
+function amp_wp_kses_mustache( $markup ) {
+	$amp_mustache_allowed_html_tags = array( 'strong', 'b', 'em', 'i', 'u', 's', 'small', 'mark', 'del', 'ins', 'sup', 'sub' );
+	return wp_kses( $markup, array_fill_keys( $amp_mustache_allowed_html_tags, array() ) );
+}
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
@@ -31,7 +31,7 @@ class AMP_Autoloader {
 	private static $_classmap = array(
 		'AMP_Editor_Blocks'                           => 'includes/admin/class-amp-editor-blocks',
 		'AMP_Theme_Support'                           => 'includes/class-amp-theme-support',
-		'AMP_Response_Headers'                        => 'includes/class-amp-response-headers',
+		'AMP_HTTP'                                    => 'includes/class-amp-http',
 		'AMP_Comment_Walker'                          => 'includes/class-amp-comment-walker',
 		'AMP_Template_Customizer'                     => 'includes/admin/class-amp-customizer',
 		'AMP_Post_Meta_Box'                           => 'includes/admin/class-amp-post-meta-box',