From 3156ae704334e952ebfaffc8918075458ea1364a Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 14:26:30 +0200
Subject: [PATCH 01/14] Correctly handle `siblings_disallowed` from spec

---
 bin/amphtml-update.py                         |  10 +-
 bin/latest-extension-versions.json            |   1 +
 .../class-amp-allowed-tags-generated.php      | 283 +++++++-----------
 includes/sanitizers/class-amp-rule-spec.php   |   1 +
 .../class-amp-tag-and-attribute-sanitizer.php |  44 +++
 .../php/test-tag-and-attribute-sanitizer.php  |  56 +++-
 6 files changed, 195 insertions(+), 200 deletions(-)

diff --git a/bin/amphtml-update.py b/bin/amphtml-update.py
index f9ddb389312..df4faa4726f 100755
--- a/bin/amphtml-update.py
+++ b/bin/amphtml-update.py
@@ -411,8 +411,8 @@ def ParseRules(repo_directory, out_dir):
 				satisfies = script_tag['tag_spec']['satisfies']
 			else:
 				satisfies = extension
-			if satisfies in extension_specs_by_satisfies:
-				raise Exception( 'Duplicate extension script that satisfies %s.' % satisfies )
+# 			if satisfies in extension_specs_by_satisfies:
+# 				raise Exception( 'Duplicate extension script that satisfies %s.' % satisfies )
 
 			extension_specs_by_satisfies[satisfies] = script_tag['tag_spec']['extension_spec']
 
@@ -468,11 +468,10 @@ def ParseRules(repo_directory, out_dir):
 			tag['tag_spec']['requires_extension'] = requires_extension_versions
 
 	extensions = json.load( open( os.path.join( repo_directory, 'build-system/compile/bundles.config.extensions.json' ) ) )
-	bento_extensions = json.load( open( os.path.join( repo_directory, 'build-system/compile/bundles.config.bento.json' ) ) )
 
 	latest_versions = json.load( open( latest_extensions_file_path ) )
 	extensions_versions = dict()
-	for extension in extensions + bento_extensions:
+	for extension in extensions:
 		if '-impl' in extension['name'] or '-polyfill' in extension['name']:
 			continue
 
@@ -799,6 +798,9 @@ def GetTagRules(tag_spec):
 	if tag_spec.HasField('unique_warning'):
 		tag_rules['unique_warning'] = tag_spec.unique_warning
 
+	if tag_spec.HasField('siblings_disallowed'):
+		tag_rules['siblings_disallowed'] = tag_spec.siblings_disallowed
+
 	if tag_spec.HasField('child_tags'):
 		child_tags = collections.defaultdict( lambda: [] )
 		for field in tag_spec.child_tags.ListFields():
diff --git a/bin/latest-extension-versions.json b/bin/latest-extension-versions.json
index 3a00f2a877b..991e2b07a28 100644
--- a/bin/latest-extension-versions.json
+++ b/bin/latest-extension-versions.json
@@ -115,6 +115,7 @@
   "amp-sticky-ad"                : "1.0",
   "amp-story"                    : "1.0",
   "amp-story-360"                : "0.1",
+  "amp-story-audio-sticker"      : "0.1",
   "amp-story-auto-ads"           : "0.1",
   "amp-story-auto-analytics"     : "0.1",
   "amp-story-captions"           : "0.1",
diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index 45b87352fb9..6d572c7bf37 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -249,6 +249,7 @@ class AMP_Allowed_Tags_Generated {
 			'address',
 			'amp-analytics',
 			'amp-audio',
+			'amp-bodymovin-animation',
 			'amp-date-countdown',
 			'amp-date-display',
 			'amp-experiment',
@@ -271,6 +272,7 @@ class AMP_Allowed_Tags_Generated {
 			'amp-story-interactive-poll',
 			'amp-story-interactive-quiz',
 			'amp-story-interactive-results',
+			'amp-story-interactive-slider',
 			'amp-story-panning-media',
 			'amp-story-shopping-tag',
 			'amp-timeago',
@@ -607,6 +609,14 @@ class AMP_Allowed_Tags_Generated {
 					'attributionreportto' => array(),
 					'attributionsourceeventid' => array(),
 					'attributionsourceid' => array(),
+					'attributionsrc' => array(
+						'value_url' => array(
+							'allow_empty' => true,
+							'protocol' => array(
+								'https',
+							),
+						),
+					),
 					'border' => array(),
 					'conversiondestination' => array(),
 					'data-amp-bind-href' => array(),
@@ -3155,7 +3165,6 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'bento' => false,
 					'requires_extension' => array(
 						'amp-facebook-comments',
 					),
@@ -3184,7 +3193,6 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'bento' => true,
 					'requires_extension' => array(
 						'amp-facebook',
 					),
@@ -3223,7 +3231,6 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'bento' => false,
 					'requires_extension' => array(
 						'amp-facebook-like',
 					),
@@ -3259,7 +3266,6 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'bento' => true,
 					'requires_extension' => array(
 						'amp-facebook',
 					),
@@ -3298,7 +3304,6 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'bento' => false,
 					'requires_extension' => array(
 						'amp-facebook-page',
 					),
@@ -3334,7 +3339,6 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'bento' => true,
 					'requires_extension' => array(
 						'amp-facebook',
 					),
@@ -5238,6 +5242,14 @@ class AMP_Allowed_Tags_Generated {
 			array(
 				'attr_spec_list' => array(
 					'allow-ssr-img' => array(),
+					'attributionsrc' => array(
+						'value_url' => array(
+							'allow_empty' => true,
+							'protocol' => array(
+								'https',
+							),
+						),
+					),
 					'media' => array(),
 					'noloading' => array(
 						'value' => array(
@@ -5459,37 +5471,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
-		'amp-redbull-player' => array(
-			array(
-				'attr_spec_list' => array(
-					'data-param-videoid' => array(
-						'mandatory' => true,
-					),
-					'media' => array(),
-					'noloading' => array(
-						'value' => array(
-							'',
-						),
-					),
-				),
-				'tag_spec' => array(
-					'amp_layout' => array(
-						'supported_layouts' => array(
-							2,
-							3,
-							4,
-							6,
-							7,
-							8,
-							9,
-						),
-					),
-					'requires_extension' => array(
-						'amp-redbull-player',
-					),
-				),
-			),
-		),
 		'amp-reddit' => array(
 			array(
 				'attr_spec_list' => array(
@@ -6102,6 +6083,9 @@ class AMP_Allowed_Tags_Generated {
 							),
 						),
 					),
+					'desktop-aspect-ratio' => array(
+						'value_regex' => '\\d+:\\d+',
+					),
 					'entity' => array(),
 					'entity-logo-src' => array(
 						'value_url' => array(
@@ -6194,6 +6178,7 @@ class AMP_Allowed_Tags_Generated {
 							'amp-story-bookend',
 							'amp-story-page',
 							'amp-story-social-share',
+							'amp-story-subscriptions',
 						),
 						'mandatory_min_num_child_tags' => 1,
 					),
@@ -6201,6 +6186,7 @@ class AMP_Allowed_Tags_Generated {
 					'requires_extension' => array(
 						'amp-story',
 					),
+					'siblings_disallowed' => true,
 				),
 			),
 		),
@@ -6306,7 +6292,15 @@ class AMP_Allowed_Tags_Generated {
 		),
 		'amp-story-auto-ads' => array(
 			array(
-				'attr_spec_list' => array(),
+				'attr_spec_list' => array(
+					'src' => array(
+						'value_url' => array(
+							'protocol' => array(
+								'https',
+							),
+						),
+					),
+				),
 				'tag_spec' => array(
 					'mandatory_parent' => 'amp-story',
 					'requires_extension' => array(
@@ -6921,6 +6915,55 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
+		'amp-story-interactive-slider' => array(
+			array(
+				'attr_spec_list' => array(
+					'chip-style' => array(
+						'value' => array(
+							'shadow',
+							'flat',
+							'transparent',
+						),
+					),
+					'endpoint' => array(
+						'mandatory' => true,
+						'value_url' => array(
+							'allow_empty' => false,
+							'allow_relative' => false,
+							'protocol' => array(
+								'https',
+							),
+						),
+					),
+					'id' => array(
+						'mandatory' => true,
+					),
+					'option-1-text' => array(
+						'mandatory' => false,
+					),
+					'prompt-size' => array(
+						'value' => array(
+							'small',
+							'medium',
+							'large',
+						),
+					),
+					'prompt-text' => array(),
+					'theme' => array(
+						'value' => array(
+							'light',
+							'dark',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'mandatory_ancestor' => 'amp-story-grid-layer',
+					'requires_extension' => array(
+						'amp-story-interactive',
+					),
+				),
+			),
+		),
 		'amp-story-page' => array(
 			array(
 				'attr_spec_list' => array(
@@ -7226,12 +7269,21 @@ class AMP_Allowed_Tags_Generated {
 		'amp-story-subscriptions' => array(
 			array(
 				'attr_spec_list' => array(
+					'additional-description' => array(),
+					'description' => array(
+						'mandatory' => true,
+					),
+					'headline' => array(),
 					'media' => array(),
 					'noloading' => array(
 						'value' => array(
 							'',
 						),
 					),
+					'price' => array(
+						'mandatory' => true,
+					),
+					'subscriptions-page-index' => array(),
 				),
 				'tag_spec' => array(
 					'amp_layout' => array(
@@ -8004,6 +8056,11 @@ class AMP_Allowed_Tags_Generated {
 						'mandatory' => true,
 						'value_regex' => '[0-9]+',
 					),
+					'do-not-track' => array(
+						'value' => array(
+							'',
+						),
+					),
 					'media' => array(),
 					'noloading' => array(
 						'value' => array(
@@ -11031,6 +11088,7 @@ class AMP_Allowed_Tags_Generated {
 							),
 						),
 					),
+					'xssi-prefix' => array(),
 				),
 				'tag_spec' => array(
 					'disallowed_ancestor' => array(
@@ -15127,10 +15185,10 @@ class AMP_Allowed_Tags_Generated {
 					),
 					'nonce' => array(),
 					'src' => array(
-						'dispatch_key' => 2,
 						'mandatory' => true,
 						'value' => array(
 							'https://cdn.ampproject.org/v0.js',
+							'https://ampjs.org/v0.js',
 						),
 					),
 					'type' => array(
@@ -15173,6 +15231,7 @@ class AMP_Allowed_Tags_Generated {
 						'mandatory' => true,
 						'value' => array(
 							'https://cdn.ampproject.org/lts/v0.js',
+							'https://ampjs.org/lts/v0.js',
 						),
 					),
 					'type' => array(
@@ -15721,6 +15780,7 @@ class AMP_Allowed_Tags_Generated {
 					'requires_extension' => array(
 						'amp-story',
 					),
+					'siblings_disallowed' => true,
 					'spec_name' => 'amp-story-bookend extension .json script',
 					'unique' => true,
 				),
@@ -15741,6 +15801,7 @@ class AMP_Allowed_Tags_Generated {
 					'requires_extension' => array(
 						'amp-story',
 					),
+					'siblings_disallowed' => true,
 					'spec_name' => 'amp-story-social-share extension .json script',
 					'unique' => true,
 				),
@@ -16166,10 +16227,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-accordion',
 						'requires_usage' => true,
@@ -16481,10 +16538,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => false,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-audio',
 						'requires_usage' => true,
@@ -16579,10 +16632,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-base-carousel',
 						'requires_usage' => true,
@@ -16739,10 +16788,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-brightcove',
 						'requires_usage' => true,
@@ -16962,10 +17007,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-dailymotion',
 						'requires_usage' => true,
@@ -16998,10 +17039,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-date-countdown',
 						'requires_usage' => true,
@@ -17034,10 +17071,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-date-display',
 						'requires_usage' => true,
@@ -17163,10 +17196,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-embedly-card',
 						'requires_usage' => true,
@@ -17231,10 +17260,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-facebook',
 						'requires_usage' => true,
@@ -17360,10 +17385,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-fit-text',
 						'requires_usage' => true,
@@ -17706,10 +17727,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-iframe',
 						'requires_usage' => true,
@@ -17897,10 +17914,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-inline-gallery',
 						'requires_usage' => true,
@@ -17964,10 +17977,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-instagram',
 						'requires_usage' => true,
@@ -18124,10 +18133,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-lightbox',
 						'requires_usage' => true,
@@ -18160,10 +18165,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-lightbox-gallery',
 						'requires_usage' => false,
@@ -18291,10 +18292,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-mathml',
 						'requires_usage' => true,
@@ -18896,37 +18893,6 @@ class AMP_Allowed_Tags_Generated {
 					),
 				),
 			),
-			array(
-				'attr_spec_list' => array(
-					'async' => array(
-						'mandatory' => true,
-						'value' => array(
-							'',
-						),
-					),
-					'crossorigin' => array(
-						'value' => array(
-							'anonymous',
-						),
-					),
-					'nonce' => array(),
-					'type' => array(
-						'value_casei' => array(
-							'text/javascript',
-						),
-					),
-				),
-				'tag_spec' => array(
-					'extension_spec' => array(
-						'latest' => '0.1',
-						'name' => 'amp-redbull-player',
-						'requires_usage' => true,
-						'version' => array(
-							'0.1',
-						),
-					),
-				),
-			),
 			array(
 				'attr_spec_list' => array(
 					'async' => array(
@@ -19073,10 +19039,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-selector',
 						'requires_usage' => true,
@@ -19109,10 +19071,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-sidebar',
 						'requires_usage' => true,
@@ -19207,10 +19165,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-social-share',
 						'requires_usage' => true,
@@ -19243,10 +19197,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-soundcloud',
 						'requires_usage' => true,
@@ -19653,10 +19603,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-stream-gallery',
 						'requires_usage' => true,
@@ -19784,10 +19730,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-timeago',
 						'requires_usage' => true,
@@ -19851,10 +19793,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-twitter',
 						'requires_usage' => true,
@@ -19918,10 +19856,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-video',
 						'requires_usage' => true,
@@ -19985,10 +19919,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-video-iframe',
 						'requires_usage' => true,
@@ -20021,10 +19951,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-vimeo',
 						'requires_usage' => true,
@@ -20212,10 +20138,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '1.0',
 						'name' => 'amp-wordpress-embed',
 						'requires_usage' => true,
@@ -20279,10 +20201,6 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
-						'bento' => array(
-							'has_css' => true,
-							'version' => '1.0',
-						),
 						'latest' => '0.1',
 						'name' => 'amp-youtube',
 						'requires_usage' => true,
@@ -22766,6 +22684,7 @@ class AMP_Allowed_Tags_Generated {
 						'unique' => false,
 					),
 				),
+				'siblings_disallowed' => true,
 				'spec_name' => 'AMP-MEGA-MENU > NAV',
 			),
 		),
diff --git a/includes/sanitizers/class-amp-rule-spec.php b/includes/sanitizers/class-amp-rule-spec.php
index 3df2e0d667e..644b42bc9c3 100644
--- a/includes/sanitizers/class-amp-rule-spec.php
+++ b/includes/sanitizers/class-amp-rule-spec.php
@@ -37,6 +37,7 @@ abstract class AMP_Rule_Spec {
 	const MANDATORY_PARENT    = 'mandatory_parent';
 	const DESCENDANT_TAG_LIST = 'descendant_tag_list';
 	const CHILD_TAGS          = 'child_tags';
+	const SIBLINGS_DISALLOWED = 'siblings_disallowed';
 
 	/*
 	 * HTML Element Attribute rule names
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 47069101e68..45f62818dad 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -45,6 +45,7 @@ class AMP_Tag_And_Attribute_Sanitizer extends AMP_Base_Sanitizer {
 	const DISALLOWED_CHILD_TAG                 = 'DISALLOWED_CHILD_TAG';
 	const DISALLOWED_DESCENDANT_TAG            = 'DISALLOWED_DESCENDANT_TAG';
 	const DISALLOWED_FIRST_CHILD_TAG           = 'DISALLOWED_FIRST_CHILD_TAG';
+	const DISALLOWED_SIBLING_TAG               = 'DISALLOWED_SIBLING_TAG';
 	const DISALLOWED_PROCESSING_INSTRUCTION    = 'DISALLOWED_PROCESSING_INSTRUCTION';
 	const DISALLOWED_PROPERTY_IN_ATTR_VALUE    = 'DISALLOWED_PROPERTY_IN_ATTR_VALUE';
 	const DISALLOWED_RELATIVE_URL              = 'DISALLOWED_RELATIVE_URL';
@@ -749,6 +750,11 @@ static function ( $validation_error ) {
 			}
 		}
 
+		// If the node disallows any siblings, remove them.
+		if ( ! empty( $tag_spec[ AMP_Rule_Spec::SIBLINGS_DISALLOWED ] ) ) {
+			$this->remove_disallowed_siblings( $node, $this->get_spec_name( $node, $tag_spec ) );
+		}
+
 		// After attributes have been sanitized (and potentially removed), if mandatory attribute(s) are missing, remove the element.
 		$missing_mandatory_attributes = $this->get_missing_mandatory_attributes( $attr_spec_list, $node );
 		if ( ! empty( $missing_mandatory_attributes ) ) {
@@ -2453,6 +2459,44 @@ private function remove_disallowed_descendants( DOMElement $node, $allowed_desce
 		}
 	}
 
+	/**
+	 * Loop through node's siblings and remove them.
+	 *
+	 * @param DOMElement $node      Node.
+	 * @param string     $spec_name Spec name.
+	 */
+	private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
+		if ( ! $node->previousSibling || ! $node->nextSibling ) {
+			return;
+		}
+
+		$prev_sibling = $node->previousElementSibling;
+		while ( $prev_sibling !== null ) {
+			$this->remove_invalid_child(
+				$prev_sibling,
+				[
+					'code'      => self::DISALLOWED_SIBLING_TAG,
+					'sibling'   => $node->nodeName,
+					'spec_name' => $spec_name,
+				]
+			);
+			$prev_sibling = $prev_sibling->previousElementSibling;
+		}
+
+		$next_sibling = $node->nextElementSibling;
+		while ( $next_sibling !== null ) {
+			$this->remove_invalid_child(
+				$next_sibling,
+				[
+					'code'      => self::DISALLOWED_SIBLING_TAG,
+					'sibling'   => $node->nodeName,
+					'spec_name' => $spec_name,
+				]
+			);
+			$next_sibling = $next_sibling->nextElementSibling;
+		}
+	}
+
 	/**
 	 * Check whether the node validates the constraints for children.
 	 *
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 29d83ad9308..9576ceb59ec 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -1397,6 +1397,48 @@ static function() {
 				[ 'amp-sidebar', 'amp-story' ],
 			],
 
+			'amp_story_with_disallowed_sibling'          => [
+				str_replace(
+					[ "\n", "\t" ],
+					'',
+					'
+						<b id="disallowed-before1"></b>
+						<i id="disallowed-before2"></i>
+						<amp-story standalone="standalone" title="Stories in AMP - Hello World" publisher="AMP Project" publisher-logo-src="https://ampbyexample.com/favicons/coast-228x228.png" poster-portrait-src="https://ampbyexample.com/img/story_dog2_portrait.jpg">
+							<amp-story-page id="cover">
+								<amp-story-grid-layer template="fill">
+									<h1>Hello World</h1>
+									<p>This is the cover page of this story.</p>
+								</amp-story-grid-layer>
+							</amp-story-page>
+						</amp-story>
+						<span id="disallowed-after1"></span>
+						<div id="disallowed-after2"></div>
+					'
+				),
+				str_replace(
+					[ "\n", "\t" ],
+					'',
+					'
+						<amp-story standalone="standalone" title="Stories in AMP - Hello World" publisher="AMP Project" publisher-logo-src="https://ampbyexample.com/favicons/coast-228x228.png" poster-portrait-src="https://ampbyexample.com/img/story_dog2_portrait.jpg">
+							<amp-story-page id="cover">
+								<amp-story-grid-layer template="fill">
+									<h1>Hello World</h1>
+									<p>This is the cover page of this story.</p>
+								</amp-story-grid-layer>
+							</amp-story-page>
+						</amp-story>
+					'
+				),
+				[ 'amp-story' ],
+				[
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_SIBLING_TAG,
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_SIBLING_TAG,
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_SIBLING_TAG,
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_SIBLING_TAG,
+				],
+			],
+
 			'amp_sidebar_with_autoscroll'                  => [
 				str_replace(
 					[ "\n", "\t" ],
@@ -2958,20 +3000,6 @@ class="slide"
 				[ 'amp-sidebar', 'amp-list', 'amp-mustache' ],
 			],
 
-			'amp-redbull-player'                           => [
-				'
-				<amp-redbull-player
-				  id="rbvideo"
-				  data-param-videoid="rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT"
-				  data-param-skinid="com"
-				  data-param-locale="en"
-				  height="360"
-				  width="640"></amp-redbull-player>
-				',
-				null,
-				[ 'amp-redbull-player' ],
-			],
-
 			'mustache_templates_with_variable_attrs'       => [
 				'
 				<template type="amp-mustache">

From b5d64659b222892e056492534800e2a0e20673dc Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 14:33:41 +0200
Subject: [PATCH 02/14] Remove debug cruft

---
 bin/amphtml-update.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/amphtml-update.py b/bin/amphtml-update.py
index df4faa4726f..975596746df 100755
--- a/bin/amphtml-update.py
+++ b/bin/amphtml-update.py
@@ -411,8 +411,8 @@ def ParseRules(repo_directory, out_dir):
 				satisfies = script_tag['tag_spec']['satisfies']
 			else:
 				satisfies = extension
-# 			if satisfies in extension_specs_by_satisfies:
-# 				raise Exception( 'Duplicate extension script that satisfies %s.' % satisfies )
+			if satisfies in extension_specs_by_satisfies:
+				raise Exception( 'Duplicate extension script that satisfies %s.' % satisfies )
 
 			extension_specs_by_satisfies[satisfies] = script_tag['tag_spec']['extension_spec']
 

From f7438c25fa9d3708675ae7835d13d9c94e7899f7 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 14:38:25 +0200
Subject: [PATCH 03/14] Lint fixes

---
 .phpcs.xml.dist                                | 2 ++
 tests/php/test-tag-and-attribute-sanitizer.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 1aea174e8ce..8981474796d 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -87,6 +87,8 @@
 				<element value="DEFAULT_WIDTH"/>
 				<element value="DEFAULT_HEIGHT"/>
 				<element value="ampElements"/>
+				<element value="previousElementSibling"/>
+				<element value="nextElementSibling"/>
 			</property>
 		</properties>
 	</rule>
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 9576ceb59ec..0ec49640ba7 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -1397,7 +1397,7 @@ static function() {
 				[ 'amp-sidebar', 'amp-story' ],
 			],
 
-			'amp_story_with_disallowed_sibling'          => [
+			'amp_story_with_disallowed_sibling'            => [
 				str_replace(
 					[ "\n", "\t" ],
 					'',

From 5f14a8a055f031cdd43b3912613d9d4770ca4dee Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 16:05:09 +0200
Subject: [PATCH 04/14] Use yoda conditions

---
 includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 45f62818dad..d69bdc6b5a7 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2471,7 +2471,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 		}
 
 		$prev_sibling = $node->previousElementSibling;
-		while ( $prev_sibling !== null ) {
+		while ( null !== $prev_sibling) {
 			$this->remove_invalid_child(
 				$prev_sibling,
 				[
@@ -2484,7 +2484,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 		}
 
 		$next_sibling = $node->nextElementSibling;
-		while ( $next_sibling !== null ) {
+		while ( null !== $next_sibling) {
 			$this->remove_invalid_child(
 				$next_sibling,
 				[

From c191f11abef6cbf0ad9d0d06916e0146e78e4f0f Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 18:17:05 +0200
Subject: [PATCH 05/14] Undo some of the changes

---
 bin/amphtml-update.py                         |   3 +-
 .../class-amp-allowed-tags-generated.php      | 118 ++++++++++++++++++
 tests/php/test-amp-helper-functions.php       |   2 -
 3 files changed, 120 insertions(+), 3 deletions(-)

diff --git a/bin/amphtml-update.py b/bin/amphtml-update.py
index 975596746df..87f8aaad937 100755
--- a/bin/amphtml-update.py
+++ b/bin/amphtml-update.py
@@ -468,10 +468,11 @@ def ParseRules(repo_directory, out_dir):
 			tag['tag_spec']['requires_extension'] = requires_extension_versions
 
 	extensions = json.load( open( os.path.join( repo_directory, 'build-system/compile/bundles.config.extensions.json' ) ) )
+	bento_extensions = json.load( open( os.path.join( repo_directory, 'build-system/compile/bundles.config.bento.json' ) ) )
 
 	latest_versions = json.load( open( latest_extensions_file_path ) )
 	extensions_versions = dict()
-	for extension in extensions:
+	for extension in extensions + bento_extensions:
 		if '-impl' in extension['name'] or '-polyfill' in extension['name']:
 			continue
 
diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index 6d572c7bf37..caada992b63 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -3165,6 +3165,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
+					'bento' => false,
 					'requires_extension' => array(
 						'amp-facebook-comments',
 					),
@@ -3193,6 +3194,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
+					'bento' => true,
 					'requires_extension' => array(
 						'amp-facebook',
 					),
@@ -3231,6 +3233,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
+					'bento' => false,
 					'requires_extension' => array(
 						'amp-facebook-like',
 					),
@@ -3266,6 +3269,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
+					'bento' => true,
 					'requires_extension' => array(
 						'amp-facebook',
 					),
@@ -3304,6 +3308,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
+					'bento' => false,
 					'requires_extension' => array(
 						'amp-facebook-page',
 					),
@@ -3339,6 +3344,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
+					'bento' => true,
 					'requires_extension' => array(
 						'amp-facebook',
 					),
@@ -16227,6 +16233,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-accordion',
 						'requires_usage' => true,
@@ -16538,6 +16548,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => false,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-audio',
 						'requires_usage' => true,
@@ -16632,6 +16646,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-base-carousel',
 						'requires_usage' => true,
@@ -16788,6 +16806,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-brightcove',
 						'requires_usage' => true,
@@ -17007,6 +17029,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-dailymotion',
 						'requires_usage' => true,
@@ -17039,6 +17065,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-date-countdown',
 						'requires_usage' => true,
@@ -17071,6 +17101,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-date-display',
 						'requires_usage' => true,
@@ -17196,6 +17230,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-embedly-card',
 						'requires_usage' => true,
@@ -17260,6 +17298,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-facebook',
 						'requires_usage' => true,
@@ -17385,6 +17427,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-fit-text',
 						'requires_usage' => true,
@@ -17727,6 +17773,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-iframe',
 						'requires_usage' => true,
@@ -17914,6 +17964,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-inline-gallery',
 						'requires_usage' => true,
@@ -17977,6 +18031,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-instagram',
 						'requires_usage' => true,
@@ -18133,6 +18191,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-lightbox',
 						'requires_usage' => true,
@@ -18165,6 +18227,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-lightbox-gallery',
 						'requires_usage' => false,
@@ -18292,6 +18358,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-mathml',
 						'requires_usage' => true,
@@ -19039,6 +19109,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-selector',
 						'requires_usage' => true,
@@ -19071,6 +19145,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-sidebar',
 						'requires_usage' => true,
@@ -19165,6 +19243,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-social-share',
 						'requires_usage' => true,
@@ -19197,6 +19279,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-soundcloud',
 						'requires_usage' => true,
@@ -19603,6 +19689,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-stream-gallery',
 						'requires_usage' => true,
@@ -19730,6 +19820,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-timeago',
 						'requires_usage' => true,
@@ -19793,6 +19887,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-twitter',
 						'requires_usage' => true,
@@ -19856,6 +19954,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-video',
 						'requires_usage' => true,
@@ -19919,6 +20021,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-video-iframe',
 						'requires_usage' => true,
@@ -19951,6 +20057,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-vimeo',
 						'requires_usage' => true,
@@ -20138,6 +20248,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '1.0',
 						'name' => 'amp-wordpress-embed',
 						'requires_usage' => true,
@@ -20201,6 +20315,10 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'tag_spec' => array(
 					'extension_spec' => array(
+						'bento' => array(
+							'has_css' => true,
+							'version' => '1.0',
+						),
 						'latest' => '0.1',
 						'name' => 'amp-youtube',
 						'requires_usage' => true,
diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index 5e8e2a56f53..55f12c813ff 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -1586,7 +1586,6 @@ public function test_amp_register_default_scripts_and_styles() {
 			'amp-powr-player'              => 'v0/amp-powr-player-0.1.js',
 			'amp-reach-player'             => 'v0/amp-reach-player-0.1.js',
 			'amp-recaptcha-input'          => 'v0/amp-recaptcha-input-0.1.js',
-			'amp-redbull-player'           => 'v0/amp-redbull-player-0.1.js',
 			'amp-reddit'                   => 'v0/amp-reddit-0.1.js',
 			'amp-render'                   => 'v0/amp-render-1.0.js',
 			'amp-riddle-quiz'              => 'v0/amp-riddle-quiz-0.1.js',
@@ -1757,7 +1756,6 @@ public function test_amp_register_default_scripts_and_styles_with_bento() {
 			'amp-powr-player'              => 'v0/amp-powr-player-0.1.js',
 			'amp-reach-player'             => 'v0/amp-reach-player-0.1.js',
 			'amp-recaptcha-input'          => 'v0/amp-recaptcha-input-0.1.js',
-			'amp-redbull-player'           => 'v0/amp-redbull-player-0.1.js',
 			'amp-reddit'                   => 'v0/amp-reddit-0.1.js',
 			'amp-render'                   => 'v0/amp-render-1.0.js',
 			'amp-riddle-quiz'              => 'v0/amp-riddle-quiz-0.1.js',

From 710c0c4f8e765d5cbdc3531d00f9e42bb174921e Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 18:35:04 +0200
Subject: [PATCH 06/14] Undo more changes

---
 .../class-amp-allowed-tags-generated.php      | 62 +++++++++++++++++++
 tests/php/test-amp-helper-functions.php       |  2 +
 .../php/test-tag-and-attribute-sanitizer.php  | 14 +++++
 3 files changed, 78 insertions(+)

diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index caada992b63..22c9f4c4a64 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -5477,6 +5477,37 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
+		'amp-redbull-player' => array(
+			array(
+				'attr_spec_list' => array(
+					'data-param-videoid' => array(
+						'mandatory' => true,
+					),
+					'media' => array(),
+					'noloading' => array(
+						'value' => array(
+							'',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'amp_layout' => array(
+						'supported_layouts' => array(
+							2,
+							3,
+							4,
+							6,
+							7,
+							8,
+							9,
+						),
+					),
+					'requires_extension' => array(
+						'amp-redbull-player',
+					),
+				),
+			),
+		),
 		'amp-reddit' => array(
 			array(
 				'attr_spec_list' => array(
@@ -18963,6 +18994,37 @@ class AMP_Allowed_Tags_Generated {
 					),
 				),
 			),
+			array(
+				'attr_spec_list' => array(
+					'async' => array(
+						'mandatory' => true,
+						'value' => array(
+							'',
+						),
+					),
+					'crossorigin' => array(
+						'value' => array(
+							'anonymous',
+						),
+					),
+					'nonce' => array(),
+					'type' => array(
+						'value_casei' => array(
+							'text/javascript',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'extension_spec' => array(
+						'latest' => '0.1',
+						'name' => 'amp-redbull-player',
+						'requires_usage' => true,
+						'version' => array(
+							'0.1',
+						),
+					),
+				),
+			),
 			array(
 				'attr_spec_list' => array(
 					'async' => array(
diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index 55f12c813ff..5e8e2a56f53 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -1586,6 +1586,7 @@ public function test_amp_register_default_scripts_and_styles() {
 			'amp-powr-player'              => 'v0/amp-powr-player-0.1.js',
 			'amp-reach-player'             => 'v0/amp-reach-player-0.1.js',
 			'amp-recaptcha-input'          => 'v0/amp-recaptcha-input-0.1.js',
+			'amp-redbull-player'           => 'v0/amp-redbull-player-0.1.js',
 			'amp-reddit'                   => 'v0/amp-reddit-0.1.js',
 			'amp-render'                   => 'v0/amp-render-1.0.js',
 			'amp-riddle-quiz'              => 'v0/amp-riddle-quiz-0.1.js',
@@ -1756,6 +1757,7 @@ public function test_amp_register_default_scripts_and_styles_with_bento() {
 			'amp-powr-player'              => 'v0/amp-powr-player-0.1.js',
 			'amp-reach-player'             => 'v0/amp-reach-player-0.1.js',
 			'amp-recaptcha-input'          => 'v0/amp-recaptcha-input-0.1.js',
+			'amp-redbull-player'           => 'v0/amp-redbull-player-0.1.js',
 			'amp-reddit'                   => 'v0/amp-reddit-0.1.js',
 			'amp-render'                   => 'v0/amp-render-1.0.js',
 			'amp-riddle-quiz'              => 'v0/amp-riddle-quiz-0.1.js',
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 0ec49640ba7..52adaf8359f 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -3000,6 +3000,20 @@ class="slide"
 				[ 'amp-sidebar', 'amp-list', 'amp-mustache' ],
 			],
 
+			'amp-redbull-player'                           => [
+				'
+				<amp-redbull-player
+				  id="rbvideo"
+				  data-param-videoid="rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT"
+				  data-param-skinid="com"
+				  data-param-locale="en"
+				  height="360"
+				  width="640"></amp-redbull-player>
+				',
+				null,
+				[ 'amp-redbull-player' ],
+			],
+
 			'mustache_templates_with_variable_attrs'       => [
 				'
 				<template type="amp-mustache">

From b3be69215d1e6a3a7d843a5bb1a97ac9716783e7 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 18:40:31 +0200
Subject: [PATCH 07/14] Use `previousSibling`/`nextSibling`

---
 .phpcs.xml.dist                               |  2 -
 .../class-amp-tag-and-attribute-sanitizer.php | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 8981474796d..1aea174e8ce 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -87,8 +87,6 @@
 				<element value="DEFAULT_WIDTH"/>
 				<element value="DEFAULT_HEIGHT"/>
 				<element value="ampElements"/>
-				<element value="previousElementSibling"/>
-				<element value="nextElementSibling"/>
 			</property>
 		</properties>
 	</rule>
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index d69bdc6b5a7..498ce936e4b 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2470,30 +2470,34 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 			return;
 		}
 
-		$prev_sibling = $node->previousElementSibling;
+		$prev_sibling = $node->previousSibling;
 		while ( null !== $prev_sibling) {
-			$this->remove_invalid_child(
-				$prev_sibling,
-				[
-					'code'      => self::DISALLOWED_SIBLING_TAG,
-					'sibling'   => $node->nodeName,
-					'spec_name' => $spec_name,
-				]
-			);
-			$prev_sibling = $prev_sibling->previousElementSibling;
+			if ( XML_COMMENT_NODE !== $prev_sibling->nodeType ) {
+				$this->remove_invalid_child(
+					$prev_sibling,
+					[
+						'code' => self::DISALLOWED_SIBLING_TAG,
+						'sibling' => $node->nodeName,
+						'spec_name' => $spec_name,
+					]
+				);
+			}
+			$prev_sibling = $prev_sibling->previousSibling;
 		}
 
-		$next_sibling = $node->nextElementSibling;
+		$next_sibling = $node->nextSibling;
 		while ( null !== $next_sibling) {
-			$this->remove_invalid_child(
-				$next_sibling,
-				[
-					'code'      => self::DISALLOWED_SIBLING_TAG,
-					'sibling'   => $node->nodeName,
-					'spec_name' => $spec_name,
-				]
-			);
-			$next_sibling = $next_sibling->nextElementSibling;
+			if ( XML_COMMENT_NODE !== $next_sibling->nodeType ) {
+				$this->remove_invalid_child(
+					$next_sibling,
+					[
+						'code' => self::DISALLOWED_SIBLING_TAG,
+						'sibling' => $node->nodeName,
+						'spec_name' => $spec_name,
+					]
+				);
+			}
+			$next_sibling = $next_sibling->nextSibling;
 		}
 	}
 

From 5dd23425a9d7da7e0f2d2dfcbb06bcfd576599e6 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 19:11:16 +0200
Subject: [PATCH 08/14] Lint fixes

---
 .../class-amp-tag-and-attribute-sanitizer.php        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 498ce936e4b..9a3d6062e21 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2471,13 +2471,13 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 		}
 
 		$prev_sibling = $node->previousSibling;
-		while ( null !== $prev_sibling) {
+		while ( null !== $prev_sibling ) {
 			if ( XML_COMMENT_NODE !== $prev_sibling->nodeType ) {
 				$this->remove_invalid_child(
 					$prev_sibling,
 					[
-						'code' => self::DISALLOWED_SIBLING_TAG,
-						'sibling' => $node->nodeName,
+						'code' =>   self::DISALLOWED_SIBLING_TAG,
+						'sibling'   => $node->nodeName,
 						'spec_name' => $spec_name,
 					]
 				);
@@ -2486,13 +2486,13 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 		}
 
 		$next_sibling = $node->nextSibling;
-		while ( null !== $next_sibling) {
+		while ( null !== $next_sibling ) {
 			if ( XML_COMMENT_NODE !== $next_sibling->nodeType ) {
 				$this->remove_invalid_child(
 					$next_sibling,
 					[
-						'code' => self::DISALLOWED_SIBLING_TAG,
-						'sibling' => $node->nodeName,
+						'code'      => self::DISALLOWED_SIBLING_TAG,
+						'sibling'   => $node->nodeName,
 						'spec_name' => $spec_name,
 					]
 				);

From 891477c7de4aa06ef748a6843a2a5fa083cafa21 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 19:30:25 +0200
Subject: [PATCH 09/14] Lint fix

---
 includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 9a3d6062e21..59e705387e6 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2476,7 +2476,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 				$this->remove_invalid_child(
 					$prev_sibling,
 					[
-						'code' =>   self::DISALLOWED_SIBLING_TAG,
+						'code'      => self::DISALLOWED_SIBLING_TAG,
 						'sibling'   => $node->nodeName,
 						'spec_name' => $spec_name,
 					]

From 0df4b5d949fdbc7c334fcdb9ea2b147529670f9b Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 20:06:53 +0200
Subject: [PATCH 10/14] Apply suggestions from code review

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 59e705387e6..7b21d225ea1 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2472,7 +2472,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 
 		$prev_sibling = $node->previousSibling;
 		while ( null !== $prev_sibling ) {
-			if ( XML_COMMENT_NODE !== $prev_sibling->nodeType ) {
+			if ( ! ( $prev_sibling instanceof Element ) ) {
 				$this->remove_invalid_child(
 					$prev_sibling,
 					[
@@ -2487,7 +2487,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 
 		$next_sibling = $node->nextSibling;
 		while ( null !== $next_sibling ) {
-			if ( XML_COMMENT_NODE !== $next_sibling->nodeType ) {
+			if ( ! ( $next_sibling instanceof Element ) ) {
 				$this->remove_invalid_child(
 					$next_sibling,
 					[

From 21f8f6ff0371d38093f44b816a97c2eb4ccb12a5 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 20:11:59 +0200
Subject: [PATCH 11/14] Fix condition

---
 includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 7b21d225ea1..f33df0990e2 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2472,7 +2472,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 
 		$prev_sibling = $node->previousSibling;
 		while ( null !== $prev_sibling ) {
-			if ( ! ( $prev_sibling instanceof Element ) ) {
+			if ( $prev_sibling instanceof Element ) {
 				$this->remove_invalid_child(
 					$prev_sibling,
 					[
@@ -2487,7 +2487,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 
 		$next_sibling = $node->nextSibling;
 		while ( null !== $next_sibling ) {
-			if ( ! ( $next_sibling instanceof Element ) ) {
+			if ( $next_sibling instanceof Element ) {
 				$this->remove_invalid_child(
 					$next_sibling,
 					[

From 7b6ce5f66dc3e81f8b93ba7c67874d76ec9720c9 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 20:12:43 +0200
Subject: [PATCH 12/14] Capture first

---
 .../sanitizers/class-amp-tag-and-attribute-sanitizer.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index f33df0990e2..251c71d98af 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2472,6 +2472,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 
 		$prev_sibling = $node->previousSibling;
 		while ( null !== $prev_sibling ) {
+			$prev_prev_sibling = $prev_sibling->previousSibling;
 			if ( $prev_sibling instanceof Element ) {
 				$this->remove_invalid_child(
 					$prev_sibling,
@@ -2482,11 +2483,12 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 					]
 				);
 			}
-			$prev_sibling = $prev_sibling->previousSibling;
+			$prev_sibling = $prev_prev_sibling;
 		}
 
 		$next_sibling = $node->nextSibling;
 		while ( null !== $next_sibling ) {
+			$next_next_sibling = $next_sibling->nextSibling;
 			if ( $next_sibling instanceof Element ) {
 				$this->remove_invalid_child(
 					$next_sibling,
@@ -2497,7 +2499,7 @@ private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
 					]
 				);
 			}
-			$next_sibling = $next_sibling->nextSibling;
+			$next_sibling = $next_next_sibling;
 		}
 	}
 

From 588e7ff9b740a0deb6abd1636d62489c44d1cd88 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 20:33:00 +0200
Subject: [PATCH 13/14] Fix condition

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 251c71d98af..e3b707f555c 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2466,7 +2466,7 @@ private function remove_disallowed_descendants( DOMElement $node, $allowed_desce
 	 * @param string     $spec_name Spec name.
 	 */
 	private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
-		if ( ! $node->previousSibling || ! $node->nextSibling ) {
+		if ( ! $node->previousSibling && ! $node->nextSibling ) {
 			return;
 		}
 

From 7fca058f72b5a59142af69a3c9afe7ac88a6b87c Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 3 Aug 2023 21:10:45 +0200
Subject: [PATCH 14/14] Remove unnecessary check

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index e3b707f555c..aac823f191a 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -2466,10 +2466,6 @@ private function remove_disallowed_descendants( DOMElement $node, $allowed_desce
 	 * @param string     $spec_name Spec name.
 	 */
 	private function remove_disallowed_siblings( DOMElement $node, $spec_name ) {
-		if ( ! $node->previousSibling && ! $node->nextSibling ) {
-			return;
-		}
-
 		$prev_sibling = $node->previousSibling;
 		while ( null !== $prev_sibling ) {
 			$prev_prev_sibling = $prev_sibling->previousSibling;