205963 2020-01-08 15:28:09 -0800 Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable 2020-01-08 17:21:10 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander bfulgham commit-queue webkit-bug-importer oldest_to_newest 1604313 0 wilander 2020-01-08 15:28:09 -0800 To get default on behavior, experimental features in the network process need to be turned from enable to disable flags. We should do that for the experimental cookie blocking setting. 1604314 1 webkit-bug-importer 2020-01-08 15:28:35 -0800 <rdar://problem/58424136> 1604324 2 387149 wilander 2020-01-08 15:46:14 -0800 Created attachment 387149 Patch 1604340 3 387149 bfulgham 2020-01-08 16:03:47 -0800 Comment on attachment 387149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387149&action=review > Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:75 > + auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All; When would we ever hit 'OnlyAccordingToPerDomainPolicy'? 1604348 4 wilander 2020-01-08 16:11:35 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 387149 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387149&action=review > > > Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:75 > > + auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All; > > When would we ever hit 'OnlyAccordingToPerDomainPolicy'? It was the old default but now it's only needed to be able to run layout tests with non-ITP behavior by default. The TestRunner falls back to this old setting for all tests that don't explicitly test ITP's behavior. Otherwise a bunch of tests that assume cookie access would not pass. My reasoning is that since users can turn off ITP and WKWebViews don't run with ITP, the rest of the layout test suite needs to continue testing under such conditions. (Per-domain policy effectively means that if the layout test doesn't make a domain prevalent, ITP won't do anything, ergo non-ITP behavior.) I hope this makes sense. Thanks for the review! 1604393 5 387149 commit-queue 2020-01-08 17:21:09 -0800 Comment on attachment 387149 Patch Clearing flags on attachment: 387149 Committed r254239: <https://trac.webkit.org/changeset/254239> 1604394 6 commit-queue 2020-01-08 17:21:10 -0800 All reviewed patches have been landed. Closing bug. 387149 2020-01-08 15:46:14 -0800 2020-01-08 17:21:09 -0800 Patch bug-205963-20200108154613.patch text/plain 10648 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFkZWJkNDE1ZDI5ZTI4 MzcxNTFlZjAzODRhNmJlNTViNTQyNDkxYi4uMmRiNTliMzM2MzY2NTVjZjA2OWU0NGFiY2QzOTQw NzMxOGMzNzQxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAxLTA4ICBKb2hu IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQg U3RhdGlzdGljczogRmxpcCBleHBlcmltZW50YWwgY29va2llIGJsb2NraW5nIHNldHRpbmcgZnJv bSBhbiBlbmFibGUgdG8gYSBkaXNhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDU5NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4NDI0MTM2 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIGdl dCBkZWZhdWx0IG9uIGJlaGF2aW9yLCBleHBlcmltZW50YWwgZmVhdHVyZXMgaW4gdGhlIG5ldHdv cmsgcHJvY2VzcyBuZWVkIHRvIGJlCisgICAgICAgIHR1cm5lZCBmcm9tIGVuYWJsZSBmbGFncyB0 byBkaXNhYmxlIGZsYWdzLiBUaGlzIHBhdGNoIGRvZXMgdGhhdCBmb3IgdGhlIGV4cGVyaW1lbnRh bAorICAgICAgICBjb29raWUgYmxvY2tpbmcgZmxhZy4KKworICAgICAgICBObyBuZXcgdGVzdHMu IFRoaXMgY2hhbmdlIGp1c3QgcmV2ZXJzZXMgdGhlIGludGVycHJldGF0aW9uIG9mIGEgZmxhZy4K KworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKwogMjAyMC0wMS0wOCAgRGV2aW4gUm91 c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogKHIyNTQxODYp IFsgTWFjIF0gaW5zcGVjdG9yL2Nzcy9hZGQtcnVsZS5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5k ZXggY2NmYWUzZjgyNTM2MmQxYjdhZGU3ZjVhZDEzMTM2MDk1NGI3ZjcxMS4uYmE3NWQzMmNjOTAz OGNhZTE4MDU5Y2VjMzZjZTU4NzI4OTg5ZGYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAor MjAyMC0wMS0wOCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3M6IEZsaXAgZXhwZXJpbWVudGFsIGNvb2tpZSBibG9j a2luZyBzZXR0aW5nIGZyb20gYW4gZW5hYmxlIHRvIGEgZGlzYWJsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1OTYzCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS81ODQyNDEzNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUbyBnZXQgZGVmYXVsdCBvbiBiZWhhdmlvciwgZXhwZXJpbWVudGFsIGZlYXR1 cmVzIGluIHRoZSBuZXR3b3JrIHByb2Nlc3MgbmVlZCB0byBiZQorICAgICAgICB0dXJuZWQgZnJv bSBlbmFibGUgZmxhZ3MgdG8gZGlzYWJsZSBmbGFncy4gVGhpcyBwYXRjaCBkb2VzIHRoYXQgZm9y IHRoZSBleHBlcmltZW50YWwKKyAgICAgICAgY29va2llIGJsb2NraW5nIGZsYWcuCisKKyAgICAg ICAgVGhpcyBjaGFuZ2UgYWxzbyBhbGlnbnMgdGhlIGluaXQgdmFsdWVzIG9mIHRoZSBzZXR0aW5n IHRvIG1hdGNoIHRoZSBkZWZhdWx0LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtT ZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVu Y2VzLnlhbWw6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1t OgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpwYXJhbWV0ZXJzKToKKwogMjAy MC0wMS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIGZpeCBzb21lIElPU19GQU1JTFkgYnVpbGRzIGFmdGVyIHIyNTQyMTAuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLnlhbWwKaW5kZXggMThhYTczZjY4ZjkyNGNkNDUxMzU2NjY3ZGMwYjk4MGFm MDA0YjlkNy4uYmQ3NDBiMjIwMDAyNzY5NjAzMWVhZjEyMWRhZGU2NDViYzgyZGVjNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvU2V0dGluZ3MueWFtbApAQCAtODg2LDggKzg4Niw4IEBAIHdlYlJUQ0VuY3J5cHRp b25FbmFibGVkOgogICBpbml0aWFsOiB0cnVlCiAgIGluc3BlY3Rvck92ZXJyaWRlOiB0cnVlCiAK LWlzVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nRW5hYmxlZDoKLSAgaW5pdGlhbDogdHJ1ZQoraXNU aGlyZFBhcnR5Q29va2llQmxvY2tpbmdEaXNhYmxlZDoKKyAgaW5pdGlhbDogZmFsc2UKIAogaXNG aXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1vdmFsRW5hYmxlZDoKICAgaW5pdGlhbDogdHJ1ZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFz c2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IDdkYWRmNGRiODg3MzUy YWNmOWUxZWY1ZjQwMDc0ZmFlZWFjMDNhODUuLjQ1ZWNiNmQ3NzgxMDRmMDcwNTBlYzNjOTgwMzc2 ZmFlNDFhN2QwNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xh c3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgK QEAgLTI3NCw3ICsyNzQsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWlu IG1fZGVidWdTdGF0aWNQcmV2YWxlbnRSZXNvdXJjZSB7IFVSTCB7IFVSTCgpLCAiaHR0cHM6Ly8z cmRwYXJ0eXRlc3R3ZWJraXQub3JnIl9zIH0gfTsKICAgICBib29sIG1fZGVidWdMb2dnaW5nRW5h YmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2RlYnVnTW9kZUVuYWJsZWQgeyBmYWxzZSB9Owot ICAgIFdlYkNvcmU6OlRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgbV90aGlyZFBhcnR5Q29v a2llQmxvY2tpbmdNb2RlIHsgV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6 QWxsT25TaXRlc1dpdGhvdXRVc2VySW50ZXJhY3Rpb24gfTsKKyAgICBXZWJDb3JlOjpUaGlyZFBh cnR5Q29va2llQmxvY2tpbmdNb2RlIG1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSB7IFdl YkNvcmU6OlRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbCB9OwogICAgIGJvb2wgbV9k YXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZCB7IGZhbHNlIH07CiAgICAgU2hvdWxkSW5jbHVkZUxvY2Fs aG9zdCBtX3Nob3VsZEluY2x1ZGVMb2NhbGhvc3QgeyBTaG91bGRJbmNsdWRlTG9jYWxob3N0OjpZ ZXMgfTsKICAgICBXZWJDb3JlOjpGaXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1vdmFsTW9kZSBtX2Zp cnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlIHsgV2ViQ29yZTo6Rmlyc3RQYXJ0eVdlYnNp dGVEYXRhUmVtb3ZhbE1vZGU6Ok5vbmUgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Nlc3Npb24uaAppbmRleCBjYTBkOWFkMGMwNWRlOGY3NjFlNmIyMjJhMzU4MTIw ZDRjZmVlZjY3Li5jMmZjODBiNjNhZTk4YTc2YWNkNTEzM2Y4NTFhNmUxN2U1OTdkODgwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCkBAIC0xNTMs NyArMTUzLDcgQEAgcHJvdGVjdGVkOgogICAgIFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluIG1f cmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbnVhbFByZXZhbGVudFJlc291cmNlOwogICAgIGJvb2wg bV9lbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTG9nVGVzdGluZ0V2ZW50OwogICAgIGJvb2wg bV9kb3duZ3JhZGVSZWZlcnJlciB7IHRydWUgfTsKLSAgICBXZWJDb3JlOjpUaGlyZFBhcnR5Q29v a2llQmxvY2tpbmdNb2RlIG1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSB7IFdlYkNvcmU6 OlRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbE9uU2l0ZXNXaXRob3V0VXNlckludGVy YWN0aW9uIH07CisgICAgV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSBtX3Ro aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgeyBXZWJDb3JlOjpUaGlyZFBhcnR5Q29va2llQmxv Y2tpbmdNb2RlOjpBbGwgfTsKICAgICBXZWJDb3JlOjpGaXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1v dmFsTW9kZSBtX2ZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlIHsgV2ViQ29yZTo6Rmly c3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGU6Ok5vbmUgfTsKICNlbmRpZgogICAgIGJvb2wg bV9pc1N0YWxlV2hpbGVSZXZhbGlkYXRlRW5hYmxlZCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0 ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3JlYXRp b25QYXJhbWV0ZXJzLmgKaW5kZXggY2U0MzhjNTY4YzJlZWRhNDJhZGMwZTBmNjQxOWY2OTRiZjFk YWU3MC4uMGZlOWRiMWZhMzBmMDI1YWY1MGQ2MGEzZDM0ZjE5ZTAwYzhjM2ZiYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFy YW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Np b25DcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtODYsNyArODYsNyBAQCBzdHJ1Y3QgTmV0d29ya1Nl c3Npb25DcmVhdGlvblBhcmFtZXRlcnMgewogICAgIGJvb2wgZW5hYmxlUmVzb3VyY2VMb2FkU3Rh dGlzdGljc0xvZ1Rlc3RpbmdFdmVudCB7IGZhbHNlIH07CiAgICAgYm9vbCBzaG91bGRJbmNsdWRl TG9jYWxob3N0SW5SZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHsgdHJ1ZSB9OwogICAgIGJvb2wgZW5h YmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSB7IGZhbHNlIH07Ci0gICAgV2ViQ29y ZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSB0aGlyZFBhcnR5Q29va2llQmxvY2tpbmdN b2RlIHsgV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsT25TaXRlc1dp dGhvdXRVc2VySW50ZXJhY3Rpb24gfTsKKyAgICBXZWJDb3JlOjpUaGlyZFBhcnR5Q29va2llQmxv Y2tpbmdNb2RlIHRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgeyBXZWJDb3JlOjpUaGlyZFBh cnR5Q29va2llQmxvY2tpbmdNb2RlOjpBbGwgfTsKICAgICBXZWJDb3JlOjpGaXJzdFBhcnR5V2Vi c2l0ZURhdGFSZW1vdmFsTW9kZSBmaXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1vdmFsTW9kZSB7IFdl YkNvcmU6OkZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlOjpOb25lIH07CiAgICAgYm9v bCBkZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25zRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9v bCBhbGxMb2Fkc0Jsb2NrZWRCeURldmljZU1hbmFnZW1lbnRSZXN0cmljdGlvbnNGb3JUZXN0aW5n IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVu Y2VzLnlhbWwgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCmluZGV4 IGYzM2E3MGJmZWU0Y2U5MmNlYjlkZjg5MTExN2NiNzFmNDU5Zjk0MzEuLjAwZDMyZjQ4ZDg3ODEy NjAyMWM5ZmM0YzFhZGQ0NzJkZWU5ZDBiZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL1dlYlByZWZlcmVuY2VzLnlhbWwKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJl ZmVyZW5jZXMueWFtbApAQCAtMTgzMSwxMSArMTgzMSwxMSBAQCBMYXp5SW1hZ2VMb2FkaW5nRW5h YmxlZDoKICAgd2ViY29yZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMKICAgY2F0ZWdv cnk6IGV4cGVyaW1lbnRhbAogCi1Jc1RoaXJkUGFydHlDb29raWVCbG9ja2luZ0VuYWJsZWQ6CitJ c1RoaXJkUGFydHlDb29raWVCbG9ja2luZ0Rpc2FibGVkOgogICB0eXBlOiBib29sCi0gIGRlZmF1 bHRWYWx1ZTogdHJ1ZQotICBodW1hblJlYWRhYmxlTmFtZTogIkJsb2NrIEFsbCAzcmQtUGFydHkg Q29va2llcyAoSVRQKSIKLSAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiQmxvY2sgYWxsIHRo aXJkLXBhcnR5IGNvb2tpZXMgd2hlbiBJbnRlbGxpZ2VudCBUcmFja2luZyBQcmV2ZW50aW9uIGlz IGVuYWJsZWQiCisgIGRlZmF1bHRWYWx1ZTogZmFsc2UKKyAgaHVtYW5SZWFkYWJsZU5hbWU6ICJE aXNhYmxlIEZ1bGwgM3JkLVBhcnR5IENvb2tpZSBCbG9ja2luZyAoSVRQKSIKKyAgaHVtYW5SZWFk YWJsZURlc2NyaXB0aW9uOiAiRGlzYWJsZSBmdWxsIHRoaXJkLXBhcnR5IGNvb2tpZSBibG9ja2lu ZyB3aGVuIEludGVsbGlnZW50IFRyYWNraW5nIFByZXZlbnRpb24gaXMgZW5hYmxlZCIKICAgY2F0 ZWdvcnk6IGV4cGVyaW1lbnRhbAogCiBJc0ZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxFbmFi bGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGMw YWQzY2U3MmE1NjM1OTc4MGZkM2QxZGNkYWRlM2ZkNGMwMTc3MjMuLjJmNDk1YzlmMjUxN2NkYmMx NzZiYTJmYmZiMzVlNTU5OTQ0MjMwMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKQEAgLTU3Niw3ICs1NzYsNyBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBX ZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0 aAogICAgIGJvb2wgZW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0xvZ1Rlc3RpbmdFdmVudCA9 IGZhbHNlOwogICAgIGJvb2wgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdCA9IHRydWU7CiAgICAgYm9v bCBlbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlID0gZmFsc2U7Ci0gICAgV2Vi Q29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSB0aGlyZFBhcnR5Q29va2llQmxvY2tp bmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsT25TaXRl c1dpdGhvdXRVc2VySW50ZXJhY3Rpb247CisgICAgV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJs b2NraW5nTW9kZSB0aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQ YXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsOwogICAgIFdlYkNvcmU6OkZpcnN0UGFydHlXZWJz aXRlRGF0YVJlbW92YWxNb2RlIGZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlID0gV2Vi Q29yZTo6Rmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGU6Ok5vbmU7CiAgICAgV2ViQ29y ZTo6UmVnaXN0cmFibGVEb21haW4gbWFudWFsUHJldmFsZW50UmVzb3VyY2UgeyB9OwogICAgIGlm ICh3aXRoV2Vic2l0ZURhdGFTdG9yZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29h Lm1tCmluZGV4IGUwZDUxMjA5MjYyZWVhMzRlMDQ5NmM2NWZhNmU5YTRmNTllNjRkOTMuLmJiOWYw NDk1MWI3ZTc2ZjUyZTk5ZGNmZjMwY2FkZjY0NGM1M2EwNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRl RGF0YVN0b3JlQ29jb2EubW0KQEAgLTcyLDcgKzcyLDcgQEAgV2Vic2l0ZURhdGFTdG9yZVBhcmFt ZXRlcnMgV2Vic2l0ZURhdGFTdG9yZTo6cGFyYW1ldGVycygpCiAgICAgTlNVc2VyRGVmYXVsdHMg KmRlZmF1bHRzID0gW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXTsKICAgICBi b29sIHNob3VsZExvZ0Nvb2tpZUluZm9ybWF0aW9uID0gZmFsc2U7CiAgICAgYm9vbCBlbmFibGVS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlID0gZmFsc2U7Ci0gICAgYXV0byB0aGlyZFBh cnR5Q29va2llQmxvY2tpbmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5n TW9kZTo6T25seUFjY29yZGluZ1RvUGVyRG9tYWluUG9saWN5OworICAgIGF1dG8gdGhpcmRQYXJ0 eUNvb2tpZUJsb2NraW5nTW9kZSA9IFdlYkNvcmU6OlRoaXJkUGFydHlDb29raWVCbG9ja2luZ01v ZGU6OkFsbDsKICAgICBhdXRvIGZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlID0gV2Vi Q29yZTo6Rmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGU6Ok5vbmU7CiAgICAgYm9vbCBl bmFibGVMZWdhY3lUTFMgPSBmYWxzZTsKICAgICBpZiAoaWQgdmFsdWUgPSBbZGVmYXVsdHMgb2Jq ZWN0Rm9yS2V5OkAiV2ViS2l0RW5hYmxlTGVnYWN5VExTIl0pCkBAIC04NywxMCArODcsMTAgQEAg V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMgV2Vic2l0ZURhdGFTdG9yZTo6cGFyYW1ldGVycygp CiAgICAgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4gcmVzb3VyY2VMb2FkU3RhdGlzdGljc01h bnVhbFByZXZhbGVudFJlc291cmNlIHsgfTsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFU SVNUSUNTKQogICAgIGVuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgPSBbZGVm YXVsdHMgYm9vbEZvcktleTpAIklUUERlYnVnTW9kZSJdOwotICAgIGlmIChbZGVmYXVsdHMgYm9v bEZvcktleTpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwgV2Vi UHJlZmVyZW5jZXNLZXk6OmlzVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nRW5hYmxlZEtleSgpLmNy ZWF0ZUNGU3RyaW5nKCkuZ2V0KCldXSkKLSAgICAgICAgdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5n TW9kZSA9IFdlYkNvcmU6OlRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbDsKLSAgICBl bHNlCisgICAgaWYgKFtkZWZhdWx0cyBib29sRm9yS2V5OltOU1N0cmluZyBzdHJpbmdXaXRoRm9y bWF0OkAiRXhwZXJpbWVudGFsJUAiLCBXZWJQcmVmZXJlbmNlc0tleTo6aXNUaGlyZFBhcnR5Q29v a2llQmxvY2tpbmdEaXNhYmxlZEtleSgpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCldXSkKICAgICAg ICAgdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSA9IFdlYkNvcmU6OlRoaXJkUGFydHlDb29r aWVCbG9ja2luZ01vZGU6OkFsbE9uU2l0ZXNXaXRob3V0VXNlckludGVyYWN0aW9uOworICAgIGVs c2UKKyAgICAgICAgdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSA9IFdlYkNvcmU6OlRoaXJk UGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbDsKICAgICBpZiAoW2RlZmF1bHRzIGJvb2xGb3JL ZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJFeHBlcmltZW50YWwlQCIsIFdlYlByZWZl cmVuY2VzS2V5Ojppc0ZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxFbmFibGVkS2V5KCkuY3Jl YXRlQ0ZTdHJpbmcoKS5nZXQoKV1dKSB7CiAgICAgICAgIGlmIChbZGVmYXVsdHMgYm9vbEZvcktl eTpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkludGVybmFsRGVidWclQCIsIFdlYlByZWZl cmVuY2VzS2V5Ojppc0ZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxSZXByb1Rlc3RpbmdFbmFi bGVkS2V5KCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKV1dKQogICAgICAgICAgICAgZmlyc3RQYXJ0 eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGUgPSBXZWJDb3JlOjpGaXJzdFBhcnR5V2Vic2l0ZURhdGFS ZW1vdmFsTW9kZTo6QWxsQnV0Q29va2llc1JlcHJvVGVzdGluZ1RpbWVvdXQ7Cg==