221453 2021-02-05 00:14:48 -0800 Make sure click attribution is processed in case of redirected kept alive loads 2021-02-05 10:28:06 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cdumez ews-watchlist japhet katherine_cheney webkit-bug-importer wilander oldest_to_newest 1725958 0 youennf 2021-02-05 00:14:48 -0800 Make sure click attribution is processed in case of redirected kept alive loads 1725960 1 youennf 2021-02-05 00:17:15 -0800 <rdar://problem/70896640> 1725961 2 419368 youennf 2021-02-05 00:22:51 -0800 Created attachment 419368 Patch 1726101 3 419368 katherine_cheney 2021-02-05 09:11:03 -0800 Comment on attachment 419368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419368&action=review > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:1 > +CONSOLE MESSAGE: [Private Click Measurement] Conversion was not accepted because the URL path contained unrecognized parts. If you changed "whatever" to a number between 0 and 15, you could get rid of this console message and successfully convert the report. > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:2 > +CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin. It seems like maybe you did not intend for this message to be there because you added header("Access-Control-Allow-Origin: *"); in redirectToConversion.php? > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive.html:43 > + triggerFetch("whatever").catch(() => { e.g. triggerFetch("15").catch(() => { 1726111 4 419368 wilander 2021-02-05 09:22:27 -0800 Comment on attachment 419368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419368&action=review Thanks for fixing this! > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:2 > +CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin. Could we add a header to the php file to silence this output? > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:3 > +CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:8443/.well-known/private-click-measurement/trigger-attribution/whatever due to access control checks. Ditto. > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive.html:36 > + triggerFetch(12); Do we risk being flaky because of this time dependence? > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive.html:42 > + // Do an invalid private click attribution fetch to ensure the previous correct click attribution fetch will be finished. Clever. 1726114 5 419368 katherine_cheney 2021-02-05 09:24:29 -0800 Comment on attachment 419368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419368&action=review >> LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive.html:43 >> + triggerFetch("whatever").catch(() => { > > e.g. triggerFetch("15").catch(() => { Ah, I see this was intentional. Disregard my comments. 1726136 6 youennf 2021-02-05 10:11:12 -0800 (In reply to katherine_cheney from comment #3) > Comment on attachment 419368 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=419368&action=review > > > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:1 > > +CONSOLE MESSAGE: [Private Click Measurement] Conversion was not accepted because the URL path contained unrecognized parts. > > If you changed "whatever" to a number between 0 and 15, you could get rid of > this console message and successfully convert the report. I would prefer not to. There should be only one report, the second fetch is just a way to not be flaky (hopefully). > > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:2 > > +CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin. > > Could we add a header to the php file to silence this output? There is no php file, it is receiving a 404 straight from Apache and without any CORS header. We could try to change the redirect to something else that would point to a real php script but this does not seem worth it. > > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive-expected.txt:3 > > +CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:8443/.well-known/private-click-measurement/trigger-attribution/whatever due to access control checks. > > Ditto. > > > LayoutTests/http/tests/privateClickMeasurement/attribution-conversion-through-fetch-keepalive.html:36 > > + triggerFetch(12); > > Do we risk being flaky because of this time dependence? Hopefully no, this fetch will happen first so should complete before the second one. But this is not bullet proof given we are talking of network requests that could be in theory done in parallel. 1726139 7 419368 youennf 2021-02-05 10:13:09 -0800 Comment on attachment 419368 Patch CQ+ it now since it seems good to have it in the build sooner rather than later. Let me know if you would still like some removal of console lines. 1726155 8 ews-feeder 2021-02-05 10:28:03 -0800 Committed r272422: <https://trac.webkit.org/changeset/272422> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419368. 419368 2021-02-05 00:22:51 -0800 2021-02-05 10:28:05 -0800 Patch bug-221453-20210205092249.patch text/plain 10657 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVjODQ3NDU1NmMxMTQz MDkzMzk5NGE2MzFkNmFhN2Q0ODNjMjQwNC4uOGFjOTg3ZmMyOGM4MWViODEyYTMwNDZkNzgwYWVm NzlhYWQxN2U0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAyLTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHN1cmUgY2xpY2sg YXR0cmlidXRpb24gaXMgcHJvY2Vzc2VkIGluIGNhc2Ugb2YgcmVkaXJlY3RlZCBrZXB0IGFsaXZl IGxvYWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjE0NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwODk2NjQwPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvcHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQvYXR0cmlidXRpb24tY29udmVyc2lvbi10aHJvdWdoLWZldGNoLWtl ZXBhbGl2ZS5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmFkZFN1YnJlc291cmNlTG9hZGVyKToKKyAg ICAgICAgVXBkYXRlIGFzc2VydGlvbiB0byBjb3BlIHdpdGgga2VlcCBhbGl2ZSBmZXRjaGVzIHdo aWNoIGFyZSBzaW1pbGFyIHRvIGJlYWNvbi9waW5nIGxvYWRzLgorCiAyMDIxLTAyLTA0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgTWFrZSBzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzIHdyaXRpbmcgbW9kZSBhd2FyZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwppbmRleCAzYTBjMDgzZjBjODNmZGNhOWI5ZDA1NzFjNzBiNGFhY2QyNjhiZDdlLi5jMGNmODM0 NWUwYTM3Njg2ZWIzZWViNTE3ODYxZTFjODBiN2YwMzRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTAyLTA1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBNYWtlIHN1cmUgY2xpY2sgYXR0cmlidXRpb24gaXMgcHJvY2Vzc2VkIGluIGNhc2Ugb2Yg cmVkaXJlY3RlZCBrZXB0IGFsaXZlIGxvYWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE0NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwODk2 NjQwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb250aW51ZVdpbGxTZW5kUmVkaXJlY3RlZFJlcXVl c3QpOgorICAgICAgICBNb3ZlIHRoZSBjbGljayBhdHRyaWJ1dGlvbiBwcm9jZXNzaW5nIGJlZm9y ZSBrZXB0IGFsaXZlIGNoZWNrLgorCiAyMDIxLTAyLTA0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjT1NdIEVuYWJsZSBBdWRpbyBDYXB0dXJlIGluIEdQ VVByb2Nlc3MgYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Rv Y3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5j cHAKaW5kZXggYzMzMzc1ZjMwYWNhODhjYTA3ODUzMDA4OGI0NzZhMTUxOWUzNDllMC4uY2VkMTgy N2RlZWNiZTRhZjk0OWUyZjg2OWRmMDFhMjUxOGYwNGYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC0xODE5LDcgKzE4MTksNyBAQCB2b2lkIERvY3VtZW50 TG9hZGVyOjphZGRTdWJyZXNvdXJjZUxvYWRlcihSZXNvdXJjZUxvYWRlciogbG9hZGVyKQogICAg ICAgICBjYXNlIERvY3VtZW50OjpBYm91dFRvRW50ZXJCYWNrRm9yd2FyZENhY2hlOiB7CiAgICAg ICAgICAgICAvLyBBIHBhZ2UgYWJvdXQgdG8gZW50ZXIgdGhlIEJhY2tGb3J3YXJkQ2FjaGUgc2hv dWxkIG9ubHkgYmUgYWJsZSB0byBzdGFydCBwaW5nIGxvYWRzLgogICAgICAgICAgICAgYXV0byog Y2FjaGVkUmVzb3VyY2UgPSBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCkucmVzb3VyY2VGb3JSZXF1 ZXN0KGxvYWRlci0+cmVxdWVzdCgpLCBsb2FkZXItPmZyYW1lTG9hZGVyKCktPmZyYW1lKCkucGFn ZSgpLT5zZXNzaW9uSUQoKSk7Ci0gICAgICAgICAgICBBU1NFUlQoY2FjaGVkUmVzb3VyY2UgJiYg Q2FjaGVkUmVzb3VyY2U6OnNob3VsZFVzZVBpbmdMb2FkKGNhY2hlZFJlc291cmNlLT50eXBlKCkp KTsKKyAgICAgICAgICAgIEFTU0VSVChjYWNoZWRSZXNvdXJjZSAmJiAoQ2FjaGVkUmVzb3VyY2U6 OnNob3VsZFVzZVBpbmdMb2FkKGNhY2hlZFJlc291cmNlLT50eXBlKCkpIHx8IGNhY2hlZFJlc291 cmNlLT5vcHRpb25zKCkua2VlcEFsaXZlKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogICAgICAgICBjYXNlIERvY3VtZW50OjpJbkJhY2tGb3J3YXJkQ2FjaGU6CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAK aW5kZXggZjBlYmQzYjVmMjdkZjgyMGYyNTNiNGU2OWMyNWM4Yzc1YjUwMzYzMy4uYmIzNjY0NTAz MTRiM2QxMjkxYmMzYmNlNTQ3M2NhNDNkMTU5NDA0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtODgxLDE1 ICs4ODEsMTUgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlV2lsbFNlbmRS ZWRpcmVjdGVkUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJgogICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoImNvbnRpbnVlV2lsbFNlbmRSZWRpcmVjdGVkUmVxdWVzdDogKG1faXNLZXB0QWxpdmU9 JWQsIGhhc0FkQ2xpY2tDb252ZXJzaW9uPSVkKSIsIG1faXNLZXB0QWxpdmUsICEhcHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRBdHRyaWJ1dGlvblRyaWdnZXJEYXRhKTsKICAgICBBU1NFUlQoIWlzU3lu Y2hyb25vdXMoKSk7CiAKKyAgICBOZXR3b3JrU2Vzc2lvbiogbmV0d29ya1Nlc3Npb24gPSBudWxs cHRyOworICAgIGlmIChwcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVHJpZ2dlckRh dGEgJiYgKG5ldHdvcmtTZXNzaW9uID0gbV9jb25uZWN0aW9uLT5uZXR3b3JrUHJvY2VzcygpLm5l dHdvcmtTZXNzaW9uKHNlc3Npb25JRCgpKSkpCisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5oYW5k bGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudENvbnZlcnNpb24oV1RGTW92ZSgqcHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRBdHRyaWJ1dGlvblRyaWdnZXJEYXRhKSwgcmVxdWVzdC51cmwoKSwgcmVkaXJl Y3RSZXF1ZXN0KTsKKwogICAgIGlmIChtX2lzS2VwdEFsaXZlKSB7CiAgICAgICAgIGNvbnRpbnVl V2lsbFNlbmRSZXF1ZXN0KFdURk1vdmUocmVkaXJlY3RSZXF1ZXN0KSwgZmFsc2UpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgTmV0d29ya1Nlc3Npb24qIG5ldHdvcmtTZXNzaW9uID0g bnVsbHB0cjsKLSAgICBpZiAocHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRBdHRyaWJ1dGlvblRyaWdn ZXJEYXRhICYmIChuZXR3b3JrU2Vzc2lvbiA9IG1fY29ubmVjdGlvbi0+bmV0d29ya1Byb2Nlc3Mo KS5uZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQoKSkpKQotICAgICAgICBuZXR3b3JrU2Vzc2lvbi0+ aGFuZGxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRDb252ZXJzaW9uKFdURk1vdmUoKnByaXZhdGVD bGlja01lYXN1cmVtZW50QXR0cmlidXRpb25UcmlnZ2VyRGF0YSksIHJlcXVlc3QudXJsKCksIHJl ZGlyZWN0UmVxdWVzdCk7Ci0KICAgICAvLyBXZSBzZW5kIHRoZSByZXF1ZXN0IGJvZHkgc2VwYXJh dGVseSBiZWNhdXNlIHRoZSBSZXNvdXJjZVJlcXVlc3QgYm9keSBub3JtYWxseSBkb2VzIG5vdCBn ZXQgZW5jb2RlZCB3aGVuIHNlbnQgb3ZlciBJUEMsIGFzIGFuIG9wdGltaXphdGlvbi4KICAgICAv LyBIb3dldmVyLCB3ZSByZWFsbHkgbmVlZCB0aGUgYm9keSBoZXJlIGJlY2F1c2UgYSByZWRpcmVj dCBjcm9zcy1zaXRlIG1heSBjYXVzZSBhIHByb2Nlc3Mtc3dhcCBhbmQgdGhlIHJlcXVlc3QgdG8g c3RhcnQgYWdhaW4gaW4gYSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgogICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlJlc291cmNlTG9hZGVyOjpXaWxsU2VuZFJlcXVlc3QocmVkaXJlY3RSZXF1ZXN0LCBJ UEM6OkZvcm1EYXRhUmVmZXJlbmNlIHsgcmVkaXJlY3RSZXF1ZXN0Lmh0dHBCb2R5KCkgfSwgc2Fu aXRpemVSZXNwb25zZUlmUG9zc2libGUoV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgUmVzb3Vy Y2VSZXNwb25zZTo6U2FuaXRpemF0aW9uVHlwZTo6UmVkaXJlY3Rpb24pKSk7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjlh NDQyMGE0MjUwNDVkNTY5OWRhYzlkNjQ1NDk2MjlhNzdkYzNkOC4uMzBjMjMwZWU5YTkwODg0YTdl N2JhZGQxNThlYTVmNTYxMzA1NWEwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAyLTA1 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHN1cmUg Y2xpY2sgYXR0cmlidXRpb24gaXMgcHJvY2Vzc2VkIGluIGNhc2Ugb2YgcmVkaXJlY3RlZCBrZXB0 IGFsaXZlIGxvYWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjE0NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwODk2NjQwPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9wcml2 YXRlQ2xpY2tNZWFzdXJlbWVudC9hdHRyaWJ1dGlvbi1jb252ZXJzaW9uLXRocm91Z2gtZmV0Y2gt a2VlcGFsaXZlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9wcml2 YXRlQ2xpY2tNZWFzdXJlbWVudC9hdHRyaWJ1dGlvbi1jb252ZXJzaW9uLXRocm91Z2gtZmV0Y2gt a2VlcGFsaXZlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvcHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQvcmVzb3VyY2VzL3JlZGlyZWN0VG9Db252ZXJzaW9uLnBocDoKKwogMjAyMS0w Mi0wNCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl IEdQVVByb2Nlc3MgZmxhZyBpbiBNZWRpYVJlY29yZGVyIHRlc3RzCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL3ByaXZhdGVDbGlja01lYXN1cmVtZW50L2F0dHJpYnV0aW9uLWNv bnZlcnNpb24tdGhyb3VnaC1mZXRjaC1rZWVwYWxpdmUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9hdHRyaWJ1dGlvbi1jb252ZXJz aW9uLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jYzJk NGRhMmY4M2RiZDhjZjBkYzhiYmU0NTEzN2JhOWQwNjBhMWU3Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9hdHRyaWJ1dGlv bi1jb252ZXJzaW9uLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDE0IEBACitDT05TT0xFIE1FU1NBR0U6IFtQcml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBD b252ZXJzaW9uIHdhcyBub3QgYWNjZXB0ZWQgYmVjYXVzZSB0aGUgVVJMIHBhdGggY29udGFpbmVk IHVucmVjb2duaXplZCBwYXJ0cy4KK0NPTlNPTEUgTUVTU0FHRTogT3JpZ2luIGh0dHA6Ly8xMjcu MC4wLjE6ODAwMCBpcyBub3QgYWxsb3dlZCBieSBBY2Nlc3MtQ29udHJvbC1BbGxvdy1PcmlnaW4u CitDT05TT0xFIE1FU1NBR0U6IEZldGNoIEFQSSBjYW5ub3QgbG9hZCBodHRwczovLzEyNy4wLjAu MTo4NDQzLy53ZWxsLWtub3duL3ByaXZhdGUtY2xpY2stbWVhc3VyZW1lbnQvdHJpZ2dlci1hdHRy aWJ1dGlvbi93aGF0ZXZlciBkdWUgdG8gYWNjZXNzIGNvbnRyb2wgY2hlY2tzLgorVGVzdHMgdHJp Z2dlcmluZyBvZiBwcml2YXRlIGNsaWNrIG1lYXN1cmVtZW50IGF0dHJpYnV0aW9ucyB3aXRoIGZl dGNoIG9uIHBhZ2VoaWRlLgorCisKK0F0dHJpYnV0ZWQgUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVu dHM6CitXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCAxCitTb3VyY2Ugc2l0ZTogMTI3 LjAuMC4xCitBdHRyaWJ1dGUgb24gc2l0ZTogbG9jYWxob3N0CitTb3VyY2UgSUQ6IDMKK0F0dHJp YnV0aW9uIHRyaWdnZXIgZGF0YTogMTIKK0F0dHJpYnV0aW9uIHByaW9yaXR5OiAwCitBdHRyaWJ1 dGlvbiBlYXJsaWVzdCB0aW1lIHRvIHNlbmQ6IFdpdGhpbiAyNC00OCBob3VycwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9hdHRyaWJ1 dGlvbi1jb252ZXJzaW9uLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLmh0bWwgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3ByaXZhdGVDbGlja01lYXN1cmVtZW50L2F0dHJpYnV0aW9uLWNvbnZlcnNp b24tdGhyb3VnaC1mZXRjaC1rZWVwYWxpdmUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MjllZmE0OWU5MGJi MDA1YjFjYTY5YWVlYzYxMjBlMDdmNDZjM2Q1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9hdHRyaWJ1dGlvbi1jb252ZXJz aW9uLXRocm91Z2gtZmV0Y2gta2VlcGFsaXZlLmh0bWwKQEAgLTAsMCArMSw1NCBAQAorPCFET0NU WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9IlVURi04Ij4KKyAg ICA8c2NyaXB0IHNyYz0iL2pzLXRlc3QtcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+ CisgICAgPHNjcmlwdCBzcmM9InJlc291cmNlcy91dGlsLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxkaXYgaWQ9ImRlc2NyaXB0aW9uIj5UZXN0cyB0 cmlnZ2VyaW5nIG9mIHByaXZhdGUgY2xpY2sgbWVhc3VyZW1lbnQgYXR0cmlidXRpb25zIHdpdGgg ZmV0Y2ggb24gcGFnZWhpZGUuPC9kaXY+Cis8YSBpZD0idGFyZ2V0TGluayIgaHJlZj0iaHR0cDov L2xvY2FsaG9zdDo4MDAwL3ByaXZhdGVDbGlja01lYXN1cmVtZW50L2F0dHJpYnV0aW9uLWNvbnZl cnNpb24tdGhyb3VnaC1mZXRjaC1rZWVwYWxpdmUuaHRtbD9zdGVwVHdvIiBhdHRyaWJ1dGlvbnNv dXJjZWlkPSIzIiBhdHRyaWJ1dGVvbj0iaHR0cDovL2xvY2FsaG9zdDo4MDAwIj5MaW5rPC9hPjxi cj4KKzxkaXYgaWQ9Im91dHB1dCI+PC9kaXY+Cis8c2NyaXB0PgorICAgIHByZXBhcmVUZXN0KCk7 CisKKyAgICBmdW5jdGlvbiBhY3RpdmF0ZUVsZW1lbnQoZWxlbWVudElEKSB7CisgICAgICAgIHZh ciBlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoZWxlbWVudElEKTsKKyAgICAgICAg dmFyIGNlbnRlclggPSBlbGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8g MjsKKyAgICAgICAgdmFyIGNlbnRlclkgPSBlbGVtZW50Lm9mZnNldFRvcCArIGVsZW1lbnQub2Zm c2V0SGVpZ2h0IC8gMjsKKyAgICAgICAgVUlIZWxwZXIuYWN0aXZhdGVBdChjZW50ZXJYLCBjZW50 ZXJZKS50aGVuKAorICAgICAgICAgICAgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgfSwKKyAg ICAgICAgICAgIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgib3V0cHV0IikuaW5uZXJUZXh0ID0gIkZBSUwgUHJvbWlzZSByZWplY3RlZC4iOwor ICAgICAgICAgICAgICAgIHRlYXJEb3duQW5kRmluaXNoKCk7CisgICAgICAgICAgICB9CisgICAg ICAgICk7CisgICAgfQorCisgICAgZnVuY3Rpb24gdHJpZ2dlckZldGNoKGNvbnZlcnNpb25EYXRh KSB7CisgICAgICAgIHJldHVybiBmZXRjaCgiaHR0cHM6Ly8xMjcuMC4wLjE6ODQ0My9wcml2YXRl Q2xpY2tNZWFzdXJlbWVudC9yZXNvdXJjZXMvcmVkaXJlY3RUb0NvbnZlcnNpb24ucGhwP2NvbnZl cnNpb25EYXRhPSIrIGNvbnZlcnNpb25EYXRhICsgIiZkZWxheV9tcz0xMDAiLCB7IGtlZXBhbGl2 ZTogdHJ1ZSB9KTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBydW5UZXN0KCkgeworICAgICAgICBp ZiAod2luZG93LmxvY2F0aW9uLnNlYXJjaCA9PT0gIj9zdGVwVHdvIikgeworICAgICAgICAgICAg Ly8gU3RhcnQgcHJpdmF0ZSBjbGljayBhdHRyaWJ1dGlvbiBmZXRjaCBidXQgbmF2aWdhdGUgYXdh eSBiZWZvcmUgdGhlIGZldGNoIHJlZGlyZWN0aW9uIGhhcHBlbnMuCisgICAgICAgICAgICB0cmln Z2VyRmV0Y2goMTIpOworICAgICAgICAgICAgZG9jdW1lbnQubG9jYXRpb24uaHJlZiA9ICJodHRw Oi8vMTI3LjAuMC4xOjgwMDAvcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvYXR0cmlidXRpb24tY29u dmVyc2lvbi10aHJvdWdoLWZldGNoLWtlZXBhbGl2ZS5odG1sP3N0ZXBUaHJlZSI7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHdpbmRvdy5sb2NhdGlvbi5zZWFy Y2ggPT09ICI/c3RlcFRocmVlIikgeworICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVD aGlsZChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGFyZ2V0TGluayIpKTsKKyAgICAgICAgICAg IC8vIERvIGFuIGludmFsaWQgcHJpdmF0ZSBjbGljayBhdHRyaWJ1dGlvbiBmZXRjaCB0byBlbnN1 cmUgdGhlIHByZXZpb3VzIGNvcnJlY3QgY2xpY2sgYXR0cmlidXRpb24gZmV0Y2ggd2lsbCBiZSBm aW5pc2hlZC4KKyAgICAgICAgICAgIHRyaWdnZXJGZXRjaCgid2hhdGV2ZXIiKS5jYXRjaCgoKSA9 PiB7CisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAg ICAgICAgICB0ZXN0UnVubmVyLmR1bXBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCgpOworICAgICAg ICAgICAgICAgIHRlYXJEb3duQW5kRmluaXNoKCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBhY3RpdmF0ZUVsZW1lbnQoInRhcmdldExp bmsiKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvcmVzb3VyY2VzL3Jl ZGlyZWN0VG9Db252ZXJzaW9uLnBocCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQvcmVzb3VyY2VzL3JlZGlyZWN0VG9Db252ZXJzaW9uLnBocAppbmRleCA3 ZDY1MzVlYTlhYzFmN2Y3MzU0MzAxYWJlYjM2YjBjN2QwOTNlNzFmLi40Y2E2NTE1NDliODA2YzAw ZDdjOGI1YzMyMDQzMWZjN2I2ZTI0N2NhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3ByaXZhdGVDbGlja01lYXN1cmVtZW50L3Jlc291cmNlcy9yZWRpcmVjdFRvQ29udmVyc2lv bi5waHAKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVu dC9yZXNvdXJjZXMvcmVkaXJlY3RUb0NvbnZlcnNpb24ucGhwCkBAIC0xLDYgKzEsMTEgQEAKIDw/ cGhwCitpZiAoaXNzZXQoJF9HRVRbImRlbGF5X21zIl0pKSB7CisgICAgdXNsZWVwKCRfR0VUWyJk ZWxheV9tcyJdICogMTAwMCk7Cit9CiBoZWFkZXIoIkhUVFAvMS4xIDMwMiBGb3VuZCIpOwogaGVh ZGVyKCJDYWNoZS1Db250cm9sOiBuby1jYWNoZSwgbm8tc3RvcmUsIG11c3QtcmV2YWxpZGF0ZSIp OworaGVhZGVyKCJBY2Nlc3MtQ29udHJvbC1BbGxvdy1PcmlnaW46ICoiKTsKK2hlYWRlcigiQWNj ZXNzLUNvbnRyb2wtQWxsb3ctTWV0aG9kczogR0VUIik7CiBpZiAoaXNzZXQoJF9HRVRbImNvbnZl cnNpb25EYXRhIl0pICYmIGlzc2V0KCRfR0VUWyJwcmlvcml0eSJdKSkgewogICBoZWFkZXIoIkxv Y2F0aW9uOiAvLndlbGwta25vd24vcHJpdmF0ZS1jbGljay1tZWFzdXJlbWVudC90cmlnZ2VyLWF0 dHJpYnV0aW9uLyIgLiAkX0dFVFsiY29udmVyc2lvbkRhdGEiXSAuICIvIiAuICRfR0VUWyJwcmlv cml0eSJdKTsKIH0gZWxzZSBpZiAoaXNzZXQoJF9HRVRbImNvbnZlcnNpb25EYXRhIl0pKSB7Cg==