21079 2008-09-24 16:10:23 -0700 Disallow embedding Safari-generated pages in subframes 2008-09-24 18:08:19 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 darin darin oldest_to_newest 92616 0 darin 2008-09-24 16:10:23 -0700 Safari uses some WebKit SPI for generated pages. This SPI should be changed so that it only works for top level frames. 92617 1 darin 2008-09-24 16:10:38 -0700 <rdar://problem/6203938> 92644 2 23776 darin 2008-09-24 18:00:41 -0700 Created attachment 23776 patch 92646 3 23776 mitz 2008-09-24 18:03:21 -0700 Comment on attachment 23776 patch r=me 92648 4 darin 2008-09-24 18:08:19 -0700 http://trac.webkit.org/changeset/36880 23776 2008-09-24 18:00:41 -0700 2008-09-24 18:03:21 -0700 patch MainFramePatch.txt text/plain 6100 darin SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiAzNjg3OSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDgtMDktMjQgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc5CisgICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyMDM5Mzg+IERpc2FsbG93IGVtYmVkZGluZyBTYWZhcmkt Z2VuZXJhdGVkIHBhZ2VzCisgICAgICAgICAgKGUuZyBib29rbWFya3MgY29sbGVjdGlvbikgaW4g c3ViZnJhbWVzCisKKyAgICAgICAgKiBEZWZhdWx0RGVsZWdhdGVzL1dlYkRlZmF1bHRQb2xpY3lE ZWxlZ2F0ZS5tOgorICAgICAgICAoLVtXZWJEZWZhdWx0UG9saWN5RGVsZWdhdGUgd2ViVmlldzpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOnJlcXVlc3Q6ZnJhbWU6ZGVjaXNpb25MaXN0 ZW5lcjpdKToKKyAgICAgICAgVXNlIHRoZSBuZXcgK1tXZWJWaWV3IF9jYW5IYW5kbGVSZXF1ZXN0 OmZvck1haW5GcmFtZTpdIHNvIHdlIGNhbiBnaXZlCisgICAgICAgIGEgZGlmZmVyZW50IGFuc3dl ciBmb3IgdGhlIG1haW4gZnJhbWUgYW5kIHN1YmZyYW1lcy4KKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpjYW5IYW5kbGVSZXF1ZXN0KTogRGl0dG8uCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXcubW06CisgICAgICAgICgrW1dlYlZpZXcgX2NhbkhhbmRsZVJlcXVlc3Q6Zm9yTWFpbkZyYW1l Ol0pOiBBZGRlZCBmb3JNYWluRnJhbWUuIE9ubHkgbG9vaworICAgICAgICBmb3Igc2NoZW1lLXNw ZWNpZmljIHJlcHJlc2VudGF0aW9ucyBmb3IgdGhlIG1haW4gZnJhbWUsIG5vdCBzdWJmcmFtZXMu IAorICAgICAgICAoK1tXZWJWaWV3IF9jYW5IYW5kbGVSZXF1ZXN0Ol0pOiBHaXZlIGFuc3dlciBm b3IgbWFpbiBmcmFtZSAtLSBjYWxscyB0aGUKKyAgICAgICAgbWV0aG9kIGFib3ZlIHdpdGggWUVT IGZvciBtYWluIGZyYW1lLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaDog QWRkZWQgX2NhbkhhbmRsZVJlcXVlc3Q6Zm9yTWFpbkZyYW1lOi4KKwogMjAwOC0wOS0yMyAgRGF2 aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDM5CkluZGV4OiBXZWJLaXQvbWFjL0RlZmF1bHREZWxl Z2F0ZXMvV2ViRGVmYXVsdFBvbGljeURlbGVnYXRlLm0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9EZWZhdWx0RGVsZWdhdGVzL1dlYkRlZmF1bHRQb2xpY3lEZWxlZ2F0ZS5tCShyZXZpc2lvbiAz Njg3MykKKysrIFdlYktpdC9tYWMvRGVmYXVsdERlbGVnYXRlcy9XZWJEZWZhdWx0UG9saWN5RGVs ZWdhdGUubQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQg KEMpIDIwMDUgQXBwbGUgQ29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDUsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNiwxOSArMjYsMTcgQEAKICAqIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCiAgKi8KIAotI2ltcG9ydCA8V2ViS2l0L1dlYkRhdGFTb3VyY2UuaD4KLSNpbXBvcnQg PFdlYktpdC9XZWJEZWZhdWx0UG9saWN5RGVsZWdhdGUuaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJG cmFtZS5oPgotI2ltcG9ydCA8V2ViS2l0L1dlYlBvbGljeURlbGVnYXRlUHJpdmF0ZS5oPgotI2lt cG9ydCA8V2ViS2l0L1dlYlZpZXcuaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJWaWV3UHJpdmF0ZS5o PgorI2ltcG9ydCAiV2ViRGVmYXVsdFBvbGljeURlbGVnYXRlLmgiCiAKKyNpbXBvcnQgIldlYkRh dGFTb3VyY2UuaCIKKyNpbXBvcnQgIldlYkZyYW1lLmgiCisjaW1wb3J0ICJXZWJQb2xpY3lEZWxl Z2F0ZVByaXZhdGUuaCIKKyNpbXBvcnQgIldlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCA8Rm91 bmRhdGlvbi9OU1VSTENvbm5lY3Rpb24uaD4KICNpbXBvcnQgPEZvdW5kYXRpb24vTlNVUkxSZXF1 ZXN0Lmg+CiAjaW1wb3J0IDxGb3VuZGF0aW9uL05TVVJMUmVzcG9uc2UuaD4KICNpbXBvcnQgPHd0 Zi9Bc3NlcnRpb25zLmg+CiAKLQogQGltcGxlbWVudGF0aW9uIFdlYkRlZmF1bHRQb2xpY3lEZWxl Z2F0ZQogCiBzdGF0aWMgV2ViRGVmYXVsdFBvbGljeURlbGVnYXRlICpzaGFyZWREZWxlZ2F0ZSA9 IG5pbDsKQEAgLTg1LDcgKzgzLDcgQEAgc3RhdGljIFdlYkRlZmF1bHRQb2xpY3lEZWxlZ2F0ZSAq c2hhcmVkRAogewogICAgIFdlYk5hdmlnYXRpb25UeXBlIG5hdlR5cGUgPSBbW2FjdGlvbkluZm9y bWF0aW9uIG9iamVjdEZvcktleTpXZWJBY3Rpb25OYXZpZ2F0aW9uVHlwZUtleV0gaW50VmFsdWVd OwogCi0gICAgaWYgKFtXZWJWaWV3IF9jYW5IYW5kbGVSZXF1ZXN0OnJlcXVlc3RdKSB7CisgICAg aWYgKFtXZWJWaWV3IF9jYW5IYW5kbGVSZXF1ZXN0OnJlcXVlc3QgZm9yTWFpbkZyYW1lOmZyYW1l ID09IFt3diBtYWluRnJhbWVdXSkgewogICAgICAgICBbbGlzdGVuZXIgdXNlXTsKICAgICB9IGVs c2UgaWYgKG5hdlR5cGUgPT0gV2ViTmF2aWdhdGlvblR5cGVQbHVnSW5SZXF1ZXN0KSB7CiAgICAg ICAgIFtsaXN0ZW5lciB1c2VdOwpJbmRleDogV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCShyZXZpc2lvbiAzNjg3MykKKysrIFdlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0JKHdvcmtpbmcgY29weSkK QEAgLTc3OSw3ICs3NzksMTAgQEAgYm9vbCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2hvdWxkRmFs bEJhYwogCiBib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjYW5IYW5kbGVSZXF1ZXN0KGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgY29uc3QKIHsKLSAgICByZXR1cm4gW1dlYlZpZXcg X2NhbkhhbmRsZVJlcXVlc3Q6cmVxdWVzdC5uc1VSTFJlcXVlc3QoKV07CisgICAgRnJhbWUqIGZy YW1lID0gY29yZShtX3dlYkZyYW1lLmdldCgpKTsKKyAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBh Z2UoKTsKKyAgICBCT09MIGZvck1haW5GcmFtZSA9IHBhZ2UgJiYgcGFnZS0+bWFpbkZyYW1lKCkg PT0gZnJhbWU7CisgICAgcmV0dXJuIFtXZWJWaWV3IF9jYW5IYW5kbGVSZXF1ZXN0OnJlcXVlc3Qu bnNVUkxSZXF1ZXN0KCkgZm9yTWFpbkZyYW1lOmZvck1haW5GcmFtZV07CiB9CiAKIGJvb2wgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmNhblNob3dNSU1FVHlwZShjb25zdCBTdHJpbmcmIE1JTUVUeXBl KSBjb25zdApJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDM2ODczKQorKysgV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTExOTksOSArMTE5 OSw5IEBAIFdlYkZyYW1lTG9hZERlbGVnYXRlSW1wbGVtZW50YXRpb25DYWNoZSoKICAgICByZXR1 cm4gW3NjaGVtZXNXaXRoUmVwcmVzZW50YXRpb25zU2V0IGNvbnRhaW5zT2JqZWN0OltVUkxTY2hl bWUgbG93ZXJjYXNlU3RyaW5nXV07CiB9CiAKLSsgKEJPT0wpX2NhbkhhbmRsZVJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlcXVlc3QKKysgKEJPT0wpX2NhbkhhbmRsZVJlcXVlc3Q6KE5TVVJMUmVx dWVzdCAqKXJlcXVlc3QgZm9yTWFpbkZyYW1lOihCT09MKWZvck1haW5GcmFtZQogewotICAgIC8v IEZJWE1FOiBJZiA8cmRhcjovL3Byb2JsZW0vNTIxNzMwOT4gZ2V0cyBmaXhlZCwgdGhpcyBjaGVj ayBjYW4gYmUgcmVtb3ZlZAorICAgIC8vIEZJWE1FOiBJZiA8cmRhcjovL3Byb2JsZW0vNTIxNzMw OT4gZ2V0cyBmaXhlZCwgdGhpcyBjaGVjayBjYW4gYmUgcmVtb3ZlZC4KICAgICBpZiAoIXJlcXVl c3QpCiAgICAgICAgIHJldHVybiBOTzsKIApAQCAtMTIxMCwxMCArMTIxMCwxNiBAQCBXZWJGcmFt ZUxvYWREZWxlZ2F0ZUltcGxlbWVudGF0aW9uQ2FjaGUqCiAKICAgICBOU1N0cmluZyAqc2NoZW1l ID0gW1tyZXF1ZXN0IFVSTF0gc2NoZW1lXTsKIAotICAgIGlmIChbc2VsZiBfcmVwcmVzZW50YXRp b25FeGlzdHNGb3JVUkxTY2hlbWU6c2NoZW1lXSkKKyAgICAvLyBSZXByZXNlbnRhdGlvbnMgZm9y IFVSTCBzY2hlbWVzIHdvcmsgYXQgdGhlIHRvcCBsZXZlbC4KKyAgICBpZiAoZm9yTWFpbkZyYW1l ICYmIFtzZWxmIF9yZXByZXNlbnRhdGlvbkV4aXN0c0ZvclVSTFNjaGVtZTpzY2hlbWVdKQogICAg ICAgICByZXR1cm4gWUVTOwogICAgICAgICAKLSAgICByZXR1cm4gKFtzY2hlbWUgX3dlYmtpdF9p c0Nhc2VJbnNlbnNpdGl2ZUVxdWFsVG9TdHJpbmc6QCJhcHBsZXdlYmRhdGEiXSk7CisgICAgcmV0 dXJuIFtzY2hlbWUgX3dlYmtpdF9pc0Nhc2VJbnNlbnNpdGl2ZUVxdWFsVG9TdHJpbmc6QCJhcHBs ZXdlYmRhdGEiXTsKK30KKworKyAoQk9PTClfY2FuSGFuZGxlUmVxdWVzdDooTlNVUkxSZXF1ZXN0 ICopcmVxdWVzdAoreworICAgIHJldHVybiBbc2VsZiBfY2FuSGFuZGxlUmVxdWVzdDpyZXF1ZXN0 IGZvck1haW5GcmFtZTpZRVNdOwogfQogCiArIChOU1N0cmluZyAqKV9kZWNvZGVEYXRhOihOU0Rh dGEgKilkYXRhCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0ludGVybmFsLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oCShyZXZpc2lv biAzNjg3MykKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaAkod29ya2lu ZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYs IDIwMDcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA1LCAyMDA2LCAyMDA3LCAyMDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq CiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTM2LDYgKzEzNiw4IEBAIHR5cGVkZWYg V2ViQ29yZTo6UGFnZSBXZWJDb3JlUGFnZTsKIC0gKEJPT0wpX2NhblJlc2V0Wm9vbTooQk9PTClp c1RleHRPbmx5OwogLSAoSUJBY3Rpb24pX3Jlc2V0Wm9vbTooaWQpc2VuZGVyIGlzVGV4dE9ubHk6 KEJPT0wpaXNUZXh0T25seTsKIAorKyAoQk9PTClfY2FuSGFuZGxlUmVxdWVzdDooTlNVUkxSZXF1 ZXN0ICopcmVxdWVzdCBmb3JNYWluRnJhbWU6KEJPT0wpZm9yTWFpbkZyYW1lOworCiBAZW5kCiAK IHR5cGVkZWYgc3RydWN0IF9XZWJSZXNvdXJjZURlbGVnYXRlSW1wbGVtZW50YXRpb25DYWNoZSB7 Cg==