236263 2022-02-07 14:57:43 -0800 http/tests/cache-storage/cache-origins.https.html is flaky 2022-02-08 13:18:21 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=235958 InRadar P2 Normal --- 1 cdumez cdumez cgarcia darin ews-watchlist ggaren webkit-bug-importer youennf oldest_to_newest 1838377 0 cdumez 2022-02-07 14:57:43 -0800 http/tests/cache-storage/cache-origins.https.html is flaky because it relies on a particular HashMap ordering. 1838378 1 451157 cdumez 2022-02-07 15:01:47 -0800 Created attachment 451157 Patch 1838385 2 451157 darin 2022-02-07 15:10:35 -0800 Comment on attachment 451157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451157&action=review We should do this sorting inside WebCore, I think. > LayoutTests/http/tests/cache-storage/cache-origins.https.html:23 > + representation.sort((a, b) => { return a.origin.clientOrigin > b.origin.clientOrigin; }); This isn’t right. It’s supposed to be a three way sort function, and needs to return -1, 0, +1 based on the ordering. Not like C++ standard library where they used boolean less than style sorting. > LayoutTests/http/tests/cache-storage/cache-origins.https.html:36 > + representation.sort((a, b) => { return a.origin.clientOrigin > b.origin.clientOrigin; }); Ditto. 1838400 3 451163 cdumez 2022-02-07 15:27:53 -0800 Created attachment 451163 Patch 1838404 4 451163 darin 2022-02-07 15:38:53 -0800 Comment on attachment 451163 Patch I still think we should fix this inside WebCore, but this is a good fix. We should also take out the "value_or(0)" we added to work around it. 1838414 5 451167 cdumez 2022-02-07 16:15:56 -0800 Created attachment 451167 Patch 1838415 6 cdumez 2022-02-07 16:16:21 -0800 Alternative approach, fixing it on native side, as suggested. 1838418 7 451168 cdumez 2022-02-07 16:21:40 -0800 Created attachment 451168 Patch 1838464 8 451168 darin 2022-02-07 17:54:24 -0800 Comment on attachment 451168 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451168&action=review I like this as is, but I have some thoughts on little style tweaks. > Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp:796 > builder.append("{ \"path\": \""); > builder.append(m_rootPath); > builder.append("\", \"origins\": ["); We can merge these all into one line. > Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp:797 > + Vector<String> origins = WTF::map(m_caches, [](auto& keyValue) { Could use auto here instead of Vector<String>. I think it would look a little better if it’s built even before we define StringBuilder. > Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp:803 > + originBuilder.append("\n{ \"origin\" : { \"topOrigin\" : \""); > + originBuilder.append(keyValue.key.topOrigin.toString()); > + originBuilder.append("\", \"clientOrigin\": \""); > + originBuilder.append(keyValue.key.clientOrigin.toString()); > + originBuilder.append("\" }, \"caches\" : "); We can merge these all into fewer lines. > Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp:811 > + for (auto& origin : origins) { Another way to write this: const char* divider = ""; for (auto& origin : origins) { builder.append(divider, origin); divider = ","; } A little less wordy than the isFirst version. 1838654 9 451243 cdumez 2022-02-08 07:33:53 -0800 Created attachment 451243 Patch 1838853 10 ews-feeder 2022-02-08 13:17:34 -0800 Committed r289419 (246982@main): <https://commits.webkit.org/246982@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451243. 1838854 11 webkit-bug-importer 2022-02-08 13:18:21 -0800 <rdar://problem/88648506> 451157 2022-02-07 15:01:47 -0800 2022-02-07 15:27:51 -0800 Patch bug-236263-20220207150147.patch text/plain 2205 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjM2CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmFiM2EyNDVmNTc2Njc5MzE3MjI1 NGQ0NjM3NzhjN2IwY2NlMTRmMC4uN2ZhNWZiNDQwMjlhMmRkYTdlNjA3NzMzNTAxOTcyODZjMGI1 YTM1YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAyLTA3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hl LW9yaWdpbnMuaHR0cHMuaHRtbCBpcyBmbGFreQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU29ydCBhcnJheSBiZWZvcmUgdmFsaWRhdGluZyBpdCB0byBh ZGRyZXNzIGZsYWtpbmVzcy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9j YWNoZS1vcmlnaW5zLmh0dHBzLmh0bWw6CisKIDIwMjItMDItMDQgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc2hhcmluZyBTaGFyZWQg V29ya2VycyAoaW5jbHVkaW5nIGFjcm9zcyBXZWJQcm9jZXNzZXMpCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlLXN0b3JhZ2UvY2FjaGUtb3JpZ2lucy5odHRwcy5odG1s IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0 cHMuaHRtbAppbmRleCAyMWY4ZWMzNWJlOGEyMTVhY2YxZWEzMWJlMTk4NjY5YmYxMTAyZWU1Li5m Y2ZlZGJlMmY5NmU4ZjVmNDZmODgwMzAyODJkZjZlYjJmM2RkMmZmIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlLXN0b3JhZ2UvY2FjaGUtb3JpZ2lucy5odHRwcy5odG1s CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5z Lmh0dHBzLmh0bWwKQEAgLTIwLDYgKzIwLDcgQEAKICAgICBhc3luYyBmdW5jdGlvbiBjaGVja0Nh Y2hlc0FmdGVyQ2xlYXJpbmdPcmlnaW5zKCkgewogICAgICAgICB0ZXN0UnVubmVyLmNsZWFyRE9N Q2FjaGUoJ2h0dHBzOi8vMTI3LjAuMC4xOjg0NDMnKTsKICAgICAgICAgdmFyIHJlcHJlc2VudGF0 aW9uID0gSlNPTi5wYXJzZShhd2FpdCBpbnRlcm5hbHMuY2FjaGVTdG9yYWdlRW5naW5lUmVwcmVz ZW50YXRpb24oKSkub3JpZ2luczsKKyAgICAgICAgcmVwcmVzZW50YXRpb24uc29ydCgoYSwgYikg PT4geyByZXR1cm4gYS5vcmlnaW4uY2xpZW50T3JpZ2luID4gYi5vcmlnaW4uY2xpZW50T3JpZ2lu OyB9KTsKICAgICAgICAgdGVzdCgoKSA9PiB7CiAgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKHJl cHJlc2VudGF0aW9uWzBdLm9yaWdpbi50b3BPcmlnaW4sICJodHRwczovLzEyNy4wLjAuMTo4NDQz IiwgInRvcCBvcmlnaW4gb2YgY2FjaGUgMSIpOwogICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhy ZXByZXNlbnRhdGlvblsxXS5vcmlnaW4udG9wT3JpZ2luLCAiaHR0cHM6Ly8xMjcuMC4wLjE6ODQ0 MyIsICJ0b3Agb3JpZ2luIG9mIGNhY2hlIDIiKTsKQEAgLTMyLDYgKzMzLDcgQEAKIAogICAgIGFz eW5jIGZ1bmN0aW9uIGNoZWNrQ2FjaGVSZXByZXNlbnRhdGlvbigpIHsKICAgICAgICAgdmFyIHJl cHJlc2VudGF0aW9uID0gSlNPTi5wYXJzZShhd2FpdCBpbnRlcm5hbHMuY2FjaGVTdG9yYWdlRW5n aW5lUmVwcmVzZW50YXRpb24oKSkub3JpZ2luczsKKyAgICAgICAgcmVwcmVzZW50YXRpb24uc29y dCgoYSwgYikgPT4geyByZXR1cm4gYS5vcmlnaW4uY2xpZW50T3JpZ2luID4gYi5vcmlnaW4uY2xp ZW50T3JpZ2luOyB9KTsKICAgICAgICAgdGVzdCgoKSA9PiB7CiAgICAgICAgICAgICBhc3NlcnRf ZXF1YWxzKHJlcHJlc2VudGF0aW9uWzBdLm9yaWdpbi50b3BPcmlnaW4sICJodHRwczovLzEyNy4w LjAuMTo4NDQzIiwgInRvcCBvcmlnaW4gb2YgY2FjaGUgMSIpOwogICAgICAgICAgICAgYXNzZXJ0 X2VxdWFscyhyZXByZXNlbnRhdGlvblsxXS5vcmlnaW4udG9wT3JpZ2luLCAiaHR0cHM6Ly8xMjcu MC4wLjE6ODQ0MyIsICJ0b3Agb3JpZ2luIG9mIGNhY2hlIDIiKTsK 451163 2022-02-07 15:27:53 -0800 2022-02-07 16:15:54 -0800 Patch bug-236263-20220207152753.patch text/plain 2407 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjQ2CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWUyYzE5NWJkOTg5ZTU2Yjg0ZGYx NTc4MWU4YWYwNzM3OGE1ODJhYi4uNWVhZjZhNmY1Njk2NmYzZjdjNDQxYjY3NTQ0MDE4ZjA1NjBm ZGY4NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAyLTA3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hl LW9yaWdpbnMuaHR0cHMuaHRtbCBpcyBmbGFreQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU29ydCBhcnJheSBiZWZvcmUgdmFsaWRhdGluZyBpdCB0byBh ZGRyZXNzIGZsYWtpbmVzcy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9j YWNoZS1vcmlnaW5zLmh0dHBzLmh0bWw6CisKIDIwMjItMDItMDcgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZW5hbWUgdGVzdCBpbiBUZXN0 RXhwZWN0YXRpb25zIHRvIG1hdGNoIHRoZSBhY3R1YWwgdGVzdCBuYW1lLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMu aHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5z Lmh0dHBzLmh0bWwKaW5kZXggMjFmOGVjMzViZThhMjE1YWNmMWVhMzFiZTE5ODY2OWJmMTEwMmVl NS4uZmJlYmNmZDQyM2M5NTdiZDUxYTY2NjI2YzFmNDY2NzZmYTAwNmMwMCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlLXN0b3JhZ2UvY2FjaGUtb3Jp Z2lucy5odHRwcy5odG1sCkBAIC0xNyw5ICsxNywxOCBAQAogICAgICAgICB9LCAiVmVyaWZ5aW5n IHRoYXQgY2FjaGVzIGFyZSBjbHVzdGVyZWQgcGVyIGNsaWVudCBvcmlnaW4uIik7CiAgICAgfQog CisgICAgZnVuY3Rpb24gc29ydE9yaWdpbnMoYSwgYikgeworICAgICAgICBpZiAoYS5vcmlnaW4u Y2xpZW50T3JpZ2luID4gYi5vcmlnaW4uY2xpZW50T3JpZ2luKQorICAgICAgICAgICAgcmV0dXJu IDE7CisgICAgICAgIGlmIChhLm9yaWdpbi5jbGllbnRPcmlnaW4gPCBiLm9yaWdpbi5jbGllbnRP cmlnaW4pCisgICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIHJldHVybiAwOworICAgIH0K KwogICAgIGFzeW5jIGZ1bmN0aW9uIGNoZWNrQ2FjaGVzQWZ0ZXJDbGVhcmluZ09yaWdpbnMoKSB7 CiAgICAgICAgIHRlc3RSdW5uZXIuY2xlYXJET01DYWNoZSgnaHR0cHM6Ly8xMjcuMC4wLjE6ODQ0 MycpOwogICAgICAgICB2YXIgcmVwcmVzZW50YXRpb24gPSBKU09OLnBhcnNlKGF3YWl0IGludGVy bmFscy5jYWNoZVN0b3JhZ2VFbmdpbmVSZXByZXNlbnRhdGlvbigpKS5vcmlnaW5zOworICAgICAg ICByZXByZXNlbnRhdGlvbi5zb3J0KHNvcnRPcmlnaW5zKTsKICAgICAgICAgdGVzdCgoKSA9PiB7 CiAgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKHJlcHJlc2VudGF0aW9uWzBdLm9yaWdpbi50b3BP cmlnaW4sICJodHRwczovLzEyNy4wLjAuMTo4NDQzIiwgInRvcCBvcmlnaW4gb2YgY2FjaGUgMSIp OwogICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhyZXByZXNlbnRhdGlvblsxXS5vcmlnaW4udG9w T3JpZ2luLCAiaHR0cHM6Ly8xMjcuMC4wLjE6ODQ0MyIsICJ0b3Agb3JpZ2luIG9mIGNhY2hlIDIi KTsKQEAgLTMyLDYgKzQxLDcgQEAKIAogICAgIGFzeW5jIGZ1bmN0aW9uIGNoZWNrQ2FjaGVSZXBy ZXNlbnRhdGlvbigpIHsKICAgICAgICAgdmFyIHJlcHJlc2VudGF0aW9uID0gSlNPTi5wYXJzZShh d2FpdCBpbnRlcm5hbHMuY2FjaGVTdG9yYWdlRW5naW5lUmVwcmVzZW50YXRpb24oKSkub3JpZ2lu czsKKyAgICAgICAgcmVwcmVzZW50YXRpb24uc29ydChzb3J0T3JpZ2lucyk7CiAgICAgICAgIHRl c3QoKCkgPT4gewogICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhyZXByZXNlbnRhdGlvblswXS5v cmlnaW4udG9wT3JpZ2luLCAiaHR0cHM6Ly8xMjcuMC4wLjE6ODQ0MyIsICJ0b3Agb3JpZ2luIG9m IGNhY2hlIDEiKTsKICAgICAgICAgICAgIGFzc2VydF9lcXVhbHMocmVwcmVzZW50YXRpb25bMV0u b3JpZ2luLnRvcE9yaWdpbiwgImh0dHBzOi8vMTI3LjAuMC4xOjg0NDMiLCAidG9wIG9yaWdpbiBv ZiBjYWNoZSAyIik7Cg== 451167 2022-02-07 16:15:56 -0800 2022-02-07 16:21:38 -0800 Patch bug-236263-20220207161555.patch text/plain 2937 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVlMzRjOWVmODg2YjRlMjlm YjgwNDE1NjU4NmM1NGQ0MGQxYmJiNTkuLjk4Mzk1YzFkODRhZDE4M2Y0MjM5NGQ0ZmVhMzQ3NGEy NGMyZmE4MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMDcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwL3Rlc3RzL2NhY2hlLXN0b3Jh Z2UvY2FjaGUtb3JpZ2lucy5odHRwcy5odG1sIGlzIGZsYWt5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYyNjMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgQ2FjaGVTdG9yYWdlOjpFbmdpbmU6 OnJlcHJlc2VudGF0aW9uKCkgKHdoaWNoIGlzIHVzZWQgYnkgdGhlIGxheW91dCB0ZXN0cykgdG8g cmV0dXJuCisgICAgICAgIG9yaWdpbnMgaW4gYSBzdGFibGUgb3JkZXIgaW4gb3JkZXIgdG8gYWRk cmVzcyB0ZXN0IGZsYWtpbmVzcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL0Nh Y2hlU3RvcmFnZUVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5n aW5lOjpyZXByZXNlbnRhdGlvbik6CisKIDIwMjItMDItMDcgIE1lZ2FuIEdhcmRuZXIgIDxtZWdh bl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgaG92ZXIgc3RhdGUgYmFzZWQg b24gcG9pbnRlciB0eXBlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwCmluZGV4IGMyMDBjZThiNWViNGMzYTAz NjU3ZTgyMjY4OTkwMmI0NmRiZjhhYjAuLmQ4MGU5NGI5ZjUzNjEwM2VkMWMyNGY4MmFlNmQxYTE1 ZjlhYjg5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv Q2FjaGVTdG9yYWdlRW5naW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKQEAgLTc5MCwyMyArNzkwLDI5IEBAIFN0cmlu ZyBFbmdpbmU6OnJlcHJlc2VudGF0aW9uKCkKICAgICBBU1NFUlQobV9wZW5kaW5nQ2xlYXJDYWxs YmFja3MuaXNFbXB0eSgpKTsKICAgICBBU1NFUlQobV9pbml0aWFsaXphdGlvbkNhbGxiYWNrcy5p c0VtcHR5KCkpOwogCi0gICAgYm9vbCBpc0ZpcnN0ID0gdHJ1ZTsKICAgICBTdHJpbmdCdWlsZGVy IGJ1aWxkZXI7CiAgICAgYnVpbGRlci5hcHBlbmQoInsgXCJwYXRoXCI6IFwiIik7CiAgICAgYnVp bGRlci5hcHBlbmQobV9yb290UGF0aCk7CiAgICAgYnVpbGRlci5hcHBlbmQoIlwiLCBcIm9yaWdp bnNcIjogWyIpOwotICAgIGZvciAoYXV0byYga2V5VmFsdWUgOiBtX2NhY2hlcykgeworICAgIFZl Y3RvcjxTdHJpbmc+IG9yaWdpbnMgPSBXVEY6Om1hcChtX2NhY2hlcywgW10oYXV0byYga2V5VmFs dWUpIHsKKyAgICAgICAgU3RyaW5nQnVpbGRlciBvcmlnaW5CdWlsZGVyOworICAgICAgICBvcmln aW5CdWlsZGVyLmFwcGVuZCgiXG57IFwib3JpZ2luXCIgOiB7IFwidG9wT3JpZ2luXCIgOiBcIiIp OworICAgICAgICBvcmlnaW5CdWlsZGVyLmFwcGVuZChrZXlWYWx1ZS5rZXkudG9wT3JpZ2luLnRv U3RyaW5nKCkpOworICAgICAgICBvcmlnaW5CdWlsZGVyLmFwcGVuZCgiXCIsIFwiY2xpZW50T3Jp Z2luXCI6IFwiIik7CisgICAgICAgIG9yaWdpbkJ1aWxkZXIuYXBwZW5kKGtleVZhbHVlLmtleS5j bGllbnRPcmlnaW4udG9TdHJpbmcoKSk7CisgICAgICAgIG9yaWdpbkJ1aWxkZXIuYXBwZW5kKCJc IiB9LCBcImNhY2hlc1wiIDogIik7CisgICAgICAgIGtleVZhbHVlLnZhbHVlLT5hcHBlbmRSZXBy ZXNlbnRhdGlvbihvcmlnaW5CdWlsZGVyKTsKKyAgICAgICAgb3JpZ2luQnVpbGRlci5hcHBlbmQo J30nKTsKKyAgICAgICAgcmV0dXJuIG9yaWdpbkJ1aWxkZXIudG9TdHJpbmcoKTsKKyAgICB9KTsK KyAgICBzdGQ6OnNvcnQob3JpZ2lucy5iZWdpbigpLCBvcmlnaW5zLmVuZCgpLCBbXShhdXRvJiBh LCBhdXRvJiBiKSB7IHJldHVybiBjb2RlUG9pbnRDb21wYXJlTGVzc1RoYW4oYSwgYik7IH0pOwor CisgICAgYm9vbCBpc0ZpcnN0ID0gdHJ1ZTsKKyAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG9yaWdp bnMpIHsKICAgICAgICAgaWYgKCFpc0ZpcnN0KQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQo IiwiKTsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCcsJyk7CiAgICAgICAgIGlzRmlyc3Qg PSBmYWxzZTsKLQotICAgICAgICBidWlsZGVyLmFwcGVuZCgiXG57IFwib3JpZ2luXCIgOiB7IFwi dG9wT3JpZ2luXCIgOiBcIiIpOwotICAgICAgICBidWlsZGVyLmFwcGVuZChrZXlWYWx1ZS5rZXku dG9wT3JpZ2luLnRvU3RyaW5nKCkpOwotICAgICAgICBidWlsZGVyLmFwcGVuZCgiXCIsIFwiY2xp ZW50T3JpZ2luXCI6IFwiIik7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKGtleVZhbHVlLmtleS5j bGllbnRPcmlnaW4udG9TdHJpbmcoKSk7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJcIiB9LCBc ImNhY2hlc1wiIDogIik7Ci0gICAgICAgIGtleVZhbHVlLnZhbHVlLT5hcHBlbmRSZXByZXNlbnRh dGlvbihidWlsZGVyKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoIn0iKTsKKyAgICAgICAgYnVp bGRlci5hcHBlbmQob3JpZ2luKTsKICAgICB9CiAgICAgYnVpbGRlci5hcHBlbmQoIl19Iik7CiAg ICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsK 451168 2022-02-07 16:21:40 -0800 2022-02-08 07:33:50 -0800 Patch bug-236263-20220207162139.patch text/plain 4294 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I1MmI0OWUxMDNiZDRh OGZlMzhiM2MyZDQzMGI2YTNiZGU0YmZmMi4uY2RhZTE3ZmE5MjMwNDg2ZDQzZGMwMjFiODA5ODE1 OTRmOGE5OGVhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTA3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1z dG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMuaHRtbCBpcyBmbGFreQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MjYzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHJvcCB3b3JrYXJvdW5kIGxhbmRlZCBp biByMjg5MjQ3IHRvIHRyeSBhbmQgbWFpbnRhaW4gSGFzaE1hcCBvcmRlcmluZy4KKworICAgICAg ICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjphZGQpOgor CiAyMDIyLTAyLTA3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIHN1cHBvcnQgZm9yIHNoYXJpbmcgU2hhcmVkIFdvcmtlcnMgKGluY2x1ZGluZyBhY3Jvc3Mg V2ViUHJvY2Vzc2VzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBkYzg1YjNkOGJlZDkxNjA0ODU4M2I3OGIwYjAxOGEx MzcxODFjOGViLi41YjhlYzJlYjFhYzk0NWEwMmU0N2I3ODBmMzY1YTA3ODFiYjI5NzlkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTA3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdp bnMuaHR0cHMuaHRtbCBpcyBmbGFreQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM2MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXBkYXRlIENhY2hlU3RvcmFnZTo6RW5naW5lOjpyZXByZXNlbnRhdGlv bigpICh3aGljaCBpcyB1c2VkIGJ5IHRoZSBsYXlvdXQgdGVzdHMpIHRvIHJldHVybgorICAgICAg ICBvcmlnaW5zIGluIGEgc3RhYmxlIG9yZGVyIGluIG9yZGVyIHRvIGFkZHJlc3MgdGVzdCBmbGFr aW5lc3MuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdp bmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6cmVwcmVzZW50 YXRpb24pOgorCiAyMDIyLTAyLTA3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHNoYXJpbmcgU2hhcmVkIFdvcmtlcnMgKGluY2x1ZGlu ZyBhY3Jvc3MgV2ViUHJvY2Vzc2VzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9T ZWN1cml0eU9yaWdpbkRhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5E YXRhLmgKaW5kZXggZWZiZmIwYzkyODIyMThiZTgzMDNkYzc0Y2M3MjAxNjZmMDM5NWIwZi4uMzcz NTBhYTQwYTZiZTBiZDI2ZGM2NTUxYmM3MDQ2MzRkYTljMjM5YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5oCkBAIC0xMDAsNyArMTAwLDcgQEAgaW5saW5lIGJvb2wg b3BlcmF0b3IhPShjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGZpcnN0LCBjb25zdCBTZWN1cml0 eU9yaWdpbkRhdGEKIAogaW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBTZWN1 cml0eU9yaWdpbkRhdGEmIGRhdGEpCiB7Ci0gICAgYWRkKGhhc2hlciwgZGF0YS5wcm90b2NvbCwg ZGF0YS5ob3N0LCBkYXRhLnBvcnQudmFsdWVfb3IoMCkpOworICAgIGFkZChoYXNoZXIsIGRhdGEu cHJvdG9jb2wsIGRhdGEuaG9zdCwgZGF0YS5wb3J0KTsKIH0KIAogdGVtcGxhdGU8Y2xhc3MgRW5j b2Rlcj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2Fj aGVTdG9yYWdlRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv Q2FjaGVTdG9yYWdlRW5naW5lLmNwcAppbmRleCBjMjAwY2U4YjVlYjRjM2EwMzY1N2U4MjI2ODk5 MDJiNDZkYmY4YWIwLi5kODBlOTRiOWY1MzYxMDNlZDFjMjRmODJhZTZkMWExNWY5YWI4OWNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFn ZUVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNo ZVN0b3JhZ2VFbmdpbmUuY3BwCkBAIC03OTAsMjMgKzc5MCwyOSBAQCBTdHJpbmcgRW5naW5lOjpy ZXByZXNlbnRhdGlvbigpCiAgICAgQVNTRVJUKG1fcGVuZGluZ0NsZWFyQ2FsbGJhY2tzLmlzRW1w dHkoKSk7CiAgICAgQVNTRVJUKG1faW5pdGlhbGl6YXRpb25DYWxsYmFja3MuaXNFbXB0eSgpKTsK IAotICAgIGJvb2wgaXNGaXJzdCA9IHRydWU7CiAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwog ICAgIGJ1aWxkZXIuYXBwZW5kKCJ7IFwicGF0aFwiOiBcIiIpOwogICAgIGJ1aWxkZXIuYXBwZW5k KG1fcm9vdFBhdGgpOwogICAgIGJ1aWxkZXIuYXBwZW5kKCJcIiwgXCJvcmlnaW5zXCI6IFsiKTsK LSAgICBmb3IgKGF1dG8mIGtleVZhbHVlIDogbV9jYWNoZXMpIHsKKyAgICBWZWN0b3I8U3RyaW5n PiBvcmlnaW5zID0gV1RGOjptYXAobV9jYWNoZXMsIFtdKGF1dG8mIGtleVZhbHVlKSB7CisgICAg ICAgIFN0cmluZ0J1aWxkZXIgb3JpZ2luQnVpbGRlcjsKKyAgICAgICAgb3JpZ2luQnVpbGRlci5h cHBlbmQoIlxueyBcIm9yaWdpblwiIDogeyBcInRvcE9yaWdpblwiIDogXCIiKTsKKyAgICAgICAg b3JpZ2luQnVpbGRlci5hcHBlbmQoa2V5VmFsdWUua2V5LnRvcE9yaWdpbi50b1N0cmluZygpKTsK KyAgICAgICAgb3JpZ2luQnVpbGRlci5hcHBlbmQoIlwiLCBcImNsaWVudE9yaWdpblwiOiBcIiIp OworICAgICAgICBvcmlnaW5CdWlsZGVyLmFwcGVuZChrZXlWYWx1ZS5rZXkuY2xpZW50T3JpZ2lu LnRvU3RyaW5nKCkpOworICAgICAgICBvcmlnaW5CdWlsZGVyLmFwcGVuZCgiXCIgfSwgXCJjYWNo ZXNcIiA6ICIpOworICAgICAgICBrZXlWYWx1ZS52YWx1ZS0+YXBwZW5kUmVwcmVzZW50YXRpb24o b3JpZ2luQnVpbGRlcik7CisgICAgICAgIG9yaWdpbkJ1aWxkZXIuYXBwZW5kKCd9Jyk7CisgICAg ICAgIHJldHVybiBvcmlnaW5CdWlsZGVyLnRvU3RyaW5nKCk7CisgICAgfSk7CisgICAgc3RkOjpz b3J0KG9yaWdpbnMuYmVnaW4oKSwgb3JpZ2lucy5lbmQoKSwgW10oYXV0byYgYSwgYXV0byYgYikg eyByZXR1cm4gY29kZVBvaW50Q29tcGFyZUxlc3NUaGFuKGEsIGIpOyB9KTsKKworICAgIGJvb2wg aXNGaXJzdCA9IHRydWU7CisgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBvcmlnaW5zKSB7CiAgICAg ICAgIGlmICghaXNGaXJzdCkKLSAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIsIik7CisgICAg ICAgICAgICBidWlsZGVyLmFwcGVuZCgnLCcpOwogICAgICAgICBpc0ZpcnN0ID0gZmFsc2U7Ci0K LSAgICAgICAgYnVpbGRlci5hcHBlbmQoIlxueyBcIm9yaWdpblwiIDogeyBcInRvcE9yaWdpblwi IDogXCIiKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoa2V5VmFsdWUua2V5LnRvcE9yaWdpbi50 b1N0cmluZygpKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoIlwiLCBcImNsaWVudE9yaWdpblwi OiBcIiIpOwotICAgICAgICBidWlsZGVyLmFwcGVuZChrZXlWYWx1ZS5rZXkuY2xpZW50T3JpZ2lu LnRvU3RyaW5nKCkpOwotICAgICAgICBidWlsZGVyLmFwcGVuZCgiXCIgfSwgXCJjYWNoZXNcIiA6 ICIpOwotICAgICAgICBrZXlWYWx1ZS52YWx1ZS0+YXBwZW5kUmVwcmVzZW50YXRpb24oYnVpbGRl cik7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJ9Iik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5k KG9yaWdpbik7CiAgICAgfQogICAgIGJ1aWxkZXIuYXBwZW5kKCJdfSIpOwogICAgIHJldHVybiBi dWlsZGVyLnRvU3RyaW5nKCk7Cg== 451243 2022-02-08 07:33:53 -0800 2022-02-08 13:17:35 -0800 Patch bug-236263-20220208073352.patch text/plain 4249 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5MjdjMjdhYmQ0MzI3 MDE0ZjU5YTdiNzUzNDk5NmM1ZTBlZTg1Ni4uZjVhNTlhN2I4YjUyNGUwMGEyYTE3MWY3OTk4M2Y2 NjIwYjE4NjgyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1z dG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMuaHRtbCBpcyBmbGFreQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MjYzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgRHJvcCB3b3JrYXJvdW5kIGxhbmRlZCBpbiBy Mjg5MjQ3IHRvIHRyeSBhbmQgbWFpbnRhaW4gSGFzaE1hcCBvcmRlcmluZy4KKworICAgICAgICAq IHBhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjphZGQpOgorCiAy MDIyLTAyLTA4ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIFRha2Ugd3JpdGluZyBkaXJlY3Rpb24gaW50byBhY2NvdW50IHdoZW4gYXBwbHlpbmcg UmVuZGVyQmxvY2tGbG93IGVuZCBwYWRkaW5nIHF1aXJrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBmZjFkZWI0MGEy Zjk0ZjZlODNhZjQzNWEzNGM4NzE3YTFkNzc3NmEuLjU1ODljMzQ3NGY0NWVhYzBmODhmM2QxNzAy OWFmYTRjZjg2YmIwMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMDggIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwL3Rlc3RzL2NhY2hl LXN0b3JhZ2UvY2FjaGUtb3JpZ2lucy5odHRwcy5odG1sIGlzIGZsYWt5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYyNjMKKworICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBVcGRhdGUgQ2FjaGVTdG9yYWdlOjpFbmdp bmU6OnJlcHJlc2VudGF0aW9uKCkgKHdoaWNoIGlzIHVzZWQgYnkgdGhlIGxheW91dCB0ZXN0cykg dG8gcmV0dXJuCisgICAgICAgIG9yaWdpbnMgaW4gYSBzdGFibGUgb3JkZXIgaW4gb3JkZXIgdG8g YWRkcmVzcyB0ZXN0IGZsYWtpbmVzcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L0NhY2hlU3RvcmFnZUVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6 RW5naW5lOjpyZXByZXNlbnRhdGlvbik6CisKIDIwMjItMDItMDggIEtpbW1vIEtpbm51bmVuICA8 a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBHUFVQIFdlYkdMIFJFTEVBU0VfTE9HcyBl cnJvcm5lb3VzbHkgZm9yIHVuaGFuZGxlZCBtZXNzYWdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW5EYXRhLmgKaW5kZXggZWZiZmIwYzkyODIyMThiZTgzMDNkYzc0Y2M3MjAxNjZm MDM5NWIwZi4uMzczNTBhYTQwYTZiZTBiZDI2ZGM2NTUxYmM3MDQ2MzRkYTljMjM5YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5oCkBAIC0xMDAsNyArMTAwLDcgQEAg aW5saW5lIGJvb2wgb3BlcmF0b3IhPShjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGZpcnN0LCBj b25zdCBTZWN1cml0eU9yaWdpbkRhdGEKIAogaW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVy LCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGRhdGEpCiB7Ci0gICAgYWRkKGhhc2hlciwgZGF0 YS5wcm90b2NvbCwgZGF0YS5ob3N0LCBkYXRhLnBvcnQudmFsdWVfb3IoMCkpOworICAgIGFkZCho YXNoZXIsIGRhdGEucHJvdG9jb2wsIGRhdGEuaG9zdCwgZGF0YS5wb3J0KTsKIH0KIAogdGVtcGxh dGU8Y2xhc3MgRW5jb2Rlcj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAppbmRleCBjMjAwY2U4YjVlYjRjM2Ew MzY1N2U4MjI2ODk5MDJiNDZkYmY4YWIwLi42MzQyNWFjNWU1YzUxMjJlMTc1NjM2OWU0NTUzODA2 NDcxNzNlNjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwCkBAIC03OTAsMjMgKzc5MCwyMSBAQCBTdHJp bmcgRW5naW5lOjpyZXByZXNlbnRhdGlvbigpCiAgICAgQVNTRVJUKG1fcGVuZGluZ0NsZWFyQ2Fs bGJhY2tzLmlzRW1wdHkoKSk7CiAgICAgQVNTRVJUKG1faW5pdGlhbGl6YXRpb25DYWxsYmFja3Mu aXNFbXB0eSgpKTsKIAotICAgIGJvb2wgaXNGaXJzdCA9IHRydWU7CisgICAgYXV0byBvcmlnaW5z ID0gV1RGOjptYXAobV9jYWNoZXMsIFtdKGF1dG8mIGtleVZhbHVlKSB7CisgICAgICAgIFN0cmlu Z0J1aWxkZXIgb3JpZ2luQnVpbGRlcjsKKyAgICAgICAgb3JpZ2luQnVpbGRlci5hcHBlbmQoIlxu eyBcIm9yaWdpblwiIDogeyBcInRvcE9yaWdpblwiIDogXCIiLCBrZXlWYWx1ZS5rZXkudG9wT3Jp Z2luLnRvU3RyaW5nKCksICJcIiwgXCJjbGllbnRPcmlnaW5cIjogXCIiLCBrZXlWYWx1ZS5rZXku Y2xpZW50T3JpZ2luLnRvU3RyaW5nKCksICJcIiB9LCBcImNhY2hlc1wiIDogIik7CisgICAgICAg IGtleVZhbHVlLnZhbHVlLT5hcHBlbmRSZXByZXNlbnRhdGlvbihvcmlnaW5CdWlsZGVyKTsKKyAg ICAgICAgb3JpZ2luQnVpbGRlci5hcHBlbmQoJ30nKTsKKyAgICAgICAgcmV0dXJuIG9yaWdpbkJ1 aWxkZXIudG9TdHJpbmcoKTsKKyAgICB9KTsKKyAgICBzdGQ6OnNvcnQob3JpZ2lucy5iZWdpbigp LCBvcmlnaW5zLmVuZCgpLCBbXShhdXRvJiBhLCBhdXRvJiBiKSB7IHJldHVybiBjb2RlUG9pbnRD b21wYXJlTGVzc1RoYW4oYSwgYik7IH0pOworCiAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwot ICAgIGJ1aWxkZXIuYXBwZW5kKCJ7IFwicGF0aFwiOiBcIiIpOwotICAgIGJ1aWxkZXIuYXBwZW5k KG1fcm9vdFBhdGgpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCJcIiwgXCJvcmlnaW5zXCI6IFsiKTsK LSAgICBmb3IgKGF1dG8mIGtleVZhbHVlIDogbV9jYWNoZXMpIHsKLSAgICAgICAgaWYgKCFpc0Zp cnN0KQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIiwiKTsKLSAgICAgICAgaXNGaXJzdCA9 IGZhbHNlOwotCi0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJcbnsgXCJvcmlnaW5cIiA6IHsgXCJ0 b3BPcmlnaW5cIiA6IFwiIik7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKGtleVZhbHVlLmtleS50 b3BPcmlnaW4udG9TdHJpbmcoKSk7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJcIiwgXCJjbGll bnRPcmlnaW5cIjogXCIiKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoa2V5VmFsdWUua2V5LmNs aWVudE9yaWdpbi50b1N0cmluZygpKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoIlwiIH0sIFwi Y2FjaGVzXCIgOiAiKTsKLSAgICAgICAga2V5VmFsdWUudmFsdWUtPmFwcGVuZFJlcHJlc2VudGF0 aW9uKGJ1aWxkZXIpOwotICAgICAgICBidWlsZGVyLmFwcGVuZCgifSIpOworICAgIGJ1aWxkZXIu YXBwZW5kKCJ7IFwicGF0aFwiOiBcIiIsIG1fcm9vdFBhdGgsICJcIiwgXCJvcmlnaW5zXCI6IFsi KTsKKyAgICBjb25zdCBjaGFyKiBkaXZpZGVyID0gIiI7CisgICAgZm9yIChhdXRvJiBvcmlnaW4g OiBvcmlnaW5zKSB7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGRpdmlkZXIsIG9yaWdpbik7Cisg ICAgICAgIGRpdmlkZXIgPSAiLCI7CiAgICAgfQogICAgIGJ1aWxkZXIuYXBwZW5kKCJdfSIpOwog ICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7Cg==