235160 2022-01-12 15:15:23 -0800 PCM: Same-site triggering events should support ephemeral measurement 2022-01-12 19:24:54 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander achristensen cdumez ews-watchlist japhet webkit-bug-importer oldest_to_newest 1830365 0 wilander 2022-01-12 15:15:23 -0800 We added ephemeral measurement for direct response advertising in https://bugs.webkit.org/show_bug.cgi?id=228984. We added support for same-site triggering events in https://bugs.webkit.org/show_bug.cgi?id=233173. These two features should work together. 1830366 1 wilander 2022-01-12 15:15:49 -0800 <rdar://87423294> 1830382 2 449006 wilander 2022-01-12 15:48:25 -0800 Created attachment 449006 [fast-cq] Patch 1830392 3 449006 achristensen 2022-01-12 15:58:24 -0800 Comment on attachment 449006 [fast-cq] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449006&action=review > Source/WebKit/NetworkProcess/NetworkSession.cpp:375 > + if (ephemeralMeasurement.isNeitherSameSiteNorCrossSiteTriggeringEvent(redirectDomain, firstPartyForCookies, attributionTriggerData)) I think the code would read nicer if this were phrased positively, like this: if (!ephemeralMeasurement.isSameSiteOrCrossSiteTriggeringEvent(...)) return; 1830398 4 wilander 2022-01-12 16:02:57 -0800 (In reply to Alex Christensen from comment #3) > Comment on attachment 449006 [details] > [fast-cq] Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=449006&action=review > > > Source/WebKit/NetworkProcess/NetworkSession.cpp:375 > > + if (ephemeralMeasurement.isNeitherSameSiteNorCrossSiteTriggeringEvent(redirectDomain, firstPartyForCookies, attributionTriggerData)) > > I think the code would read nicer if this were phrased positively, like this: > if (!ephemeralMeasurement.isSameSiteOrCrossSiteTriggeringEvent(...)) > return; I did consider that, but opted against it because we can't say for sure with the rather shallow analysis we do in that function that it *is* a triggering event. But we can say for sure that it *isn't* a triggering event. Unfortunate for readability but I don't want to take on the risk of someone calling that function and then assuming it's a fully validated triggering event based on the boolean return value. Makes sense? 1830399 5 achristensen 2022-01-12 16:03:32 -0800 sounds reasonable 1830400 6 wilander 2022-01-12 16:04:08 -0800 (In reply to John Wilander from comment #4) > (In reply to Alex Christensen from comment #3) > > Comment on attachment 449006 [details] > > [fast-cq] Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=449006&action=review > > > > > Source/WebKit/NetworkProcess/NetworkSession.cpp:375 > > > + if (ephemeralMeasurement.isNeitherSameSiteNorCrossSiteTriggeringEvent(redirectDomain, firstPartyForCookies, attributionTriggerData)) > > > > I think the code would read nicer if this were phrased positively, like this: > > if (!ephemeralMeasurement.isSameSiteOrCrossSiteTriggeringEvent(...)) > > return; > > I did consider that, but opted against it because we can't say for sure with > the rather shallow analysis we do in that function that it *is* a triggering > event. But we can say for sure that it *isn't* a triggering event. > Unfortunate for readability but I don't want to take on the risk of someone > calling that function and then assuming it's a fully validated triggering > event based on the boolean return value. > > Makes sense? I at one point had the function named isLikely… which felt vague and not really what the caller wanted. 1830403 7 wilander 2022-01-12 16:18:59 -0800 win bot test flakiness unrelated. 1830445 8 wilander 2022-01-12 19:18:40 -0800 The mac-AS-debug-wk2 bot is hitting an XPC or process bootstrap crash. 1830446 9 449006 wilander 2022-01-12 19:20:33 -0800 Comment on attachment 449006 [fast-cq] Patch The remaining bots are taking forever to run. Thanks for the review, Alex! 1830449 10 ews-feeder 2022-01-12 19:24:51 -0800 Committed r287970 (245999@main): <https://commits.webkit.org/245999@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449006. 449006 2022-01-12 15:48:25 -0800 2022-01-12 19:24:53 -0800 [fast-cq] Patch bug-235160-20220112154824.patch text/plain 11405 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDVmYzVkOTBkNmZmOTA4 YThkZjkwOTliYjI2Yzk2YzNkN2NlNjg5Yi4uMjhhZTI5MjVhYzgwOTc1ODBkNjJiOTM5NDg3NTdm NDA2OGVmN2FkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAxLTEyICBKb2hu IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFBDTTogU2FtZS1zaXRl IHRyaWdnZXJpbmcgZXZlbnRzIHNob3VsZCBzdXBwb3J0IGVwaGVtZXJhbCBtZWFzdXJlbWVudAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MTYwCisg ICAgICAgIDxyZGFyOi8vODc0MjMyOTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2UgYWRkZWQgZXBoZW1lcmFsIG1lYXN1cmVtZW50IGZvciBkaXJl Y3QgcmVzcG9uc2UgYWR2ZXJ0aXNpbmcgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyODk4NC4KKyAgICAgICAgV2UgYWRkZWQgc3VwcG9ydCBmb3Igc2FtZS1zaXRl IHRyaWdnZXJpbmcgZXZlbnRzIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzMxNzMuCisgICAgICAgIFRoZXNlIHR3byBmZWF0dXJlcyBzaG91bGQgd29yayB0b2dl dGhlci4KKworICAgICAgICBUaGUgYnVnIHdhcyB0aGF0IFdlYktpdDo6TmV0d29ya1Nlc3Npb246 OmhhbmRsZVByaXZhdGVDbGlja01lYXN1cmVtZW50Q29udmVyc2lvbigpCisgICAgICAgIG9ubHkg Y2hlY2tlZCBmb3IgY3Jvc3Mtc2l0ZSB0cmlnZ2VyaW5nIGV2ZW50cyB3aGVuIGhhbmRsaW5nIGVw aGVtZXJhbCBtZWFzdXJlbWVudHMuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9wcml2YXRl Q2xpY2tNZWFzdXJlbWVudC90cmlnZ2VyaW5nLWV2ZW50LXdpdGgtYXR0cmlidXRpb24tc291cmNl LXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLWVwaGVtZXJhbC5odG1sCisKKyAgICAgICAgKiBsb2Fk ZXIvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQ6OmlzTmVpdGhlclNhbWVTaXRlTm9yQ3Jvc3NTaXRlVHJpZ2dlcmlu Z0V2ZW50KToKKyAgICAgICAgICAgIE5ldyBjb252ZW5pZW5jZSBmdW5jdGlvbiB0byBlbmhhbmNl IHJlYWRhYmlsaXR5IGluCisgICAgICAgICAgICBXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjpoYW5k bGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudENvbnZlcnNpb24oKS4KKyAgICAgICAgKiBsb2FkZXIv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuaDoKKwogMjAyMi0wMS0xMiAgU2FtIFdlaW5pZyAgPHdl aW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHNvbWUgZnVuY3Rpb25zIHRvIENvbG9yIHRv IG1ha2UgZGVidWdnaW5nIHVzaW5nIGNvbG9yIGluZGljYXRvcnMgZWFzaWVyCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4 IDI1ODgwNDdkZjJlMTAxNWQ0NWY5NmY2MjE4MTRhMmI0YTIzMzFiM2QuLjM2ZDVhNWFkN2FmZTE5 YTIyZjk2ZGNlN2YzOWI4ZDQxMzE4M2Y0MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIw MjItMDEtMTIgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAg UENNOiBTYW1lLXNpdGUgdHJpZ2dlcmluZyBldmVudHMgc2hvdWxkIHN1cHBvcnQgZXBoZW1lcmFs IG1lYXN1cmVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzUxNjAKKyAgICAgICAgPHJkYXI6Ly84NzQyMzI5ND4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhZGRlZCBlcGhlbWVyYWwgbWVhc3Vy ZW1lbnQgZm9yIGRpcmVjdCByZXNwb25zZSBhZHZlcnRpc2luZyBpbiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4OTg0LgorICAgICAgICBXZSBhZGRlZCBzdXBwb3J0 IGZvciBzYW1lLXNpdGUgdHJpZ2dlcmluZyBldmVudHMgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMzE3My4KKyAgICAgICAgVGhlc2UgdHdvIGZlYXR1cmVzIHNo b3VsZCB3b3JrIHRvZ2V0aGVyLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nl c3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6aGFuZGxlUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnRDb252ZXJzaW9uKToKKyAgICAgICAgICAgIFRoaXMgZnVuY3Rpb24g cHJldmlvdXNseSBvbmx5IGNoZWNrZWQgZm9yIGNyb3NzLXNpdGUgdHJpZ2dlcmluZyBldmVudHMg d2hlbgorICAgICAgICAgICAgaGFuZGxpbmcgZXBoZW1lcmFsIG1lYXN1cmVtZW50cy4gTm93IGl0 IGFsc28gY2hlY2tzIGZvciBzYW1lLXNpdGUgdHJpZ2dlcmluZworICAgICAgICAgICAgZXZlbnRz LgorCiAyMDIyLTAxLTEyICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIFBhZ2UgbG9hZGluZyBoYW5ncyBmb3IgfjEwcyBvbiBXZWJQcm9jZXNzIGxhdW5j aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1ByaXZhdGVDbGlja01lYXN1cmVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5j cHAKaW5kZXggNDIwYTM3MTg4Yzg5NTU0ZDM2Mzk2YzhjNDk1ZjZhNjVmNWM5NDk1YS4uZjAzYjRh NDNmZWVhMTdhNzk5M2FiOWY3OWI0YmNjMDNjOTJhMTliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1ByaXZhdGVDbGlja01lYXN1cmVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuY3BwCkBAIC0xMjQsNiArMTI0LDE1 IEBAIFByaXZhdGVDbGlja01lYXN1cmVtZW50IFByaXZhdGVDbGlja01lYXN1cmVtZW50Ojppc29s YXRlZENvcHkoKSBjb25zdAogICAgIHJldHVybiBjb3B5OwogfQogCitib29sIFByaXZhdGVDbGlj a01lYXN1cmVtZW50Ojppc05laXRoZXJTYW1lU2l0ZU5vckNyb3NzU2l0ZVRyaWdnZXJpbmdFdmVu dChjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgcmVkaXJlY3REb21haW4sIGNvbnN0IFVSTCYgZmly c3RQYXJ0eVVSTCwgY29uc3QgQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYgYXR0cmlidXRpb25Ucmln Z2VyRGF0YSkKK3sKKyAgICBhdXRvIGlzU2FtZVNpdGVUcmlnZ2VyaW5nRXZlbnQgPSByZWRpcmVj dERvbWFpbi5tYXRjaGVzKGZpcnN0UGFydHlVUkwpICYmIGF0dHJpYnV0aW9uVHJpZ2dlckRhdGEu c291cmNlUmVnaXN0cmFibGVEb21haW47CisgICAgaWYgKGlzU2FtZVNpdGVUcmlnZ2VyaW5nRXZl bnQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBhdXRvIGlzQ3Jvc3NTaXRlVHJpZ2dlcmlu Z0V2ZW50ID0gc291cmNlU2l0ZSgpLnJlZ2lzdHJhYmxlRG9tYWluID09IHJlZGlyZWN0RG9tYWlu ICYmICFhdHRyaWJ1dGlvblRyaWdnZXJEYXRhLnNvdXJjZVJlZ2lzdHJhYmxlRG9tYWluOworICAg IHJldHVybiAhaXNDcm9zc1NpdGVUcmlnZ2VyaW5nRXZlbnQ7Cit9CisKIEV4cGVjdGVkPFByaXZh dGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvblRyaWdnZXJEYXRhLCBTdHJpbmc+IFByaXZh dGVDbGlja01lYXN1cmVtZW50OjpwYXJzZUF0dHJpYnV0aW9uUmVxdWVzdFF1ZXJ5KGNvbnN0IFVS TCYgcmVkaXJlY3RVUkwpCiB7CiAgICAgaWYgKCFyZWRpcmVjdFVSTC5oYXNRdWVyeSgpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1ByaXZhdGVDbGlja01lYXN1cmVtZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuaAppbmRleCAz ODFmNjI3YWM2MzRjNzI5NWIwOWEzZmUyMDk3YzQxNjZkZDcxZWYxLi4wMWY4NzM0OGFiNmEyMWEw MmU2MDM2YjI1OGU4OTI3MjYwZTNlNzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuaApAQCAtMzc4LDYgKzM3OCw3IEBAIHB1YmxpYzoKICAg ICB9CiAKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgY29uc3QgU2Vjb25kcyBtYXhBZ2UoKTsK KyAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzTmVpdGhlclNhbWVTaXRlTm9yQ3Jvc3NTaXRlVHJp Z2dlcmluZ0V2ZW50KGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiByZWRpcmVjdERvbWFpbiwgY29u c3QgVVJMJiBmaXJzdFBhcnR5VVJMLCBjb25zdCBBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJik7CiAg ICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIEV4cGVjdGVkPEF0dHJpYnV0aW9uVHJpZ2dlckRhdGEs IFN0cmluZz4gcGFyc2VBdHRyaWJ1dGlvblJlcXVlc3QoY29uc3QgVVJMJiByZWRpcmVjdFVSTCk7 CiAgICAgV0VCQ09SRV9FWFBPUlQgQXR0cmlidXRpb25TZWNvbmRzVW50aWxTZW5kRGF0YSBhdHRy aWJ1dGVBbmRHZXRFYXJsaWVzdFRpbWVUb1NlbmQoQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmLCBJ c1J1bm5pbmdMYXlvdXRUZXN0KTsKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGhhc0hpZ2hlclBy aW9yaXR5VGhhbihjb25zdCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCAzM2Jm NGE0NDY0ZmU2MjAxODg1Y2UwYTFiODVlZmY0ZDgyNjA5YjQ5Li45YTMyZWExODY1NGM5NmU4Yzgw MTBkZGMwMTg5ODg5ZDkyNTA4MjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtTZXNzaW9uLmNwcApAQCAtMzcyLDcgKzM3Miw3IEBAIHZvaWQgTmV0d29ya1Nl c3Npb246OmhhbmRsZVByaXZhdGVDbGlja01lYXN1cmVtZW50Q29udmVyc2lvbihQcml2YXRlQ2xp Y2tNZWFzdXJlCiAgICAgICAgIGF1dG8gZmlyc3RQYXJ0eUZvckNvb2tpZXMgPSByZWRpcmVjdFJl cXVlc3QuZmlyc3RQYXJ0eUZvckNvb2tpZXMoKTsKIAogICAgICAgICAvLyBFcGhlbWVyYWwgbWVh c3VyZW1lbnQgY2FuIG9ubHkgaGF2ZSBvbmUgcGVuZGluZyBjbGljay4KLSAgICAgICAgaWYgKGVw aGVtZXJhbE1lYXN1cmVtZW50LnNvdXJjZVNpdGUoKS5yZWdpc3RyYWJsZURvbWFpbiAhPSByZWRp cmVjdERvbWFpbikKKyAgICAgICAgaWYgKGVwaGVtZXJhbE1lYXN1cmVtZW50LmlzTmVpdGhlclNh bWVTaXRlTm9yQ3Jvc3NTaXRlVHJpZ2dlcmluZ0V2ZW50KHJlZGlyZWN0RG9tYWluLCBmaXJzdFBh cnR5Rm9yQ29va2llcywgYXR0cmlidXRpb25UcmlnZ2VyRGF0YSkpCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIGlmIChlcGhlbWVyYWxNZWFzdXJlbWVudC5kZXN0aW5hdGlvblNpdGUoKS5y ZWdpc3RyYWJsZURvbWFpbiAhPSBSZWdpc3RyYWJsZURvbWFpbihmaXJzdFBhcnR5Rm9yQ29va2ll cykpCiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGMyYzMzYmJlYTExN2NiOTFjNWU1NWNm NGI3OTY4ODdiNjFjYTkxNC4uMzA4YWFiODdlNDZmNGRiOWIyY2IxNmRlZWMwMzZiNjE1ZDAzMGM2 OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAxLTEyICBKb2huIFdpbGFuZGVyICA8d2ls YW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFBDTTogU2FtZS1zaXRlIHRyaWdnZXJpbmcgZXZl bnRzIHNob3VsZCBzdXBwb3J0IGVwaGVtZXJhbCBtZWFzdXJlbWVudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MTYwCisgICAgICAgIDxyZGFyOi8v ODc0MjMyOTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBodHRwL3Rlc3RzL3ByaXZhdGVDbGlja01lYXN1cmVtZW50L3RyaWdnZXJpbmctZXZlbnQt d2l0aC1hdHRyaWJ1dGlvbi1zb3VyY2UtdGhyb3VnaC1mZXRjaC1rZWVwYWxpdmUtZXBoZW1lcmFs LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tN ZWFzdXJlbWVudC90cmlnZ2VyaW5nLWV2ZW50LXdpdGgtYXR0cmlidXRpb24tc291cmNlLXRocm91 Z2gtZmV0Y2gta2VlcGFsaXZlLWVwaGVtZXJhbC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0xMiAg UmF6dmFuIENhbGltYW4gIDxyY2FsaW1hbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogVW5oYW5kbGVkIGV4Y2VwdGlvbiB3aGVuIG1vdmluZyBjdXJzb3IgbWlkLXRva2VuIGFm dGVyIHJlY2VpdmluZyBDU1MgcHJvcGVydHkgbmFtZSBjb21wbGV0aW9ucwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC90cmlnZ2VyaW5n LWV2ZW50LXdpdGgtYXR0cmlidXRpb24tc291cmNlLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLWVw aGVtZXJhbC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3ByaXZhdGVDbGlj a01lYXN1cmVtZW50L3RyaWdnZXJpbmctZXZlbnQtd2l0aC1hdHRyaWJ1dGlvbi1zb3VyY2UtdGhy b3VnaC1mZXRjaC1rZWVwYWxpdmUtZXBoZW1lcmFsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4z NDFlYWVmNTdmNmQwNzU0YmFlYmZlN2I5ZWVhNGNiOTc1MmZjOTkzCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC90cmlnZ2Vy aW5nLWV2ZW50LXdpdGgtYXR0cmlidXRpb24tc291cmNlLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZl LWVwaGVtZXJhbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNiBAQAorQ09OU09MRSBNRVNTQUdF OiBbUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudF0gVHJpZ2dlcmluZyBldmVudCB3YXMgbm90IGFj Y2VwdGVkIGJlY2F1c2UgdGhlIGNvbnZlcnNpb24gZGF0YSBjb3VsZCBub3QgYmUgcGFyc2VkIG9y IHdhcyBoaWdoZXIgdGhhbiB0aGUgYWxsb3dlZCBtYXhpbXVtIG9mIDE1LgorQ09OU09MRSBNRVNT QUdFOiBPcmlnaW4gaHR0cDovL2xvY2FsaG9zdDo4MDAwIGlzIG5vdCBhbGxvd2VkIGJ5IEFjY2Vz cy1Db250cm9sLUFsbG93LU9yaWdpbi4gU3RhdHVzIGNvZGU6IDQwNAorQ09OU09MRSBNRVNTQUdF OiBGZXRjaCBBUEkgY2Fubm90IGxvYWQgaHR0cHM6Ly9sb2NhbGhvc3Q6ODQ0My8ud2VsbC1rbm93 bi9wcml2YXRlLWNsaWNrLW1lYXN1cmVtZW50L3RyaWdnZXItYXR0cmlidXRpb24vRHVtbXk/YXR0 cmlidXRpb25Tb3VyY2U9aHR0cHM6Ly8xMjcuMC4wLjEgZHVlIHRvIGFjY2VzcyBjb250cm9sIGNo ZWNrcy4KK1Rlc3RzIHRyaWdnZXJpbmcgb2YgZXBoZW1lcmFsIHByaXZhdGUgY2xpY2sgbWVhc3Vy ZW1lbnQgYXR0cmlidXRpb24gd2l0aCBzYW1lLXNpdGUgdHJpZ2dlcmluZyBldmVudCByZXF1ZXN0 LgorCisKK0F0dHJpYnV0ZWQgUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudHM6CitXZWJDb3JlOjpQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudCAxCitTb3VyY2Ugc2l0ZTogMTI3LjAuMC4xCitBdHRyaWJ1 dGUgb24gc2l0ZTogbG9jYWxob3N0CitTb3VyY2UgSUQ6IDMKK0F0dHJpYnV0aW9uIHRyaWdnZXIg ZGF0YTogMTIKK0F0dHJpYnV0aW9uIHByaW9yaXR5OiAwCitBdHRyaWJ1dGlvbiBlYXJsaWVzdCB0 aW1lIHRvIHNlbmQ6IFdpdGhpbiAyNC00OCBob3VycworRGVzdGluYXRpb24gdG9rZW46IE5vdCBz ZXQKK0FwcGxpY2F0aW9uIGJ1bmRsZSBpZGVudGlmaWVyOiB0ZXN0QnVuZGxlSUQKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvdHJpZ2dl cmluZy1ldmVudC13aXRoLWF0dHJpYnV0aW9uLXNvdXJjZS10aHJvdWdoLWZldGNoLWtlZXBhbGl2 ZS1lcGhlbWVyYWwuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQvdHJpZ2dlcmluZy1ldmVudC13aXRoLWF0dHJpYnV0aW9uLXNvdXJjZS10aHJvdWdo LWZldGNoLWtlZXBhbGl2ZS1lcGhlbWVyYWwuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZWQ5YTg5N2E0ZGY5 MmU1NjJmZDczOTJkMzYyMjgyODE2ODY1ZjU4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC90cmlnZ2VyaW5nLWV2ZW50LXdp dGgtYXR0cmlidXRpb24tc291cmNlLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLWVwaGVtZXJhbC5o dG1sCkBAIC0wLDAgKzEsNTYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAg ICA8bWV0YSBjaGFyc2V0PSJVVEYtOCI+CisgICAgPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291 cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMv dXRpbC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8 ZGl2IGlkPSJkZXNjcmlwdGlvbiI+VGVzdHMgdHJpZ2dlcmluZyBvZiBlcGhlbWVyYWwgcHJpdmF0 ZSBjbGljayBtZWFzdXJlbWVudCBhdHRyaWJ1dGlvbiB3aXRoIHNhbWUtc2l0ZSB0cmlnZ2VyaW5n IGV2ZW50IHJlcXVlc3QuPC9kaXY+Cis8YSBpZD0idGFyZ2V0TGluayIgaHJlZj0iaHR0cDovL2xv Y2FsaG9zdDo4MDAwL3ByaXZhdGVDbGlja01lYXN1cmVtZW50L3RyaWdnZXJpbmctZXZlbnQtd2l0 aC1hdHRyaWJ1dGlvbi1zb3VyY2UtdGhyb3VnaC1mZXRjaC1rZWVwYWxpdmUtZXBoZW1lcmFsLmh0 bWw/c3RlcFR3byIgYXR0cmlidXRpb25zb3VyY2VpZD0zIGF0dHJpYnV0aW9uZGVzdGluYXRpb249 Imh0dHA6Ly9sb2NhbGhvc3Q6ODAwMCI+TGluazwvYT48YnI+Cis8ZGl2IGlkPSJvdXRwdXQiPjwv ZGl2PgorPHNjcmlwdD4KKyAgICBwcmVwYXJlVGVzdCgpOworCisgICAgZnVuY3Rpb24gYWN0aXZh dGVFbGVtZW50KGVsZW1lbnRJRCkgeworICAgICAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKGVsZW1lbnRJRCk7CisgICAgICAgIHZhciBjZW50ZXJYID0gZWxlbWVudC5v ZmZzZXRMZWZ0ICsgZWxlbWVudC5vZmZzZXRXaWR0aCAvIDI7CisgICAgICAgIHZhciBjZW50ZXJZ ID0gZWxlbWVudC5vZmZzZXRUb3AgKyBlbGVtZW50Lm9mZnNldEhlaWdodCAvIDI7CisgICAgICAg IFVJSGVscGVyLmFjdGl2YXRlQXQoY2VudGVyWCwgY2VudGVyWSkudGhlbigKKyAgICAgICAgICAg IGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICBmdW5jdGlvbiAoKSB7 CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm91dHB1dCIpLmlubmVy VGV4dCA9ICJGQUlMIFByb21pc2UgcmVqZWN0ZWQuIjsKKyAgICAgICAgICAgICAgICB0ZWFyRG93 bkFuZEZpbmlzaCgpOworICAgICAgICAgICAgfQorICAgICAgICApOworICAgIH0KKworICAgIGZ1 bmN0aW9uIHRyaWdnZXJGZXRjaChjb252ZXJzaW9uRGF0YSkgeworICAgICAgICByZXR1cm4gZmV0 Y2goImh0dHBzOi8vbG9jYWxob3N0Ojg0NDMvcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvcmVzb3Vy Y2VzL3JlZGlyZWN0VG9Db252ZXJzaW9uV2l0aEF0dHJpYnV0aW9uU291cmNlLnB5P2NvbnZlcnNp b25EYXRhPSIrIGNvbnZlcnNpb25EYXRhICsgIiZkZWxheV9tcz0xMDAiLCB7IGtlZXBhbGl2ZTog dHJ1ZSB9KTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBydW5UZXN0KCkgeworICAgICAgICBpZiAo d2luZG93LmxvY2F0aW9uLnNlYXJjaCA9PT0gIj9zdGVwVHdvIikgeworICAgICAgICAgICAgLy8g U3RhcnQgcHJpdmF0ZSBjbGljayBhdHRyaWJ1dGlvbiBmZXRjaCBidXQgbmF2aWdhdGUgYXdheSBi ZWZvcmUgdGhlIGZldGNoIHJlZGlyZWN0aW9uIGhhcHBlbnMuCisgICAgICAgICAgICB0cmlnZ2Vy RmV0Y2goMTIpOworICAgICAgICAgICAgZG9jdW1lbnQubG9jYXRpb24uaHJlZiA9ICJodHRwOi8v bG9jYWxob3N0OjgwMDAvcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvdHJpZ2dlcmluZy1ldmVudC13 aXRoLWF0dHJpYnV0aW9uLXNvdXJjZS10aHJvdWdoLWZldGNoLWtlZXBhbGl2ZS1lcGhlbWVyYWwu aHRtbD9zdGVwVGhyZWUiOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg IGlmICh3aW5kb3cubG9jYXRpb24uc2VhcmNoID09PSAiP3N0ZXBUaHJlZSIpIHsKKyAgICAgICAg ICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRh cmdldExpbmsiKSk7CisgICAgICAgICAgICAvLyBEbyBhbiBpbnZhbGlkIHByaXZhdGUgY2xpY2sg YXR0cmlidXRpb24gZmV0Y2ggdG8gZW5zdXJlIHRoZSBwcmV2aW91cyBjb3JyZWN0IGNsaWNrIGF0 dHJpYnV0aW9uIGZldGNoIHdpbGwgYmUgZmluaXNoZWQuCisgICAgICAgICAgICB0cmlnZ2VyRmV0 Y2goIkR1bW15IikuY2F0Y2goKCkgPT4geworICAgICAgICAgICAgICAgIGlmICh3aW5kb3cudGVz dFJ1bm5lcikKKyAgICAgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQoKTsKKyAgICAgICAgICAgICAgICB0ZWFyRG93bkFuZEZpbmlzaCgpOworICAg ICAgICAgICAgfSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGVz dFJ1bm5lci5zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEVwaGVtZXJhbE1lYXN1cmVtZW50Rm9y VGVzdGluZyh0cnVlKTsKKyAgICAgICAgdGVzdFJ1bm5lci5zZXRQcml2YXRlQ2xpY2tNZWFzdXJl bWVudEFwcEJ1bmRsZUlERm9yVGVzdGluZygidGVzdEJ1bmRsZUlEIik7CisgICAgICAgIGFjdGl2 YXRlRWxlbWVudCgidGFyZ2V0TGluayIpOworICAgIH0KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgo=