Implement trusted types integration with execCommand #23997

lukewarlow · 2024-02-07T13:30:09Z

`9fc59f1`

Implement trusted types integration with execCommand
https://bugs.webkit.org/show_bug.cgi?id=267690

Reviewed by Youenn Fablet and Ryosuke Niwa.

Call trustedTypeCompliantString from within document execCommand when command is insertHTML.

* LayoutTests/imported/w3c/web-platform-tests/trusted-types/block-Document-execCommand-expected.txt:
* Source/WebCore/dom/Document+HTML.idl:
* Source/WebCore/dom/Document.cpp:
(WebCore::Document::execCommand):
* Source/WebCore/dom/Document.h:
* Source/WebCore/dom/TrustedHTML.h:

Canonical link: https://commits.webkit.org/275667@main

c1247a0

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-02-07T13:31:29Z

EWS run on previous version of this PR (hash 2668944)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	❌ 🛠 wpe	⏳ 🛠 wincairo
❌ 🧪 bindings	❌ 🛠 ios-sim	⏳ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
❌ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	❌ 🧪 api-wpe
⏳ 🧪 webkitpy	❌ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	❌ 🛠 gtk
⏳ 🛠 🧪 jsc	❌ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	⏳ 🛠 tv-sim	❌ 🧪 mac-wk2-stress	⏳ 🛠 jsc-armv7
	⏳ 🛠 watch		⏳ 🧪 jsc-armv7-tests
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-07T13:39:22Z

EWS run on previous version of this PR (hash ebbd015)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	❌ 🛠 wpe	❌ 🛠 wincairo
❌ 🧪 bindings	❌ 🛠 ios-sim	❌ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
❌ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	❌ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	❌ 🛠 gtk
	❌ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🧪 gtk-wk2
	❌ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	❌ 🛠 tv-sim	❌ 🧪 mac-wk2-stress
	❌ 🛠 watch
	❌ 🛠 watch-sim

webkit-early-warning-system · 2024-02-08T17:37:23Z

EWS run on previous version of this PR (hash 86d9523)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	❌ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	🧪 mac-wk1	❌ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	❌ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	⏳ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-02-12T14:21:28Z

EWS run on previous version of this PR (hash dd7143b)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	❌ 🛠 wincairo
❌ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	❌ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	❌ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-02-14T11:48:21Z

EWS run on previous version of this PR (hash baf7bff)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	~~🛠 wpe~~	~~🛠 wincairo~~
❌ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	❌ 🛠 gtk
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	❌ 🧪 gtk-wk2
	~~🛠 tv~~	✅ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv-sim
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-14T12:13:54Z

EWS run on previous version of this PR (hash feb554e)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
~~🧪 style~~	~~🛠 ios~~	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 wincairo~~
~~🧪 bindings~~	~~🛠 ios-sim~~	~~🛠 mac-AS-debug~~	~~🧪 wpe-wk2~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	~~🛠 gtk~~
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 tv~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 tv-sim~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

Source/WebCore/dom/Document.cpp

webkit-early-warning-system · 2024-03-04T16:14:49Z

EWS run on previous version of this PR (hash b16c56c)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	~~🛠 ios~~	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 wincairo~~
~~🧪 bindings~~	~~🛠 ios-sim~~	~~🛠 mac-AS-debug~~	~~🧪 wpe-wk2~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	~~🛠 gtk~~
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 tv~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 tv-sim~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-03-04T16:15:28Z

EWS run on previous version of this PR (hash a55de0f)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	~~🧪 api-gtk~~
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

Source/WebCore/dom/Document.cpp

youennf · 2024-03-04T17:06:26Z

Source/WebCore/dom/TrustedHTML.h

Why is it needed?

I believe this was needed for the build to succeed previously. I will just double check if it's still needed.

So it's needed else WebKitLegacy doesn't build, I think it's because Document::execCommand is exported.

webkit-early-warning-system · 2024-03-04T17:44:19Z

EWS run on previous version of this PR (hash 0dfce70)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

rniwa · 2024-03-04T19:21:25Z

Call trustedTypeCompliantString from within document execCommand when command is innerHTML.

You mean insertHTML.

webkit-early-warning-system · 2024-03-04T19:24:55Z

EWS run on current version of this PR (hash c1247a0)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-ews-buildbot · 2024-03-05T00:40:26Z

Safe-Merge-Queue: Build #13999.

https://bugs.webkit.org/show_bug.cgi?id=267690 Reviewed by Youenn Fablet and Ryosuke Niwa. Call trustedTypeCompliantString from within document execCommand when command is insertHTML. * LayoutTests/imported/w3c/web-platform-tests/trusted-types/block-Document-execCommand-expected.txt: * Source/WebCore/dom/Document+HTML.idl: * Source/WebCore/dom/Document.cpp: (WebCore::Document::execCommand): * Source/WebCore/dom/Document.h: * Source/WebCore/dom/TrustedHTML.h: Canonical link: https://commits.webkit.org/275667@main

webkit-commit-queue · 2024-03-05T01:39:14Z

Committed 275667@main (9fc59f1): https://commits.webkit.org/275667@main

Reviewed commits have been landed. Closing PR #23997 and removing active labels.

lukewarlow force-pushed the trusted-types-exec-command branch from 7cb8340 to 2668944 Compare February 7, 2024 13:30

lukewarlow self-assigned this Feb 7, 2024

lukewarlow added the WebCore Misc. For miscellaneous bugs in the WebCore framework (and not JavaScriptCore or WebKit). label Feb 7, 2024

lukewarlow changed the title ~~Implement~~ Implement trusted types integration with execCommand Feb 7, 2024

lukewarlow changed the title ~~Implement trusted types integration with execCommand~~ Implement Feb 7, 2024

lukewarlow force-pushed the trusted-types-exec-command branch from 2668944 to ebbd015 Compare February 7, 2024 13:37

lukewarlow changed the title ~~Implement~~ Implement trusted types integration with execCommand Feb 7, 2024

lukewarlow changed the title ~~Implement trusted types integration with execCommand~~ Implement Feb 8, 2024

lukewarlow force-pushed the trusted-types-exec-command branch from ebbd015 to 86d9523 Compare February 8, 2024 17:31

lukewarlow changed the title ~~Implement~~ Implement trusted types integration with execCommand Feb 8, 2024

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 8, 2024

lukewarlow removed the merging-blocked Applied to prevent a change from being merged label Feb 12, 2024

lukewarlow changed the title ~~Implement trusted types integration with execCommand~~ Implement Feb 12, 2024

lukewarlow force-pushed the trusted-types-exec-command branch from 86d9523 to dd7143b Compare February 12, 2024 14:21

lukewarlow changed the title ~~Implement~~ Implement trusted types integration with execCommand Feb 12, 2024

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 12, 2024

lukewarlow added skip-ews Applied to prevent a change from being run on EWS and removed merging-blocked Applied to prevent a change from being merged skip-ews Applied to prevent a change from being run on EWS labels Feb 14, 2024

lukewarlow changed the title ~~Implement trusted types integration with execCommand~~ Implement Feb 14, 2024

lukewarlow force-pushed the trusted-types-exec-command branch from dd7143b to baf7bff Compare February 14, 2024 11:45

lukewarlow changed the title ~~Implement~~ Implement trusted types integration with execCommand Feb 14, 2024

lukewarlow changed the title ~~Implement trusted types integration with execCommand~~ Implement Feb 14, 2024

lukewarlow force-pushed the trusted-types-exec-command branch from baf7bff to feb554e Compare February 14, 2024 12:13

lukewarlow added the skip-ews Applied to prevent a change from being run on EWS label Feb 14, 2024

lukewarlow changed the title ~~Implement~~ Implement trusted types integration with execCommand Feb 14, 2024

lukewarlow commented Feb 15, 2024

View reviewed changes

Source/WebCore/dom/Document.cpp Outdated Show resolved Hide resolved

lukewarlow removed the skip-ews Applied to prevent a change from being run on EWS label Mar 4, 2024

lukewarlow marked this pull request as ready for review March 4, 2024 16:14

lukewarlow requested review from cdumez and rniwa as code owners March 4, 2024 16:14

lukewarlow force-pushed the trusted-types-exec-command branch from feb554e to b16c56c Compare March 4, 2024 16:14

lukewarlow force-pushed the trusted-types-exec-command branch from b16c56c to a55de0f Compare March 4, 2024 16:15

youennf approved these changes Mar 4, 2024

View reviewed changes

lukewarlow force-pushed the trusted-types-exec-command branch from a55de0f to 0dfce70 Compare March 4, 2024 17:44

lukewarlow added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Mar 4, 2024

rniwa approved these changes Mar 4, 2024

View reviewed changes

lukewarlow removed the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Mar 4, 2024

lukewarlow force-pushed the trusted-types-exec-command branch from 0dfce70 to c1247a0 Compare March 4, 2024 19:24

lukewarlow added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Mar 4, 2024

webkit-ews-buildbot removed the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Mar 5, 2024

webkit-ews-buildbot added the merge-queue Applied to send a pull request to merge-queue label Mar 5, 2024

webkit-commit-queue force-pushed the trusted-types-exec-command branch from c1247a0 to 9fc59f1 Compare March 5, 2024 01:39

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 5, 2024

webkit-commit-queue merged commit 9fc59f1 into WebKit:main Mar 5, 2024

Implement trusted types integration with execCommand #23997

Implement trusted types integration with execCommand #23997

Uh oh!

Conversation

lukewarlow commented Feb 7, 2024 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

9fc59f1

Uh oh!

webkit-early-warning-system commented Feb 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Feb 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Feb 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Feb 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Feb 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Feb 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

webkit-early-warning-system commented Mar 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Mar 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

youennf Mar 4, 2024

Choose a reason for hiding this comment

Uh oh!

lukewarlow Mar 4, 2024

Choose a reason for hiding this comment

Uh oh!

lukewarlow Mar 4, 2024

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Mar 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rniwa commented Mar 4, 2024

Uh oh!

webkit-early-warning-system commented Mar 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-ews-buildbot commented Mar 5, 2024

Uh oh!

webkit-commit-queue commented Mar 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

lukewarlow commented Feb 7, 2024 •

edited by webkit-early-warning-system

Loading

`9fc59f1`

webkit-early-warning-system commented Feb 7, 2024 •

edited

Loading

webkit-early-warning-system commented Feb 7, 2024 •

edited

Loading

webkit-early-warning-system commented Feb 8, 2024 •

edited

Loading

webkit-early-warning-system commented Feb 12, 2024 •

edited

Loading

webkit-early-warning-system commented Feb 14, 2024 •

edited

Loading

webkit-early-warning-system commented Feb 14, 2024 •

edited

Loading

webkit-early-warning-system commented Mar 4, 2024 •

edited

Loading

webkit-early-warning-system commented Mar 4, 2024 •

edited

Loading

webkit-early-warning-system commented Mar 4, 2024 •

edited

Loading

webkit-early-warning-system commented Mar 4, 2024 •

edited

Loading