62806 2011-06-16 11:31:39 -0700 Set referrer sooner on a ResourceRequest from a worker 2011-06-16 16:45:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap levin webkit.review.bot oldest_to_newest 422101 0 japhet 2011-06-16 11:31:39 -0700 Currently, we have an optionalOutgoingReferrer parameter on several functions to allow a WorkerThreadableLoader to override the referrer of its requests. I think we should be able to call setHTTPReferrer() on the ResourceRequest as soon as we are in the main thread and pass the overriding referrer that way, meaning one less optional parameter in a few places. Patch coming shortly. 422106 1 97471 japhet 2011-06-16 11:34:30 -0700 Created attachment 97471 patch 422158 2 97471 ap 2011-06-16 13:22:10 -0700 Comment on attachment 97471 patch I can't follow how Referer setting logic works with this patch. For example, will we be getting https workers' URLs sent to the server in this field now? Or was it a problem even before this patch? 422162 3 japhet 2011-06-16 13:26:24 -0700 (In reply to comment #2) > (From update of attachment 97471 [details]) > I can't follow how Referer setting logic works with this patch. For example, will we be getting https workers' URLs sent to the server in this field now? Or was it a problem even before this patch? The diff cut off at a lousy place. The next line in SubresourceLoader.cpp should enforce referrer blocking regardless of whether we're using the document's outgoingReferrer of the worker's override: http://trac.webkit.org/browser/trunk/Source/WebCore/loader/SubresourceLoader.cpp#L94 422173 4 ap 2011-06-16 13:34:41 -0700 Looks good to me. David, do you remember if there was a reason why we didn't implement it this way originally? 422293 5 levin 2011-06-16 15:27:13 -0700 (In reply to comment #4) > Looks good to me. David, do you remember if there was a reason why we didn't implement it this way originally? In short, it was a bad oversight on my part. As best I can remember, my mental rough outline was to add it into ResourceRequest but was discouraged from adding more there. Unfortunately (for no good reason), I must not have checked to see that it was already there. This is much better. 422320 6 97471 webkit.review.bot 2011-06-16 16:45:28 -0700 Comment on attachment 97471 patch Clearing flags on attachment: 97471 Committed r89086: <http://trac.webkit.org/changeset/89086> 422321 7 webkit.review.bot 2011-06-16 16:45:33 -0700 All reviewed patches have been landed. Closing bug. 97471 2011-06-16 11:34:30 -0700 2011-06-16 16:45:28 -0700 patch oor.txt text/plain 12544 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MDUwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMTYgIE5hdGUgQ2hh cGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTZXQgdGhlIHJlZmVycmVyIG9uIGEgUmVzb3VyY2VSZXF1ZXN0 IGZyb20gYSBXb3JrZXJUaHJlYWRhYmxlTG9hZGVyCisgICAgICAgIGFzIHNvb24gYXMgdGhlIHJl cXVlc3QgcmVhY2hlcyB0aGUgbWFpbiB0aHJlYWQgYW5kIHJlbW92ZSB0aGUKKyAgICAgICAgb3B0 aW9uYWxPdXRnb2luZ1JlZmVycmVyIHBhcmFtZXRlciBmcm9tIHNvbWUgZnVuY3Rpb25zLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI4MDYKKworICAg ICAgICAqIGxvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5 KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6RG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRl cjo6bG9hZFJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2Fk ZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVTdWJyZXNvdXJjZUxv YWQpOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIuaDoKKyAgICAgICAg KiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVz b3VyY2VMb2FkZXI6OmNyZWF0ZSk6CisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy Lmg6CisgICAgICAgICogbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkYWJsZUxvYWRlcjo6TWFpblRocmVhZEJyaWRnZTo6bWFp blRocmVhZENyZWF0ZUxvYWRlcik6CisKIDIwMTEtMDYtMTYgIFZzZXZvbG9kIFZsYXNvdiAgPHZz ZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIu Y3BwCShyZXZpc2lvbiA4OTAzNCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv YWRTY2hlZHVsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw5ICs4NCw5IEBACiB9CiAKIFBh c3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IFJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1 bGVTdWJyZXNvdXJjZUxvYWQoRnJhbWUqIGZyYW1lLCBTdWJyZXNvdXJjZUxvYWRlckNsaWVudCog Y2xpZW50LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlTG9hZFByaW9y aXR5IHByaW9yaXR5LCBTZWN1cml0eUNoZWNrUG9saWN5IHNlY3VyaXR5Q2hlY2ssCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJvb2wgc2VuZFJlc291cmNlTG9hZENhbGxiYWNrcywgYm9vbCBzaG91bGRD b250ZW50U25pZmYsIGNvbnN0IFN0cmluZyYgb3B0aW9uYWxPdXRnb2luZ1JlZmVycmVyLCBib29s IHNob3VsZEJ1ZmZlckRhdGEpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VuZFJlc291cmNl TG9hZENhbGxiYWNrcywgYm9vbCBzaG91bGRDb250ZW50U25pZmYsIGJvb2wgc2hvdWxkQnVmZmVy RGF0YSkKIHsKLSAgICBSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IGxvYWRlciA9IFN1YnJlc291 cmNlTG9hZGVyOjpjcmVhdGUoZnJhbWUsIGNsaWVudCwgcmVxdWVzdCwgc2VjdXJpdHlDaGVjaywg c2VuZFJlc291cmNlTG9hZENhbGxiYWNrcywgc2hvdWxkQ29udGVudFNuaWZmLCBvcHRpb25hbE91 dGdvaW5nUmVmZXJyZXIsIHNob3VsZEJ1ZmZlckRhdGEpOworICAgIFJlZlB0cjxTdWJyZXNvdXJj ZUxvYWRlcj4gbG9hZGVyID0gU3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShmcmFtZSwgY2xpZW50 LCByZXF1ZXN0LCBzZWN1cml0eUNoZWNrLCBzZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzLCBzaG91 bGRDb250ZW50U25pZmYsIHNob3VsZEJ1ZmZlckRhdGEpOwogICAgIGlmIChsb2FkZXIpCiAgICAg ICAgIHNjaGVkdWxlTG9hZChsb2FkZXIuZ2V0KCksIHByaW9yaXR5KTsKICAgICByZXR1cm4gbG9h ZGVyLnJlbGVhc2UoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRh YmxlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2Vy VGhyZWFkYWJsZUxvYWRlci5jcHAJKHJldmlzaW9uIDg5MDM0KQorKysgU291cmNlL1dlYkNvcmUv bG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEs MTAgKzExMSwxMSBAQAogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PERvY3Vt ZW50Kj4oY29udGV4dCk7CiAKICAgICBPd25QdHI8UmVzb3VyY2VSZXF1ZXN0PiByZXF1ZXN0KFJl c291cmNlUmVxdWVzdDo6YWRvcHQocmVxdWVzdERhdGEpKTsKKyAgICByZXF1ZXN0LT5zZXRIVFRQ UmVmZXJyZXIob3V0Z29pbmdSZWZlcnJlcik7CiAgICAgLy8gRklYTUU6IElmIHRoZSBhIHNpdGUg cmVxdWVzdHMgYSBsb2NhbCByZXNvdXJjZSwgdGhlbiB0aGlzIHdpbGwgcmV0dXJuIGEgbm9uLXpl cm8gdmFsdWUgYnV0IHRoZSBzeW5jIHBhdGgKICAgICAvLyB3aWxsIHJldHVybiBhIDAgdmFsdWUu ICBFaXRoZXIgdGhpcyBzaG91bGQgcmV0dXJuIDAgb3IgdGhlIG90aGVyIGNvZGUgcGF0aCBzaG91 bGQgZG8gYSBjYWxsYmFjayB3aXRoCiAgICAgLy8gYSBmYWlsdXJlLgotICAgIHRoaXNQdHItPm1f bWFpblRocmVhZExvYWRlciA9IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKGRvY3Vt ZW50LCB0aGlzUHRyLCAqcmVxdWVzdCwgb3B0aW9ucywgb3V0Z29pbmdSZWZlcnJlcik7CisgICAg dGhpc1B0ci0+bV9tYWluVGhyZWFkTG9hZGVyID0gRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpj cmVhdGUoZG9jdW1lbnQsIHRoaXNQdHIsICpyZXF1ZXN0LCBvcHRpb25zKTsKICAgICBBU1NFUlQo dGhpc1B0ci0+bV9tYWluVGhyZWFkTG9hZGVyKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZFNjaGVkdWxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIuaAkocmV2aXNpb24gODkwMzQpCisrKyBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTUwLDcgKzUwLDcgQEAKIHB1YmxpYzoKICAgICBmcmllbmQgUmVzb3VyY2VMb2FkU2No ZWR1bGVyKiByZXNvdXJjZUxvYWRTY2hlZHVsZXIoKTsKIAotICAgIFBhc3NSZWZQdHI8U3VicmVz b3VyY2VMb2FkZXI+IHNjaGVkdWxlU3VicmVzb3VyY2VMb2FkKEZyYW1lKiwgU3VicmVzb3VyY2VM b2FkZXJDbGllbnQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBSZXNvdXJjZUxvYWRQcmlvcml0 eSA9IFJlc291cmNlTG9hZFByaW9yaXR5TG93LCBTZWN1cml0eUNoZWNrUG9saWN5ID0gRG9TZWN1 cml0eUNoZWNrLCBib29sIHNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MgPSB0cnVlLCBib29sIHNo b3VsZENvbnRlbnRTbmlmZiA9IHRydWUsIGNvbnN0IFN0cmluZyYgb3B0aW9uYWxPdXRnb2luZ1Jl ZmVycmVyID0gU3RyaW5nKCksIGJvb2wgc2hvdWxkQnVmZmVyRGF0YSA9IHRydWUpOworICAgIFBh c3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IHNjaGVkdWxlU3VicmVzb3VyY2VMb2FkKEZyYW1l KiwgU3VicmVzb3VyY2VMb2FkZXJDbGllbnQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBSZXNv dXJjZUxvYWRQcmlvcml0eSA9IFJlc291cmNlTG9hZFByaW9yaXR5TG93LCBTZWN1cml0eUNoZWNr UG9saWN5ID0gRG9TZWN1cml0eUNoZWNrLCBib29sIHNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3Mg PSB0cnVlLCBib29sIHNob3VsZENvbnRlbnRTbmlmZiA9IHRydWUsIGJvb2wgc2hvdWxkQnVmZmVy RGF0YSA9IHRydWUpOwogICAgIFBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI+ IHNjaGVkdWxlUGx1Z2luU3RyZWFtTG9hZChGcmFtZSosIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9h ZGVyQ2xpZW50KiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgdm9pZCBhZGRNYWluUmVz b3VyY2VMb2FkKFJlc291cmNlTG9hZGVyKik7CiAgICAgdm9pZCByZW1vdmUoUmVzb3VyY2VMb2Fk ZXIqKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2Fk ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyLmgJKHJldmlzaW9uIDg5MDM0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0Rv Y3VtZW50VGhyZWFkYWJsZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3IEBA CiAgICAgICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIHB1YmxpYzoKICAgICAgICAg c3RhdGljIHZvaWQgbG9hZFJlc291cmNlU3luY2hyb25vdXNseShEb2N1bWVudCosIGNvbnN0IFJl c291cmNlUmVxdWVzdCYsIFRocmVhZGFibGVMb2FkZXJDbGllbnQmLCBjb25zdCBUaHJlYWRhYmxl TG9hZGVyT3B0aW9ucyYpOwotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxEb2N1bWVudFRocmVh ZGFibGVMb2FkZXI+IGNyZWF0ZShEb2N1bWVudCosIFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCBj b25zdCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYsIGNv bnN0IFN0cmluZyYgb3B0aW9uYWxPdXRnb2luZ1JlZmVycmVyID0gU3RyaW5nKCkpOworICAgICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGNyZWF0ZShEb2N1 bWVudCosIFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBj b25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYpOwogICAgICAgICB2aXJ0dWFsIH5Eb2N1bWVu dFRocmVhZGFibGVMb2FkZXIoKTsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsKCk7CkBA IC03MSw3ICs3MSw3IEBACiAgICAgICAgICAgICBMb2FkQXN5bmNocm9ub3VzbHkKICAgICAgICAg fTsKIAotICAgICAgICBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIoRG9jdW1lbnQqLCBUaHJlYWRh YmxlTG9hZGVyQ2xpZW50KiwgQmxvY2tpbmdCZWhhdmlvciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmLCBjb25zdCBTdHJpbmcmIG9wdGlvbmFs T3V0Z29pbmdSZWZlcnJlcik7CisgICAgICAgIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcihEb2N1 bWVudCosIFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCBCbG9ja2luZ0JlaGF2aW9yLCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYpOwogCiAgICAg ICAgIHZpcnR1YWwgdm9pZCB3aWxsU2VuZFJlcXVlc3QoU3VicmVzb3VyY2VMb2FkZXIqLCBSZXNv dXJjZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKTsK ICAgICAgICAgdmlydHVhbCB2b2lkIGRpZFNlbmREYXRhKFN1YnJlc291cmNlTG9hZGVyKiwgdW5z aWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudCwgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsQnl0ZXNU b0JlU2VudCk7CkBAIC0xMDEsNyArMTAxLDYgQEAKICAgICAgICAgVGhyZWFkYWJsZUxvYWRlckNs aWVudCogbV9jbGllbnQ7CiAgICAgICAgIERvY3VtZW50KiBtX2RvY3VtZW50OwogICAgICAgICBU aHJlYWRhYmxlTG9hZGVyT3B0aW9ucyBtX29wdGlvbnM7Ci0gICAgICAgIFN0cmluZyBtX29wdGlv bmFsT3V0Z29pbmdSZWZlcnJlcjsKICAgICAgICAgYm9vbCBtX3NhbWVPcmlnaW5SZXF1ZXN0Owog ICAgICAgICBib29sIG1fYXN5bmM7CiAgICAgICAgIE93blB0cjxSZXNvdXJjZVJlcXVlc3Q+IG1f YWN0dWFsUmVxdWVzdDsgIC8vIG5vbi1udWxsIGR1cmluZyBBY2Nlc3MgQ29udHJvbCBwcmVmbGln aHQgY2hlY2tzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRl ci5jcHAJKHJldmlzaW9uIDg5MDM0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBAQAogI2VuZGlmCiB9 CiAKLVBhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IFN1YnJlc291cmNlTG9hZGVyOjpjcmVh dGUoRnJhbWUqIGZyYW1lLCBTdWJyZXNvdXJjZUxvYWRlckNsaWVudCogY2xpZW50LCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFNlY3VyaXR5Q2hlY2tQb2xpY3kgc2VjdXJpdHlDaGVj aywgYm9vbCBzZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzLCBib29sIHNob3VsZENvbnRlbnRTbmlm ZiwgY29uc3QgU3RyaW5nJiBvcHRpb25hbE91dGdvaW5nUmVmZXJyZXIsIGJvb2wgc2hvdWxkQnVm ZmVyRGF0YSkKK1Bhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IFN1YnJlc291cmNlTG9hZGVy OjpjcmVhdGUoRnJhbWUqIGZyYW1lLCBTdWJyZXNvdXJjZUxvYWRlckNsaWVudCogY2xpZW50LCBj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFNlY3VyaXR5Q2hlY2tQb2xpY3kgc2VjdXJp dHlDaGVjaywgYm9vbCBzZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzLCBib29sIHNob3VsZENvbnRl bnRTbmlmZiwgYm9vbCBzaG91bGRCdWZmZXJEYXRhKQogewogICAgIGlmICghZnJhbWUpCiAgICAg ICAgIHJldHVybiAwOwpAQCAtODMsMTEgKzgzLDExIEBACiAKICAgICBTdHJpbmcgb3V0Z29pbmdS ZWZlcnJlcjsKICAgICBTdHJpbmcgb3V0Z29pbmdPcmlnaW47Ci0gICAgaWYgKG9wdGlvbmFsT3V0 Z29pbmdSZWZlcnJlci5pc051bGwoKSkgeworICAgIGlmIChyZXF1ZXN0Lmh0dHBSZWZlcnJlcigp LmlzTnVsbCgpKSB7CiAgICAgICAgIG91dGdvaW5nUmVmZXJyZXIgPSBmbC0+b3V0Z29pbmdSZWZl cnJlcigpOwogICAgICAgICBvdXRnb2luZ09yaWdpbiA9IGZsLT5vdXRnb2luZ09yaWdpbigpOwog ICAgIH0gZWxzZSB7Ci0gICAgICAgIG91dGdvaW5nUmVmZXJyZXIgPSBvcHRpb25hbE91dGdvaW5n UmVmZXJyZXI7CisgICAgICAgIG91dGdvaW5nUmVmZXJyZXIgPSByZXF1ZXN0Lmh0dHBSZWZlcnJl cigpOwogICAgICAgICBvdXRnb2luZ09yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9t U3RyaW5nKG91dGdvaW5nUmVmZXJyZXIpLT50b1N0cmluZygpOwogICAgIH0KIApJbmRleDogU291 cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAJ KHJldmlzaW9uIDg5MDM0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFk YWJsZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDMwICs1MSwyOSBAQAogdm9pZCBE b2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoRG9jdW1l bnQqIGRvY3VtZW50LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFRocmVhZGFibGVM b2FkZXJDbGllbnQmIGNsaWVudCwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlv bnMpCiB7CiAgICAgLy8gVGhlIGxvYWRlciB3aWxsIGJlIGRlbGV0ZWQgYXMgc29vbiBhcyB0aGlz IGZ1bmN0aW9uIGV4aXRzLgotICAgIFJlZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGxv YWRlciA9IGFkb3B0UmVmKG5ldyBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIoZG9jdW1lbnQsICZj bGllbnQsIExvYWRTeW5jaHJvbm91c2x5LCByZXF1ZXN0LCBvcHRpb25zLCBTdHJpbmcoKSkpOwor ICAgIFJlZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGxvYWRlciA9IGFkb3B0UmVmKG5l dyBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIoZG9jdW1lbnQsICZjbGllbnQsIExvYWRTeW5jaHJv bm91c2x5LCByZXF1ZXN0LCBvcHRpb25zKSk7CiAgICAgQVNTRVJUKGxvYWRlci0+aGFzT25lUmVm KCkpOwogfQogCi1QYXNzUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4gRG9jdW1lbnRU aHJlYWRhYmxlTG9hZGVyOjpjcmVhdGUoRG9jdW1lbnQqIGRvY3VtZW50LCBUaHJlYWRhYmxlTG9h ZGVyQ2xpZW50KiBjbGllbnQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg VGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IFN0cmluZyYgb3B0aW9uYWxP dXRnb2luZ1JlZmVycmVyKQorUGFzc1JlZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IERv Y3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCwgVGhyZWFk YWJsZUxvYWRlckNsaWVudCogY2xpZW50LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJiBvcHRpb25zKQogewotICAgIFJlZlB0cjxE b2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGxvYWRlciA9IGFkb3B0UmVmKG5ldyBEb2N1bWVudFRo cmVhZGFibGVMb2FkZXIoZG9jdW1lbnQsIGNsaWVudCwgTG9hZEFzeW5jaHJvbm91c2x5LCByZXF1 ZXN0LCBvcHRpb25zLCBvcHRpb25hbE91dGdvaW5nUmVmZXJyZXIpKTsKKyAgICBSZWZQdHI8RG9j dW1lbnRUaHJlYWRhYmxlTG9hZGVyPiBsb2FkZXIgPSBhZG9wdFJlZihuZXcgRG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyKGRvY3VtZW50LCBjbGllbnQsIExvYWRBc3luY2hyb25vdXNseSwgcmVxdWVz dCwgb3B0aW9ucykpOwogICAgIGlmICghbG9hZGVyLT5tX2xvYWRlcikKICAgICAgICAgbG9hZGVy ID0gMDsKICAgICByZXR1cm4gbG9hZGVyLnJlbGVhc2UoKTsKIH0KIAotRG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXIoRG9jdW1lbnQqIGRvY3VtZW50LCBU aHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQsIEJsb2NraW5nQmVoYXZpb3IgYmxvY2tpbmdC ZWhhdmlvciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRhYmxl TG9hZGVyT3B0aW9ucyYgb3B0aW9ucywgY29uc3QgU3RyaW5nJiBvcHRpb25hbE91dGdvaW5nUmVm ZXJyZXIpCitEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRl cihEb2N1bWVudCogZG9jdW1lbnQsIFRocmVhZGFibGVMb2FkZXJDbGllbnQqIGNsaWVudCwgQmxv Y2tpbmdCZWhhdmlvciBibG9ja2luZ0JlaGF2aW9yLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJiBvcHRpb25zKQogICAgIDogbV9j bGllbnQoY2xpZW50KQogICAgICwgbV9kb2N1bWVudChkb2N1bWVudCkKICAgICAsIG1fb3B0aW9u cyhvcHRpb25zKQotICAgICwgbV9vcHRpb25hbE91dGdvaW5nUmVmZXJyZXIob3B0aW9uYWxPdXRn b2luZ1JlZmVycmVyKQogICAgICwgbV9zYW1lT3JpZ2luUmVxdWVzdChzZWN1cml0eU9yaWdpbigp LT5jYW5SZXF1ZXN0KHJlcXVlc3QudXJsKCkpKQogICAgICwgbV9hc3luYyhibG9ja2luZ0JlaGF2 aW9yID09IExvYWRBc3luY2hyb25vdXNseSkKIHsKICAgICBBU1NFUlQoZG9jdW1lbnQpOwogICAg IEFTU0VSVChjbGllbnQpOwogICAgIC8vIFNldHRpbmcgYW4gb3V0Z29pbmcgcmVmZXJlciBpcyBv bmx5IHN1cHBvcnRlZCBpbiB0aGUgYXN5bmMgY29kZSBwYXRoLgotICAgIEFTU0VSVChtX2FzeW5j IHx8IG1fb3B0aW9uYWxPdXRnb2luZ1JlZmVycmVyLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKG1f YXN5bmMgfHwgcmVxdWVzdC5odHRwUmVmZXJyZXIoKS5pc0VtcHR5KCkpOwogCiAgICAgaWYgKG1f c2FtZU9yaWdpblJlcXVlc3QgfHwgbV9vcHRpb25zLmNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSA9 PSBBbGxvd0Nyb3NzT3JpZ2luUmVxdWVzdHMpIHsKICAgICAgICAgbG9hZFJlcXVlc3QocmVxdWVz dCwgRG9TZWN1cml0eUNoZWNrKTsKQEAgLTMyMiw3ICszMjEsNyBAQAogICAgICAgICAvLyBDbGVh ciB0aGUgbG9hZGVyIHNvIHRoYXQgYW55IGNhbGxiYWNrcyBmcm9tIFN1YnJlc291cmNlTG9hZGVy OjpjcmVhdGUgd2lsbCBub3QgaGF2ZSB0aGUgb2xkIGxvYWRlci4KICAgICAgICAgbV9sb2FkZXIg PSAwOwogICAgICAgICBtX2xvYWRlciA9IHJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5zY2hlZHVs ZVN1YnJlc291cmNlTG9hZChtX2RvY3VtZW50LT5mcmFtZSgpLCB0aGlzLCByZXF1ZXN0LCBSZXNv dXJjZUxvYWRQcmlvcml0eU1lZGl1bSwgc2VjdXJpdHlDaGVjaywgc2VuZExvYWRDYWxsYmFja3Ms Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNuaWZmQ29udGVudCwgbV9vcHRpb25hbE91dGdvaW5nUmVmZXJyZXIsIHNo b3VsZEJ1ZmZlckRhdGEpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzbmlmZkNvbnRlbnQsIHNob3VsZEJ1ZmZlckRh dGEpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv bG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmgJKHJldmlzaW9uIDg5MDM0KQorKysgU291cmNlL1dl YkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcg KzQxLDcgQEAKICAgICAKICAgICBjbGFzcyBTdWJyZXNvdXJjZUxvYWRlciA6IHB1YmxpYyBSZXNv dXJjZUxvYWRlciB7CiAgICAgcHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdWJy ZXNvdXJjZUxvYWRlcj4gY3JlYXRlKEZyYW1lKiwgU3VicmVzb3VyY2VMb2FkZXJDbGllbnQqLCBj b25zdCBSZXNvdXJjZVJlcXVlc3QmLCBTZWN1cml0eUNoZWNrUG9saWN5ID0gRG9TZWN1cml0eUNo ZWNrLCBib29sIHNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MgPSB0cnVlLCBib29sIHNob3VsZENv bnRlbnRTbmlmZiA9IHRydWUsIGNvbnN0IFN0cmluZyYgb3B0aW9uYWxPdXRnb2luZ1JlZmVycmVy ID0gU3RyaW5nKCksIGJvb2wgc2hvdWxkQnVmZmVyRGF0YSA9IHRydWUpOworICAgICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4gY3JlYXRlKEZyYW1lKiwgU3VicmVzb3Vy Y2VMb2FkZXJDbGllbnQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBTZWN1cml0eUNoZWNrUG9s aWN5ID0gRG9TZWN1cml0eUNoZWNrLCBib29sIHNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MgPSB0 cnVlLCBib29sIHNob3VsZENvbnRlbnRTbmlmZiA9IHRydWUsIGJvb2wgc2hvdWxkQnVmZmVyRGF0 YSA9IHRydWUpOwogCiAgICAgICAgIHZvaWQgY2xlYXJDbGllbnQoKSB7IG1fY2xpZW50ID0gMDsg fQogCg==