223728 2021-03-24 20:57:07 -0700 WKContentRuleList first-party should include other subdomains of the current registrable domain 2021-03-25 08:30:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez ews-watchlist japhet webkit-bug-importer wilander oldest_to_newest 1743661 0 achristensen 2021-03-24 20:57:07 -0700 WKContentRuleList first-party should include other subdomains of the current registrable domain 1743663 1 424215 achristensen 2021-03-24 20:57:32 -0700 Created attachment 424215 Patch 1743664 2 achristensen 2021-03-24 20:57:35 -0700 <rdar://problem/71912579> 1743666 3 424215 wilander 2021-03-24 21:28:26 -0700 Comment on attachment 424215 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424215&action=review r=me with a requested change. > Source/WebCore/loader/ResourceLoadInfo.cpp:131 > + return RegistrableDomain(mainDocumentURL) != RegistrableDomain(resourceURL); You should be able to use RegistrableDomain::matches(const URL& url) here which is faster than creating two RegistrableDomain objects. 1743774 4 424244 achristensen 2021-03-25 08:04:28 -0700 Created attachment 424244 Patch 1743775 5 424244 wilander 2021-03-25 08:15:01 -0700 Comment on attachment 424244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424244&action=review > Source/WebCore/loader/ResourceLoadInfo.cpp:129 > + return !RegistrableDomain(mainDocumentURL).matches(resourceURL); I would have kept the comparison of the two hosts. Something like return !(mainHost == otherHost || RD(mainURL).matches(otherURL)). 1743784 6 ews-feeder 2021-03-25 08:30:38 -0700 Committed r275035: <https://commits.webkit.org/r275035> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424244. 424215 2021-03-24 20:57:32 -0700 2021-03-25 08:04:26 -0700 Patch bug-223728-20210324205731.patch text/plain 5870 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM1MGQ1YTlkNjgwNzkw MDUyMGQ2NzA3N2Q2MDI5ZjNhY2I3YjNmNy4uZmI0YjdiZWU2OTFhZDJiZWQ0OTA4NTI1N2M1ODgy MWFiODk5N2Y2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTI0ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tDb250 ZW50UnVsZUxpc3QgZmlyc3QtcGFydHkgc2hvdWxkIGluY2x1ZGUgb3RoZXIgc3ViZG9tYWlucyBv ZiB0aGUgY3VycmVudCByZWdpc3RyYWJsZSBkb21haW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzcyOAorICAgICAgICA8cmRhcjovLzcxOTEyNTc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVy ZWQgYnkgQVBJIHRlc3RzLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlJlc291cmNlTG9hZEluZm86 OmlzVGhpcmRQYXJ0eSBjb25zdCk6CisKIDIwMjEtMDMtMjIgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQ29tcG9zaXRpb24gdGV4dCBpcyBu b3QgaW5pdGlhbGx5IGhpZ2hsaWdodGVkIHdoZW4gdHlwaW5nIGluIHRleHQgZmllbGRzIHVzaW5n IFBpbnlpbiBrZXlib2FyZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZEluZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZEluZm8u Y3BwCmluZGV4IDY5NTk0ZTg4MzBiMTZmNDkwYzllZmUyNDUyM2Q4MTZhNmU5ZTEzMGUuLjU2ZjNj MTgyZGNhMjkyZGJjNzQ5MWJjYWU0NGUyNmYwYTk0ZTA5MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRJbmZvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvUmVzb3VyY2VMb2FkSW5mby5jcHAKQEAgLTEyNiwxMCArMTI2LDkgQEAgT3B0aW9uYWw8 T3B0aW9uU2V0PExvYWRUeXBlPj4gcmVhZExvYWRUeXBlKGNvbnN0IFN0cmluZyYgbmFtZSkKIAog Ym9vbCBSZXNvdXJjZUxvYWRJbmZvOjppc1RoaXJkUGFydHkoKSBjb25zdAogewotICAgIFJlZjxT ZWN1cml0eU9yaWdpbj4gbWFpbkRvY3VtZW50U2VjdXJpdHlPcmlnaW4gPSBTZWN1cml0eU9yaWdp bjo6Y3JlYXRlKG1haW5Eb2N1bWVudFVSTCk7Ci0gICAgUmVmPFNlY3VyaXR5T3JpZ2luPiByZXNv dXJjZVNlY3VyaXR5T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXNvdXJjZVVSTCk7 Ci0KLSAgICByZXR1cm4gIW1haW5Eb2N1bWVudFNlY3VyaXR5T3JpZ2luLT5pc1NhbWVPcmlnaW5E b21haW4ocmVzb3VyY2VTZWN1cml0eU9yaWdpbi5nZXQoKSk7CisgICAgaWYgKG1haW5Eb2N1bWVu dFVSTC5ob3N0KCkgPT0gcmVzb3VyY2VVUkwuaG9zdCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIFJlZ2lzdHJhYmxlRG9tYWluKG1haW5Eb2N1bWVudFVSTCkgIT0gUmVnaXN0 cmFibGVEb21haW4ocmVzb3VyY2VVUkwpOwogfQogICAgIAogUmVzb3VyY2VGbGFncyBSZXNvdXJj ZUxvYWRJbmZvOjpnZXRSZXNvdXJjZUZsYWdzKCkgY29uc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1OTgwMzg4NzdhZjc0Y2M3YjNlNWNhN2Rh ZTI5YTQ3ZDZkNjNiYjM3Li45YmVmNzU0NmU3MjJlNWNiOGVhNzM0OWEzYzY4MzE3MTUxMDU1MDQ0 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMjEtMDMtMjQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KKworICAgICAgICBXS0NvbnRlbnRSdWxlTGlzdCBmaXJzdC1wYXJ0eSBzaG91 bGQgaW5jbHVkZSBvdGhlciBzdWJkb21haW5zIG9mIHRoZSBjdXJyZW50IHJlZ2lzdHJhYmxlIGRv bWFpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIz NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlv bi5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIxLTAzLTIyICBSb2IgQnVpcyAgPHJidWlzQGln YWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1jb250YWluXSBQYXJzZSBDU1MgY29udGFpbiBwcm9w ZXJ0eQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9D b250ZW50UnVsZUxpc3ROb3RpZmljYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbi5tbQppbmRleCA3OTQ2MzNk YTMwNDlhZTM2ZThiNTMxNTI2MjA3NjAyN2Y3NGE4OWZlLi42YTEwYjAxYzc1MzIzODI1ODIxODlk NmZjYzE0MWY4MDc5NzMwN2EzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbi5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlv bi5tbQpAQCAtMjc2LDYgKzI3Niw1MyBAQCBURVNUKENvbnRlbnRSdWxlTGlzdCwgUmVzb3VyY2VU eXBlcykKICAgICBFWFBFQ1RfRVEoYmVhY29uU2VydmVyLnRvdGFsUmVxdWVzdHMoKSwgNXUpOwog fQogCitURVNUKENvbnRlbnRSdWxlTGlzdCwgVGhpcmRQYXJ0eSkKK3sKKyAgICBhdXRvIGhhbmRs ZXIgPSBbW1Rlc3RVUkxTY2hlbWVIYW5kbGVyIG5ld10gYXV0b3JlbGVhc2VdOworICAgIGhhbmRs ZXIuc3RhcnRVUkxTY2hlbWVUYXNrSGFuZGxlciA9IF4oV0tXZWJWaWV3ICosIGlkPFdLVVJMU2No ZW1lVGFzaz4gdGFzaykgeworICAgICAgICBhdXRvIHJlc3BvbmQgPSBbdGFza10gKGNvbnN0IGNo YXIqIGh0bWwpIHsKKyAgICAgICAgICAgIE5TVVJMUmVzcG9uc2UgKnJlc3BvbnNlID0gW1tbTlNV UkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpA InRleHQvaHRtbCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOnN0cmxlbihodG1sKSB0ZXh0RW5jb2Rp bmdOYW1lOm5pbF0gYXV0b3JlbGVhc2VdOworICAgICAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZVJl c3BvbnNlOnJlc3BvbnNlXTsKKyAgICAgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRhOltOU0Rh dGEgZGF0YVdpdGhCeXRlczpodG1sIGxlbmd0aDpzdHJsZW4oaHRtbCldXTsKKyAgICAgICAgICAg IFt0YXNrIGRpZEZpbmlzaF07CisgICAgICAgIH07CisgICAgICAgIE5TU3RyaW5nICpwYXRoID0g dGFzay5yZXF1ZXN0LlVSTC5wYXRoOworICAgICAgICBpZiAoW3BhdGggaXNFcXVhbFRvU3RyaW5n OkAiL21haW4uaHRtbCJdKSB7CisgICAgICAgICAgICByZXR1cm4gcmVzcG9uZCgiPHNjcmlwdD4i CisgICAgICAgICAgICAgICAgImZ1bmN0aW9uIHRlc3RXZWJLaXQoKSB7IGZldGNoKCd0ZXN0Oi8v d2Via2l0Lm9yZy9yZXNvdXJjZS50eHQnLCB7bW9kZTonbm8tY29ycyd9KS50aGVuKCgpPT57YWxl cnQoJ3dlYmtpdC5vcmcgbG9hZGVkJyk7fSkuY2F0Y2goKCk9PnthbGVydCgnd2Via2l0Lm9yZyBi bG9ja2VkJyk7fSkgfTsiCisgICAgICAgICAgICAgICAgImZldGNoKCd0ZXN0Oi8vc3ViLmV4YW1w bGUuY29tL3Jlc291cmNlLnR4dCcsIHttb2RlOiduby1jb3JzJ30pLnRoZW4oKCk9PnthbGVydCgn c3ViLmV4YW1wbGUuY29tIGxvYWRlZCcpO3Rlc3RXZWJLaXQoKTt9KS5jYXRjaCgoKT0+e2FsZXJ0 KCdzdWIuZXhhbXBsZS5jb20gYmxvY2tlZCcpO3Rlc3RXZWJLaXQoKTt9KSIKKyAgICAgICAgICAg ICI8L3NjcmlwdD4iKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoW3BhdGggaXNFcXVhbFRvU3Ry aW5nOkAiL3Jlc291cmNlLnR4dCJdKQorICAgICAgICAgICAgcmV0dXJuIHJlc3BvbmQoImhpIik7 CisKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfTsKKyAgICBhdXRvIGNvbmZp Z3VyYXRpb24gPSBbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3XSBhdXRvcmVsZWFzZV07Cisg ICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyIGZvclVSTFNjaGVt ZTpAInRlc3QiXTsKKyAgICBjb25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmUgPSBbV0tXZWJz aXRlRGF0YVN0b3JlIG5vblBlcnNpc3RlbnREYXRhU3RvcmVdOworICAgIGF1dG8gd2ViVmlldyA9 IFtbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRp b246Y29uZmlndXJhdGlvbl0gYXV0b3JlbGVhc2VdOworCisgICAgYXV0byBsaXN0V2l0aExvYWRU eXBlID0gW10gKGNvbnN0IGNoYXIqIHR5cGUpIHsKKyAgICAgICAgcmV0dXJuIG1ha2VDb250ZW50 UnVsZUxpc3QoW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJbe1wiYWN0aW9uXCI6e1widHlw ZVwiOlwiYmxvY2tcIn0sXCJ0cmlnZ2VyXCI6e1widXJsLWZpbHRlclwiOlwicmVzb3VyY2UudHh0 XCIsXCJsb2FkLXR5cGVcIjpbXCIlc1wiXX19XSIsIHR5cGVdKTsKKyAgICB9OworCisgICAgV0tV c2VyQ29udGVudENvbnRyb2xsZXIgKnVzZXJDb250ZW50Q29udHJvbGxlciA9IHdlYlZpZXcuY29u ZmlndXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXI7CisgICAgW3dlYlZpZXcgbG9hZFJlcXVl c3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInRl c3Q6Ly9leGFtcGxlLmNvbS9tYWluLmh0bWwiXV1dOworICAgIEVYUEVDVF9XS19TVFJFUShbd2Vi VmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAic3ViLmV4YW1wbGUuY29tIGxvYWRlZCIpOworICAg IEVYUEVDVF9XS19TVFJFUShbd2ViVmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAid2Via2l0Lm9y ZyBsb2FkZWQiKTsKKyAgICAKKyAgICBbdXNlckNvbnRlbnRDb250cm9sbGVyIGFkZENvbnRlbnRS dWxlTGlzdDpsaXN0V2l0aExvYWRUeXBlKCJ0aGlyZC1wYXJ0eSIpLmdldCgpXTsKKyAgICBbd2Vi VmlldyByZWxvYWRdOworICAgIEVYUEVDVF9XS19TVFJFUShbd2ViVmlldyBfdGVzdF93YWl0Rm9y QWxlcnRdLCAic3ViLmV4YW1wbGUuY29tIGxvYWRlZCIpOworICAgIEVYUEVDVF9XS19TVFJFUShb d2ViVmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAid2Via2l0Lm9yZyBibG9ja2VkIik7CisgICAg W3VzZXJDb250ZW50Q29udHJvbGxlciByZW1vdmVBbGxDb250ZW50UnVsZUxpc3RzXTsKKyAgICBb dXNlckNvbnRlbnRDb250cm9sbGVyIGFkZENvbnRlbnRSdWxlTGlzdDpsaXN0V2l0aExvYWRUeXBl KCJmaXJzdC1wYXJ0eSIpLmdldCgpXTsKKyAgICBbd2ViVmlldyByZWxvYWRdOworICAgIEVYUEVD VF9XS19TVFJFUShbd2ViVmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAic3ViLmV4YW1wbGUuY29t IGJsb2NrZWQiKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFs ZXJ0XSwgIndlYmtpdC5vcmcgbG9hZGVkIik7Cit9CisKIFRFU1QoQ29udGVudFJ1bGVMaXN0LCBT dXBwb3J0c1JlZ2V4KQogewogICAgIE5TQXJyYXk8TlNTdHJpbmcgKj4gKmFsbG93ZWQgPSBAWwo= 424244 2021-03-25 08:04:28 -0700 2021-03-25 08:30:39 -0700 Patch bug-223728-20210325080427.patch text/plain 5778 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM1MGQ1YTlkNjgwNzkw MDUyMGQ2NzA3N2Q2MDI5ZjNhY2I3YjNmNy4uYjRkMzc0M2E5ODEzNzE4YzU0OTNjZmE4YzRjZjJk YTk1MzYwYzAwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTI0ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tDb250 ZW50UnVsZUxpc3QgZmlyc3QtcGFydHkgc2hvdWxkIGluY2x1ZGUgb3RoZXIgc3ViZG9tYWlucyBv ZiB0aGUgY3VycmVudCByZWdpc3RyYWJsZSBkb21haW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzcyOAorICAgICAgICA8cmRhcjovLzcxOTEyNTc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IEpvaG4gV2lsYW5kZXIuCisKKyAgICAgICAgQ292ZXJl ZCBieSBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VMb2FkSW5mbzo6 aXNUaGlyZFBhcnR5IGNvbnN0KToKKwogMjAyMS0wMy0yMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBDb21wb3NpdGlvbiB0ZXh0IGlzIG5v dCBpbml0aWFsbHkgaGlnaGxpZ2h0ZWQgd2hlbiB0eXBpbmcgaW4gdGV4dCBmaWVsZHMgdXNpbmcg UGlueWluIGtleWJvYXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkSW5mby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5j cHAKaW5kZXggNjk1OTRlODgzMGIxNmY0OTBjOWVmZTI0NTIzZDgxNmE2ZTllMTMwZS4uOTk4NTMz YTA3MWYzM2UzYjcyOWI1MzM0ZmFmZGFkMTk5NzQ1OTNlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRJbmZvLmNwcApAQCAtMTI2LDEwICsxMjYsNyBAQCBPcHRpb25hbDxP cHRpb25TZXQ8TG9hZFR5cGU+PiByZWFkTG9hZFR5cGUoY29uc3QgU3RyaW5nJiBuYW1lKQogCiBi b29sIFJlc291cmNlTG9hZEluZm86OmlzVGhpcmRQYXJ0eSgpIGNvbnN0CiB7Ci0gICAgUmVmPFNl Y3VyaXR5T3JpZ2luPiBtYWluRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA9IFNlY3VyaXR5T3JpZ2lu OjpjcmVhdGUobWFpbkRvY3VtZW50VVJMKTsKLSAgICBSZWY8U2VjdXJpdHlPcmlnaW4+IHJlc291 cmNlU2VjdXJpdHlPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHJlc291cmNlVVJMKTsK LQotICAgIHJldHVybiAhbWFpbkRvY3VtZW50U2VjdXJpdHlPcmlnaW4tPmlzU2FtZU9yaWdpbkRv bWFpbihyZXNvdXJjZVNlY3VyaXR5T3JpZ2luLmdldCgpKTsKKyAgICByZXR1cm4gIVJlZ2lzdHJh YmxlRG9tYWluKG1haW5Eb2N1bWVudFVSTCkubWF0Y2hlcyhyZXNvdXJjZVVSTCk7CiB9CiAgICAg CiBSZXNvdXJjZUZsYWdzIFJlc291cmNlTG9hZEluZm86OmdldFJlc291cmNlRmxhZ3MoKSBjb25z dApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDU5 ODAzODg3N2FmNzRjYzdiM2U1Y2E3ZGFlMjlhNDdkNmQ2M2JiMzcuLjU2NWE2YWVjMzYxNmYxNjQ2 ODQ0ZDM4ZTJkOThmNzFlZjNjMDAxMWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wMy0yNCAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFdLQ29udGVudFJ1 bGVMaXN0IGZpcnN0LXBhcnR5IHNob3VsZCBpbmNsdWRlIG90aGVyIHN1YmRvbWFpbnMgb2YgdGhl IGN1cnJlbnQgcmVnaXN0cmFibGUgZG9tYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM3MjgKKworICAgICAgICBSZXZpZXdlZCBieSBKb2huIFdp bGFuZGVyLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250 ZW50UnVsZUxpc3ROb3RpZmljYXRpb24ubW06CisgICAgICAgIChURVNUKToKKwogMjAyMS0wMy0y MiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtY29udGFpbl0g UGFyc2UgQ1NTIGNvbnRhaW4gcHJvcGVydHkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvQ29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uLm1tIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250ZW50UnVsZUxpc3ROb3RpZmlj YXRpb24ubW0KaW5kZXggNzk0NjMzZGEzMDQ5YWUzNmU4YjUzMTUyNjIwNzYwMjdmNzRhODlmZS4u NmExMGIwMWM3NTMyMzgyNTgyMTg5ZDZmY2MxNDFmODA3OTczMDdhMyAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250ZW50UnVsZUxpc3ROb3RpZmlj YXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250 ZW50UnVsZUxpc3ROb3RpZmljYXRpb24ubW0KQEAgLTI3Niw2ICsyNzYsNTMgQEAgVEVTVChDb250 ZW50UnVsZUxpc3QsIFJlc291cmNlVHlwZXMpCiAgICAgRVhQRUNUX0VRKGJlYWNvblNlcnZlci50 b3RhbFJlcXVlc3RzKCksIDV1KTsKIH0KIAorVEVTVChDb250ZW50UnVsZUxpc3QsIFRoaXJkUGFy dHkpCit7CisgICAgYXV0byBoYW5kbGVyID0gW1tUZXN0VVJMU2NoZW1lSGFuZGxlciBuZXddIGF1 dG9yZWxlYXNlXTsKKyAgICBoYW5kbGVyLnN0YXJ0VVJMU2NoZW1lVGFza0hhbmRsZXIgPSBeKFdL V2ViVmlldyAqLCBpZDxXS1VSTFNjaGVtZVRhc2s+IHRhc2spIHsKKyAgICAgICAgYXV0byByZXNw b25kID0gW3Rhc2tdIChjb25zdCBjaGFyKiBodG1sKSB7CisgICAgICAgICAgICBOU1VSTFJlc3Bv bnNlICpyZXNwb25zZSA9IFtbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2su cmVxdWVzdC5VUkwgTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIGV4cGVjdGVkQ29udGVudExlbmd0aDpz dHJsZW4oaHRtbCkgdGV4dEVuY29kaW5nTmFtZTpuaWxdIGF1dG9yZWxlYXNlXTsKKyAgICAgICAg ICAgIFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTpyZXNwb25zZV07CisgICAgICAgICAgICBbdGFz ayBkaWRSZWNlaXZlRGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6aHRtbCBsZW5ndGg6c3RybGVu KGh0bWwpXV07CisgICAgICAgICAgICBbdGFzayBkaWRGaW5pc2hdOworICAgICAgICB9OworICAg ICAgICBOU1N0cmluZyAqcGF0aCA9IHRhc2sucmVxdWVzdC5VUkwucGF0aDsKKyAgICAgICAgaWYg KFtwYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9tYWluLmh0bWwiXSkgeworICAgICAgICAgICAgcmV0 dXJuIHJlc3BvbmQoIjxzY3JpcHQ+IgorICAgICAgICAgICAgICAgICJmdW5jdGlvbiB0ZXN0V2Vi S2l0KCkgeyBmZXRjaCgndGVzdDovL3dlYmtpdC5vcmcvcmVzb3VyY2UudHh0Jywge21vZGU6J25v LWNvcnMnfSkudGhlbigoKT0+e2FsZXJ0KCd3ZWJraXQub3JnIGxvYWRlZCcpO30pLmNhdGNoKCgp PT57YWxlcnQoJ3dlYmtpdC5vcmcgYmxvY2tlZCcpO30pIH07IgorICAgICAgICAgICAgICAgICJm ZXRjaCgndGVzdDovL3N1Yi5leGFtcGxlLmNvbS9yZXNvdXJjZS50eHQnLCB7bW9kZTonbm8tY29y cyd9KS50aGVuKCgpPT57YWxlcnQoJ3N1Yi5leGFtcGxlLmNvbSBsb2FkZWQnKTt0ZXN0V2ViS2l0 KCk7fSkuY2F0Y2goKCk9PnthbGVydCgnc3ViLmV4YW1wbGUuY29tIGJsb2NrZWQnKTt0ZXN0V2Vi S2l0KCk7fSkiCisgICAgICAgICAgICAiPC9zY3JpcHQ+Iik7CisgICAgICAgIH0KKyAgICAgICAg aWYgKFtwYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9yZXNvdXJjZS50eHQiXSkKKyAgICAgICAgICAg IHJldHVybiByZXNwb25kKCJoaSIpOworCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgIH07CisgICAgYXV0byBjb25maWd1cmF0aW9uID0gW1tXS1dlYlZpZXdDb25maWd1cmF0aW9u IG5ld10gYXV0b3JlbGVhc2VdOworICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRs ZXI6aGFuZGxlciBmb3JVUkxTY2hlbWU6QCJ0ZXN0Il07CisgICAgY29uZmlndXJhdGlvbi53ZWJz aXRlRGF0YVN0b3JlID0gW1dLV2Vic2l0ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3Jl XTsKKyAgICBhdXRvIHdlYlZpZXcgPSBbW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6 Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb25dIGF1dG9yZWxlYXNlXTsKKwor ICAgIGF1dG8gbGlzdFdpdGhMb2FkVHlwZSA9IFtdIChjb25zdCBjaGFyKiB0eXBlKSB7CisgICAg ICAgIHJldHVybiBtYWtlQ29udGVudFJ1bGVMaXN0KFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0 OkAiW3tcImFjdGlvblwiOntcInR5cGVcIjpcImJsb2NrXCJ9LFwidHJpZ2dlclwiOntcInVybC1m aWx0ZXJcIjpcInJlc291cmNlLnR4dFwiLFwibG9hZC10eXBlXCI6W1wiJXNcIl19fV0iLCB0eXBl XSk7CisgICAgfTsKKworICAgIFdLVXNlckNvbnRlbnRDb250cm9sbGVyICp1c2VyQ29udGVudENv bnRyb2xsZXIgPSB3ZWJWaWV3LmNvbmZpZ3VyYXRpb24udXNlckNvbnRlbnRDb250cm9sbGVyOwor ICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vZXhhbXBsZS5jb20vbWFpbi5odG1sIl1dXTsKKyAg ICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgInN1Yi5leGFt cGxlLmNvbSBsb2FkZWQiKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2Fp dEZvckFsZXJ0XSwgIndlYmtpdC5vcmcgbG9hZGVkIik7CisgICAgCisgICAgW3VzZXJDb250ZW50 Q29udHJvbGxlciBhZGRDb250ZW50UnVsZUxpc3Q6bGlzdFdpdGhMb2FkVHlwZSgidGhpcmQtcGFy dHkiKS5nZXQoKV07CisgICAgW3dlYlZpZXcgcmVsb2FkXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEo W3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgInN1Yi5leGFtcGxlLmNvbSBsb2FkZWQiKTsK KyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgIndlYmtp dC5vcmcgYmxvY2tlZCIpOworICAgIFt1c2VyQ29udGVudENvbnRyb2xsZXIgcmVtb3ZlQWxsQ29u dGVudFJ1bGVMaXN0c107CisgICAgW3VzZXJDb250ZW50Q29udHJvbGxlciBhZGRDb250ZW50UnVs ZUxpc3Q6bGlzdFdpdGhMb2FkVHlwZSgiZmlyc3QtcGFydHkiKS5nZXQoKV07CisgICAgW3dlYlZp ZXcgcmVsb2FkXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFs ZXJ0XSwgInN1Yi5leGFtcGxlLmNvbSBibG9ja2VkIik7CisgICAgRVhQRUNUX1dLX1NUUkVRKFt3 ZWJWaWV3IF90ZXN0X3dhaXRGb3JBbGVydF0sICJ3ZWJraXQub3JnIGxvYWRlZCIpOworfQorCiBU RVNUKENvbnRlbnRSdWxlTGlzdCwgU3VwcG9ydHNSZWdleCkKIHsKICAgICBOU0FycmF5PE5TU3Ry aW5nICo+ICphbGxvd2VkID0gQFsK