Changeset 52399 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

Timestamp:

12/21/2021 04:12:06 AM (3 years ago)

Author:

hellofromTonya

Message:

REST API: Support . in theme directory names in WP_REST_Global_Styles_Controller, WP_REST_Templates_Controller, and WP_REST_Themes_Controller.

Regex changes from [52376] are reverted to restore the original regex patterns. Why? [52376] used an include characters pattern, which was too limiting. It did not account for localized characters, such as é, or other valid directory name characters.

The original theme directory regex pattern, i.e. [^.\/]+(?:\/[^.\/]+)? excluded the period . character. Removing the . character resolves the reported issue by allowing matching for themes/theme-dirname-1.0/ or themes/<subdirname>/theme-dirname-1.0/.

As the pattern used an exclude approach, all characters are valid for matching except for /. However, not all characters are cross-platform valid for directory names. For example, the characters /:<>*?"| are not valid on Windows OS. The pattern now excludes those characters.

The theme's directory (or subdirectory) name pattern matching is now used in WP_REST_Global_Styles_Controller, WP_REST_Templates_Controller, and WP_REST_Themes_Controller.

Follow-up to [51003], [52051], [52275], [52376].

Props costdev, hellofromTonya, spacedmonkey, TimothyBlynJacobs, bijayyadav, kafleg.
Fixes #54596.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (3 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -42 +42 @@
         register_rest_route(
             $this->namespace,
-            '/' . $this->rest_base . '/themes/(?P<stylesheet>[\/\s%\w\.\(\)\[\]\@_\-]+)',
+            // The route.
+            sprintf(
+                '/%s/themes/(?P<stylesheet>%s)',
+                $this->rest_base,
+                // Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
+                // Excludes invalid directory name characters: `/:<>*?"|`.
+                '[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?'
+            ),
             array(
                 array(
@@ -62 +69 @@
         register_rest_route(
             $this->namespace,
-            '/' . $this->rest_base . '/(?P<id>[\/\s%\w\.\(\)\[\]\@_\-]+)',
+            '/' . $this->rest_base . '/(?P<id>[\/\w-]+)',
             array(
                 array(
@@ -89 +96 @@
     /**
      * Sanitize the global styles ID or stylesheet to decode endpoint.
-     * For example, `wp/v2/global-styles/templatetwentytwo%200.4.0`
-     * would be decoded to `templatetwentytwo 0.4.0`.
+     * For example, `wp/v2/global-styles/twentytwentytwo%200.4.0`
+     * would be decoded to `twentytwentytwo 0.4.0`.
      *
      * @since 5.9.0