39750 2010-05-26 10:24:20 -0700 Allow descendant frame navigation for file URLs when allowFileAccessFromFileURLs is false 2010-05-29 03:59:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 jschuh webkit-unassigned abarth commit-queue jschuh oldest_to_newest 230760 0 jschuh 2010-05-26 10:24:20 -0700 The current restrictions when allowFileAccessFromFileURLs is false break most local HTML documentation pacages. Since it shouldn't add additional risk, we should allow navigation by frames when they're all file URLs and share the same top frame. Patch forthcoming. 230789 1 57119 jschuh 2010-05-26 11:31:42 -0700 Created attachment 57119 Patch 230805 2 57119 abarth 2010-05-26 11:57:53 -0700 Comment on attachment 57119 Patch WebCore/loader/FrameLoader.cpp:2194 + && targetFrame->document()->url().protocolIs("file")) { We should be getting this information out of the securityOrigin() not out of the document's URL. Don't we just want to ask if securityOrigin()->isLocal() ? 230820 3 jschuh 2010-05-26 12:38:07 -0700 (In reply to comment #2) > (From update of attachment 57119 [details]) > WebCore/loader/FrameLoader.cpp:2194 > + && targetFrame->document()->url().protocolIs("file")) { > We should be getting this information out of the securityOrigin() not out of the document's URL. Don't we just want to ask if securityOrigin()->isLocal() ? Yes I suppose we do. Posting an updated patch. 230821 4 57125 jschuh 2010-05-26 12:44:21 -0700 Created attachment 57125 Patch 231489 5 57125 abarth 2010-05-27 15:45:52 -0700 Comment on attachment 57125 Patch This isn't quite accurate. This will allow sibling navigation. We only want to allow descendants. What you want to do is move this check into canAccessAncestor after http://trac.webkit.org/browser/trunk/WebCore/loader/FrameLoader.cpp#L2149. Basically, you want to fake that the call to |canAccess| there succeeds if both security origins are local. 231493 6 jschuh 2010-05-27 16:00:59 -0700 (In reply to comment #5) > (From update of attachment 57125 [details]) > This isn't quite accurate. This will allow sibling navigation. Actually, I'm intentionally enabling sibling navigation. If you look at http://crbug.com/39767 the bug reports we're currently getting are for sibling navigation. So, I want to enable both sibling and ancestor navigation. (Although, I should have used the term "sibling" rather than "peer.") 231596 7 abarth 2010-05-28 01:10:28 -0700 In the case in that bug, aren't all the frame on the page from the local file system? In which case, the navigation will be allowed if you put the check where I suggest above. Put another way, they were happy before we locked down file:// URLs, and we used the descendant navigation policy before the lockdown. It stands to reason that they'll be happy again if we turn on the descendant navigation policy for local URLs. 231739 8 jschuh 2010-05-28 09:13:17 -0700 (In reply to comment #7) > Put another way, they were happy before we locked down file:// URLs, and we used the descendant navigation policy before the lockdown. It stands to reason that they'll be happy again if we turn on the descendant navigation policy for local URLs. Just to clarify, I was thinking of it as sibling navigation because the active frame and target are siblings. However, all I really need is ancestor navigation because the location of the target is an attribute of the parent frameset? Is that correct? 231798 9 57346 jschuh 2010-05-28 11:10:54 -0700 Created attachment 57346 Patch 231814 10 57346 jschuh 2010-05-28 11:23:14 -0700 Comment on attachment 57346 Patch This version allows a file/local frame to navigate another file/local frame as long as the target frame is a descendant of a file/local frame. I did not check for a shared common ancestor in this iteration because I'm not sure it's necessary. However, I can add that if we want to restrict this type of navigation more. 231816 11 jschuh 2010-05-28 11:26:53 -0700 (In reply to comment #10) > (From update of attachment 57346 [details]) > This version allows a file/local frame to navigate another file/local frame as long as the target frame is a descendant of a file/local frame. Sorry, that line should read "This version allows a file/local frame to navigate a target frame as long as the frame is a descendant of a file/local frame." 231817 12 57346 abarth 2010-05-28 11:28:31 -0700 Comment on attachment 57346 Patch Awesome. Thanks! 232093 13 57346 commit-queue 2010-05-29 03:59:00 -0700 Comment on attachment 57346 Patch Clearing flags on attachment: 57346 Committed r60404: <http://trac.webkit.org/changeset/60404> 232094 14 commit-queue 2010-05-29 03:59:06 -0700 All reviewed patches have been landed. Closing bug. 57119 2010-05-26 11:31:42 -0700 2010-05-26 12:44:18 -0700 Patch bug-39750-20100526113141.patch text/plain 4710 jschuh SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDI0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMjYgIEp1c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWxsb3cgcGVlciBmcmFtZSBuYXZpZ2F0aW9uIGZvciBmaWxlIFVSTHMgd2hlbiBhbGxvd0ZpbGVB Y2Nlc3NGcm9tRmlsZVVSTHMgaXMgZmFsc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM5NzUwCisKKyAgICAgICAgRml4IGZvciBsb2NhbCBIVE1MIHBh Y2thZ2UgYnJlYWthZ2Ugd2hlbiBlYWNoIGZpbGUgaXMgaXRzIG93biBvcmlnaW4uIAorICAgICAg ICBJbiB0aGlzIGNhc2Ugd2Ugc2hvdWxkIGFsbG93IHBlZXIgZmlsZTogZnJhbWVzIHRvIG5hdmln YXRlIGVhY2ggb3RoZXIgCisgICAgICAgIHdoZW4gdGhleSBzaGFyZSB0aGUgc2FtZSB0b3AgZnJh bWUuCisKKyAgICAgICAgVGVzdDogZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZpbGUt YWNjZXNzLmh0bWwKKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c2hvdWxkQWxsb3dOYXZpZ2F0aW9uKToKKwogMjAxMC0w NS0yNiAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgR1RLKyBidWls ZCBmaXgsIHN0cmlrZSB0d28uCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiA2 MDI0MykKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjE4OCw2ICsyMTg4LDEzIEBAIGJvb2wgRnJhbWVMb2FkZXI6OnNob3VsZEFsbG93TmF2aWdh dGlvbigKIAogICAgIERvY3VtZW50KiBhY3RpdmVEb2N1bWVudCA9IG1fZnJhbWUtPmRvY3VtZW50 KCk7CiAgICAgQVNTRVJUKGFjdGl2ZURvY3VtZW50KTsKKworICAgIC8vIEFsbG93IHBlZXIgZnJh bWUgbmF2aWdhdGlvbiBmb3IgZmlsZSBVUkxzIGV2ZW4gd2hlbiBhbGxvd0ZpbGVBY2Nlc3NGcm9t RmlsZVVSTHMgaXMgZmFsc2UuCisgICAgaWYgKG1fZnJhbWUtPnRyZWUoKS0+dG9wKCkgPT0gdGFy Z2V0RnJhbWUtPnRyZWUoKS0+dG9wKCkgJiYgYWN0aXZlRG9jdW1lbnQtPnVybCgpLnByb3RvY29s SXMoImZpbGUiKSAKKyAgICAgICAgJiYgdGFyZ2V0RnJhbWUtPmRvY3VtZW50KCktPnVybCgpLnBy b3RvY29sSXMoImZpbGUiKSkgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBj b25zdCBTZWN1cml0eU9yaWdpbiogYWN0aXZlU2VjdXJpdHlPcmlnaW4gPSBhY3RpdmVEb2N1bWVu dC0+c2VjdXJpdHlPcmlnaW4oKTsKIAogICAgIC8vIEZvciB0b3AtbGV2ZWwgd2luZG93cywgY2hl Y2sgdGhlIG9wZW5lci4KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwMjQzKQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMjYgIEp1 c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgcGVlciBmcmFtZSBuYXZpZ2F0aW9uIGZv ciBmaWxlIFVSTHMgd2hlbiBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgaXMgZmFsc2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NzUwCisKKyAg ICAgICAgQ2hlY2sgdGhhdCBwZWVyIGZpbGU6IGZyYW1lcyBjYW4gbmF2aWdhdGUgZWFjaCBvdGhl ci4KKworICAgICAgICAqIGZhc3QvZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS1uby1maWxlLWFjY2Vz cy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZnJhbWVzL2xvY2F0aW9uLWNo YW5nZS1uby1maWxlLWFjY2Vzcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9y ZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJhbWUtMS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJhbWUtMi5odG1sOiBBZGRlZC4K KwogMjAxMC0wNS0yNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFVucmV2aWV3ZWQgZml4LCBRdCBzcGVjaWZpYyBleHBlY3RlZCBmaWxlIHVwZGF0ZWQg YWZ0ZXIgcjYwMjM1LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hh bmdlLW5vLWZpbGUtYWNjZXNzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MtZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdl LW5vLWZpbGUtYWNjZXNzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyIEBA CitBTEVSVDogU1VDQ0VTUworCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9sb2NhdGlv bi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9m YXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MuaHRtbAkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS1uby1maWxlLWFj Y2Vzcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQgQEAKKzxmcmFtZXNldCBjb2xzPSIx LDEiPgorICAgIDxmcmFtZSBzcmM9InJlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0xLmh0 bWwiPgorICAgIDxmcmFtZSBpZD0iciIgc3JjPSJyZXNvdXJjZXMvZW1wdHktYm9keS5odG1sIj4K KzwvZnJhbWVzZXQ+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8t ZmlsZS1hY2Nlc3MtZnJhbWUtMS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qv ZnJhbWVzL3Jlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0xLmh0bWwJKHJldmlzaW9uIDAp CisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJh bWUtMS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE5IEBACis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2Fp dFVudGlsRG9uZSgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLnNldEFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzKGZhbHNlKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRB bGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoZmFsc2UpOworfQord2luZG93Lm9ubG9hZCA9IGZ1 bmN0aW9uKCkgeworICAgIHBhcmVudC5mcmFtZXNbMV0ubG9jYXRpb249J25vLWZpbGUtYWNjZXNz LWZyYW1lLTIuaHRtbCc7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0 ZXN0cyBpZiBhIGZpbGUgVVJMIGNhbiBuYXZpZ2F0ZSBhIHBlZXIgZmlsZSBVUkwgZnJhbWUuCitJ ZiB0aGUgdGVzdCBmYWlsZWQgaXQgd2lsbCBoYW5nIGFuZCB0aGUgZnJhbWUgdG8gdGhlIHJpZ2h0 IHdpbGwgcmVtYWluIGJsYW5rLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRl c3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0yLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVzb3VyY2VzL25vLWZpbGUtYWNj ZXNzLWZyYW1lLTIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZnJhbWVz L3Jlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0yLmh0bWwJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsNyBAQAorPHA+U1VDQ0VTUzwvcD4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRl c3RDb250cm9sbGVyKSB7CisgICAgYWxlcnQoIlNVQ0NFU1MiKTsKKyAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5ub3RpZnlEb25lKCk7Cit9Cis8L3NjcmlwdD4K 57125 2010-05-26 12:44:21 -0700 2010-05-28 11:10:50 -0700 Patch bug-39750-20100526124419.patch text/plain 4785 jschuh SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDI0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMjYgIEp1c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWxsb3cgcGVlciBmcmFtZSBuYXZpZ2F0aW9uIGZvciBmaWxlIFVSTHMgd2hlbiBhbGxvd0ZpbGVB Y2Nlc3NGcm9tRmlsZVVSTHMgaXMgZmFsc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM5NzUwCisKKyAgICAgICAgRml4IGZvciBsb2NhbCBIVE1MIHBh Y2thZ2UgYnJlYWthZ2Ugd2hlbiBlYWNoIGZpbGUgaXMgaXRzIG93biBvcmlnaW4uIAorICAgICAg ICBJbiB0aGlzIGNhc2Ugd2Ugc2hvdWxkIGFsbG93IHBlZXIgZmlsZTogZnJhbWVzIHRvIG5hdmln YXRlIGVhY2ggb3RoZXIgCisgICAgICAgIHdoZW4gdGhleSBzaGFyZSB0aGUgc2FtZSB0b3AgZnJh bWUuCisKKyAgICAgICAgVGVzdDogZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZpbGUt YWNjZXNzLmh0bWwKKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c2hvdWxkQWxsb3dOYXZpZ2F0aW9uKToKKwogMjAxMC0w NS0yNiAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgR1RLKyBidWls ZCBmaXgsIHN0cmlrZSB0d28uCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiA2 MDI0MykKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjE5MCw2ICsyMTkwLDEyIEBAIGJvb2wgRnJhbWVMb2FkZXI6OnNob3VsZEFsbG93TmF2aWdh dGlvbigKICAgICBBU1NFUlQoYWN0aXZlRG9jdW1lbnQpOwogICAgIGNvbnN0IFNlY3VyaXR5T3Jp Z2luKiBhY3RpdmVTZWN1cml0eU9yaWdpbiA9IGFjdGl2ZURvY3VtZW50LT5zZWN1cml0eU9yaWdp bigpOwogCisgICAgLy8gQWxsb3cgcGVlciBmcmFtZSBuYXZpZ2F0aW9uIGZvciBmaWxlIFVSTHMg ZXZlbiB3aGVuIGFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyBpcyBmYWxzZS4KKyAgICBpZiAo bV9mcmFtZS0+dHJlZSgpLT50b3AoKSA9PSB0YXJnZXRGcmFtZS0+dHJlZSgpLT50b3AoKSAmJiBh Y3RpdmVTZWN1cml0eU9yaWdpbi0+aXNMb2NhbCgpCisgICAgICAgICYmIHRhcmdldEZyYW1lLT5k b2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5pc0xvY2FsKCkpIHsKKyAgICAgICAgcmV0dXJu IHRydWU7CisgICAgfQorCiAgICAgLy8gRm9yIHRvcC1sZXZlbCB3aW5kb3dzLCBjaGVjayB0aGUg b3BlbmVyLgogICAgIGlmICghdGFyZ2V0RnJhbWUtPnRyZWUoKS0+cGFyZW50KCkgJiYgY2FuQWNj ZXNzQW5jZXN0b3IoYWN0aXZlU2VjdXJpdHlPcmlnaW4sIHRhcmdldEZyYW1lLT5sb2FkZXIoKS0+ b3BlbmVyKCkpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwMjQz KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTAtMDUtMjYgIEp1c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgcGVlciBm cmFtZSBuYXZpZ2F0aW9uIGZvciBmaWxlIFVSTHMgd2hlbiBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmls ZVVSTHMgaXMgZmFsc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM5NzUwCisKKyAgICAgICAgQ2hlY2sgdGhhdCBwZWVyIGZpbGU6IGZyYW1lcyBjYW4g bmF2aWdhdGUgZWFjaCBvdGhlci4KKworICAgICAgICAqIGZhc3QvZnJhbWVzL2xvY2F0aW9uLWNo YW5nZS1uby1maWxlLWFjY2Vzcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv ZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS1uby1maWxlLWFjY2Vzcy5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJhbWUtMS5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJh bWUtMi5odG1sOiBBZGRlZC4KKwogMjAxMC0wNS0yNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3Nz eUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZml4LCBRdCBzcGVjaWZpYyBleHBl Y3RlZCBmaWxlIHVwZGF0ZWQgYWZ0ZXIgcjYwMjM1LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9m cmFtZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZpbGUtYWNjZXNzLWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1h Y2Nlc3MtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mcmFt ZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZpbGUtYWNjZXNzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwyIEBACitBTEVSVDogU1VDQ0VTUworCkluZGV4OiBMYXlvdXRUZXN0cy9m YXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MuaHRtbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nl c3MuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2xvY2F0aW9u LWNoYW5nZS1uby1maWxlLWFjY2Vzcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQgQEAK KzxmcmFtZXNldCBjb2xzPSIxLDEiPgorICAgIDxmcmFtZSBzcmM9InJlc291cmNlcy9uby1maWxl LWFjY2Vzcy1mcmFtZS0xLmh0bWwiPgorICAgIDxmcmFtZSBpZD0iciIgc3JjPSJyZXNvdXJjZXMv ZW1wdHktYm9keS5odG1sIj4KKzwvZnJhbWVzZXQ+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Zy YW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJhbWUtMS5odG1sCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0x Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMv bm8tZmlsZS1hY2Nlc3MtZnJhbWUtMS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE5IEBA Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xs ZXIpIHsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVy LnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGZhbHNlKTsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5zZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoZmFsc2UpOworfQor d2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgIHBhcmVudC5mcmFtZXNbMV0ubG9jYXRp b249J25vLWZpbGUtYWNjZXNzLWZyYW1lLTIuaHRtbCc7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5PgorPHA+VGhpcyB0ZXN0cyBpZiBhIGZpbGUgVVJMIGNhbiBuYXZpZ2F0ZSBhIHBlZXIg ZmlsZSBVUkwgZnJhbWUuCitJZiB0aGUgdGVzdCBmYWlsZWQgaXQgd2lsbCBoYW5nIGFuZCB0aGUg ZnJhbWUgdG8gdGhlIHJpZ2h0IHdpbGwgcmVtYWluIGJsYW5rLjwvcD4KKzwvYm9keT4KKzwvaHRt bD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy9uby1maWxlLWFjY2Vz cy1mcmFtZS0yLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVz b3VyY2VzL25vLWZpbGUtYWNjZXNzLWZyYW1lLTIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0yLmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNyBAQAorPHA+U1VDQ0VTUzwvcD4KKzxzY3JpcHQ+Citp ZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgYWxlcnQoIlNVQ0NFU1MiKTsK KyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cit9Cis8L3NjcmlwdD4K 57346 2010-05-28 11:10:54 -0700 2010-05-29 03:59:00 -0700 Patch bug-39750-20100528111052.patch text/plain 4963 jschuh SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDM2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMjggIEp1c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWxsb3cgZGVzY2VuZGFudCBmcmFtZSBuYXZpZ2F0aW9uIGZvciBmaWxlIFVSTHMgd2hlbiBhbGxv d0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgaXMgZmFsc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NzUwCisKKyAgICAgICAgRml4IGZvciBsb2NhbCBI VE1MIHBhY2thZ2UgYnJlYWthZ2Ugd2hlbiBlYWNoIGZpbGUgaXMgaXRzIG93biBvcmlnaW4uIAor ICAgICAgICBJbiB0aGlzIGNhc2Ugd2Ugc2hvdWxkIGFsbG93IGRlc2NlbmRhbnQgZmlsZTogZnJh bWVzIHRvIG5hdmlnYXRlIGVhY2ggCisgICAgICAgIG90aGVyIHdoZW4gdGhleSBzaGFyZSB0aGUg c2FtZSB0b3AgZnJhbWUuCisKKyAgICAgICAgVGVzdDogZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hh bmdlLW5vLWZpbGUtYWNjZXNzLmh0bWwKKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c2hvdWxkQWxsb3dOYXZpZ2F0aW9u KToKKwogMjAxMC0wNS0yNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShy ZXZpc2lvbiA2MDM2NCkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjE0MSw2ICsyMTQxLDcgQEAgc3RhdGljIGJvb2wgY2FuQWNjZXNzQW5jZXN0 b3IoY29uc3QgU2VjdQogICAgIGlmICghdGFyZ2V0RnJhbWUpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAorICAgIGNvbnN0IGJvb2wgaXNMb2NhbEFjdGl2ZU9yaWdpbiA9IGFjdGl2ZVNlY3VyaXR5 T3JpZ2luLT5pc0xvY2FsKCk7CiAgICAgZm9yIChGcmFtZSogYW5jZXN0b3JGcmFtZSA9IHRhcmdl dEZyYW1lOyBhbmNlc3RvckZyYW1lOyBhbmNlc3RvckZyYW1lID0gYW5jZXN0b3JGcmFtZS0+dHJl ZSgpLT5wYXJlbnQoKSkgewogICAgICAgICBEb2N1bWVudCogYW5jZXN0b3JEb2N1bWVudCA9IGFu Y2VzdG9yRnJhbWUtPmRvY3VtZW50KCk7CiAgICAgICAgIGlmICghYW5jZXN0b3JEb2N1bWVudCkK QEAgLTIxNDksNiArMjE1MCwxMCBAQCBzdGF0aWMgYm9vbCBjYW5BY2Nlc3NBbmNlc3Rvcihjb25z dCBTZWN1CiAgICAgICAgIGNvbnN0IFNlY3VyaXR5T3JpZ2luKiBhbmNlc3RvclNlY3VyaXR5T3Jp Z2luID0gYW5jZXN0b3JEb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKTsKICAgICAgICAgaWYgKGFj dGl2ZVNlY3VyaXR5T3JpZ2luLT5jYW5BY2Nlc3MoYW5jZXN0b3JTZWN1cml0eU9yaWdpbikpCiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgCisgICAgICAgIC8vIEFsbG93IGZpbGUg VVJMIGRlc2NlbmRhbnQgbmF2aWdhdGlvbiBldmVuIHdoZW4gYWxsb3dGaWxlQWNjZXNzRnJvbUZp bGVVUkxzIGlzIGZhbHNlLgorICAgICAgICBpZiAoaXNMb2NhbEFjdGl2ZU9yaWdpbiAmJiBhbmNl c3RvclNlY3VyaXR5T3JpZ2luLT5pc0xvY2FsKCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2MDM2NCkKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisy MDEwLTA1LTI4ICBKdXN0aW4gU2NodWggIDxqc2NodWhAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IGRlc2NlbmRhbnQg ZnJhbWUgbmF2aWdhdGlvbiBmb3IgZmlsZSBVUkxzIHdoZW4gYWxsb3dGaWxlQWNjZXNzRnJvbUZp bGVVUkxzIGlzIGZhbHNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zOTc1MAorCisgICAgICAgIENoZWNrIHRoYXQgZGVzY2VuZGFudCBmaWxlOiBmcmFt ZXMgY2FuIG5hdmlnYXRlIGVhY2ggb3RoZXIuCisKKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9sb2Nh dGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9mcmFtZXMvcmVzb3VyY2VzL25vLWZpbGUtYWNjZXNzLWZyYW1lLTEu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvcmVzb3VyY2VzL25vLWZpbGUtYWNj ZXNzLWZyYW1lLTIuaHRtbDogQWRkZWQuCisKIDIwMTAtMDUtMjggIFNodSBDaGFuZyAgPGNoYW5n LnNodUBub2tpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4KSW5kZXg6IExheW91dFRlc3Rz L2Zhc3QvZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS1uby1maWxlLWFjY2Vzcy1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLW5v LWZpbGUtYWNjZXNzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zh c3QvZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS1uby1maWxlLWFjY2Vzcy1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMiBAQAorQUxFUlQ6IFNVQ0NFU1MKKwpJbmRleDogTGF5b3V0 VGVzdHMvZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZpbGUtYWNjZXNzLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZp bGUtYWNjZXNzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9s b2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3MuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSw0IEBACis8ZnJhbWVzZXQgY29scz0iMSwxIj4KKyAgICA8ZnJhbWUgc3JjPSJyZXNvdXJjZXMv bm8tZmlsZS1hY2Nlc3MtZnJhbWUtMS5odG1sIj4KKyAgICA8ZnJhbWUgaWQ9InIiIHNyYz0icmVz b3VyY2VzL2VtcHR5LWJvZHkuaHRtbCI+Cis8L2ZyYW1lc2V0PgpJbmRleDogTGF5b3V0VGVzdHMv ZmFzdC9mcmFtZXMvcmVzb3VyY2VzL25vLWZpbGUtYWNjZXNzLWZyYW1lLTEuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3Mt ZnJhbWUtMS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVz b3VyY2VzL25vLWZpbGUtYWNjZXNzLWZyYW1lLTEuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwxOSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAg IGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5zZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyhmYWxzZSk7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKGZhbHNl KTsKK30KK3dpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICBwYXJlbnQuZnJhbWVzWzFd LmxvY2F0aW9uPSduby1maWxlLWFjY2Vzcy1mcmFtZS0yLmh0bWwnOworfQorPC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdHMgaWYgYSBmaWxlIFVSTCBjYW4gbmF2aWdhdGUg YSBwZWVyIGZpbGUgVVJMIGZyYW1lLgorSWYgdGhlIHRlc3QgZmFpbGVkIGl0IHdpbGwgaGFuZyBh bmQgdGhlIGZyYW1lIHRvIHRoZSByaWdodCB3aWxsIHJlbWFpbiBibGFuay48L3A+Cis8L2JvZHk+ Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmls ZS1hY2Nlc3MtZnJhbWUtMi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZnJh bWVzL3Jlc291cmNlcy9uby1maWxlLWFjY2Vzcy1mcmFtZS0yLmh0bWwJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbm8tZmlsZS1hY2Nlc3MtZnJhbWUt Mi5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDcgQEAKKzxwPlNVQ0NFU1M8L3A+Cis8c2Ny aXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgIGFsZXJ0KCJTVUND RVNTIik7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworfQorPC9zY3Jp cHQ+Cg==