232668 2021-11-03 07:44:16 -0700 Clicking a link should preconnect to destination as first party 2021-11-03 13:25:25 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232147 1 cdumez cdumez achristensen changseok esprehn+autocc ews-watchlist ggaren gyuyoung.kim japhet nham webkit-bug-importer oldest_to_newest 1811466 0 cdumez 2021-11-03 07:44:16 -0700 Clicking a link should preconnect to destination as first party, not third-party. Otherwise, the preconnect is wasted when session isolation based on registrable domain is enabled. 1811467 1 443200 cdumez 2021-11-03 07:46:33 -0700 Created attachment 443200 Patch 1811473 2 443200 achristensen 2021-11-03 08:55:54 -0700 Comment on attachment 443200 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443200&action=review Does this make it so that script can use a.click() to preconnect in the context of another page? > Source/WebCore/html/HTMLAnchorElement.cpp:544 > + if (completedURL.protocolIsInHTTPFamily() && ((frame->isMainFrame() && isSelfTargetFrameName(effectiveTarget)) || isBlankTargetFrameName(effectiveTarget))) { I assume this makes it so that we don't preconnect for a link that is supposed to open in an iframe, right? 1811474 3 cdumez 2021-11-03 08:58:55 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 443200 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443200&action=review > > Does this make it so that script can use a.click() to preconnect in the > context of another page? I think it does. But since this will cause a top-level navigation, we would anyway connect to that server as first party, no? > > > Source/WebCore/html/HTMLAnchorElement.cpp:544 > > + if (completedURL.protocolIsInHTTPFamily() && ((frame->isMainFrame() && isSelfTargetFrameName(effectiveTarget)) || isBlankTargetFrameName(effectiveTarget))) { > > I assume this makes it so that we don't preconnect for a link that is > supposed to open in an iframe, right? Yes, since we are now preconnecting as first party and since we want session partitioning, it only makes sense to preconnect if clicking the link is going to cause a top frame navigation. 1811631 4 ews-feeder 2021-11-03 13:24:51 -0700 Committed r285224 (243848@main): <https://commits.webkit.org/243848@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443200. 1811632 5 webkit-bug-importer 2021-11-03 13:25:25 -0700 <rdar://problem/84988999> 443200 2021-11-03 07:46:33 -0700 2021-11-03 13:24:52 -0700 Patch bug-232668-20211103074632.patch text/plain 12346 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk0OTZjYWYyOGI4YzRm YmEyNGUyMmIyNTRiYWY5NmRlYzFlNzM5Mi4uZmUxMzgxZDE5NDU1M2MyNGVkZWM1NGJhYTg1YjFl MTkyMzI5Zjc2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTExLTAzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xpY2tpbmcgYSBsaW5rIHNo b3VsZCBwcmVjb25uZWN0IHRvIGRlc3RpbmF0aW9uIGFzIGZpcnN0IHBhcnR5CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI2NjgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGlja2luZyBhIGxpbmsgc2hv dWxkIHByZWNvbm5lY3QgdG8gZGVzdGluYXRpb24gYXMgZmlyc3QgcGFydHksIG5vdCB0aGlyZC1w YXJ0eS4gT3RoZXJ3aXNlLCB0aGUKKyAgICAgICAgcHJlY29ubmVjdCBpcyB3YXN0ZWQgd2hlbiBz ZXNzaW9uIGlzb2xhdGlvbiBiYXNlZCBvbiByZWdpc3RyYWJsZSBkb21haW4gaXMgZW5hYmxlZC4g VGhpcyBpcyBhCisgICAgICAgIGZvbGxvdy11cCB0byByMjg0NzMwLgorCisgICAgICAgICogaHRt bC9IVE1MQW5jaG9yRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQW5jaG9yRWxl bWVudDo6aGFuZGxlQ2xpY2spOgorICAgICAgICAqIGxvYWRlci9MaW5rTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxpbmtMb2FkZXI6OnByZWNvbm5lY3RJZk5lZWRlZCk6CisgICAgICAg ICogbG9hZGVyL0xvYWRlclN0cmF0ZWd5Lmg6CisKIDIwMjEtMTEtMDIgIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBQcm92aWRl IGJpZGkgcHJvcGVydGllcyB3aGVuIGNvbnN0cnVjdGluZyBUZXh0UnVuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdk Y2FiZmFkYTI2MTAwNGM1NTkxNzNhNWQ2MzBiMzIyOTY1NzQ2NTUuLjI1ZWI3NDI0ZWQyYjA5YjU3 ZTMzNGJkMzcwY2JiYjdhNTAyODVjMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEt MTEtMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGlja2lu ZyBhIGxpbmsgc2hvdWxkIHByZWNvbm5lY3QgdG8gZGVzdGluYXRpb24gYXMgZmlyc3QgcGFydHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjY2OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsaWNraW5n IGEgbGluayBzaG91bGQgcHJlY29ubmVjdCB0byBkZXN0aW5hdGlvbiBhcyBmaXJzdCBwYXJ0eSwg bm90IHRoaXJkLXBhcnR5LiBPdGhlcndpc2UsIHRoZQorICAgICAgICBwcmVjb25uZWN0IGlzIHdh c3RlZCB3aGVuIHNlc3Npb24gaXNvbGF0aW9uIGJhc2VkIG9uIHJlZ2lzdHJhYmxlIGRvbWFpbiBp cyBlbmFibGVkLiBUaGlzIGlzIGEKKyAgICAgICAgZm9sbG93LXVwIHRvIHIyODQ3MzAuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6cHJlY29ubmVjdFRvKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaDoKKwogMjAyMS0xMS0wMiAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoIHVuZGVyIFdlYlBh Z2U6OnNlbmRDT0VQQ09SUFZpb2xhdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCmluZGV4IDUwNmIy NTAxNTI5NmU0ZmM3ZGVhZDc2OTYwMTJkZTM4NjYxNjcwM2QuLjY0ZTBhZjY0ZTAwMjUyZTkxNDYy N2FmZmJkMWRmY2I2YzUzZTQ0NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMjEtMTEtMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAg ICBDbGlja2luZyBhIGxpbmsgc2hvdWxkIHByZWNvbm5lY3QgdG8gZGVzdGluYXRpb24gYXMgZmly c3QgcGFydHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMjY2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENsaWNraW5nIGEgbGluayBzaG91bGQgcHJlY29ubmVjdCB0byBkZXN0aW5hdGlvbiBhcyBmaXJz dCBwYXJ0eSwgbm90IHRoaXJkLXBhcnR5LiBPdGhlcndpc2UsIHRoZQorICAgICAgICBwcmVjb25u ZWN0IGlzIHdhc3RlZCB3aGVuIHNlc3Npb24gaXNvbGF0aW9uIGJhc2VkIG9uIHJlZ2lzdHJhYmxl IGRvbWFpbiBpcyBlbmFibGVkLiBUaGlzIGlzIGEKKyAgICAgICAgZm9sbG93LXVwIHRvIHIyODQ3 MzAuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIu Y3BwOgorICAgICAgICAoV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpwcmVjb25uZWN0VG8pOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oOgorCiAy MDIxLTEwLTI5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmVtb3ZlIGNvZGUgaW5zaWRlIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5jaG9yRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcAppbmRleCBhMDI5ZDQ2M2Zh MDg3MzgzMjAwYWMxYmJmNDhlMDM4OTdmMzNlMDA3Li4yYjFjZjk4YTNjNWE5YTBkMDg2OTA3YzAz OTdhNjA0ZDI3N2Q3YjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNo b3JFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVtZW50 LmNwcApAQCAtNTQxLDkgKzU0MSw5IEBAIHZvaWQgSFRNTEFuY2hvckVsZW1lbnQ6OmhhbmRsZUNs aWNrKEV2ZW50JiBldmVudCkKICAgICBzZW5kUGluZ3MoY29tcGxldGVkVVJMKTsKIAogICAgIC8v IFByZWNvbm5lY3QgdG8gdGhlIGxpbmsncyB0YXJnZXQgZm9yIGltcHJvdmVkIHBhZ2UgbG9hZCB0 aW1lLgotICAgIGlmIChjb21wbGV0ZWRVUkwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKSB7Cisg ICAgaWYgKGNvbXBsZXRlZFVSTC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgJiYgKChmcmFtZS0+ aXNNYWluRnJhbWUoKSAmJiBpc1NlbGZUYXJnZXRGcmFtZU5hbWUoZWZmZWN0aXZlVGFyZ2V0KSkg fHwgaXNCbGFua1RhcmdldEZyYW1lTmFtZShlZmZlY3RpdmVUYXJnZXQpKSkgewogICAgICAgICBh dXRvIHN0b3JhZ2VDcmVkZW50aWFsc1BvbGljeSA9IGZyYW1lLT5wYWdlKCkgJiYgZnJhbWUtPnBh Z2UoKS0+Y2FuVXNlQ3JlZGVudGlhbFN0b3JhZ2UoKSA/IFN0b3JlZENyZWRlbnRpYWxzUG9saWN5 OjpVc2UgOiBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2U7Ci0gICAgICAgIHBsYXRm b3JtU3RyYXRlZ2llcygpLT5sb2FkZXJTdHJhdGVneSgpLT5wcmVjb25uZWN0VG8oZnJhbWUtPmxv YWRlcigpLCBjb21wbGV0ZWRVUkwsIHN0b3JhZ2VDcmVkZW50aWFsc1BvbGljeSwgbnVsbHB0cik7 CisgICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5sb2FkZXJTdHJhdGVneSgpLT5wcmVjb25u ZWN0VG8oZnJhbWUtPmxvYWRlcigpLCBjb21wbGV0ZWRVUkwsIHN0b3JhZ2VDcmVkZW50aWFsc1Bv bGljeSwgTG9hZGVyU3RyYXRlZ3k6OlNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHk6Olllcywg bnVsbHB0cik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TGlua0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAKaW5k ZXggOGZiOTE3Yjk1MWMyZmRhNGI5OWNlMWJlNzVlNjFiMWQxNDBhYmIyNC4uOWYxN2MxMjhhMzE4 MTZhNmE5Mzk4YjVkMmIxNDU2ODU0YzVkOWE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0xpbmtMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9h ZGVyLmNwcApAQCAtMjE3LDcgKzIxNyw3IEBAIHZvaWQgTGlua0xvYWRlcjo6cHJlY29ubmVjdElm TmVlZGVkKGNvbnN0IExpbmtMb2FkUGFyYW1ldGVycyYgcGFyYW1zLCBEb2N1bWVudCYKICAgICBp ZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShwYXJhbXMuY3Jvc3NPcmlnaW4sICJhbm9ueW1vdXMi KSAmJiBkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmlzU2FtZU9yaWdpbkRvbWFpbihTZWN1cml0 eU9yaWdpbjo6Y3JlYXRlKGhyZWYpKSkKICAgICAgICAgc3RvcmFnZUNyZWRlbnRpYWxzUG9saWN5 ID0gU3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOwogICAgIEFTU0VSVChkb2N1bWVu dC5mcmFtZSgpLT5sb2FkZXIoKS5uZXR3b3JraW5nQ29udGV4dCgpKTsKLSAgICBwbGF0Zm9ybVN0 cmF0ZWdpZXMoKS0+bG9hZGVyU3RyYXRlZ3koKS0+cHJlY29ubmVjdFRvKGRvY3VtZW50LmZyYW1l KCktPmxvYWRlcigpLCBocmVmLCBzdG9yYWdlQ3JlZGVudGlhbHNQb2xpY3ksIFt3ZWFrRG9jdW1l bnQgPSBXZWFrUHRyIHsgZG9jdW1lbnQgfSwgaHJlZl0oUmVzb3VyY2VFcnJvciBlcnJvcikgewor ICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5sb2FkZXJTdHJhdGVneSgpLT5wcmVjb25uZWN0VG8o ZG9jdW1lbnQuZnJhbWUoKS0+bG9hZGVyKCksIGhyZWYsIHN0b3JhZ2VDcmVkZW50aWFsc1BvbGlj eSwgTG9hZGVyU3RyYXRlZ3k6OlNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHk6Ok5vLCBbd2Vh a0RvY3VtZW50ID0gV2Vha1B0ciB7IGRvY3VtZW50IH0sIGhyZWZdKFJlc291cmNlRXJyb3IgZXJy b3IpIHsKICAgICAgICAgaWYgKCF3ZWFrRG9jdW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Mb2FkZXJTdHJhdGVneS5oIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0xvYWRlclN0cmF0ZWd5LmgKaW5kZXggYjBjYjU2ZWMwMTdlOWM3 ZjE3NmJmNTdjMmY4ZjI4YWMwMWFhMTNiOC4uYWVmNjY4YmQ2M2VkNWZjZDQ1ZTYxZTlkMWYxMDdj ZmI2YWVmMjY0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xvYWRlclN0cmF0 ZWd5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xvYWRlclN0cmF0ZWd5LmgKQEAgLTc5 LDcgKzc5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzdGFydFBpbmdMb2FkKEZyYW1l JiwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgSFRUUEhlYWRlck1hcCYgb3JpZ2luYWxSZXF1ZXN0 SGVhZGVycywgY29uc3QgRmV0Y2hPcHRpb25zJiwgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3Np dGlvbiwgUGluZ0xvYWRDb21wbGV0aW9uSGFuZGxlciYmID0geyB9KSA9IDA7CiAKICAgICB1c2lu ZyBQcmVjb25uZWN0Q29tcGxldGlvbkhhbmRsZXIgPSBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291 cmNlRXJyb3ImKT47Ci0gICAgdmlydHVhbCB2b2lkIHByZWNvbm5lY3RUbyhGcmFtZUxvYWRlciYs IGNvbnN0IFVSTCYsIFN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBQcmVjb25uZWN0Q29tcGxldGlv bkhhbmRsZXImJikgPSAwOworICAgIGVudW0gY2xhc3MgU2hvdWxkUHJlY29ubmVjdEFzRmlyc3RQ YXJ0eSA6IGJvb2wgeyBObywgWWVzIH07CisgICAgdmlydHVhbCB2b2lkIHByZWNvbm5lY3RUbyhG cmFtZUxvYWRlciYsIGNvbnN0IFVSTCYsIFN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBTaG91bGRQ cmVjb25uZWN0QXNGaXJzdFBhcnR5LCBQcmVjb25uZWN0Q29tcGxldGlvbkhhbmRsZXImJikgPSAw OwogCiAgICAgdmlydHVhbCB2b2lkIHNldENhcHR1cmVFeHRyYU5ldHdvcmtMb2FkTWV0cmljc0Vu YWJsZWQoYm9vbCkgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggY2QyNzk2ZDI5MTc0NTllYWE5NWY5 MGNiZDc4NTI4ZGNmMWU4MDMyZC4uZDY3MWQwNTgxMDcxMTQ4YjQyZTYwN2FiNTk4NDg2ZTkwYTcw MzVlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9h ZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtNzY2LDcgKzc2Niw3IEBAIHZvaWQgV2ViTG9hZGVyU3Ry YXRlZ3k6OmRpZEZpbmlzaFBpbmdMb2FkKFdlYkNvcmU6OlJlc291cmNlTG9hZGVySWRlbnRpZmll ciBwaW5nCiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoZXJyb3IpLCBXVEZNb3Zl KHJlc3BvbnNlKSk7CiB9CiAKLXZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyhG cmFtZUxvYWRlciYgZnJhbWVMb2FkZXIsIGNvbnN0IFVSTCYgdXJsLCBTdG9yZWRDcmVkZW50aWFs c1BvbGljeSBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgUHJlY29ubmVjdENvbXBsZXRpb25IYW5k bGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25u ZWN0VG8oRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCBjb25zdCBVUkwmIHVybCwgU3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kgc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIFNob3VsZFByZWNvbm5lY3RB c0ZpcnN0UGFydHkgc2hvdWxkUHJlY29ubmVjdEFzRmlyc3RQYXJ0eSwgUHJlY29ubmVjdENvbXBs ZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgYXV0byogd2ViRnJhbWVM b2FkZXJDbGllbnQgPSB0b1dlYkZyYW1lTG9hZGVyQ2xpZW50KGZyYW1lTG9hZGVyLmNsaWVudCgp KTsKICAgICBpZiAoIXdlYkZyYW1lTG9hZGVyQ2xpZW50KSB7CkBAIC03ODIsMTAgKzc4MiwxMCBA QCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8oRnJhbWVMb2FkZXImIGZyYW1l TG9hZGVyLCBjb25zdCBVUkwmIHVybCwgUwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg cHJlY29ubmVjdFRvKFJlc291cmNlUmVxdWVzdCB7IHVybCB9LCAqd2ViUGFnZSwgd2ViRnJhbWUs IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Cisg ICAgcHJlY29ubmVjdFRvKFJlc291cmNlUmVxdWVzdCB7IHVybCB9LCAqd2ViUGFnZSwgd2ViRnJh bWUsIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBzaG91bGRQcmVjb25uZWN0QXNGaXJzdFBhcnR5 LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKLXZvaWQgV2ViTG9hZGVyU3RyYXRl Z3k6OnByZWNvbm5lY3RUbyhXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJQ YWdlJiB3ZWJQYWdlLCBXZWJGcmFtZSYgd2ViRnJhbWUsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRp YWxzUG9saWN5IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBQcmVjb25uZWN0Q29tcGxldGlvbkhh bmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNv bm5lY3RUbyhXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJQYWdlJiB3ZWJQ YWdlLCBXZWJGcmFtZSYgd2ViRnJhbWUsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5 IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBTaG91bGRQcmVjb25uZWN0QXNGaXJzdFBhcnR5IHNo b3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHksIFByZWNvbm5lY3RDb21wbGV0aW9uSGFuZGxlciYm IGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGlmICh3ZWJQYWdlLmNvcmVQYWdlKCkgJiYgIXdl YlBhZ2UuY29yZVBhZ2UoKS0+YWxsb3dzTG9hZEZyb21VUkwocmVxdWVzdC51cmwoKSwgTWFpbkZy YW1lTWFpblJlc291cmNlOjpObykpIHsKICAgICAgICAgaWYgKGNvbXBsZXRpb25IYW5kbGVyKQpA QCAtNzk0LDcgKzc5NCwxMCBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8o V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViUGFnZQogICAgIH0KIAogICAg IGlmIChhdXRvKiBkb2N1bWVudCA9IHdlYlBhZ2UubWFpbkZyYW1lKCktPmRvY3VtZW50KCkpIHsK LSAgICAgICAgcmVxdWVzdC5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhkb2N1bWVudC0+Zmlyc3RQ YXJ0eUZvckNvb2tpZXMoKSk7CisgICAgICAgIGlmIChzaG91bGRQcmVjb25uZWN0QXNGaXJzdFBh cnR5ID09IFNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHk6OlllcykKKyAgICAgICAgICAgIHJl cXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMocmVxdWVzdC51cmwoKSk7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIHJlcXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMoZG9jdW1lbnQt PmZpcnN0UGFydHlGb3JDb29raWVzKCkpOwogICAgICAgICBpZiAoYXV0byogbG9hZGVyID0gZG9j dW1lbnQtPmxvYWRlcigpKQogICAgICAgICAgICAgcmVxdWVzdC5zZXRJc0FwcEluaXRpYXRlZChs b2FkZXItPmxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKCkpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oCmlu ZGV4IDQwNWM3MzQzMGUyMTAxMmIxZTFhYzc4ODk2NWNiYzk3Njc3NjIzNjguLjIyOTBkOTg3YzM2 ZjY4MjQ1YjA4ZmIyYjg2MzE5ZDRkNWE2OGU0YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmgKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaApAQCAtNjksOCArNjksOCBA QCBwdWJsaWM6CiAgICAgdm9pZCBzdGFydFBpbmdMb2FkKFdlYkNvcmU6OkZyYW1lJiwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6SFRUUEhlYWRlck1hcCYgb3JpZ2lu YWxSZXF1ZXN0SGVhZGVycywgY29uc3QgV2ViQ29yZTo6RmV0Y2hPcHRpb25zJiwgV2ViQ29yZTo6 Q29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiwgUGluZ0xvYWRDb21wbGV0aW9uSGFuZGxl ciYmKSBmaW5hbDsKICAgICB2b2lkIGRpZEZpbmlzaFBpbmdMb2FkKFdlYkNvcmU6OlJlc291cmNl TG9hZGVySWRlbnRpZmllciBwaW5nTG9hZElkZW50aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlRXJy b3ImJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmKTsKIAotICAgIHZvaWQgcHJlY29ubmVj dFRvKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJQYWdlJiwgV2ViRnJhbWUmLCBXZWJD b3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgUHJlY29ubmVjdENvbXBsZXRpb25IYW5kbGVy JiYgPSBudWxscHRyKTsKLSAgICB2b2lkIHByZWNvbm5lY3RUbyhXZWJDb3JlOjpGcmFtZUxvYWRl ciYsIGNvbnN0IFVSTCYsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBQcmVjb25u ZWN0Q29tcGxldGlvbkhhbmRsZXImJikgZmluYWw7CisgICAgdm9pZCBwcmVjb25uZWN0VG8oV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYlBhZ2UmLCBXZWJGcmFtZSYsIFdlYkNvcmU6OlN0 b3JlZENyZWRlbnRpYWxzUG9saWN5LCBTaG91bGRQcmVjb25uZWN0QXNGaXJzdFBhcnR5LCBQcmVj b25uZWN0Q29tcGxldGlvbkhhbmRsZXImJiA9IG51bGxwdHIpOworICAgIHZvaWQgcHJlY29ubmVj dFRvKFdlYkNvcmU6OkZyYW1lTG9hZGVyJiwgY29uc3QgVVJMJiwgV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3ksIFNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHksIFByZWNvbm5lY3RD b21wbGV0aW9uSGFuZGxlciYmKSBmaW5hbDsKICAgICB2b2lkIGRpZEZpbmlzaFByZWNvbm5lY3Rp b24oV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJJZGVudGlmaWVyIHByZWNvbm5lY3Rpb25JZGVudGlm aWVyLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYpOwogCiAgICAgdm9pZCBzZXRDYXB0dXJlRXh0 cmFOZXR3b3JrTG9hZE1ldHJpY3NFbmFibGVkKGJvb2wpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIu Y3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRT Y2hlZHVsZXIuY3BwCmluZGV4IDFlNGQyOWMwZTQxZjc4NmM2NWQ0MzFmMzcxYjI2YzQ3NTA0OTVk MDAuLjM5YmI4YjU2ODEwNWQyMWZmNTBlMGY2YzFkZjFmNjJhMzllYjVlODUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvV2ViQ29yZVN1cHBvcnQvV2ViUmVzb3VyY2VMb2FkU2NoZWR1 bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L1dlYkNvcmVTdXBwb3J0L1dlYlJlc291 cmNlTG9hZFNjaGVkdWxlci5jcHAKQEAgLTQwMiw3ICs0MDIsNyBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFNjaGVkdWxlcjo6YWRkT25saW5lU3RhdGVDaGFuZ2VMaXN0ZW5lcihXVEY6OkZ1bmN0aW9u PHZvaWQoYgogICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyOjpzaW5nbGV0b24oKS5hZGRMaXN0ZW5l cihXVEZNb3ZlKGxpc3RlbmVyKSk7CiB9CiAKLXZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVy OjpwcmVjb25uZWN0VG8oRnJhbWVMb2FkZXImLCBjb25zdCBVUkwmLCBTdG9yZWRDcmVkZW50aWFs c1BvbGljeSwgUHJlY29ubmVjdENvbXBsZXRpb25IYW5kbGVyJiYpCit2b2lkIFdlYlJlc291cmNl TG9hZFNjaGVkdWxlcjo6cHJlY29ubmVjdFRvKEZyYW1lTG9hZGVyJiwgY29uc3QgVVJMJiwgU3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3ksIFNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHksIFByZWNv bm5lY3RDb21wbGV0aW9uSGFuZGxlciYmKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0TGVnYWN5L1dlYkNvcmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oIGIvU291 cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIu aAppbmRleCBlNTk1NTBmYmJiYTBmNmRjMzRjYzMzZDUxMGU4OWU2ZTM0OThkYTA1Li40N2M1ZjJl MGE1YmIxYjdhYTEwM2ExMzRlMmRiNTA4OWY4NjUxYWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0TGVnYWN5L1dlYkNvcmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oCisrKyBi L1NvdXJjZS9XZWJLaXRMZWdhY3kvV2ViQ29yZVN1cHBvcnQvV2ViUmVzb3VyY2VMb2FkU2NoZWR1 bGVyLmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzdGFydFBpbmdMb2Fk KFdlYkNvcmU6OkZyYW1lJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29y ZTo6SFRUUEhlYWRlck1hcCYsIGNvbnN0IFdlYkNvcmU6OkZldGNoT3B0aW9ucyYsIFdlYkNvcmU6 OkNvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24sIFBpbmdMb2FkQ29tcGxldGlvbkhhbmRs ZXImJikgZmluYWw7CiAKLSAgICB2b2lkIHByZWNvbm5lY3RUbyhXZWJDb3JlOjpGcmFtZUxvYWRl ciYsIGNvbnN0IFVSTCYsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBQcmVjb25u ZWN0Q29tcGxldGlvbkhhbmRsZXImJikgZmluYWw7CisgICAgdm9pZCBwcmVjb25uZWN0VG8oV2Vi Q29yZTo6RnJhbWVMb2FkZXImLCBjb25zdCBVUkwmLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFs c1BvbGljeSwgU2hvdWxkUHJlY29ubmVjdEFzRmlyc3RQYXJ0eSwgUHJlY29ubmVjdENvbXBsZXRp b25IYW5kbGVyJiYpIGZpbmFsOwogCiAgICAgdm9pZCBzZXRDYXB0dXJlRXh0cmFOZXR3b3JrTG9h ZE1ldHJpY3NFbmFibGVkKGJvb2wpIGZpbmFsIHsgfQogCg==