Skip to content
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.

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

Allow more complex contentWidth & wideWidth values #31740

Merged
merged 5 commits into from
May 17, 2021

Conversation

aristath
Copy link
Member

Description

contentWidth and wideWidth will not always be as simple as 800px or 70em. In some cases, more complex values are used to accomplish different results. In the Q theme for example, I'm using adaptive/responsive typography and the content-width adapts to the values of that.
So in the theme.json file I have this:

{
	"settings": {
		"layout": {
			"contentSize": "calc((var(--wp--custom--typo--root-size) * 1px + var(--wp--custom--typo--adaptive-ratio) * 1vw) * var(--wp--custom--typo--line-width) / 2)",
			"wideSize": "calc(1.5 * (var(--wp--custom--typo--root-size) * 1px + var(--wp--custom--typo--adaptive-ratio) * 1vw) * var(--wp--custom--typo--line-width) / 2)"
		},
		"custom": {
			"typo": {
				"rootSize": 16,
				"adaptiveRatio": 0.8,
				"scale": 1.333,
				"lineHeight": 1.55,
				"lineWidth": 74
			}
		}
	}
}

Now, if with these settings I add a group and set it to inherit the default layout, then this is the CSS that gets added on the frontend:

.wp-container-609b87bce1965 > * {
	;
	margin-left: auto !important;
	margin-right: auto !important;
}
.wp-container-609b87bce1965 > .alignwide {
	;
}
...

so, the max-width definitions are missing.

This PR fixes the issue by removing the safecss_filter_attr call which can't handle values including complex calc().
In the process of doing that, the PR also simplifies the implementation a bit by setting the $style PHP var instead of using an output buffer.

How has this been tested?

Tested with the TT1-blocks & Q themes.

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • [-] My code follows the accessibility standards.
  • [-] I've tested my changes with keyboard and screen readers.
  • [-] My code has proper inline documentation.
  • [-] I've included developer documentation if appropriate.
  • [-] I've updated all React Native files affected by any refactorings/renamings in this PR (please manually search all *.native.js files for terms that need renaming or removal).

@aristath aristath requested a review from carolinan May 12, 2021 08:18
@aristath aristath added the [Feature] Themes Questions or issues with incorporating or styling blocks in a theme. label May 12, 2021
@aristath aristath requested a review from youknowriad May 12, 2021 08:18
@github-actions
Copy link

github-actions bot commented May 12, 2021

Size Change: -13.9 kB (-1%)

Total Size: 1.3 MB

Filename Size Change
build/annotations/index.js 2.93 kB +1 B (0%)
build/block-directory/index.js 6.61 kB +16 B (0%)
build/block-editor/index.js 118 kB +1.98 kB (+2%)
build/block-editor/style-rtl.css 13 kB +4 B (0%)
build/block-editor/style.css 13 kB +4 B (0%)
build/block-library/blocks/file/frontend.js 771 B -2 B (0%)
build/block-library/blocks/navigation/editor-rtl.css 1.52 kB +205 B (+16%) ⚠️
build/block-library/blocks/navigation/editor.css 1.52 kB +205 B (+16%) ⚠️
build/block-library/blocks/navigation/style-rtl.css 1.71 kB +440 B (+35%) 🚨
build/block-library/blocks/navigation/style.css 1.71 kB +443 B (+35%) 🚨
build/block-library/blocks/page-list/editor-rtl.css 310 B +71 B (+30%) 🚨
build/block-library/blocks/page-list/editor.css 311 B +71 B (+30%) 🚨
build/block-library/blocks/page-list/style-rtl.css 233 B +66 B (+40%) 🚨
build/block-library/blocks/page-list/style.css 233 B +66 B (+40%) 🚨
build/block-library/editor-rtl.css 9.89 kB +220 B (+2%)
build/block-library/editor.css 9.88 kB +216 B (+2%)
build/block-library/index.js 146 kB +3.48 kB (+2%)
build/block-library/style-rtl.css 10.2 kB +394 B (+4%)
build/block-library/style.css 10.2 kB +392 B (+4%)
build/block-serialization-default-parser/index.js 1.3 kB -1 B (0%)
build/block-serialization-spec-parser/index.js 3.06 kB -1 B (0%)
build/blocks/index.js 47.1 kB -11 B (0%)
build/components/index.js 188 kB +102 B (0%)
build/components/style-rtl.css 16.2 kB +8 B (0%)
build/components/style.css 16.2 kB +9 B (0%)
build/compose/index.js 9.92 kB -3 B (0%)
build/core-data/index.js 12.1 kB +6 B (0%)
build/customize-widgets/index.js 5.99 kB -7 B (0%)
build/data-controls/index.js 828 B -2 B (0%)
build/data/index.js 7.23 kB +1 B (0%)
build/date/index.js 31.8 kB -2 B (0%)
build/deprecated/index.js 739 B +1 B (0%)
build/dom-ready/index.js 577 B +1 B (0%)
build/dom/index.js 4.62 kB -4 B (0%)
build/edit-navigation/index.js 13.6 kB +101 B (+1%)
build/edit-post/index.js 334 kB +1.03 kB (0%)
build/edit-post/style-rtl.css 6.84 kB +48 B (+1%)
build/edit-post/style.css 6.83 kB +49 B (+1%)
build/edit-site/index.js 26 kB -106 B (0%)
build/edit-widgets/index.js 12.5 kB -101 B (-1%)
build/editor/index.js 38.4 kB -22.1 kB (-36%) 🎉
build/element/index.js 3.44 kB -2 B (0%)
build/format-library/index.js 5.67 kB +3 B (0%)
build/hooks/index.js 1.76 kB -1 B (0%)
build/html-entities/index.js 627 B -1 B (0%)
build/i18n/index.js 3.73 kB -4 B (0%)
build/keyboard-shortcuts/index.js 1.65 kB +1 B (0%)
build/keycodes/index.js 1.43 kB -1 B (0%)
build/list-reusable-blocks/index.js 2.06 kB -1 B (0%)
build/nux/index.js 2.31 kB -1 B (0%)
build/plugins/index.js 1.99 kB -13 B (-1%)
build/primitives/index.js 1.03 kB -1 B (0%)
build/react-i18n/index.js 923 B -1 B (0%)
build/redux-routine/index.js 2.82 kB -3 B (0%)
build/reusable-blocks/index.js 2.54 kB -25 B (-1%)
build/rich-text/index.js 10.7 kB -1.15 kB (-10%) 👏
build/server-side-render/index.js 1.64 kB -3 B (0%)
build/shortcode/index.js 1.68 kB -2 B (0%)
build/token-list/index.js 846 B -2 B (0%)
build/warning/index.js 1.13 kB -1 B (0%)
build/widgets/index.js 1.66 kB -20 B (-1%)
build/wordcount/index.js 1.24 kB +2 B (0%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.12 kB 0 B
build/api-fetch/index.js 2.42 kB 0 B
build/autop/index.js 2.28 kB 0 B
build/blob/index.js 673 B 0 B
build/block-directory/style-rtl.css 993 B 0 B
build/block-directory/style.css 995 B 0 B
build/block-library/blocks/archives/editor-rtl.css 61 B 0 B
build/block-library/blocks/archives/editor.css 60 B 0 B
build/block-library/blocks/audio/editor-rtl.css 58 B 0 B
build/block-library/blocks/audio/editor.css 58 B 0 B
build/block-library/blocks/audio/style-rtl.css 112 B 0 B
build/block-library/blocks/audio/style.css 112 B 0 B
build/block-library/blocks/block/editor-rtl.css 161 B 0 B
build/block-library/blocks/block/editor.css 161 B 0 B
build/block-library/blocks/button/editor-rtl.css 475 B 0 B
build/block-library/blocks/button/editor.css 474 B 0 B
build/block-library/blocks/button/style-rtl.css 601 B 0 B
build/block-library/blocks/button/style.css 600 B 0 B
build/block-library/blocks/buttons/editor-rtl.css 315 B 0 B
build/block-library/blocks/buttons/editor.css 315 B 0 B
build/block-library/blocks/buttons/style-rtl.css 375 B 0 B
build/block-library/blocks/buttons/style.css 375 B 0 B
build/block-library/blocks/calendar/style-rtl.css 208 B 0 B
build/block-library/blocks/calendar/style.css 208 B 0 B
build/block-library/blocks/categories/editor-rtl.css 84 B 0 B
build/block-library/blocks/categories/editor.css 83 B 0 B
build/block-library/blocks/categories/style-rtl.css 79 B 0 B
build/block-library/blocks/categories/style.css 79 B 0 B
build/block-library/blocks/code/style-rtl.css 90 B 0 B
build/block-library/blocks/code/style.css 90 B 0 B
build/block-library/blocks/columns/editor-rtl.css 190 B 0 B
build/block-library/blocks/columns/editor.css 190 B 0 B
build/block-library/blocks/columns/style-rtl.css 422 B 0 B
build/block-library/blocks/columns/style.css 422 B 0 B
build/block-library/blocks/cover/editor-rtl.css 643 B 0 B
build/block-library/blocks/cover/editor.css 645 B 0 B
build/block-library/blocks/cover/style-rtl.css 1.22 kB 0 B
build/block-library/blocks/cover/style.css 1.22 kB 0 B
build/block-library/blocks/embed/editor-rtl.css 486 B 0 B
build/block-library/blocks/embed/editor.css 486 B 0 B
build/block-library/blocks/embed/style-rtl.css 401 B 0 B
build/block-library/blocks/embed/style.css 400 B 0 B
build/block-library/blocks/file/editor-rtl.css 301 B 0 B
build/block-library/blocks/file/editor.css 300 B 0 B
build/block-library/blocks/file/style-rtl.css 255 B 0 B
build/block-library/blocks/file/style.css 255 B 0 B
build/block-library/blocks/freeform/editor-rtl.css 2.45 kB 0 B
build/block-library/blocks/freeform/editor.css 2.45 kB 0 B
build/block-library/blocks/gallery/editor-rtl.css 704 B 0 B
build/block-library/blocks/gallery/editor.css 705 B 0 B
build/block-library/blocks/gallery/style-rtl.css 1.06 kB 0 B
build/block-library/blocks/gallery/style.css 1.05 kB 0 B
build/block-library/blocks/group/editor-rtl.css 160 B 0 B
build/block-library/blocks/group/editor.css 160 B 0 B
build/block-library/blocks/group/style-rtl.css 57 B 0 B
build/block-library/blocks/group/style.css 57 B 0 B
build/block-library/blocks/heading/editor-rtl.css 129 B 0 B
build/block-library/blocks/heading/editor.css 129 B 0 B
build/block-library/blocks/heading/style-rtl.css 76 B 0 B
build/block-library/blocks/heading/style.css 76 B 0 B
build/block-library/blocks/home-link/style-rtl.css 259 B 0 B
build/block-library/blocks/home-link/style.css 259 B 0 B
build/block-library/blocks/html/editor-rtl.css 281 B 0 B
build/block-library/blocks/html/editor.css 281 B 0 B
build/block-library/blocks/image/editor-rtl.css 717 B 0 B
build/block-library/blocks/image/editor.css 716 B 0 B
build/block-library/blocks/image/style-rtl.css 481 B 0 B
build/block-library/blocks/image/style.css 485 B 0 B
build/block-library/blocks/latest-comments/style-rtl.css 281 B 0 B
build/block-library/blocks/latest-comments/style.css 282 B 0 B
build/block-library/blocks/latest-posts/editor-rtl.css 137 B 0 B
build/block-library/blocks/latest-posts/editor.css 137 B 0 B
build/block-library/blocks/latest-posts/style-rtl.css 523 B 0 B
build/block-library/blocks/latest-posts/style.css 522 B 0 B
build/block-library/blocks/legacy-widget/editor-rtl.css 557 B 0 B
build/block-library/blocks/legacy-widget/editor.css 557 B 0 B
build/block-library/blocks/list/style-rtl.css 63 B 0 B
build/block-library/blocks/list/style.css 63 B 0 B
build/block-library/blocks/media-text/editor-rtl.css 176 B 0 B
build/block-library/blocks/media-text/editor.css 176 B 0 B
build/block-library/blocks/media-text/style-rtl.css 492 B 0 B
build/block-library/blocks/media-text/style.css 489 B 0 B
build/block-library/blocks/more/editor-rtl.css 434 B 0 B
build/block-library/blocks/more/editor.css 434 B 0 B
build/block-library/blocks/navigation-link/editor-rtl.css 617 B 0 B
build/block-library/blocks/navigation-link/editor.css 619 B 0 B
build/block-library/blocks/navigation-link/style-rtl.css 94 B 0 B
build/block-library/blocks/navigation-link/style.css 94 B 0 B
build/block-library/blocks/nextpage/editor-rtl.css 395 B 0 B
build/block-library/blocks/nextpage/editor.css 395 B 0 B
build/block-library/blocks/paragraph/editor-rtl.css 157 B 0 B
build/block-library/blocks/paragraph/editor.css 157 B 0 B
build/block-library/blocks/paragraph/style-rtl.css 247 B 0 B
build/block-library/blocks/paragraph/style.css 248 B 0 B
build/block-library/blocks/post-author/editor-rtl.css 209 B 0 B
build/block-library/blocks/post-author/editor.css 209 B 0 B
build/block-library/blocks/post-author/style-rtl.css 183 B 0 B
build/block-library/blocks/post-author/style.css 184 B 0 B
build/block-library/blocks/post-comments-form/style-rtl.css 140 B 0 B
build/block-library/blocks/post-comments-form/style.css 140 B 0 B
build/block-library/blocks/post-comments/style-rtl.css 360 B 0 B
build/block-library/blocks/post-comments/style.css 359 B 0 B
build/block-library/blocks/post-content/editor-rtl.css 139 B 0 B
build/block-library/blocks/post-content/editor.css 139 B 0 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B 0 B
build/block-library/blocks/post-excerpt/editor.css 73 B 0 B
build/block-library/blocks/post-excerpt/style-rtl.css 69 B 0 B
build/block-library/blocks/post-excerpt/style.css 69 B 0 B
build/block-library/blocks/post-featured-image/editor-rtl.css 338 B 0 B
build/block-library/blocks/post-featured-image/editor.css 338 B 0 B
build/block-library/blocks/post-featured-image/style-rtl.css 119 B 0 B
build/block-library/blocks/post-featured-image/style.css 119 B 0 B
build/block-library/blocks/post-title/style-rtl.css 60 B 0 B
build/block-library/blocks/post-title/style.css 60 B 0 B
build/block-library/blocks/preformatted/style-rtl.css 103 B 0 B
build/block-library/blocks/preformatted/style.css 103 B 0 B
build/block-library/blocks/pullquote/editor-rtl.css 183 B 0 B
build/block-library/blocks/pullquote/editor.css 183 B 0 B
build/block-library/blocks/pullquote/style-rtl.css 318 B 0 B
build/block-library/blocks/pullquote/style.css 318 B 0 B
build/block-library/blocks/query-loop/editor-rtl.css 83 B 0 B
build/block-library/blocks/query-loop/editor.css 82 B 0 B
build/block-library/blocks/query-loop/style-rtl.css 315 B 0 B
build/block-library/blocks/query-loop/style.css 317 B 0 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B 0 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B 0 B
build/block-library/blocks/query-pagination/editor-rtl.css 270 B 0 B
build/block-library/blocks/query-pagination/editor.css 262 B 0 B
build/block-library/blocks/query-pagination/style-rtl.css 168 B 0 B
build/block-library/blocks/query-pagination/style.css 168 B 0 B
build/block-library/blocks/query-title/editor-rtl.css 86 B 0 B
build/block-library/blocks/query-title/editor.css 86 B 0 B
build/block-library/blocks/query/editor-rtl.css 131 B 0 B
build/block-library/blocks/query/editor.css 132 B 0 B
build/block-library/blocks/quote/style-rtl.css 169 B 0 B
build/block-library/blocks/quote/style.css 169 B 0 B
build/block-library/blocks/rss/editor-rtl.css 201 B 0 B
build/block-library/blocks/rss/editor.css 202 B 0 B
build/block-library/blocks/rss/style-rtl.css 290 B 0 B
build/block-library/blocks/rss/style.css 290 B 0 B
build/block-library/blocks/search/editor-rtl.css 189 B 0 B
build/block-library/blocks/search/editor.css 189 B 0 B
build/block-library/blocks/search/style-rtl.css 359 B 0 B
build/block-library/blocks/search/style.css 362 B 0 B
build/block-library/blocks/separator/editor-rtl.css 99 B 0 B
build/block-library/blocks/separator/editor.css 99 B 0 B
build/block-library/blocks/separator/style-rtl.css 251 B 0 B
build/block-library/blocks/separator/style.css 251 B 0 B
build/block-library/blocks/shortcode/editor-rtl.css 512 B 0 B
build/block-library/blocks/shortcode/editor.css 512 B 0 B
build/block-library/blocks/site-logo/editor-rtl.css 440 B 0 B
build/block-library/blocks/site-logo/editor.css 441 B 0 B
build/block-library/blocks/site-logo/style-rtl.css 154 B 0 B
build/block-library/blocks/site-logo/style.css 154 B 0 B
build/block-library/blocks/social-link/editor-rtl.css 164 B 0 B
build/block-library/blocks/social-link/editor.css 165 B 0 B
build/block-library/blocks/social-links/editor-rtl.css 796 B 0 B
build/block-library/blocks/social-links/editor.css 795 B 0 B
build/block-library/blocks/social-links/style-rtl.css 1.32 kB 0 B
build/block-library/blocks/social-links/style.css 1.33 kB 0 B
build/block-library/blocks/spacer/editor-rtl.css 308 B 0 B
build/block-library/blocks/spacer/editor.css 308 B 0 B
build/block-library/blocks/spacer/style-rtl.css 48 B 0 B
build/block-library/blocks/spacer/style.css 48 B 0 B
build/block-library/blocks/table/editor-rtl.css 478 B 0 B
build/block-library/blocks/table/editor.css 478 B 0 B
build/block-library/blocks/table/style-rtl.css 485 B 0 B
build/block-library/blocks/table/style.css 485 B 0 B
build/block-library/blocks/tag-cloud/editor-rtl.css 118 B 0 B
build/block-library/blocks/tag-cloud/editor.css 118 B 0 B
build/block-library/blocks/tag-cloud/style-rtl.css 94 B 0 B
build/block-library/blocks/tag-cloud/style.css 94 B 0 B
build/block-library/blocks/template-part/editor-rtl.css 551 B 0 B
build/block-library/blocks/template-part/editor.css 550 B 0 B
build/block-library/blocks/term-description/editor-rtl.css 90 B 0 B
build/block-library/blocks/term-description/editor.css 90 B 0 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B 0 B
build/block-library/blocks/text-columns/editor.css 95 B 0 B
build/block-library/blocks/text-columns/style-rtl.css 166 B 0 B
build/block-library/blocks/text-columns/style.css 166 B 0 B
build/block-library/blocks/verse/style-rtl.css 87 B 0 B
build/block-library/blocks/verse/style.css 87 B 0 B
build/block-library/blocks/video/editor-rtl.css 569 B 0 B
build/block-library/blocks/video/editor.css 570 B 0 B
build/block-library/blocks/video/style-rtl.css 169 B 0 B
build/block-library/blocks/video/style.css 169 B 0 B
build/block-library/common-rtl.css 1.26 kB 0 B
build/block-library/common.css 1.26 kB 0 B
build/block-library/reset-rtl.css 506 B 0 B
build/block-library/reset.css 507 B 0 B
build/block-library/theme-rtl.css 692 B 0 B
build/block-library/theme.css 693 B 0 B
build/customize-widgets/style-rtl.css 698 B 0 B
build/customize-widgets/style.css 699 B 0 B
build/edit-navigation/style-rtl.css 2.83 kB 0 B
build/edit-navigation/style.css 2.83 kB 0 B
build/edit-post/classic-rtl.css 454 B 0 B
build/edit-post/classic.css 454 B 0 B
build/edit-site/style-rtl.css 4.79 kB 0 B
build/edit-site/style.css 4.78 kB 0 B
build/edit-widgets/style-rtl.css 3.02 kB 0 B
build/edit-widgets/style.css 3.03 kB 0 B
build/editor/style-rtl.css 3.95 kB 0 B
build/editor/style.css 3.95 kB 0 B
build/escape-html/index.js 739 B 0 B
build/format-library/style-rtl.css 637 B 0 B
build/format-library/style.css 639 B 0 B
build/is-shallow-equal/index.js 710 B 0 B
build/list-reusable-blocks/style-rtl.css 629 B 0 B
build/list-reusable-blocks/style.css 628 B 0 B
build/media-utils/index.js 3.08 kB 0 B
build/navigation/index.js 2.85 kB 0 B
build/notices/index.js 1.07 kB 0 B
build/nux/style-rtl.css 718 B 0 B
build/nux/style.css 716 B 0 B
build/priority-queue/index.js 791 B 0 B
build/reusable-blocks/style-rtl.css 225 B 0 B
build/reusable-blocks/style.css 225 B 0 B
build/url/index.js 1.95 kB 0 B
build/viewport/index.js 1.28 kB 0 B

compressed-size-action

@aristath aristath added the [Type] Bug An existing feature does not function as intended label May 12, 2021
aristath added a commit to aristath/q that referenced this pull request May 12, 2021
@youknowriad
Copy link
Contributor

Feels like this could have some security impact. Should safecss_filter_attr be adapted to allow these complex values?

@aristath
Copy link
Member Author

aristath commented May 12, 2021

Feels like this could have some security impact.

Not really... safecss_filter_attr's function is to filter attributes and only allow the ones that we deem "safe". In this case, the attribute is known and is max-width - which is in the list of allowed attributes.
Removing the call here won't be a security issue since the values are still properly escaped using esc_html.
If we want we can wrap them in an additional wp_strip_all_tags to make sure that they won't be able to add a weird value containing </style><script>....</script>, but that that might be a bit of an overkill (though it would further harden the security here)

Should safecss_filter_attr be adapted to allow these complex values?

The issue here is that safecss_filter_attr runs a regex on the values, and if it contains one (or more) of the /, \, (, * characters then it marks the value as not allowed. Both calc() and var() fail these tests.
We already have tickets on trac - #46498 & #46197

@carolinan
Copy link
Contributor

carolinan commented May 12, 2021

I only tested with the Q theme and the PR solves the issues with the missing widths in the CSS.

The output for a group with inherit set to true is now:
.wp-container-609be58033225 > * {max-width: calc((var(--wp--custom--typo--root-size) * 1px + var(--wp--custom--typo--adaptive-ratio) * 1vw) * var(--wp--custom--typo--line-width) / 2);margin-left: auto !important;margin-right: auto !important;}.wp-container-609be58033225 > .alignwide { max-width: calc(1.5 * (var(--wp--custom--typo--root-size) * 1px + var(--wp--custom--typo--adaptive-ratio) * 1vw) * var(--wp--custom--typo--line-width) / 2);}.wp-container-609be58033225 .alignfull { max-width: none; }.wp-container-609be58033225 .alignleft { float: left; margin-right: 2em; }.wp-container-609be58033225 .alignright { float: right; margin-left: 2em; }

@youknowriad youknowriad added this to the Gutenberg 10.6 milestone May 12, 2021
@jorgefilipecosta
Copy link
Member

Feels like this could have some security impact.

Not really... safecss_filter_attr's function is to filter attributes and only allow the ones that we deem "safe". In this case, the attribute is known and is max-width - which is in the list of allowed attributes.
Removing the call here won't be a security issue since the values are still properly escaped using esc_html.
If we want we can wrap them in an additional wp_strip_all_tags to make sure that they won't be able to add a weird value containing </style><script>....</script>, but that that might be a bit of an overkill (though it would further harden the security here)

Should safecss_filter_attr be adapted to allow these complex values?

The issue here is that safecss_filter_attr runs a regex on the values, and if it contains one (or more) of the /, \, (, * characters then it marks the value as not allowed. Both calc() and var() fail these tests.
We already have tickets on trac - #46498 & #46197

Hi @aristath,
Using esc_html is not enough to ensure the user is not able to do something not allowed.
If our escaping is 'max-width: ' . esc_html( $all_max_width_value ) . ';'and the $all_max_width_value is 400px; background: url( malicious svg with javascript ) the user will be able to apply rules the user should not.
I feel safecss_filter_attr is the solution core offers for CSS escaping and we should try to use it. We are already using it as the escaping mechanism for theme.json and we added a filter that allows the usage of CSS variables

function gutenberg_global_styles_include_support_for_wp_variables( $allow_css, $css_test_string ) {
. Maybe we should expand the filter (expanding safecss_filter_attr) to support things like calc?
It seems something that will require a complex parsing but sooner or later we should probably do it to allow users without full output permissions to use things like a calc or clamp in their block styles.

@aristath
Copy link
Member Author

If we want to get this in core, I submitted a patch in WordPress/wordpress-develop#1260
Ideally we'd get this in WP5.8...

If we can't make that patch on time for 5.8, then I added wp_strip_all_tags in this PR - which I think should mitigate the issue described above 🤔

Copy link
Member

@jorgefilipecosta jorgefilipecosta left a comment

Choose a reason for hiding this comment

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

Hi @aristath,
I tested your last updates and it mitigates part of the security issue but we still allow something that normally a non-privileged user would not be able to do like set z-index or CSS variables:

<!-- wp:group {"className":"wewew","layout":{"contentSize":"500px; z-index: 4; \u002d\u002dwp\u002d\u002dprivate\u002d\u002dvar: red"}} -->
<div class="wp-block-group wewew"><!-- wp:paragraph -->
<p>test</p>
<!-- /wp:paragraph --></div>
<!-- /wp:group -->

Maybe we can mitigate this issue by also removing the char ";" from the strings? It would force the css rule to always be interpreted as max-width.

@jorgefilipecosta
Copy link
Member

Maybe we can mitigate this issue by also removing the char ";" from the strings? It would force the css rule to always be interpreted as max-width.

This would be a temporary solution until an update to the existing CSS mechanism in the form of a core patch or a filter in Gutenberg is ready.

@aristath
Copy link
Member Author

I tested your last updates and it mitigates part of the security issue but we still allow something that normally a non-privileged user would not be able to do like set z-index or CSS variables:

Good catch! Added a tweak using explode( ';', $css )[0] so users can't add extra CSS 👍

Copy link
Member

@jorgefilipecosta jorgefilipecosta left a comment

Choose a reason for hiding this comment

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

The last update worked as expected and I did not find an issue with it.

@youknowriad youknowriad merged commit 7ff04ad into trunk May 17, 2021
@youknowriad youknowriad deleted the fix/layout-strip-values branch May 17, 2021 13:27
@youknowriad
Copy link
Contributor

I had a conflict cherry-picking this into release/10.6 I solved it but I'd appreciate a sanity check :)

@oandregal oandregal mentioned this pull request May 19, 2021
82 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Themes Questions or issues with incorporating or styling blocks in a theme. [Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants