Grouped Backports to the 6.3 branch.

- Editor: Fix Path Traversal issue on Windows in Template-Part Block.
- Editor: Sanitize Template Part HTML tag on save.
- HTML API: Run URL attributes through `esc_url()`.

Merges [58470], [58471], [58472] and [58473] to the 6.3 branch.
Props xknown, peterwilsoncc, jorbin, bernhard-reiter, azaozz, dmsnell, gziolo.




git-svn-id: https://develop.svn.wordpress.org/branches/6.3@58476 602fd350-edb4-49c9-b593-d223f7449a82

package.json

@@ -83,9 +83,9 @@
 		"@wordpress/api-fetch": "6.32.2",
 		"@wordpress/autop": "3.35.2",
 		"@wordpress/blob": "3.35.2",
-		"@wordpress/block-directory": "4.12.19",
+		"@wordpress/block-directory": "4.12.20",
 		"@wordpress/block-editor": "12.3.15",
-		"@wordpress/block-library": "8.12.19",
+		"@wordpress/block-library": "8.12.20",
 		"@wordpress/block-serialization-default-parser": "4.35.2",
 		"@wordpress/blocks": "12.12.8",
 		"@wordpress/commands": "0.6.13",
@@ -93,16 +93,16 @@
 		"@wordpress/compose": "6.12.3",
 		"@wordpress/core-commands": "0.4.16",
 		"@wordpress/core-data": "6.12.16",
-		"@wordpress/customize-widgets": "4.12.19",
+		"@wordpress/customize-widgets": "4.12.20",
 		"@wordpress/data": "9.5.6",
 		"@wordpress/data-controls": "3.4.6",
 		"@wordpress/date": "4.35.2",
 		"@wordpress/deprecated": "3.35.2",
 		"@wordpress/dom": "3.35.2",
 		"@wordpress/dom-ready": "3.35.2",
-		"@wordpress/edit-post": "7.12.19",
-		"@wordpress/edit-site": "5.12.19",
-		"@wordpress/edit-widgets": "5.12.19",
+		"@wordpress/edit-post": "7.12.20",
+		"@wordpress/edit-site": "5.12.20",
+		"@wordpress/edit-widgets": "5.12.20",
 		"@wordpress/editor": "13.12.16",
 		"@wordpress/element": "5.12.2",
 		"@wordpress/escape-html": "2.35.2",

src/wp-includes/blocks.php

@@ -880,7 +880,7 @@ function _filter_block_content_callback( $matches ) {
  * @return array The filtered and sanitized block object result.
  */
 function filter_block_kses( $block, $allowed_html, $allowed_protocols = array() ) {
-	$block['attrs'] = filter_block_kses_value( $block['attrs'], $allowed_html, $allowed_protocols );
+	$block['attrs'] = filter_block_kses_value( $block['attrs'], $allowed_html, $allowed_protocols, $block );
 
 	if ( is_array( $block['innerBlocks'] ) ) {
 		foreach ( $block['innerBlocks'] as $i => $inner_block ) {
@@ -896,6 +896,7 @@ function filter_block_kses( $block, $allowed_html, $allowed_protocols = array()
  * non-allowable HTML.
  *
  * @since 5.3.1
+ * @since 6.5.5 Added the `$block_context` parameter.
  *
  * @param string[]|string $value             The attribute value to filter.
  * @param array[]|string  $allowed_html      An array of allowed HTML elements and attributes,
@@ -903,13 +904,18 @@ function filter_block_kses( $block, $allowed_html, $allowed_protocols = array()
  *                                           for the list of accepted context names.
  * @param string[]        $allowed_protocols Optional. Array of allowed URL protocols.
  *                                           Defaults to the result of wp_allowed_protocols().
+ * @param array           $block_context     Optional. The block the attribute belongs to, in parsed block array format.
  * @return string[]|string The filtered and sanitized result.
  */
-function filter_block_kses_value( $value, $allowed_html, $allowed_protocols = array() ) {
+function filter_block_kses_value( $value, $allowed_html, $allowed_protocols = array(), $block_context = null ) {
 	if ( is_array( $value ) ) {
 		foreach ( $value as $key => $inner_value ) {
-			$filtered_key   = filter_block_kses_value( $key, $allowed_html, $allowed_protocols );
-			$filtered_value = filter_block_kses_value( $inner_value, $allowed_html, $allowed_protocols );
+			$filtered_key   = filter_block_kses_value( $key, $allowed_html, $allowed_protocols, $block_context );
+			$filtered_value = filter_block_kses_value( $inner_value, $allowed_html, $allowed_protocols, $block_context );
+
+			if ( isset( $block_context['blockName'] ) && 'core/template-part' === $block_context['blockName'] ) {
+				$filtered_value = filter_block_core_template_part_attributes( $filtered_value, $filtered_key, $allowed_html );
+			}
 
 			if ( $filtered_key !== $key ) {
 				unset( $value[ $key ] );
@@ -924,6 +930,28 @@ function filter_block_kses_value( $value, $allowed_html, $allowed_protocols = ar
 	return $value;
 }
 
+/**
+ * Sanitizes the value of the Template Part block's `tagName` attribute.
+ *
+ * @since 6.5.5
+ *
+ * @param string          $attribute_value   The attribute value to filter.
+ * @param string          $attribute_name    The attribute name.
+ * @param array[]|string  $allowed_html      An array of allowed HTML elements and attributes,
+ *                                           or a context name such as 'post'. See wp_kses_allowed_html()
+ *                                           for the list of accepted context names.
+ * @return string The sanitized attribute value.
+ */
+function filter_block_core_template_part_attributes( $attribute_value, $attribute_name, $allowed_html ) {
+	if ( empty( $attribute_value ) || 'tagName' !== $attribute_name ) {
+		return $attribute_value;
+	}
+	if ( ! is_array( $allowed_html ) ) {
+		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
+	return isset( $allowed_html[ $attribute_value ] ) ? $attribute_value : '';
+}
+
 /**
  * Parses blocks out of a content string, and renders those appropriate for the excerpt.
  *

src/wp-includes/blocks/template-part.php

@@ -157,7 +157,7 @@ function render_block_core_template_part( $attributes ) {
 	global $wp_embed;
 	$content = $wp_embed->autoembed( $content );
 
-	if ( empty( $attributes['tagName'] ) ) {
+	if ( empty( $attributes['tagName'] ) || tag_escape( $attributes['tagName'] ) !== $attributes['tagName'] ) {
 		$area_tag = 'div';
 		if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
 			$area_tag = $area_definition['area_tag'];

src/wp-includes/formatting.php

@@ -4785,12 +4785,13 @@ EOF;
  * Escapes an HTML tag name.
  *
  * @since 2.5.0
+ * @since 6.5.5 Allow hyphens in tag names (i.e. custom elements).
  *
  * @param string $tag_name
  * @return string
  */
 function tag_escape( $tag_name ) {
-	$safe_tag = strtolower( preg_replace( '/[^a-zA-Z0-9_:]/', '', $tag_name ) );
+	$safe_tag = strtolower( preg_replace( '/[^a-zA-Z0-9-_:]/', '', $tag_name ) );
 	/**
 	 * Filters a string cleaned and escaped for output as an HTML tag.
 	 *

src/wp-includes/functions.php

@@ -6041,6 +6041,9 @@ function validate_file( $file, $allowed_files = array() ) {
 		return 0;
 	}
 
+	// Normalize path for Windows servers
+	$file = wp_normalize_path( $file );
+
 	// `../` on its own is not allowed:
 	if ( '../' === $file ) {
 		return 1;

src/wp-includes/html-api/class-wp-html-tag-processor.php

@@ -1983,7 +1983,14 @@ class WP_HTML_Tag_Processor {
 		if ( true === $value ) {
 			$updated_attribute = $name;
 		} else {
-			$escaped_new_value = esc_attr( $value );
+			$comparable_name = strtolower( $name );
+
+			/*
+			 * Escape URL attributes.
+			 *
+			 * @see https://html.spec.whatwg.org/#attributes-3
+			 */
+			$escaped_new_value = in_array( $comparable_name, wp_kses_uri_attributes() ) ? esc_url( $value ) : esc_attr( $value );
 			$updated_attribute = "{$name}=\"{$escaped_new_value}\"";
 		}