Skip to content

Font Library: remove insecure properties #56230

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

Merged
merged 3 commits into from
Nov 18, 2023
Merged

Font Library: remove insecure properties #56230

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56b55db
Add additional sanitization to fonts.
jffng Nov 16, 2023
3a207b3
Add test case to remove insecure font family.
jffng Nov 16, 2023
58f65d4
Format php.
jffng Nov 16, 2023
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
Next Next commit
Add additional sanitization to fonts.
  • Loading branch information
@jffng
jffng committed Nov 16, 2023
commit 56b55dbb9ef7d979603343f475faaba652b8a638
7 changes: 6 additions & 1 deletion lib/experimental/fonts/font-library/class-wp-font-family.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,17 @@ private function sanitize() {
'version' => '2',
'settings' => array(
'typography' => array(
'fontFamilies' => array( $this->data ),
'fontFamilies' => array(
'custom' => array(
Copy link
Contributor Author

@jffng jffng Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The custom key is necessary to accommodate the input expected by remove_insecure_properties.

$this->data,
),
),
),
),
);
// Creates a new WP_Theme_JSON object with the new fonts to
// leverage sanitization and validation.
$fonts_json = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $fonts_json );
$theme_json = new WP_Theme_JSON_Gutenberg( $fonts_json );
$theme_data = $theme_json->get_data();
$sanitized_font = ! empty( $theme_data['settings']['typography']['fontFamilies'] )
Expand Down