179107 2017-11-01 00:36:21 -0700 Assert that NoEventDispatchAssertion is not in the stack when executing a script 2017-11-01 13:39:00 -0700 1 1 1 Unclassified WebKit UI Events WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa buildbot fpizlo ggaren koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1366785 0 rniwa 2017-11-01 00:36:21 -0700 We should assert that we're not trying to execute script when NoEventDispatchAssertion is in the stack. 1366789 1 325554 rniwa 2017-11-01 00:42:12 -0700 Created attachment 325554 Adds assertion 1366790 2 rniwa 2017-11-01 00:42:47 -0700 Once this patch is landed, we can make NoEventDispatchAssertion cheap enough for the main thread to release-assert. 1366791 3 webkit-bug-importer 2017-11-01 00:43:25 -0700 <rdar://problem/35288788> 1366792 4 buildbot 2017-11-01 00:45:33 -0700 Attachment 325554 did not pass style-queue: ERROR: Source/WebCore/bindings/js/ScriptController.cpp:681: Please replace ASSERT_WITH_SECURITY_IMPLICATION() with RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(). [security/assertion] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1366911 5 325554 simon.fraser 2017-11-01 10:52:40 -0700 Comment on attachment 325554 Adds assertion View in context: https://bugs.webkit.org/attachment.cgi?id=325554&action=review > Source/WebCore/bindings/js/ScriptController.cpp:681 > + ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::isEventAllowedInMainThread()); Please add a blank line after this. 1367019 6 rniwa 2017-11-01 13:30:23 -0700 (In reply to Simon Fraser (smfr) from comment #5) > Comment on attachment 325554 [details] > Adds assertion > > View in context: > https://bugs.webkit.org/attachment.cgi?id=325554&action=review > > > Source/WebCore/bindings/js/ScriptController.cpp:681 > > + ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::isEventAllowedInMainThread()); > > Please add a blank line after this. Done that. 1367020 7 rniwa 2017-11-01 13:36:50 -0700 Talked with Keith (Miller) and Saam to confirm that creating event listener wouldn't run arbitrary scripts to be sure. 1367022 8 rniwa 2017-11-01 13:39:00 -0700 Committed r224290: <https://trac.webkit.org/changeset/224290> 325554 2017-11-01 00:42:12 -0700 2017-11-01 10:52:40 -0700 Adds assertion bug-179107-20171101004211.patch text/plain 4703 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDI3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE3LTExLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFzc2VydCB0aGF0IE5vRXZlbnRE aXNwYXRjaEFzc2VydGlvbiBpcyBub3QgaW4gdGhlIHN0YWNrIHdoZW4gZXhlY3V0aW5nIGEgc2Ny aXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzkx MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBc3Nl cnQgdGhhdCBOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnRBbGxvd2VkSW5NYWluVGhy ZWFkKCkgaXMgdHJ1ZSB3aGVuIHdlJ3JlIGFib3V0IHRvIGV4ZWN1dGUgYSBzY3JpcHQKKyAgICAg ICAgYnkgYWRkaW5nIHRoZSBhc3NlcnRpb24gaW4gU2NyaXB0Q29udHJvbGxlcjo6Y2FuRXhlY3V0 ZVNjcmlwdHMgd2hpY2ggZ2V0cyBjYWxsZWQgd2l0aCBBYm91dFRvRXhlY3V0ZVNjcmlwdAorICAg ICAgICB3aGVuZXZlciB3ZSdyZSBhYm91dCB0byBydW4gc2NyaXB0cyBpbiBldmVudCBoYW5kbGVy cywgZXRjLi4uCisKKyAgICAgICAgV2UgZG9uJ3QgYXNzZXJ0IHRoZSBjb25zdHJ1Y3Rpb24gb2Yg ZXZlbnQgaGFuZGxlcnMgaW4gSlNMYXp5RXZlbnRMaXN0ZW5lciBzaW5jZSB0aGlzIGhhcHBlbnMg d2hpbGUgY29weWluZworICAgICAgICB0aGUgRE9NIHRyZWUgaW5zaWRlIGEgU1ZHIHVzZSBlbGVt ZW50IGFuZCBjcmVhdGluZyBhIGV2ZW50IGhhbmRsZXIncyBKUyBmdW5jdGlvbiB3b24ndCBleGVj dXRlIGFyYml0cmFyeSBzY3JpcHRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGVy ZSBzaG91bGQgYmUgbm8gYmVoYXZpb3JhbCBjaGFuZ2Ugb3RoZXIgCisKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9KU0xhenlFdmVudExpc3RlbmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTTGF6 eUV2ZW50TGlzdGVuZXI6OmluaXRpYWxpemVKU0Z1bmN0aW9uIGNvbnN0KTogVXNlIG5ld2x5IGFk ZGVkIEFib3V0VG9DcmVhdGVFdmVudExpc3RlbmVyLgorICAgICAgICAoV2ViQ29yZTo6SlNMYXp5 RXZlbnRMaXN0ZW5lcjo6Y3JlYXRlKTogRGl0dG8uCisgICAgICAgICogYmluZGluZ3MvanMvU2Ny aXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpj YW5FeGVjdXRlU2NyaXB0cyk6IEFkZGVkIHRoZSBhc3NlcnRpb24uCisgICAgICAgICogYmluZGlu Z3MvanMvU2NyaXB0Q29udHJvbGxlci5oOgorCiAyMDE3LTEwLTMxICBTYWlkIEFib3UtSGFsbGF3 YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgdXBkYXRlTWFza2VkQW5jZXN0 b3JTaG91bGRJc29sYXRlQmxlbmRpbmcoKSBzaG91bGQgY2hlY2sgdGhlIE51bGxhYmlsaXR5IG9m IHRoZSBjb21wdXRlZFN0eWxlKCkgb2YgdGhlIGVsZW1lbnQncyBhbmNlc3RvcnMKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTGF6eUV2ZW50TGlzdGVuZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTGF6eUV2ZW50TGlzdGVuZXIuY3Bw CShyZXZpc2lvbiAyMjQyMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0xhenlF dmVudExpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcsNyArOTcsNyBAQCBKU09iamVj dCogSlNMYXp5RXZlbnRMaXN0ZW5lcjo6aW5pdGlhbGl6CiAgICAgICAgIHJldHVybiBudWxscHRy OwogCiAgICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0ID0gZG9jdW1lbnQuZnJhbWUoKS0+c2Ny aXB0KCk7Ci0gICAgaWYgKCFzY3JpcHQuY2FuRXhlY3V0ZVNjcmlwdHMoQWJvdXRUb0V4ZWN1dGVT Y3JpcHQpIHx8IHNjcmlwdC5pc1BhdXNlZCgpKQorICAgIGlmICghc2NyaXB0LmNhbkV4ZWN1dGVT Y3JpcHRzKEFib3V0VG9DcmVhdGVFdmVudExpc3RlbmVyKSB8fCBzY3JpcHQuaXNQYXVzZWQoKSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFs T2JqZWN0ID0gdG9KU0RPTUdsb2JhbE9iamVjdCgmZXhlY3V0aW9uQ29udGV4dCwgaXNvbGF0ZWRX b3JsZCgpKTsKQEAgLTE2OCw3ICsxNjgsNyBAQCBSZWZQdHI8SlNMYXp5RXZlbnRMaXN0ZW5lcj4g SlNMYXp5RXZlbnRMCiAgICAgVGV4dFBvc2l0aW9uIHBvc2l0aW9uOwogICAgIFN0cmluZyBzb3Vy Y2VVUkw7CiAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGFyZ3VtZW50cy5kb2N1bWVudC5mcmFtZSgp KSB7Ci0gICAgICAgIGlmICghZnJhbWUtPnNjcmlwdCgpLmNhbkV4ZWN1dGVTY3JpcHRzKEFib3V0 VG9FeGVjdXRlU2NyaXB0KSkKKyAgICAgICAgaWYgKCFmcmFtZS0+c2NyaXB0KCkuY2FuRXhlY3V0 ZVNjcmlwdHMoQWJvdXRUb0NyZWF0ZUV2ZW50TGlzdGVuZXIpKQogICAgICAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAgICAgICAgIHBvc2l0aW9uID0gZnJhbWUtPnNjcmlwdCgpLmV2ZW50SGFuZGxl clBvc2l0aW9uKCk7CiAgICAgICAgIHNvdXJjZVVSTCA9IGFyZ3VtZW50cy5kb2N1bWVudC51cmwo KS5zdHJpbmcoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRy b2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Njcmlw dENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyMjQyMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMs NyBAQAogI2luY2x1ZGUgIk1vZHVsZUZldGNoRmFpbHVyZUtpbmQuaCIKICNpbmNsdWRlICJNb2R1 bGVGZXRjaFBhcmFtZXRlcnMuaCIKICNpbmNsdWRlICJOUF9qc29iamVjdC5oIgorI2luY2x1ZGUg Ik5vRXZlbnREaXNwYXRjaEFzc2VydGlvbi5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRl ICJQYWdlQ29uc29sZUNsaWVudC5oIgogI2luY2x1ZGUgIlBhZ2VHcm91cC5oIgpAQCAtNjc2LDkg KzY3NywxMSBAQCBKU1ZhbHVlIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHRJCiAKIGJv b2wgU2NyaXB0Q29udHJvbGxlcjo6Y2FuRXhlY3V0ZVNjcmlwdHMoUmVhc29uRm9yQ2FsbGluZ0Nh bkV4ZWN1dGVTY3JpcHRzIHJlYXNvbikKIHsKKyAgICBpZiAocmVhc29uID09IEFib3V0VG9FeGVj dXRlU2NyaXB0KQorICAgICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihOb0V2 ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnRBbGxvd2VkSW5NYWluVGhyZWFkKCkpOwogICAg IGlmIChtX2ZyYW1lLmRvY3VtZW50KCkgJiYgbV9mcmFtZS5kb2N1bWVudCgpLT5pc1NhbmRib3hl ZChTYW5kYm94U2NyaXB0cykpIHsKICAgICAgICAgLy8gRklYTUU6IFRoaXMgbWVzc2FnZSBzaG91 bGQgYmUgbW92ZWQgb2ZmIHRoZSBjb25zb2xlIG9uY2UgYSBzb2x1dGlvbiB0byBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMjc0IGV4aXN0cy4KLSAgICAgICAgaWYg KHJlYXNvbiA9PSBBYm91dFRvRXhlY3V0ZVNjcmlwdCkKKyAgICAgICAgaWYgKHJlYXNvbiA9PSBB Ym91dFRvRXhlY3V0ZVNjcmlwdCB8fCByZWFzb24gPT0gQWJvdXRUb0NyZWF0ZUV2ZW50TGlzdGVu ZXIpCiAgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNzYWdlKE1l c3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCAiQmxvY2tlZCBzY3Jp cHQgZXhlY3V0aW9uIGluICciICsgbV9mcmFtZS5kb2N1bWVudCgpLT51cmwoKS5zdHJpbmdDZW50 ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSArICInIGJlY2F1c2UgdGhlIGRvY3VtZW50J3MgZnJhbWUg aXMgc2FuZGJveGVkIGFuZCB0aGUgJ2FsbG93LXNjcmlwdHMnIHBlcm1pc3Npb24gaXMgbm90IHNl dC4iKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmgJKHJldmlzaW9uIDIyNDIxOSkKKysr IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaAkod29ya2luZyBj b3B5KQpAQCAtNjQsNiArNjQsNyBAQCBjbGFzcyBXaWRnZXQ7CiBzdHJ1Y3QgRXhjZXB0aW9uRGV0 YWlsczsKIAogZW51bSBSZWFzb25Gb3JDYWxsaW5nQ2FuRXhlY3V0ZVNjcmlwdHMgeworICAgIEFi b3V0VG9DcmVhdGVFdmVudExpc3RlbmVyLAogICAgIEFib3V0VG9FeGVjdXRlU2NyaXB0LAogICAg IE5vdEFib3V0VG9FeGVjdXRlU2NyaXB0CiB9Owo=