210347 2020-04-10 11:03:23 -0700 Add capability to opt in specific domains into SameSite=strict bounce tracking protection 2020-04-10 15:29:03 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210362 1 wilander wilander bfulgham hi webkit-bug-importer oldest_to_newest 1640266 0 wilander 2020-04-10 11:03:23 -0700 We should add the capability to opt in specific domains into SameSite=strict bounce tracking protection. This way we can apply the new restriction to domains known to engage in bounce tracking while also getting frequent user interaction. 1640267 1 webkit-bug-importer 2020-04-10 11:04:34 -0700 <rdar://problem/61593323> 1640292 2 396110 wilander 2020-04-10 11:39:54 -0700 Created attachment 396110 Patch 1640320 3 396110 bfulgham 2020-04-10 13:11:48 -0700 Comment on attachment 396110 Patch Looks good! r=me 1640380 4 396110 wilander 2020-04-10 14:54:05 -0700 Comment on attachment 396110 Patch Thanks, Brent! 1640383 5 ews-feeder 2020-04-10 14:57:19 -0700 Committed r259906: <https://trac.webkit.org/changeset/259906> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396110. 1640387 6 396110 hi 2020-04-10 15:04:29 -0700 Comment on attachment 396110 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396110&action=review > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:1632 > + RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ITPDebug, "Did set %" PUBLIC_LOG_STRING " as making a top frame redirect to %" PUBLIC_LOG_STRING ".", sourceDomain.string().utf8().data(), targetDomain.string().utf8().data()); Do you want these messages to also be sent to Web Inspector? If so, I'd rewrite this as: ``` if (UNLIKELY(debugLoggingEnabled()) { RELEASE_LOG_INFO(ITPDebug, "Did set %" PUBLIC_LOG_STRING " as making a top frame redirect to %" PUBLIC_LOG_STRING ".", sourceDomain.string().utf8().data(), targetDomain.string().utf8().data()); debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, makeString("[ITP] Did set '"_s, sourceDomain.string(), "' as making a top frame redirect to '"_s, targetDomain.string(), "'."_s)); } ``` > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:479 > + RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ITPDebug, "Did set %" PUBLIC_LOG_STRING " as making a top frame redirect to %" PUBLIC_LOG_STRING ".", sourceDomain.string().utf8().data(), targetDomain.string().utf8().data()); Ditto 1640395 7 396110 hi 2020-04-10 15:29:03 -0700 Comment on attachment 396110 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396110&action=review >> Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:1632 >> + RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ITPDebug, "Did set %" PUBLIC_LOG_STRING " as making a top frame redirect to %" PUBLIC_LOG_STRING ".", sourceDomain.string().utf8().data(), targetDomain.string().utf8().data()); > > Do you want these messages to also be sent to Web Inspector? If so, I'd rewrite this as: > ``` > if (UNLIKELY(debugLoggingEnabled()) { > RELEASE_LOG_INFO(ITPDebug, "Did set %" PUBLIC_LOG_STRING " as making a top frame redirect to %" PUBLIC_LOG_STRING ".", sourceDomain.string().utf8().data(), targetDomain.string().utf8().data()); > debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, makeString("[ITP] Did set '"_s, sourceDomain.string(), "' as making a top frame redirect to '"_s, targetDomain.string(), "'."_s)); > } > ``` <https://webkit.org/b/210362> Web Inspector: add `broadcastConsoleMessage` calls for new ITPDebug logs after 259275 396110 2020-04-10 11:39:54 -0700 2020-04-10 14:57:19 -0700 Patch bug-210347-20200410113953.patch text/plain 10081 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5ODg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI2ODZhZDdlY2I2MTFhZTQy NjdiYjYyMmZmMmE5MTcxYTg4ZTliYjYuLjYxNTI0NjhmMWJiYWM0NTc1MjJmOGM4ZTk2M2YwMjFl MGMyZjM2MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDQtMTAgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGNhcGFiaWxpdHkgdG8g b3B0IGluIHNwZWNpZmljIGRvbWFpbnMgaW50byBTYW1lU2l0ZT1zdHJpY3QgYm91bmNlIHRyYWNr aW5nIHByb3RlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxMDM0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE1OTMzMjM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWRk cyBhbiBhZGRpdGlvbmFsIG9wdC1pbiBjb25kaXRpb24gdG8gdGhlIHNob3VsZEVuZm9yY2VTYW1l U2l0ZVN0cmljdEZvcigpCisgICAgICAgIGZ1bmN0aW9ucyBpbiBib3RoIFJlc291cmNlTG9hZFN0 YXRpc3RpY3NNZW1vcnlTdG9yZSBhbmQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3Rv cmUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGFkZHMgZG9tYWluIHNwZWNpZmljIGxv Z2ljLCBxdWlyay1zdHlsZS4gVGhlIGxvZ0ZyYW1lTmF2aWdhdGlvbigpCisgICAgICAgIGNoYW5n ZXMgYXJlIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6Omxv Z0ZyYW1lTmF2aWdhdGlvbik6CisgICAgICAgICAgICBOb3cgb25seSBjYXB0dXJlcyByZWFsIHJl ZGlyZWN0cyBmb3IgdGhlIHB1cnBvc2VzIG9mIHRoZSBTYW1lU2l0ZT1zdHJpY3QgcnVsZS4KKyAg ICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnNob3Vs ZEVuZm9yY2VTYW1lU2l0ZVN0cmljdEZvcik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xh c3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwOgorICAgICAgICAo V2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmxvZ0ZyYW1lTmF2aWdh dGlvbik6CisgICAgICAgICAgICBOb3cgb25seSBjYXB0dXJlcyByZWFsIHJlZGlyZWN0cyBmb3Ig dGhlIHB1cnBvc2VzIG9mIHRoZSBTYW1lU2l0ZT1zdHJpY3QgcnVsZS4KKyAgICAgICAgKFdlYktp dDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpzaG91bGRFbmZvcmNlU2FtZVNp dGVTdHJpY3RGb3IpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVt b3J5U3RvcmU6OnJlZ2lzdHJhYmxlRG9tYWluc1RvRGVsZXRlT3JSZXN0cmljdFdlYnNpdGVEYXRh Rm9yKToKKyAgICAgICAgICAgIFJlbW92ZWQgc3RyYXkgbmV3bGluZS4KKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxkRW5mb3Jj ZVNhbWVTaXRlU3RyaWN0Rm9yU3BlY2lmaWNEb21haW4gY29uc3QpOgorICAgICAgICAgICBUaGUg bmV3IGZ1bmN0aW9uIHdpdGggZG9tYWlucyB0byBzdWJqZWN0IHRvIHRoZSBuZXcgcnVsZS4KKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oOgorCiAyMDIwLTA0LTEwICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBBZGQgcm91dGluZXMgdG8gbWVzc2FnZSBmaWx0ZXIgaW4gdGhl IFdlYkNvbnRlbnQgc2FuZGJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKaW5kZXggZDM2ODc1MjNhMTBmM2U5MzJhYzI0OGJmZjZk NmE5ZWFiNTZlYTVmMC4uZDBhOGUwNDM3NTM4ZWNjNTUxZDZlMWI4ZGI0OTcyZGM4ODVhYWNkNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3Rv cmUuY3BwCkBAIC0xNjI3LDggKzE2MjcsMTAgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFJlZ2lzdHJhYmxlRG8KICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICBpbnNlcnREb21haW5SZWxhdGlvbnNoaXBMaXN0KHRvcEZyYW1lVW5pcXVlUmVkaXJlY3Rz VG9RdWVyeSwgSGFzaFNldDxSZWdpc3RyYWJsZURvbWFpbj4oeyB0YXJnZXREb21haW4gfSksICpy ZWRpcmVjdGluZ0RvbWFpblJlc3VsdC5zZWNvbmQpOwotICAgICAgICAgICAgICAgIGluc2VydERv bWFpblJlbGF0aW9uc2hpcExpc3QodG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUb1NpbmNlU2FtZVNp dGVTdHJpY3RFbmZvcmNlbWVudFF1ZXJ5LCBIYXNoU2V0PFJlZ2lzdHJhYmxlRG9tYWluPih7IHRh cmdldERvbWFpbiB9KSwgKnJlZGlyZWN0aW5nRG9tYWluUmVzdWx0LnNlY29uZCk7Ci0gICAgICAg ICAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERl YnVnLCAiRGlkIHNldCAlIiBQVUJMSUNfTE9HX1NUUklORyAiIGFzIG1ha2luZyBhIHRvcCBmcmFt ZSByZWRpcmVjdCB0byAlIiBQVUJMSUNfTE9HX1NUUklORyAiLiIsIHNvdXJjZURvbWFpbi5zdHJp bmcoKS51dGY4KCkuZGF0YSgpLCB0YXJnZXREb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7 CisgICAgICAgICAgICAgICAgaWYgKGlzUmVkaXJlY3QpIHsKKyAgICAgICAgICAgICAgICAgICAg aW5zZXJ0RG9tYWluUmVsYXRpb25zaGlwTGlzdCh0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvU2lu Y2VTYW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50UXVlcnksIEhhc2hTZXQ8UmVnaXN0cmFibGVEb21h aW4+KHsgdGFyZ2V0RG9tYWluIH0pLCAqcmVkaXJlY3RpbmdEb21haW5SZXN1bHQuc2Vjb25kKTsK KyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFi bGVkKCksIElUUERlYnVnLCAiRGlkIHNldCAlIiBQVUJMSUNfTE9HX1NUUklORyAiIGFzIG1ha2lu ZyBhIHRvcCBmcmFtZSByZWRpcmVjdCB0byAlIiBQVUJMSUNfTE9HX1NUUklORyAiLiIsIHNvdXJj ZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCB0YXJnZXREb21haW4uc3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGluc2VydERv bWFpblJlbGF0aW9uc2hpcExpc3QodG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tUXVlcnksIEhh c2hTZXQ8UmVnaXN0cmFibGVEb21haW4+KHsgc291cmNlRG9tYWluIH0pLCAqdGFyZ2V0UmVzdWx0 LnNlY29uZCk7CiAgICAgICAgICAgICAgICAgc3RhdGlzdGljc1dlcmVVcGRhdGVkID0gdHJ1ZTsK ICAgICAgICAgICAgIH0KQEAgLTI0MjQsNyArMjQyNiw4IEBAIGJvb2wgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RhdGFiYXNlU3RvcmU6OnNob3VsZFJlbW92ZUFsbEJ1dENvb2tpZXNGb3IoY29uc3Qg RG9tCiAKIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnNob3VsZEVu Zm9yY2VTYW1lU2l0ZVN0cmljdEZvcihEb21haW5EYXRhJiByZXNvdXJjZVN0YXRpc3RpYywgYm9v bCBzaG91bGRDaGVja0ZvckdyYW5kZmF0aGVyaW5nKQogewotICAgIGlmICghaXNTYW1lU2l0ZVN0 cmljdEVuZm9yY2VtZW50RW5hYmxlZCgpIHx8IChzaG91bGRDaGVja0ZvckdyYW5kZmF0aGVyaW5n ICYmIHJlc291cmNlU3RhdGlzdGljLmdyYW5kZmF0aGVyZWQpKQorICAgIGlmICgoIWlzU2FtZVNp dGVTdHJpY3RFbmZvcmNlbWVudEVuYWJsZWQoKSAmJiAhc2hvdWxkRW5mb3JjZVNhbWVTaXRlU3Ry aWN0Rm9yU3BlY2lmaWNEb21haW4ocmVzb3VyY2VTdGF0aXN0aWMucmVnaXN0cmFibGVEb21haW4p KQorICAgICAgICB8fCAoc2hvdWxkQ2hlY2tGb3JHcmFuZGZhdGhlcmluZyAmJiByZXNvdXJjZVN0 YXRpc3RpYy5ncmFuZGZhdGhlcmVkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYg KHJlc291cmNlU3RhdGlzdGljLnRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzVG9TaW5jZVNhbWVTaXRl U3RyaWN0RW5mb3JjZW1lbnQgPiBwYXJhbWV0ZXJzKCkubWluaW11bVRvcEZyYW1lUmVkaXJlY3Rz Rm9yU2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVudCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlT dG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcAppbmRleCBkYzYxZWQ2ODI2NzA0NjQ2ZTIx M2YyM2FlYWEwNzc3ZTc0MTY2MGNkLi5iM2FkODFkMTAwZTA0MzFkNjE3MjU2N2M4ZDAyOWIwZDkw ZmYxOWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9y eVN0b3JlLmNwcApAQCAtNDc0LDkgKzQ3NCwxMCBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NNZW1vcnlTdG9yZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYQog ICAgICAgICAgICAgaWYgKGlzUmVkaXJlY3QgfHwgd2FzTmF2aWdhdGVkQWZ0ZXJTaG9ydERlbGF5 V2l0aG91dFVzZXJJbnRlcmFjdGlvbikgewogICAgICAgICAgICAgICAgIGlmIChyZWRpcmVjdGlu Z0RvbWFpblN0YXRpc3RpY3MudG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUby5hZGQodGFyZ2V0RG9t YWluKS5pc05ld0VudHJ5KQogICAgICAgICAgICAgICAgICAgICBzdGF0aXN0aWNzV2VyZVVwZGF0 ZWQgPSB0cnVlOwotICAgICAgICAgICAgICAgIGlmIChyZWRpcmVjdGluZ0RvbWFpblN0YXRpc3Rp Y3MudG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUb1NpbmNlU2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVu dC5hZGQodGFyZ2V0RG9tYWluKS5pc05ld0VudHJ5KQorICAgICAgICAgICAgICAgIGlmIChpc1Jl ZGlyZWN0ICYmIHJlZGlyZWN0aW5nRG9tYWluU3RhdGlzdGljcy50b3BGcmFtZVVuaXF1ZVJlZGly ZWN0c1RvU2luY2VTYW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50LmFkZCh0YXJnZXREb21haW4pLmlz TmV3RW50cnkpIHsKICAgICAgICAgICAgICAgICAgICAgc3RhdGlzdGljc1dlcmVVcGRhdGVkID0g dHJ1ZTsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0Vu YWJsZWQoKSwgSVRQRGVidWcsICJEaWQgc2V0ICUiIFBVQkxJQ19MT0dfU1RSSU5HICIgYXMgbWFr aW5nIGEgdG9wIGZyYW1lIHJlZGlyZWN0IHRvICUiIFBVQkxJQ19MT0dfU1RSSU5HICIuIiwgc291 cmNlRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIHRhcmdldERvbWFpbi5zdHJpbmcoKS51 dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihk ZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERlYnVnLCAiRGlkIHNldCAlIiBQVUJMSUNfTE9HX1NU UklORyAiIGFzIG1ha2luZyBhIHRvcCBmcmFtZSByZWRpcmVjdCB0byAlIiBQVUJMSUNfTE9HX1NU UklORyAiLiIsIHNvdXJjZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCB0YXJnZXREb21h aW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NG b3JSZWdpc3RyYWJsZURvbWFpbih0YXJnZXREb21haW4pOwogICAgICAgICAgICAgICAgIGlmICh0 YXJnZXRTdGF0aXN0aWNzLnRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzRnJvbS5hZGQoc291cmNlRG9t YWluKS5pc05ld0VudHJ5KQogICAgICAgICAgICAgICAgICAgICBzdGF0aXN0aWNzV2VyZVVwZGF0 ZWQgPSB0cnVlOwpAQCAtOTQ5LDcgKzk1MCw4IEBAIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c01lbW9yeVN0b3JlOjpzaG91bGRSZW1vdmVBbGxCdXRDb29raWVzRm9yKFJlc291cmNlTG9hCiAK IGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpzaG91bGRFbmZvcmNlU2Ft ZVNpdGVTdHJpY3RGb3IoUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYgcmVzb3VyY2VTdGF0aXN0aWMs IGJvb2wgc2hvdWxkQ2hlY2tGb3JHcmFuZGZhdGhlcmluZykKIHsKLSAgICBpZiAoIWlzU2FtZVNp dGVTdHJpY3RFbmZvcmNlbWVudEVuYWJsZWQoKSB8fCAoc2hvdWxkQ2hlY2tGb3JHcmFuZGZhdGhl cmluZyAmJiByZXNvdXJjZVN0YXRpc3RpYy5ncmFuZGZhdGhlcmVkKSkKKyAgICBpZiAoKCFpc1Nh bWVTaXRlU3RyaWN0RW5mb3JjZW1lbnRFbmFibGVkKCkgJiYgIXNob3VsZEVuZm9yY2VTYW1lU2l0 ZVN0cmljdEZvclNwZWNpZmljRG9tYWluKHJlc291cmNlU3RhdGlzdGljLnJlZ2lzdHJhYmxlRG9t YWluKSkKKyAgICAgICAgfHwgKHNob3VsZENoZWNrRm9yR3JhbmRmYXRoZXJpbmcgJiYgcmVzb3Vy Y2VTdGF0aXN0aWMuZ3JhbmRmYXRoZXJlZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IGlmIChyZXNvdXJjZVN0YXRpc3RpYy50b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvU2luY2VTYW1l U2l0ZVN0cmljdEVuZm9yY2VtZW50LnNpemUoKSA+IHBhcmFtZXRlcnMoKS5taW5pbXVtVG9wRnJh bWVSZWRpcmVjdHNGb3JTYW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50KSB7CkBAIC05ODYsNyArOTg4 LDYgQEAgUmVnaXN0cmFibGVEb21haW5zVG9EZWxldGVPclJlc3RyaWN0V2Vic2l0ZURhdGFGb3Ig UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVMKICAgICAgICAgICAgIGlmIChzaG91bGRFbmZv cmNlU2FtZVNpdGVTdHJpY3RGb3Ioc3RhdGlzdGljLCBzaG91bGRDaGVja0ZvckdyYW5kZmF0aGVy aW5nKSkgewogICAgICAgICAgICAgICAgIHRvRGVsZXRlT3JSZXN0cmljdEZvci5kb21haW5zVG9F bmZvcmNlU2FtZVNpdGVTdHJpY3RGb3IuYXBwZW5kKHN0YXRpc3RpYy5yZWdpc3RyYWJsZURvbWFp bik7CiAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFi bGVkKCksIElUUERlYnVnLCAiU2NoZWR1bGVkICUiIFBVQkxJQ19MT0dfU1RSSU5HICIgdG8gaGF2 ZSBpdHMgY29va2llcyBzZXQgdG8gU2FtZVNpdGU9c3RyaWN0LiIsIHN0YXRpc3RpYy5yZWdpc3Ry YWJsZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLQogICAgICAgICAgICAgfQogICAg ICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5k ZXggNWI2NDk1YTVmNjI4NzA2MWMzMWZiMjNkZTM2YWVjMjU2OWNjNzhhZi4uYWI1NmE4MDUwODNj N2I4YWIwMTRkMjZmZWFjNzczNGY3ODUyYzA4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTUzNSw2ICs1MzUsMTcgQEAgYm9vbCBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0YXRpc3RpY3NFeHBpcmVkKGNvbnN0IFJlc291cmNlTG9h ZFN0YXRpc3QKICAgICByZXR1cm4gaGFzU3RhdGlzdGljc0V4cGlyZWQocmVzb3VyY2VTdGF0aXN0 aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUsIG9wZXJhdGluZ0RhdGVzV2luZG93KTsK IH0KIAorYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZEVuZm9yY2VTYW1l U2l0ZVN0cmljdEZvclNwZWNpZmljRG9tYWluKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBkb21h aW4pIGNvbnN0Cit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8UmVnaXN0cmFi bGVEb21haW4+PiBkb21haW5zID0gW10geworICAgICAgICBIYXNoU2V0PFJlZ2lzdHJhYmxlRG9t YWluPiBzZXQ7CisgICAgICAgIHNldC5hZGQoUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENy ZWF0ZUZyb21SZWdpc3RyYWJsZURvbWFpblN0cmluZygieWFob28uY28uanAiX3MpKTsKKyAgICAg ICAgcmV0dXJuIHNldDsKKyAgICB9KCk7CisKKyAgICByZXR1cm4gZG9tYWlucy5nZXQoKS5jb250 YWlucyhkb21haW4pOworfQorCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0 TWF4U3RhdGlzdGljc0VudHJpZXMoc2l6ZV90IG1heGltdW1FbnRyeUNvdW50KQogewogICAgIEFT U0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oCmluZGV4IDQ3ODE0ZjM5NWU4OTgzNGUyMjg4MDNiNzJlZTVmOGJmNmYxM2RiYzAu LmUzZGY0MDBhMDJiNWUxMDNkMDg2MDQyNzY1M2Q1ZTkyNjExMjE0NDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIv UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTIwNCw2ICsyMDQsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgYm9vbCBoYXNTdGF0aXN0aWNzRXhwaXJlZChXYWxsVGltZSBtb3N0UmVjZW50VXNl ckludGVyYWN0aW9uVGltZSwgT3BlcmF0aW5nRGF0ZXNXaW5kb3cpIGNvbnN0OwogICAgIHZvaWQg c2NoZWR1bGVTdGF0aXN0aWNzUHJvY2Vzc2luZ1JlcXVlc3RJZk5lY2Vzc2FyeSgpOwogICAgIHZv aWQgbWVyZ2VPcGVyYXRpbmdEYXRlcyhWZWN0b3I8T3BlcmF0aW5nRGF0ZT4mJik7CisgICAgYm9v bCBzaG91bGRFbmZvcmNlU2FtZVNpdGVTdHJpY3RGb3JTcGVjaWZpY0RvbWFpbihjb25zdCBSZWdp c3RyYWJsZURvbWFpbiYpIGNvbnN0OwogICAgIHZpcnR1YWwgVmVjdG9yPFJlZ2lzdHJhYmxlRG9t YWluPiBlbnN1cmVQcmV2YWxlbnRSZXNvdXJjZXNGb3JEZWJ1Z01vZGUoKSA9IDA7CiAgICAgdmly dHVhbCBSZWdpc3RyYWJsZURvbWFpbnNUb0RlbGV0ZU9yUmVzdHJpY3RXZWJzaXRlRGF0YUZvciBy ZWdpc3RyYWJsZURvbWFpbnNUb0RlbGV0ZU9yUmVzdHJpY3RXZWJzaXRlRGF0YUZvcigpID0gMDsK ICAgICB2aXJ0dWFsIHZvaWQgcHJ1bmVTdGF0aXN0aWNzSWZOZWVkZWQoKSA9IDA7Cg==