185534 2018-05-10 16:35:49 -0700 Storage Access API: Extend lifetime of cookies on successful user approval 2018-05-10 18:59:31 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander bfulgham commit-queue oldest_to_newest 1422938 0 wilander 2018-05-10 16:35:49 -0700 Experimental Storage Access API prompting is added in https://bugs.webkit.org/show_bug.cgi?id=185335. We should consider explicit user opt-in equivalent to user interaction as first party and thus extend the life time of cookies and website data. 1422939 1 wilander 2018-05-10 16:36:16 -0700 <rdar://problem/40064547> 1422941 2 340146 wilander 2018-05-10 16:38:49 -0700 Created attachment 340146 Patch 1422950 3 340146 bfulgham 2018-05-10 16:55:51 -0700 Comment on attachment 340146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340146&action=review > Source/WebKit/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=185534 <rdar://problem/40064547> > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:466 > + if (userWasPromptedNowOrEarlier && m_storageAccessPromptsEnabled) { Is it possible to have "userWasPromptedNowEarlier" be true, but 'm_storageAccessPromptsEnabled' is false? It doesn't seem like this code needs to know the state of the prompts being enabled -- if we get an update that says the prompt was accepted, we can just extend the lifetime of the cookie. 1422963 4 340146 bfulgham 2018-05-10 17:14:02 -0700 Comment on attachment 340146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340146&action=review >> Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:466 >> + if (userWasPromptedNowOrEarlier && m_storageAccessPromptsEnabled) { > > Is it possible to have "userWasPromptedNowEarlier" be true, but 'm_storageAccessPromptsEnabled' is false? It doesn't seem like this code needs to know the state of the prompts being enabled -- if we get an update that says the prompt was accepted, we can just extend the lifetime of the cookie. Oh I get it. The tests won't work properly if we don't check for the experimental feature. Can you just add a FIXME here to remove this code once if we decide to use prompting for Storage Access API? 1422964 5 340146 bfulgham 2018-05-10 17:14:47 -0700 Comment on attachment 340146 Patch r=me if EWS passes, and if you add the FIXME (with radar/bugzilla) 1422975 6 340154 wilander 2018-05-10 18:21:41 -0700 Created attachment 340154 Patch for landing 1422977 7 wilander 2018-05-10 18:24:46 -0700 Thanks, Brent! 1422986 8 340154 commit-queue 2018-05-10 18:59:30 -0700 Comment on attachment 340154 Patch for landing Clearing flags on attachment: 340154 Committed r231684: <https://trac.webkit.org/changeset/231684> 1422987 9 commit-queue 2018-05-10 18:59:31 -0700 All reviewed patches have been landed. Closing bug. 340146 2018-05-10 16:38:49 -0700 2018-05-10 18:21:40 -0700 Patch bug-185534-20180510163848.patch text/plain 4464 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczZWE3N2JjZjEwNmI0NDYz Mjg2MjRkYjU1MDM0OWIyYWNlYWZjMDQuLmNjMTY5OTMwMzU0NzllMjc4ZDc2ZjMzNmQ3NGJkZWYx MDM1MWQ2NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDUtMTAgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcmFnZSBBY2Nlc3MgQVBJ OiBFeHRlbmQgbGlmZXRpbWUgb2YgY29va2llcyBvbiBzdWNjZXNzZnVsIHVzZXIgYXBwcm92YWwK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTUzNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9j ZXNzL0NvY29hL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZUNvY29hLm1tOgorICAgICAg ICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlZ2lzdGVyVXNlckRl ZmF1bHRzSWZOZWVkZWQpOgorICAgICAgICAgICAgUGlja3MgdXAgdGhlIGV4cGVyaW1lbnRhbCBm ZWF0dXJlIGZsYWcuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzSW50ZXJuYWwpOgorICAgICAgICAgICAgTm93IHVwZGF0 ZXMgdGhlIGRvbWFpbidzIHVzZXIgaW50ZXJhY3Rpb24gdGltZXN0YW1wIGlmIHRoZSB1c2VyIHdh cworICAgICAgICAgICAgcHJvbXB0ZWQgZm9yIHRoaXMgYWNjZXNzLgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKwogMjAxOC0wNS0xMCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgICdDcm9zcy1PcmlnaW4tT3B0 aW9ucyBoZWFkZXIgaW1wbGVtZW50YXRpb24gZm9sbG93LXVwCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmVDb2Nv YS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZUNvY29hLm1tCmluZGV4IDUwNzVmYzg1M2EyZmMzYzZlYTJhMzRmZTY1NDRlYTg2 Y2VlY2NjOTEuLmZlMzEyYzc3NTQ4Nzk1NTY4MDM1M2NjM2JhNmNmODA3YjUwZWE2MTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZUNvY29hLm1tCkBAIC01MSw2ICs1MSw3IEBAIHZv aWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWdpc3RlclVzZXJEZWZhdWx0c0lm TmVlZGVkKCkKIAogICAgICAgICBzZXREZWJ1Z0xvZ2dnaW5nRW5hYmxlZChbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OkAiUmVzb3VyY2VMb2FkU3RhdGlz dGljc0RlYnVnTG9nZ2luZ0VuYWJsZWQiXSk7CiAgICAgICAgIHNldFJlc291cmNlTG9hZFN0YXRp c3RpY3NEZWJ1Z01vZGUoW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9v bEZvcktleTpAIkV4cGVyaW1lbnRhbFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUiXSk7 CisgICAgICAgIHNldFN0b3JhZ2VBY2Nlc3NQcm9tcHRzRW5hYmxlZChbW05TVXNlckRlZmF1bHRz IHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OkAiRXhwZXJpbWVudGFsU3RvcmFnZUFj Y2Vzc1Byb21wdHNFbmFibGVkIl0pOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApp bmRleCAyNDc5YmNmZDllN2JkYTEyZWVlMjQ3YTI3MWM4YTViYjIwYmY5NGJjLi43MDJlYmJlMWNl NWY0MTJmMGRiMTgzZTVjMGE5YzkxNDRmNGRkMTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAg LTQ1Niw3ICs0NTYsNiBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3Jh bnRTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgUwogCiB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzSW50ZXJuYWwoU3RyaW5n JiYgc3ViRnJhbWVQcmltYXJ5RG9tYWluLCBTdHJpbmcmJiB0b3BGcmFtZVByaW1hcnlEb21haW4s IHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB1 c2VyV2FzUHJvbXB0ZWROb3dPckVhcmxpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+ JiYgY2FsbGJhY2spCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHVzZXJXYXNQcm9tcHRlZE5vd09yRWFy bGllcik7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBpZiAoc3ViRnJh bWVQcmltYXJ5RG9tYWluID09IHRvcEZyYW1lUHJpbWFyeURvbWFpbikgewpAQCAtNDY0LDYgKzQ2 MywxMyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3JhbnRTdG9yYWdl QWNjZXNzSW50ZXJuYWwoU3RyaW5nJiYgc3ViRnJhbQogICAgICAgICByZXR1cm47CiAgICAgfQog CisgICAgaWYgKHVzZXJXYXNQcm9tcHRlZE5vd09yRWFybGllciAmJiBtX3N0b3JhZ2VBY2Nlc3NQ cm9tcHRzRW5hYmxlZCkgeworICAgICAgICBhdXRvJiBzdWJGcmFtZVN0YXRpc3RpYyA9IGVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4oc3ViRnJhbWVQcmltYXJ5RG9tYWlu KTsKKyAgICAgICAgQVNTRVJUKHN1YkZyYW1lU3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbik7 CisgICAgICAgIEFTU0VSVChzdWJGcmFtZVN0YXRpc3RpYy5zdG9yYWdlQWNjZXNzVW5kZXJUb3BG cmFtZU9yaWdpbnMuY29udGFpbnModG9wRnJhbWVQcmltYXJ5RG9tYWluKSk7CisgICAgICAgIHN1 YkZyYW1lU3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lID0gV2FsbFRpbWU6 Om5vdygpOworICAgIH0KKwogICAgIG1fZ3JhbnRTdG9yYWdlQWNjZXNzSGFuZGxlcihzdWJGcmFt ZVByaW1hcnlEb21haW4sIHRvcEZyYW1lUHJpbWFyeURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBX VEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5kZXggZThhZDFkZjdhY2Q0 MDlmNWZlMzg3MTljZGM3M2YyOGJhNzEyZjA1ZS4uNDY4ZDU5NDg2ODk5NjcxNjU3OWJjNzVmZDMy YTVhZWFlNzdmODUyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTE5MSw2ICsxOTEsNyBAQCBwcml2 YXRlOgogICAgIHZvaWQgcmVtb3ZlQWxsU3RvcmFnZUFjY2VzcygpOwogCiAgICAgdm9pZCBzZXRE ZWJ1Z0xvZ2dnaW5nRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9kZWJ1Z0xvZ2dpbmdFbmFibGVk ICA9IGVuYWJsZWQ7IH0KKyAgICB2b2lkIHNldFN0b3JhZ2VBY2Nlc3NQcm9tcHRzRW5hYmxlZChi b29sIGVuYWJsZWQpIHsgbV9zdG9yYWdlQWNjZXNzUHJvbXB0c0VuYWJsZWQgID0gZW5hYmxlZDsg fQogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdm9pZCByZWdpc3RlclVzZXJEZWZhdWx0c0lm TmVlZGVkKCk7CkBAIC0yMzksNiArMjQwLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9kZWJ1 Z01vZGVFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fZGVidWdMb2dnaW5nRW5hYmxlZCB7 IGZhbHNlIH07CisgICAgYm9vbCBtX3N0b3JhZ2VBY2Nlc3NQcm9tcHRzRW5hYmxlZCB7IGZhbHNl IH07CiAKICAgICBGdW5jdGlvbjx2b2lkIChjb25zdCBTdHJpbmcmKT4gbV9zdGF0aXN0aWNzVGVz dGluZ0NhbGxiYWNrOwogfTsK 340154 2018-05-10 18:21:41 -0700 2018-05-10 18:59:30 -0700 Patch for landing bug-185534-20180510182141.patch text/plain 4608 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2YzAyYmQ3ZmY3OTEwODE5 ZjJhZjI2ZmFlYjYxMmUyMWZlZWQyYTAuLjhhZGY2NWJlODg3ZDQ2YjIxODIwODdiNDYwNGM1M2U5 YTZjYWM2Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTgtMDUtMTAgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcmFnZSBBY2Nlc3MgQVBJ OiBFeHRlbmQgbGlmZXRpbWUgb2YgY29va2llcyBvbiBzdWNjZXNzZnVsIHVzZXIgYXBwcm92YWwK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTUzNAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDAwNjQ1NDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QnJlbnQgRnVsZ2hhbS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmVDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpyZWdpc3RlclVzZXJEZWZhdWx0c0lmTmVlZGVkKToKKyAgICAg ICAgICAgIFBpY2tzIHVwIHRoZSBleHBlcmltZW50YWwgZmVhdHVyZSBmbGFnLgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vz c0ludGVybmFsKToKKyAgICAgICAgICAgIE5vdyB1cGRhdGVzIHRoZSBkb21haW4ncyB1c2VyIGlu dGVyYWN0aW9uIHRpbWVzdGFtcCBpZiB0aGUgdXNlciB3YXMKKyAgICAgICAgICAgIHByb21wdGVk IGZvciB0aGlzIGFjY2Vzcy4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmg6CisKIDIwMTgtMDUtMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBbaU9TXSBSZWxlYXNlIHBhZ2UgbG9hZCBwcm9jZXNzIGFzc2VydGlv biBpZiB0aGUgc2NyZWVuIGlzIGxvY2tlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmVD b2NvYS5tbQppbmRleCA1MDc1ZmM4NTNhMmZjM2M2ZWEyYTM0ZmU2NTQ0ZWE4NmNlZWNjYzkxLi5m ZTMxMmM3NzU0ODc5NTU2ODAzNTNjYzNiYTZjZjgwN2I1MGVhNjE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmVD b2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmVDb2NvYS5tbQpAQCAtNTEsNiArNTEsNyBAQCB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVnaXN0ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZCgpCiAK ICAgICAgICAgc2V0RGVidWdMb2dnZ2luZ0VuYWJsZWQoW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFy ZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpAIlJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z0xv Z2dpbmdFbmFibGVkIl0pOwogICAgICAgICBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdN b2RlKFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6QCJF eHBlcmltZW50YWxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIl0pOworICAgICAgICBz ZXRTdG9yYWdlQWNjZXNzUHJvbXB0c0VuYWJsZWQoW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVz ZXJEZWZhdWx0c10gYm9vbEZvcktleTpAIkV4cGVyaW1lbnRhbFN0b3JhZ2VBY2Nlc3NQcm9tcHRz RW5hYmxlZCJdKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggMjQ3OWJj ZmQ5ZTdiZGExMmVlZTI0N2EyNzFjOGE1YmIyMGJmOTRiYy4uM2U3ODMxNWFjNzliYWU4MjNlZjEx N2JiYjdlYzc2N2VhOGIxMGQ1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC00NTYsNyArNDU2 LDYgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFj Y2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFMKIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzc0ludGVybmFsKFN0cmluZyYmIHN1YkZyYW1l UHJpbWFyeURvbWFpbiwgU3RyaW5nJiYgdG9wRnJhbWVQcmltYXJ5RG9tYWluLCBzdGQ6Om9wdGlv bmFsPHVpbnQ2NF90PiBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgdXNlcldhc1Byb21w dGVkTm93T3JFYXJsaWVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNr KQogewotICAgIFVOVVNFRF9QQVJBTSh1c2VyV2FzUHJvbXB0ZWROb3dPckVhcmxpZXIpOwogICAg IEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCiAgICAgaWYgKHN1YkZyYW1lUHJpbWFyeURv bWFpbiA9PSB0b3BGcmFtZVByaW1hcnlEb21haW4pIHsKQEAgLTQ2NCw2ICs0NjMsMTQgQEAgdm9p ZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzc0ludGVy bmFsKFN0cmluZyYmIHN1YkZyYW0KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIC8vIEZJ WE1FOiBSZW1vdmUgbV9zdG9yYWdlQWNjZXNzUHJvbXB0c0VuYWJsZWQgY2hlY2sgaWYgcHJvbXB0 aW5nIGlzIG5vIGxvbmdlciBleHBlcmltZW50YWwuCisgICAgaWYgKHVzZXJXYXNQcm9tcHRlZE5v d09yRWFybGllciAmJiBtX3N0b3JhZ2VBY2Nlc3NQcm9tcHRzRW5hYmxlZCkgeworICAgICAgICBh dXRvJiBzdWJGcmFtZVN0YXRpc3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1h cnlEb21haW4oc3ViRnJhbWVQcmltYXJ5RG9tYWluKTsKKyAgICAgICAgQVNTRVJUKHN1YkZyYW1l U3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbik7CisgICAgICAgIEFTU0VSVChzdWJGcmFtZVN0 YXRpc3RpYy5zdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZU9yaWdpbnMuY29udGFpbnModG9wRnJh bWVQcmltYXJ5RG9tYWluKSk7CisgICAgICAgIHN1YkZyYW1lU3RhdGlzdGljLm1vc3RSZWNlbnRV c2VySW50ZXJhY3Rpb25UaW1lID0gV2FsbFRpbWU6Om5vdygpOworICAgIH0KKwogICAgIG1fZ3Jh bnRTdG9yYWdlQWNjZXNzSGFuZGxlcihzdWJGcmFtZVByaW1hcnlEb21haW4sIHRvcEZyYW1lUHJp bWFyeURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmgKaW5kZXggZThhZDFkZjdhY2Q0MDlmNWZlMzg3MTljZGM3M2YyOGJhNzEyZjA1 ZS4uNDY4ZDU5NDg2ODk5NjcxNjU3OWJjNzVmZDMyYTVhZWFlNzdmODUyMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmgKQEAgLTE5MSw2ICsxOTEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlQWxsU3Rv cmFnZUFjY2VzcygpOwogCiAgICAgdm9pZCBzZXREZWJ1Z0xvZ2dnaW5nRW5hYmxlZChib29sIGVu YWJsZWQpIHsgbV9kZWJ1Z0xvZ2dpbmdFbmFibGVkICA9IGVuYWJsZWQ7IH0KKyAgICB2b2lkIHNl dFN0b3JhZ2VBY2Nlc3NQcm9tcHRzRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9zdG9yYWdlQWNj ZXNzUHJvbXB0c0VuYWJsZWQgID0gZW5hYmxlZDsgfQogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAg ICAgdm9pZCByZWdpc3RlclVzZXJEZWZhdWx0c0lmTmVlZGVkKCk7CkBAIC0yMzksNiArMjQwLDcg QEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9kZWJ1Z01vZGVFbmFibGVkIHsgZmFsc2UgfTsKICAg ICBib29sIG1fZGVidWdMb2dnaW5nRW5hYmxlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX3N0b3Jh Z2VBY2Nlc3NQcm9tcHRzRW5hYmxlZCB7IGZhbHNlIH07CiAKICAgICBGdW5jdGlvbjx2b2lkIChj b25zdCBTdHJpbmcmKT4gbV9zdGF0aXN0aWNzVGVzdGluZ0NhbGxiYWNrOwogfTsK