185454 2018-05-08 16:39:24 -0700 Storage Access API: Make user opt-in sticky 2018-05-08 17:02:49 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander achristensen oldest_to_newest 1422025 0 wilander 2018-05-08 16:39:24 -0700 The experimental storage access prompt should persist the user's choice to opt-in to access under specific domains. Such storage access should age out with the accessing domain's cookies and website data. 1422026 1 wilander 2018-05-08 16:39:34 -0700 <rdar://problem/40003946> 1422034 2 339898 wilander 2018-05-08 16:47:14 -0700 Created attachment 339898 Patch 1422047 3 wilander 2018-05-08 16:59:31 -0700 Committed r231524: <https://trac.webkit.org/changeset/231524> 1422052 4 wilander 2018-05-08 17:02:49 -0700 Thanks for the review, Alex! 339898 2018-05-08 16:47:14 -0700 2018-05-08 16:54:34 -0700 Patch bug-185454-20180508164713.patch text/plain 13158 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzE1MjMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA1LTA4ICBKb2huIFdpbGFu ZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNzIEFQSTog TWFrZSB1c2VyIG9wdC1pbiBzdGlja3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4NTQ1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDAwMDM5NDY+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBw YXRjaCBwZXJzaXN0cyB0aGUgdXNlcidzIGNob2ljZSB0byBvcHQtaW4gdG8gYWNjZXNzIHVuZGVy IHNwZWNpZmljIGRvbWFpbnMuCisgICAgICAgIFN1Y2ggc3RvcmFnZSBhY2Nlc3Mgc2hvdWxkIGFn ZSBvdXQgd2l0aCB0aGUgYWNjZXNzaW5nIGRvbWFpbidzIGNvb2tpZXMgYW5kIHdlYnNpdGUKKyAg ICAgICAgZGF0YS4gVGhlIG9wdC1pbiBwcm9tcHQgaXMgc3RpbGwgYW4gZXhwZXJpbWVudGFsIGZl YXR1cmUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpoYXNTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NVbmRlck9w ZW5lcik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 Z3JhbnRTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3NJbnRlcm5hbCk6CisgICAgICAgIChXZWJL aXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzVXNlckdyYW50ZWRTdG9yYWdl QWNjZXNzVGhyb3VnaFByb21wdCBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkVW5leHBpcmVkUmVjZW50VXNlckludGVyYWN0aW9u IGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmg6CisKIDIwMTgtMDUtMDggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgog CiAgICAgICAgIERvIG5vdCBhcHBseSBYLUZyYW1lLU9wdGlvbnMgYW5kIENTUCBmcmFtZS1hbmNl c3RvcnMgdG8gUXVpY2sgTG9vay1hcHBsaWNhYmxlIHJlc3BvbnNlcyBpbiBOZXR3b3JrUHJvY2Vz cwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCShyZXZpc2lvbiAyMzE1MjMpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDIsMTYgKzM0MiwyNCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6aGFzCiAgICAgICAgIAogICAgICAgICBhdXRvJiBzdWJGcmFtZVN0YXRpc3Rp YyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4oc3ViRnJhbWVQcmlt YXJ5RG9tYWluKTsKICAgICAgICAgaWYgKHNob3VsZEJsb2NrQ29va2llcyhzdWJGcmFtZVN0YXRp c3RpYykpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKGZhbHNlKTsKKyAgICAgICAgICAgIFJ1bkxv b3A6Om1haW4oKS5kaXNwYXRjaChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0geworICAg ICAgICAgICAgICAgIGNhbGxiYWNrKGZhbHNlKTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFzaG91bGRQYXJ0aXRpb25Db29r aWVzKHN1YkZyYW1lU3RhdGlzdGljKSkgewotICAgICAgICAgICAgY2FsbGJhY2sodHJ1ZSk7Cisg ICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2NhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayldIHsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayh0cnVlKTsKKyAgICAgICAgICAg IH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgbV9oYXNTdG9y YWdlQWNjZXNzRm9yRnJhbWVIYW5kbGVyKHN1YkZyYW1lUHJpbWFyeURvbWFpbiwgdG9wRnJhbWVQ cmltYXJ5RG9tYWluLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAg ICAgbV9oYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWVIYW5kbGVyKHN1YkZyYW1lUHJpbWFyeURvbWFp biwgdG9wRnJhbWVQcmltYXJ5RG9tYWluLCBmcmFtZUlELCBwYWdlSUQsIFtjYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spXSAoYm9vbCB2YWx1ZSkgbXV0YWJsZSB7CisgICAgICAgICAgICBSdW5M b29wOjptYWluKCkuZGlzcGF0Y2goW2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIHZhbHVl XSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayh2YWx1ZSk7CisgICAgICAg ICAgICB9KTsKKyAgICAgICAgfSk7CiAgICAgfSk7CiB9CiAKQEAgLTM4NCw3ICszOTIsOCBAQCB2 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVxCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAocHJvbXB0RW5hYmxlZCkgeworICAgICAgICBh dXRvIHVzZXJXYXNQcm9tcHRlZEVhcmxpZXIgPSBwcm9tcHRFbmFibGVkICYmIGhhc1VzZXJHcmFu dGVkU3RvcmFnZUFjY2Vzc1Rocm91Z2hQcm9tcHQoc3ViRnJhbWVTdGF0aXN0aWMsIHRvcEZyYW1l UHJpbWFyeURvbWFpbik7CisgICAgICAgIGlmIChwcm9tcHRFbmFibGVkICYmICF1c2VyV2FzUHJv bXB0ZWRFYXJsaWVyKSB7CiAgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2Nh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldIHsKICAgICAgICAgICAgICAgICBjYWxsYmFjayhT dG9yYWdlQWNjZXNzU3RhdHVzOjpSZXF1aXJlc1VzZXJQcm9tcHQpOwogICAgICAgICAgICAgfSk7 CkBAIC0zOTMsNyArNDAyLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnJlcQogCiAgICAgICAgIHN1YkZyYW1lU3RhdGlzdGljLnRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFy dHlEdWVUb1N0b3JhZ2VBY2Nlc3NBUEkrKzsKIAotICAgICAgICBncmFudFN0b3JhZ2VBY2Nlc3NJ bnRlcm5hbChXVEZNb3ZlKHN1YkZyYW1lUHJpbWFyeURvbWFpbiksIFdURk1vdmUodG9wRnJhbWVQ cmltYXJ5RG9tYWluKSwgZnJhbWVJRCwgcGFnZUlELCBmYWxzZSwgW2NhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayldIChib29sIHdhc0dyYW50ZWRBY2Nlc3MpIG11dGFibGUgeworICAgICAgICBn cmFudFN0b3JhZ2VBY2Nlc3NJbnRlcm5hbChXVEZNb3ZlKHN1YkZyYW1lUHJpbWFyeURvbWFpbiks IFdURk1vdmUodG9wRnJhbWVQcmltYXJ5RG9tYWluKSwgZnJhbWVJRCwgcGFnZUlELCB1c2VyV2Fz UHJvbXB0ZWRFYXJsaWVyLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0gKGJvb2wgd2Fz R3JhbnRlZEFjY2VzcykgbXV0YWJsZSB7CiAgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlz cGF0Y2goW2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIHdhc0dyYW50ZWRBY2Nlc3NdICgp IG11dGFibGUgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKHdhc0dyYW50ZWRBY2Nlc3MgPyBT dG9yYWdlQWNjZXNzU3RhdHVzOjpIYXNBY2Nlc3MgOiBTdG9yYWdlQWNjZXNzU3RhdHVzOjpDYW5u b3RSZXF1ZXN0QWNjZXNzKTsKICAgICAgICAgICAgIH0pOwpAQCAtNDAxLDE1ICs0MTAsMTUgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlcQogICAgIH0pOwogfQogCi12 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NV bmRlck9wZW5lcihTdHJpbmcmJiBkb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3MsIHVpbnQ2NF90 IG9wZW5lclBhZ2VJRCwgU3RyaW5nJiYgb3BlbmVyRG9tYWluLCBib29sIGlzVHJpZ2dlcmVkQnlV c2VyR2VzdHVyZSkKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZXF1ZXN0 U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKFN0cmluZyYmIHByaW1hcnlEb21haW5Jbk5lZWRPZlN0 b3JhZ2VBY2Nlc3MsIHVpbnQ2NF90IG9wZW5lclBhZ2VJRCwgU3RyaW5nJiYgb3BlbmVyUHJpbWFy eURvbWFpbiwgYm9vbCBpc1RyaWdnZXJlZEJ5VXNlckdlc3R1cmUpCiB7Ci0gICAgQVNTRVJUKGRv bWFpbkluTmVlZE9mU3RvcmFnZUFjY2VzcyAhPSBvcGVuZXJEb21haW4pOworICAgIEFTU0VSVChw cmltYXJ5RG9tYWluSW5OZWVkT2ZTdG9yYWdlQWNjZXNzICE9IG9wZW5lclByaW1hcnlEb21haW4p OwogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCi0gICAgaWYgKGRvbWFpbkluTmVl ZE9mU3RvcmFnZUFjY2VzcyA9PSBvcGVuZXJEb21haW4pCisgICAgaWYgKHByaW1hcnlEb21haW5J bk5lZWRPZlN0b3JhZ2VBY2Nlc3MgPT0gb3BlbmVyUHJpbWFyeURvbWFpbikKICAgICAgICAgcmV0 dXJuOwogCi0gICAgYXV0byYgZG9tYWluSW5OZWVkT2ZTdG9yYWdlQWNjZXNzU3RhdGlzdGljID0g ZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihkb21haW5Jbk5lZWRPZlN0 b3JhZ2VBY2Nlc3MpOworICAgIGF1dG8mIGRvbWFpbkluTmVlZE9mU3RvcmFnZUFjY2Vzc1N0YXRp c3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4ocHJpbWFyeURv bWFpbkluTmVlZE9mU3RvcmFnZUFjY2Vzcyk7CiAgICAgYXV0byBjb29raWVzQmxvY2tlZCA9IHNo b3VsZEJsb2NrQ29va2llcyhkb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3NTdGF0aXN0aWMpOwog CiAgICAgLy8gVGhlcmUgYXJlIG5vIGNvb2tpZXMgdG8gZ2V0IGFjY2VzcyB0byBpZiB0aGUgZG9t YWluIGhhcyBpdHMgY29va2llcyBibG9ja2VkIGFuZCBkaWQgbm90IGdldCB1c2VyIGludGVyYWN0 aW9uIG5vdy4KQEAgLTQyMCwxNyArNDI5LDI0IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpyZXEKICAgICBpZiAoIWNvb2tpZXNCbG9ja2VkICYmICFzaG91bGRQYXJ0aXRp b25Db29raWVzKGRvbWFpbkluTmVlZE9mU3RvcmFnZUFjY2Vzc1N0YXRpc3RpYykpCiAgICAgICAg IHJldHVybjsKIAotICAgIGdyYW50U3RvcmFnZUFjY2Vzc0ludGVybmFsKFdURk1vdmUoZG9tYWlu SW5OZWVkT2ZTdG9yYWdlQWNjZXNzKSwgV1RGTW92ZShvcGVuZXJEb21haW4pLCBzdGQ6Om51bGxv cHQsIG9wZW5lclBhZ2VJRCwgZmFsc2UsIFtdKGJvb2wpIHsgfSk7CiAjaWYgIVJFTEVBU0VfTE9H X0RJU0FCTEVECi0gICAgUkVMRUFTRV9MT0dfSU5GT19JRihtX2RlYnVnTG9nZ2luZ0VuYWJsZWQs IFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkdyYW50IHN0b3JhZ2UgYWNjZXNzIGZvciAl e3B1YmxpY31zIHVuZGVyIG9wZW5lciAle3B1YmxpY31zLCAle3B1YmxpY31zIHVzZXIgaW50ZXJh Y3Rpb24uIiwgZG9tYWluSW5OZWVkT2ZTdG9yYWdlQWNjZXNzLnV0ZjgoKS5kYXRhKCksIG9wZW5l ckRvbWFpbi51dGY4KCkuZGF0YSgpLCAoaXNUcmlnZ2VyZWRCeVVzZXJHZXN0dXJlID8gIndpdGgi IDogIndpdGhvdXQiKSk7CisgICAgUkVMRUFTRV9MT0dfSU5GT19JRihtX2RlYnVnTG9nZ2luZ0Vu YWJsZWQsIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkdyYW50IHN0b3JhZ2UgYWNjZXNz IGZvciAle3B1YmxpY31zIHVuZGVyIG9wZW5lciAle3B1YmxpY31zLCAle3B1YmxpY31zIHVzZXIg aW50ZXJhY3Rpb24uIiwgcHJpbWFyeURvbWFpbkluTmVlZE9mU3RvcmFnZUFjY2Vzcy51dGY4KCku ZGF0YSgpLCBvcGVuZXJQcmltYXJ5RG9tYWluLnV0ZjgoKS5kYXRhKCksIChpc1RyaWdnZXJlZEJ5 VXNlckdlc3R1cmUgPyAid2l0aCIgOiAid2l0aG91dCIpKTsKICNlbmRpZgorICAgIGdyYW50U3Rv cmFnZUFjY2Vzc0ludGVybmFsKFdURk1vdmUocHJpbWFyeURvbWFpbkluTmVlZE9mU3RvcmFnZUFj Y2VzcyksIFdURk1vdmUob3BlbmVyUHJpbWFyeURvbWFpbiksIHN0ZDo6bnVsbG9wdCwgb3BlbmVy UGFnZUlELCBmYWxzZSwgW10oYm9vbCkgeyB9KTsKIH0KIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFjY2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3Qs IFN0cmluZyYmIHRvcEZyYW1lSG9zdCwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlE LCBib29sIHVzZXJXYXNQcm9tcHRlZCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBj YWxsYmFjaykKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpncmFudFN0b3Jh Z2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB1c2VyV2FzUHJvbXB0ZWROb3cs IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY2FsbGJhY2spCiB7CiAgICAgQVNTRVJU KFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgc3ViRnJhbWVIb3N0ID0gY3Jvc3NU aHJlYWRDb3B5KHN1YkZyYW1lSG9zdCksIHRvcEZyYW1lSG9zdCA9IGNyb3NzVGhyZWFkQ29weSh0 b3BGcmFtZUhvc3QpLCBmcmFtZUlELCBwYWdlSUQsIHVzZXJXYXNQcm9tcHRlZCwgY2FsbGJhY2sg PSBXVEZNb3ZlKGNhbGxiYWNrKV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgIGdyYW50U3RvcmFnZUFj Y2Vzc0ludGVybmFsKFdURk1vdmUoc3ViRnJhbWVIb3N0KSwgV1RGTW92ZSh0b3BGcmFtZUhvc3Qp LCBmcmFtZUlELCBwYWdlSUQsIHVzZXJXYXNQcm9tcHRlZCwgW2NhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayldIChib29sIHdhc0dyYW50ZWRBY2Nlc3MpIG11dGFibGUgeworICAgIG1fc3RhdGlz dGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBzdWJGcmFtZUhvc3QgPSBjcm9zc1RocmVhZENvcHkoc3ViRnJhbWVIb3N0KSwgdG9wRnJhbWVI b3N0ID0gY3Jvc3NUaHJlYWRDb3B5KHRvcEZyYW1lSG9zdCksIGZyYW1lSUQsIHBhZ2VJRCwgdXNl cldhc1Byb21wdGVkTm93LCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSAoKSBtdXRhYmxl IHsKKyAgICAgICAgYXV0byBzdWJGcmFtZVByaW1hcnlEb21haW4gPSBpc29sYXRlZFByaW1hcnlE b21haW4oc3ViRnJhbWVIb3N0KTsKKyAgICAgICAgYXV0byB0b3BGcmFtZVByaW1hcnlEb21haW4g PSBpc29sYXRlZFByaW1hcnlEb21haW4odG9wRnJhbWVIb3N0KTsKKyAgICAgICAgaWYgKHVzZXJX YXNQcm9tcHRlZE5vdykgeworICAgICAgICAgICAgYXV0byYgc3ViRnJhbWVTdGF0aXN0aWMgPSBl bnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHN1YkZyYW1lUHJpbWFyeURv bWFpbik7CisgICAgICAgICAgICBBU1NFUlQoc3ViRnJhbWVTdGF0aXN0aWMuaGFkVXNlckludGVy YWN0aW9uKTsKKyAgICAgICAgICAgIHN1YkZyYW1lU3RhdGlzdGljLnN0b3JhZ2VBY2Nlc3NVbmRl clRvcEZyYW1lT3JpZ2lucy5hZGQodG9wRnJhbWVQcmltYXJ5RG9tYWluKTsKKyAgICAgICAgfQor ICAgICAgICBncmFudFN0b3JhZ2VBY2Nlc3NJbnRlcm5hbChXVEZNb3ZlKHN1YkZyYW1lSG9zdCks IFdURk1vdmUodG9wRnJhbWVIb3N0KSwgZnJhbWVJRCwgcGFnZUlELCB1c2VyV2FzUHJvbXB0ZWRO b3csIFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSAoYm9vbCB3YXNHcmFudGVkQWNjZXNz KSBtdXRhYmxlIHsKICAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbY2FsbGJh Y2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgd2FzR3JhbnRlZEFjY2Vzc10gKCkgbXV0YWJsZSB7CiAg ICAgICAgICAgICAgICAgY2FsbGJhY2sod2FzR3JhbnRlZEFjY2Vzcyk7CiAgICAgICAgICAgICB9 KTsKQEAgLTQzOCwxNiArNDU0LDE2IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpncmEKICAgICB9KTsKIH0KIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OmdyYW50U3RvcmFnZUFjY2Vzc0ludGVybmFsKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3Ry aW5nJiYgdG9wRnJhbWVIb3N0LCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCB1aW50 NjRfdCBwYWdlSUQsIGJvb2wgdXNlcldhc1Byb21wdGVkLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KGJvb2wpPiYmIGNhbGxiYWNrKQordm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OmdyYW50U3RvcmFnZUFjY2Vzc0ludGVybmFsKFN0cmluZyYmIHN1YkZyYW1lUHJpbWFyeURvbWFp biwgU3RyaW5nJiYgdG9wRnJhbWVQcmltYXJ5RG9tYWluLCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90 PiBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgdXNlcldhc1Byb21wdGVkTm93T3JFYXJs aWVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNrKQogeworICAgIFVO VVNFRF9QQVJBTSh1c2VyV2FzUHJvbXB0ZWROb3dPckVhcmxpZXIpOwogICAgIEFTU0VSVCghUnVu TG9vcDo6aXNNYWluKCkpOwotICAgIGF1dG8gc3ViRnJhbWVQcmltYXJ5RG9tYWluID0gaXNvbGF0 ZWRQcmltYXJ5RG9tYWluKHN1YkZyYW1lSG9zdCk7Ci0gICAgYXV0byB0b3BGcmFtZVByaW1hcnlE b21haW4gPSBpc29sYXRlZFByaW1hcnlEb21haW4odG9wRnJhbWVIb3N0KTsKKwogICAgIGlmIChz dWJGcmFtZVByaW1hcnlEb21haW4gPT0gdG9wRnJhbWVQcmltYXJ5RG9tYWluKSB7CiAgICAgICAg IGNhbGxiYWNrKHRydWUpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIAorCiAgICAgbV9n cmFudFN0b3JhZ2VBY2Nlc3NIYW5kbGVyKHN1YkZyYW1lUHJpbWFyeURvbWFpbiwgdG9wRnJhbWVQ cmltYXJ5RG9tYWluLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUoY2FsbGJhY2spKTsKIH0KIApA QCAtMTA0NSw2ICsxMDYxLDExIEBAIGJvb2wgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzaG8KICAgICByZXR1cm4gc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgJiYgIXN0YXRp c3RpYy5oYWRVc2VySW50ZXJhY3Rpb247CiB9CiAKK2Jvb2wgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpoYXNVc2VyR3JhbnRlZFN0b3JhZ2VBY2Nlc3NUaHJvdWdoUHJvbXB0KGNvbnN0 IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpYywgY29uc3QgU3RyaW5nJiBmaXJzdFBh cnR5UHJpbWFyeURvbWFpbikgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGlzdGljLnN0b3JhZ2VB Y2Nlc3NVbmRlclRvcEZyYW1lT3JpZ2lucy5jb250YWlucyhmaXJzdFBhcnR5UHJpbWFyeURvbWFp bik7Cit9CisKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp1cGRhdGVDb29r aWVQYXJ0aXRpb25pbmcoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNhbGxiYWNrKQogewog ICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAtMTE5Myw2ICsxMjE0LDcgQEAgYm9v bCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmhhcwogICAgICAgICAvLyBTZXQgdGlt ZXN0YW1wIHRvIDAgc28gdGhhdCBzdGF0aXN0aWNzIG1lcmdlIHdpbGwga25vdwogICAgICAgICAv LyBpdCBoYXMgYmVlbiByZXNldCBhcyBvcHBvc2VkIHRvIGl0cyBkZWZhdWx0IC0xLgogICAgICAg ICByZXNvdXJjZVN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSA9IHsgfTsK KyAgICAgICAgcmVzb3VyY2VTdGF0aXN0aWMuc3RvcmFnZUFjY2Vzc1VuZGVyVG9wRnJhbWVPcmln aW5zLmNsZWFyKCk7CiAgICAgICAgIHJlc291cmNlU3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlv biA9IGZhbHNlOwogICAgIH0KIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgJKHJldmlzaW9uIDIzMTUy MykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05MSw4ICs5MSw4IEBAIHB1YmxpYzoKIAogICAgIHZv aWQgaGFzU3RvcmFnZUFjY2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFN0cmluZyYmIHRvcEZy YW1lSG9zdCwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBXVEY6OkNvbXBsZXRp b25IYW5kbGVyPHZvaWQgKGJvb2wpPiYmIGNhbGxiYWNrKTsKICAgICB2b2lkIHJlcXVlc3RTdG9y YWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgcHJvbXB0RW5hYmxlZCwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChTdG9yYWdlQWNjZXNzU3RhdHVzKT4mJik7Ci0gICAgdm9pZCBy ZXF1ZXN0U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKFN0cmluZyYmIGRvbWFpbkluTmVlZE9mU3Rv cmFnZUFjY2VzcywgdWludDY0X3Qgb3BlbmVyUGFnZUlELCBTdHJpbmcmJiBvcGVuZXJEb21haW4s IGJvb2wgaXNUcmlnZ2VyZWRCeVVzZXJHZXN0dXJlKTsKLSAgICB2b2lkIGdyYW50U3RvcmFnZUFj Y2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFN0cmluZyYmIHRvcEZyYW1lSG9zdCwgdWludDY0 X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBib29sIHVzZXJXYXNQcm9tcHRlZCwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CisgICAgdm9pZCByZXF1ZXN0U3RvcmFnZUFjY2Vz c1VuZGVyT3BlbmVyKFN0cmluZyYmIHByaW1hcnlEb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3Ms IHVpbnQ2NF90IG9wZW5lclBhZ2VJRCwgU3RyaW5nJiYgb3BlbmVyUHJpbWFyeURvbWFpbiwgYm9v bCBpc1RyaWdnZXJlZEJ5VXNlckdlc3R1cmUpOworICAgIHZvaWQgZ3JhbnRTdG9yYWdlQWNjZXNz KFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgdXNlcldhc1Byb21wdGVkTm93LCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKICAgICB2b2lkIHJlcXVlc3RTdG9yYWdlQWNjZXNz Q2FsbGJhY2soYm9vbCB3YXNHcmFudGVkLCB1aW50NjRfdCBjb250ZXh0SWQpOwogCiAgICAgdm9p ZCBwcm9jZXNzV2lsbE9wZW5Db25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYsIElQQzo6Q29ubmVj dGlvbiYpOwpAQCAtMTcxLDYgKzE3MSw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIHNob3VsZFBh cnRpdGlvbkNvb2tpZXMoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcyYpIGNv bnN0OwogICAgIGJvb2wgc2hvdWxkQmxvY2tDb29raWVzKGNvbnN0IFdlYkNvcmU6OlJlc291cmNl TG9hZFN0YXRpc3RpY3MmKSBjb25zdDsKKyAgICBib29sIGhhc1VzZXJHcmFudGVkU3RvcmFnZUFj Y2Vzc1Rocm91Z2hQcm9tcHQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcyYs IGNvbnN0IFN0cmluZyYgZmlyc3RQYXJ0eVByaW1hcnlEb21haW4pIGNvbnN0OwogICAgIGJvb2wg aGFzU3RhdGlzdGljc0V4cGlyZWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGlj cyYpIGNvbnN0OwogICAgIGJvb2wgaGFzSGFkVW5leHBpcmVkUmVjZW50VXNlckludGVyYWN0aW9u KFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3MmKSBjb25zdDsKICAgICB2b2lkIGluY2x1 ZGVUb2RheUFzT3BlcmF0aW5nRGF0ZUlmTmVjZXNzYXJ5KCk7CkBAIC0xODUsNyArMTg2LDggQEAg cHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0YVJlY29yZHMoKTsKIAog ICAgIHZvaWQgcmVzZXRDb29raWVQYXJ0aXRpb25pbmdTdGF0ZSgpOwotICAgIHZvaWQgZ3JhbnRT dG9yYWdlQWNjZXNzSW50ZXJuYWwoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BG cmFtZUhvc3QsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJ RCwgYm9vbCB1c2VyV2FzUHJvbXB0ZWQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYp OworICAgIFN0b3JhZ2VBY2Nlc3NTdGF0dXMgc3RvcmFnZUFjY2Vzc1N0YXR1cyhjb25zdCBTdHJp bmcmIHN1YkZyYW1lUHJpbWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiB0b3BGcmFtZVByaW1hcnlE b21haW4pOworICAgIHZvaWQgZ3JhbnRTdG9yYWdlQWNjZXNzSW50ZXJuYWwoU3RyaW5nJiYgc3Vi RnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+ IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB1c2VyV2FzUHJvbXB0ZWROb3dPckVhcmxp ZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwogICAgIHZvaWQgcmVtb3ZlQWxs U3RvcmFnZUFjY2VzcygpOwogCiAgICAgdm9pZCBzZXREZWJ1Z0xvZ2dnaW5nRW5hYmxlZChib29s IGVuYWJsZWQpIHsgbV9kZWJ1Z0xvZ2dpbmdFbmFibGVkICA9IGVuYWJsZWQ7IH0K