69387 2011-10-04 17:09:33 -0700 Wean ContentSecurityPolicy from the Document 2011-10-04 17:51:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam dglazkov webkit.review.bot oldest_to_newest 478067 0 sam 2011-10-04 17:09:33 -0700 Wean ContentSecurityPolicy from the Document 478071 1 109720 sam 2011-10-04 17:12:02 -0700 Created attachment 109720 Patch 478077 2 109720 abarth 2011-10-04 17:19:46 -0700 Comment on attachment 109720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109720&action=review > Source/WebCore/dom/Document.h:615 > + virtual void disableEval(); Do we have the OVERRIDE keyword from clang available? This is a classic use case. 478080 3 109720 abarth 2011-10-04 17:20:48 -0700 Comment on attachment 109720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109720&action=review > Source/WebCore/page/ContentSecurityPolicy.cpp:507 > return; You can move a bunch of the code above this line down to the report section. 478091 4 109720 webkit.review.bot 2011-10-04 17:45:56 -0700 Comment on attachment 109720 Patch Attachment 109720 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9959016 478097 5 sam 2011-10-04 17:51:48 -0700 Committed r96667: <http://trac.webkit.org/changeset/96667> 109720 2011-10-04 17:12:02 -0700 2011-10-04 17:45:56 -0700 Patch bug-69387-20111004171201.patch text/plain 6763 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NjY0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMTAtMDQgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBXZWFuIENvbnRlbnRTZWN1cml0eVBvbGlj eSBmcm9tIHRoZSBEb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjkzODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGJpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyU2NyaXB0Q29udHJvbGxlcjo6ZGlzYWJsZUV2YWwpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBk b20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmRpc2FibGVFdmFs KToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlckNv bnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dDo6ZGlzYWJsZUV2YWwp OgorICAgICAgICAqIHdvcmtlcnMvV29ya2VyQ29udGV4dC5oOgorICAgICAgICAqIGRvbS9TY3Jp cHRFeGVjdXRpb25Db250ZXh0Lmg6CisgICAgICAgIEFkZCBwdXJlIHZpcnR1YWwgZGlzYWJsZUV2 YWwgdG8gU2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgc28gdGhhdCBDb250ZW50U2VjdXJpdHlQb2xp Y3kKKyAgICAgICAgY2FuIGNhbGwgaXQgZm9yIGJvdGggRG9jdW1lbnRzIGFuZCBXb3JrZXJDb250 ZXh0cy4KKworICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6ZGlkUmVjZWl2ZUhlYWRlcik6Cisg ICAgICAgIENhbGwgdGhlIG5ldyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpkaXNhYmxlRXZhbCgp IGZ1bmN0aW9uLgorCisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJl cG9ydFZpb2xhdGlvbik6CisgICAgICAgIFVzZSBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjphZGRN ZXNzYWdlKCkgaW5zdGVhZCBvZiBnb2luZyBkaXJlY3RseSB0byB0aGUgRE9NV2luZG93LgorCiAy MDExLTEwLTA0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAg ICAgTW92ZSBjb2RlIGludG8gU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXI6OmJlZ2luU2Nyb2xs R2VzdHVyZSgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRD b250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9X b3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gOTY2NjQpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTgxLDYgKzE4MSwxNCBAQCBib29sIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6OmlzRXhl Y3V0aW9uCiAgICAgcmV0dXJuIG1fZXhlY3V0aW9uRm9yYmlkZGVuOwogfQogCit2b2lkIFdvcmtl clNjcmlwdENvbnRyb2xsZXI6OmRpc2FibGVFdmFsKCkKK3sKKyAgICBpbml0U2NyaXB0SWZOZWVk ZWQoKTsKKyAgICBKU0xvY2sgbG9jayhTaWxlbmNlQXNzZXJ0aW9uc09ubHkpOworCisgICAgbV93 b3JrZXJDb250ZXh0V3JhcHBlci0+c2V0RXZhbEVuYWJsZWQoZmFsc2UpOworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoV09SS0VSUykKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmgJ KHJldmlzaW9uIDk2NjY0KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2Ny aXB0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3Myw4IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBmb3JiaWRFeGVjdXRpb24oKTsKICAgICAgICAgYm9v bCBpc0V4ZWN1dGlvbkZvcmJpZGRlbigpIGNvbnN0OwogCisgICAgICAgIHZvaWQgZGlzYWJsZUV2 YWwoKTsKKwogICAgICAgICBKU0M6OkpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSgpIHsgcmV0dXJu IG1fZ2xvYmFsRGF0YS5nZXQoKTsgfQogCiAgICAgcHJpdmF0ZToKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAkocmV2aXNpb24gOTY2NjQpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDM4LDYgKzI0MzgsMTQgQEAgU3RyaW5nIERvY3Vt ZW50Ojp1c2VyQWdlbnQoY29uc3QgS1VSTCYgdQogICAgIHJldHVybiBmcmFtZSgpID8gZnJhbWUo KS0+bG9hZGVyKCktPnVzZXJBZ2VudCh1cmwpIDogU3RyaW5nKCk7CiB9CiAKK3ZvaWQgRG9jdW1l bnQ6OmRpc2FibGVFdmFsKCkKK3sKKyAgICBpZiAoIWZyYW1lKCkpCisgICAgICAgIHJldHVybjsK KworICAgIGZyYW1lKCktPnNjcmlwdCgpLT5kaXNhYmxlRXZhbCgpOworfQorCiBDU1NTdHlsZVNo ZWV0KiBEb2N1bWVudDo6cGFnZVVzZXJTaGVldCgpCiB7CiAgICAgaWYgKG1fcGFnZVVzZXJTaGVl dCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCShyZXZpc2lvbiA5NjY2NCkKKysrIFNvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02MTIsNiArNjEyLDggQEAg cHVibGljOgogCiAgICAgdmlydHVhbCBTdHJpbmcgdXNlckFnZW50KGNvbnN0IEtVUkwmKSBjb25z dDsKIAorICAgIHZpcnR1YWwgdm9pZCBkaXNhYmxlRXZhbCgpOworCiAgICAgQ1NTU3R5bGVTaGVl dCogcGFnZVVzZXJTaGVldCgpOwogICAgIHZvaWQgY2xlYXJQYWdlVXNlclNoZWV0KCk7CiAgICAg dm9pZCB1cGRhdGVQYWdlVXNlclNoZWV0KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9T Y3JpcHRFeGVjdXRpb25Db250ZXh0LmgJKHJldmlzaW9uIDk2NjY0KQorKysgU291cmNlL1dlYkNv cmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNiAr OTYsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgdmlydHVhbCBTdHJpbmcgdXNl ckFnZW50KGNvbnN0IEtVUkwmKSBjb25zdCA9IDA7CiAKKyAgICAgICAgdmlydHVhbCB2b2lkIGRp c2FibGVFdmFsKCkgPSAwOworCiAgICAgICAgIFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdp bigpIGNvbnN0IHsgcmV0dXJuIG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCk7IH0KICAgICAgICAgQ29u dGVudFNlY3VyaXR5UG9saWN5KiBjb250ZW50U2VjdXJpdHlQb2xpY3koKSB7IHJldHVybiBtX2Nv bnRlbnRTZWN1cml0eVBvbGljeS5nZXQoKTsgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCShyZXZpc2lvbiA5NjY2NCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjcsMTIgKzI3LDEyIEBACiAjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5LmgiCiAK ICNpbmNsdWRlICJDb25zb2xlLmgiCi0jaW5jbHVkZSAiRE9NV2luZG93LmgiCiAjaW5jbHVkZSAi RG9jdW1lbnQuaCIKICNpbmNsdWRlICJGb3JtRGF0YS5oIgogI2luY2x1ZGUgIkZvcm1EYXRhTGlz dC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiUGluZ0xvYWRlci5oIgorI2luY2x1 ZGUgIlNjcmlwdENhbGxTdGFjay5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5j bHVkZSAiVGV4dEVuY29kaW5nLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkBA IC00OTEsMTMgKzQ5MSw4IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZl SGUKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgaWYgKCFjaGVja0V2YWwob3BlcmF0aXZl RGlyZWN0aXZlKG1fc2NyaXB0U3JjLmdldCgpKSkpIHsKLSAgICAgICAgLy8gRklYTUU6IFN1cHBv cnQgZGlzYWJsaW5nIGV2YWwgZm9yIFdvcmtlcnMuCi0gICAgICAgIGlmIChtX3NjcmlwdEV4ZWN1 dGlvbkNvbnRleHQtPmlzRG9jdW1lbnQoKSkgewotICAgICAgICAgICAgaWYgKEZyYW1lKiBmcmFt ZSA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KS0+ZnJh bWUoKSkKLSAgICAgICAgICAgICAgICBmcmFtZS0+c2NyaXB0KCktPmRpc2FibGVFdmFsKCk7Ci0g ICAgICAgIH0KLSAgICB9CisgICAgaWYgKCFjaGVja0V2YWwob3BlcmF0aXZlRGlyZWN0aXZlKG1f c2NyaXB0U3JjLmdldCgpKSkpCisgICAgICAgIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+ZGlz YWJsZUV2YWwoKTsKIH0KIAogdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydFZpb2xh dGlvbihjb25zdCBTdHJpbmcmIGRpcmVjdGl2ZVRleHQsIGNvbnN0IFN0cmluZyYgY29uc29sZU1l c3NhZ2UpIGNvbnN0CkBAIC01MTIsNyArNTA3LDcgQEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xp Y3k6OnJlcG9ydFZpb2xhdAogICAgICAgICByZXR1cm47CiAKICAgICBTdHJpbmcgbWVzc2FnZSA9 IG1fcmVwb3J0T25seSA/ICJbUmVwb3J0IE9ubHldICIgKyBjb25zb2xlTWVzc2FnZSA6IGNvbnNv bGVNZXNzYWdlOwotICAgIGZyYW1lLT5kb21XaW5kb3coKS0+Y29uc29sZSgpLT5hZGRNZXNzYWdl KEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNz YWdlLCAxLCBTdHJpbmcoKSk7CisgICAgbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5hZGRNZXNz YWdlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBt ZXNzYWdlLCAxLCBTdHJpbmcoKSwgMCk7CiAKICAgICBpZiAobV9yZXBvcnRVUkxzLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJD b250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNv bnRleHQuY3BwCShyZXZpc2lvbiA5NjY2NCkKKysrIFNvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29y a2VyQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw2ICsxNjUsMTEgQEAgU3RyaW5n IFdvcmtlckNvbnRleHQ6OnVzZXJBZ2VudChjb25zdCBLVQogICAgIHJldHVybiBtX3VzZXJBZ2Vu dDsKIH0KIAordm9pZCBXb3JrZXJDb250ZXh0OjpkaXNhYmxlRXZhbCgpCit7CisgICAgbV9zY3Jp cHQtPmRpc2FibGVFdmFsKCk7Cit9CisKIFdvcmtlckxvY2F0aW9uKiBXb3JrZXJDb250ZXh0Ojps b2NhdGlvbigpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2xvY2F0aW9uKQpJbmRleDogU291cmNlL1dl YkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmgJKHJldmlzaW9uIDk2NjY0KQorKysgU291cmNlL1dl YkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3 LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgU3RyaW5nIHVzZXJB Z2VudChjb25zdCBLVVJMJikgY29uc3Q7CiAKKyAgICAgICAgdmlydHVhbCB2b2lkIGRpc2FibGVF dmFsKCk7CisKICAgICAgICAgV29ya2VyU2NyaXB0Q29udHJvbGxlciogc2NyaXB0KCkgeyByZXR1 cm4gbV9zY3JpcHQuZ2V0KCk7IH0KICAgICAgICAgdm9pZCBjbGVhclNjcmlwdCgpIHsgbV9zY3Jp cHQuY2xlYXIoKTsgfQogI2lmIEVOQUJMRShJTlNQRUNUT1IpCg==