221162 2021-01-29 16:06:57 -0800 autoinstall.py: Don't use an XML parser to parse HTML, fixes "mismatched tag" error 2021-02-03 15:34:16 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221111 https://bugs.webkit.org/show_bug.cgi?id=221361 InRadar P2 Normal --- 1 aboya aboya jbedard webkit-bug-importer zimmermann oldest_to_newest 1723927 0 aboya 2021-01-29 16:06:57 -0800 Today autoinstall.py started failing becagse the page returned by https://pypi.org/simple/fasteners/ now contains a <meta> tag, which is not parseable as XML without the trailing slash. This patch replaces that code to use an HTML parser instead of an XML parser. 1723928 1 418781 aboya 2021-01-29 16:08:20 -0800 Created attachment 418781 Patch 1723940 2 418784 aboya 2021-01-29 16:21:02 -0800 Created attachment 418784 Patch 1723951 3 jbedard 2021-01-29 16:44:41 -0800 Alicia is right about this fix, although I'm reluctant to land something like this Friday afternoon given how much infrastructure we have relying on it. Since things are stable right now, I'll take a close look Monday morning. 1724344 4 ews-feeder 2021-02-01 11:51:25 -0800 commit-queue failed to commit attachment 418784 to WebKit repository. 1724347 5 jbedard 2021-02-01 11:55:34 -0800 (In reply to EWS from comment #4) > commit-queue failed to commit attachment 418784 [details] to WebKit > repository. Aakash and I are in discussion about this commit-queue issue now. 1724367 6 ews-feeder 2021-02-01 12:37:50 -0800 Committed r272167: <https://trac.webkit.org/changeset/272167> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418784. 1724368 7 webkit-bug-importer 2021-02-01 12:38:14 -0800 <rdar://problem/73841294> 1725376 8 jbedard 2021-02-03 15:34:16 -0800 *** Bug 221361 has been marked as a duplicate of this bug. *** 418781 2021-01-29 16:08:20 -0800 2021-01-29 16:20:59 -0800 Patch bug-221162-20210130010819.patch text/plain 5754 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg2ODQ5NGMzNjllNDQ1ODE4OWI1ZDRmMzNmMTk2ZWNl MDY4OGMyYy4uNTVkNmM4MTI5ODg5NTY2ZTAwMDUzNDNhYmNlYTg3ZmQyNzUyZDk4ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTAxLTI5ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4K KworICAgICAgICBhdXRvaW5zdGFsbC5weTogRG9uJ3QgdXNlIGFuIFhNTCBwYXJzZXIgdG8gcGFy c2UgSFRNTCwgZml4ZXMgIm1pc21hdGNoZWQgdGFnIiBlcnJvcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMTYyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG9kYXkgYXV0b2luc3RhbGwucHkgc3RhcnRl ZCBmYWlsaW5nIGJlY2Fnc2UgdGhlIHBhZ2UgcmV0dXJuZWQgYnkKKyAgICAgICAgaHR0cHM6Ly9w eXBpLm9yZy9zaW1wbGUvZmFzdGVuZXJzLyBub3cgY29udGFpbnMgYSA8bWV0YT4gdGFnLCB3aGlj aCBpcworICAgICAgICBub3QgcGFyc2VhYmxlIGFzIFhNTCB3aXRob3V0IHRoZSB0cmFpbGluZyBz bGFzaC4KKworICAgICAgICBUaGlzIHBhdGNoIHJlcGxhY2VzIHRoYXQgY29kZSB0byB1c2UgYW4g SFRNTCBwYXJzZXIgaW5zdGVhZCBvZiBhbiBYTUwKKyAgICAgICAgcGFyc2VyLgorCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFs bC5weToKKyAgICAgICAgKFNpbXBseVB5cGlJbmRleFBhZ2VQYXJzZXIpOgorICAgICAgICAoU2lt cGx5UHlwaUluZGV4UGFnZVBhcnNlci5fX2luaXRfXyk6CisgICAgICAgIChTaW1wbHlQeXBpSW5k ZXhQYWdlUGFyc2VyLmhhbmRsZV9zdGFydHRhZyk6CisgICAgICAgIChTaW1wbHlQeXBpSW5kZXhQ YWdlUGFyc2VyLmhhbmRsZV9kYXRhKToKKyAgICAgICAgKFNpbXBseVB5cGlJbmRleFBhZ2VQYXJz ZXIuaGFuZGxlX2VuZHRhZyk6CisgICAgICAgIChTaW1wbHlQeXBpSW5kZXhQYWdlUGFyc2VyLnBh cnNlKToKKyAgICAgICAgKFBhY2thZ2UuYXJjaGl2ZXMpOgorCiAyMDIxLTAxLTI3ICBBbGljaWEg Qm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBydW4tZ3Rr LXRlc3RzOiBTdXBwb3J0IHJ1bm5pbmcgaW5kaXZpZHVhbCB0ZXN0cyBmb3IgR1Rlc3QgdGVzdCBz dWl0ZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CmluZGV4IGUyNDVhNzNjN2Q0MjVl NWMyMWI1ZGU4NDBkOTE4MTMwMzM5YzkzNjMuLjM2YTAxZGYwMjU2ZWQzOGM4ODcyYTc0MWI4Njc1 MGM4YTdiMmM2OTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNv cmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQpAQCAtMzgsMTMg KzM4LDQzIEBAIGZyb20gY29sbGVjdGlvbnMgaW1wb3J0IGRlZmF1bHRkaWN0CiBmcm9tIGxvZ2dp bmcgaW1wb3J0IE51bGxIYW5kbGVyCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgbG9nCiBmcm9t IHdlYmtpdGNvcmVweS52ZXJzaW9uIGltcG9ydCBWZXJzaW9uCi1mcm9tIHhtbC5kb20gaW1wb3J0 IG1pbmlkb20KIAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKICAgICBmcm9tIHVybGxp Yi5yZXF1ZXN0IGltcG9ydCB1cmxvcGVuCiAgICAgZnJvbSB1cmxsaWIuZXJyb3IgaW1wb3J0IFVS TEVycm9yCisgICAgZnJvbSBodG1sLnBhcnNlciBpbXBvcnQgSFRNTFBhcnNlcgogZWxzZToKICAg ICBmcm9tIHVybGxpYjIgaW1wb3J0IHVybG9wZW4sIFVSTEVycm9yCisgICAgZnJvbSBIVE1MUGFy c2VyIGltcG9ydCBIVE1MUGFyc2VyCisKKworY2xhc3MgU2ltcGx5UHlwaUluZGV4UGFnZVBhcnNl cihIVE1MUGFyc2VyKToKKyAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAgICAgIEhUTUxQYXJz ZXIuX19pbml0X18oc2VsZikKKyAgICAgICAgc2VsZi5wYWNrYWdlcyA9IFtdCisgICAgICAgIHNl bGYuY3VycmVudF9wYWNrYWdlID0gTm9uZQorCisgICAgZGVmIGhhbmRsZV9zdGFydHRhZyhzZWxm LCB0YWcsIGF0dHJzKToKKyAgICAgICAgaWYgdGFnID09ICJhIjoKKyAgICAgICAgICAgIGF0dHJz X2RpY3QgPSBkaWN0KGF0dHJzKQorICAgICAgICAgICAgaWYgImhyZWYiIG5vdCBpbiBhdHRyc19k aWN0OgorICAgICAgICAgICAgICAgIHJldHVybgorICAgICAgICAgICAgc2VsZi5jdXJyZW50X3Bh Y2thZ2UgPSBhdHRyc19kaWN0CisKKyAgICBkZWYgaGFuZGxlX2RhdGEoc2VsZiwgZGF0YSk6Cisg ICAgICAgIGlmIHNlbGYuY3VycmVudF9wYWNrYWdlIGlzIG5vdCBOb25lOgorICAgICAgICAgICAg c2VsZi5jdXJyZW50X3BhY2thZ2VbIm5hbWUiXSA9IGRhdGEKKworICAgIGRlZiBoYW5kbGVfZW5k dGFnKHNlbGYsIHRhZyk6CisgICAgICAgIGlmIHRhZyA9PSAiYSIgYW5kIHNlbGYuY3VycmVudF9w YWNrYWdlIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgc2VsZi5wYWNrYWdlcy5hcHBlbmQoc2Vs Zi5jdXJyZW50X3BhY2thZ2UpCisgICAgICAgICAgICBzZWxmLmN1cnJlbnRfcGFja2FnZSA9IE5v bmUKKworICAgIEBzdGF0aWNtZXRob2QKKyAgICBkZWYgcGFyc2UoaHRtbF90ZXh0KToKKyAgICAg ICAgcGFyc2VyID0gU2ltcGx5UHlwaUluZGV4UGFnZVBhcnNlcigpCisgICAgICAgIHBhcnNlci5m ZWVkKGh0bWxfdGV4dCkKKyAgICAgICAgcmV0dXJuIHBhcnNlci5wYWNrYWdlcwogCiAKIGNsYXNz IFBhY2thZ2Uob2JqZWN0KToKQEAgLTEyNiwyMyArMTU2LDEyIEBAIGNsYXNzIFBhY2thZ2Uob2Jq ZWN0KToKICAgICAgICAgICAgIGlmIHJlc3BvbnNlLmNvZGUgIT0gMjAwOgogICAgICAgICAgICAg ICAgIHJhaXNlIFZhbHVlRXJyb3IoJ1RoZSBwYWNrYWdlIHt9IHdhcyBub3QgZm91bmQgb24ge30n LmZvcm1hdChzZWxmLnB5cGlfbmFtZSwgQXV0b0luc3RhbGwuaW5kZXgpKQogCi0gICAgICAgICAg ICBwYWdlID0gbWluaWRvbS5wYXJzZVN0cmluZyhyZXNwb25zZS5yZWFkKCkpCisgICAgICAgICAg ICBwYWNrYWdlcyA9IFNpbXBseVB5cGlJbmRleFBhZ2VQYXJzZXIucGFyc2UocmVzcG9uc2UucmVh ZCgpLmRlY29kZSgiVVRGLTgiKSkKICAgICAgICAgICAgIGNhY2hlZF90YWdzID0gTm9uZQogCi0g ICAgICAgICAgICBmb3IgZWxlbWVudCBpbiByZXZlcnNlZChwYWdlLmdldEVsZW1lbnRzQnlUYWdO YW1lKCJhIikpOgotICAgICAgICAgICAgICAgIGlmIG5vdCBsZW4oZWxlbWVudC5jaGlsZE5vZGVz KToKLSAgICAgICAgICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAgICAgICBpZiBlbGVt ZW50LmNoaWxkTm9kZXNbMF0ubm9kZVR5cGUgIT0gbWluaWRvbS5Ob2RlLlRFWFRfTk9ERToKLSAg ICAgICAgICAgICAgICAgICAgY29udGludWUKLQotICAgICAgICAgICAgICAgIGF0dHJpYnV0ZXMg PSB7fQotICAgICAgICAgICAgICAgIGZvciBpbmRleCBpbiByYW5nZShlbGVtZW50LmF0dHJpYnV0 ZXMubGVuZ3RoKToKLSAgICAgICAgICAgICAgICAgICAgYXR0cmlidXRlc1tlbGVtZW50LmF0dHJp YnV0ZXMuaXRlbShpbmRleCkubmFtZV0gPSBlbGVtZW50LmF0dHJpYnV0ZXMuaXRlbShpbmRleCku dmFsdWUKLSAgICAgICAgICAgICAgICBpZiBub3QgYXR0cmlidXRlcy5nZXQoJ2hyZWYnLCBOb25l KToKLSAgICAgICAgICAgICAgICAgICAgY29udGludWUKLQorICAgICAgICAgICAgZm9yIHBhY2th Z2UgaW4gcmV2ZXJzZWQocGFja2FnZXMpOgogICAgICAgICAgICAgICAgIGlmIHNlbGYud2hlZWw6 Ci0gICAgICAgICAgICAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKHInListKFteLV0rLVteLV0r LVteLV0rKS53aGwnLCBlbGVtZW50LmNoaWxkTm9kZXNbMF0uZGF0YSkKKyAgICAgICAgICAgICAg ICAgICAgbWF0Y2ggPSByZS5zZWFyY2gocicuKy0oW14tXSstW14tXSstW14tXSspLndobCcsIHBh Y2thZ2VbJ25hbWUnXSkKICAgICAgICAgICAgICAgICAgICAgaWYgbm90IG1hdGNoOgogICAgICAg ICAgICAgICAgICAgICAgICAgY29udGludWUKIApAQCAtMTU3LDI1ICsxNzYsMjUgQEAgY2xhc3Mg UGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBleHRlbnNpb24gPSAnd2hsJwog CiAgICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgaWYgZWxlbWVudC5j aGlsZE5vZGVzWzBdLmRhdGEuZW5kc3dpdGgoKCcudGFyLmd6JywgJy50YXIuYnoyJykpOgorICAg ICAgICAgICAgICAgICAgICBpZiBwYWNrYWdlWyduYW1lJ10uZW5kc3dpdGgoKCcudGFyLmd6Jywg Jy50YXIuYnoyJykpOgogICAgICAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9uID0gJ3Rhci5n eicKLSAgICAgICAgICAgICAgICAgICAgZWxpZiBlbGVtZW50LmNoaWxkTm9kZXNbMF0uZGF0YS5l bmRzd2l0aCgnLnppcCcpOgorICAgICAgICAgICAgICAgICAgICBlbGlmIHBhY2thZ2VbJ25hbWUn XS5lbmRzd2l0aCgnLnppcCcpOgogICAgICAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9uID0g J3ppcCcKICAgICAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlCiAKLSAgICAgICAgICAgICAgICByZXF1aXJlcyA9IGF0dHJpYnV0ZXMuZ2V0KCdk YXRhLXJlcXVpcmVzLXB5dGhvbicpCisgICAgICAgICAgICAgICAgcmVxdWlyZXMgPSBwYWNrYWdl LmdldCgnZGF0YS1yZXF1aXJlcy1weXRob24nKQogICAgICAgICAgICAgICAgIGlmIHJlcXVpcmVz IGFuZCBub3QgQXV0b0luc3RhbGwudmVyc2lvbi5tYXRjaGVzKHJlcXVpcmVzKToKICAgICAgICAg ICAgICAgICAgICAgY29udGludWUKIAotICAgICAgICAgICAgICAgIHZlcnNpb25fY2FuZGlkYXRl ID0gcmUuc2VhcmNoKHInXGQrXC5cZCsoXC5cZCspPycsIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5k YXRhKQorICAgICAgICAgICAgICAgIHZlcnNpb25fY2FuZGlkYXRlID0gcmUuc2VhcmNoKHInXGQr XC5cZCsoXC5cZCspPycsIHBhY2thZ2VbIm5hbWUiXSkKICAgICAgICAgICAgICAgICBpZiBub3Qg dmVyc2lvbl9jYW5kaWRhdGU6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAg ICAgICAgICAgdmVyc2lvbiA9IFZlcnNpb24oKnZlcnNpb25fY2FuZGlkYXRlLmdyb3VwKCkuc3Bs aXQoJy4nKSkKICAgICAgICAgICAgICAgICBpZiBzZWxmLnZlcnNpb24gYW5kIHZlcnNpb24gbm90 IGluIHNlbGYudmVyc2lvbjoKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKIAotICAgICAg ICAgICAgICAgIGxpbmsgPSBhdHRyaWJ1dGVzWydocmVmJ10uc3BsaXQoJyMnKVswXQorICAgICAg ICAgICAgICAgIGxpbmsgPSBwYWNrYWdlWydocmVmJ10uc3BsaXQoJyMnKVswXQogICAgICAgICAg ICAgICAgIGlmICc6Ly8nIG5vdCBpbiBsaW5rOgogICAgICAgICAgICAgICAgICAgICBkZXB0aCA9 IDAKICAgICAgICAgICAgICAgICAgICAgd2hpbGUgbGluay5zdGFydHN3aXRoKCcuLi8nKToK 418784 2021-01-29 16:21:02 -0800 2021-02-01 12:37:50 -0800 Patch bug-221162-20210130012101.patch text/plain 6088 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmQxY2UzMjRjYTFiMzllMTRmODAxNzdhY2ZhMzk5ZjFl NGVmNDBkMi4uOTcxNTg0MjIxNzhlNWFiMzdlOGM4ZDk3ODM2MThmYTdiY2ZiMmU4ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTAxLTI5ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4K KworICAgICAgICBhdXRvaW5zdGFsbC5weTogRG9uJ3QgdXNlIGFuIFhNTCBwYXJzZXIgdG8gcGFy c2UgSFRNTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjIxMTYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VmVyeSByZWNlbnRseSBhdXRvaW5zdGFsbC5weSBzdGFydGVkIGZhaWxpbmcgYmVjYWdzZSB0aGUg cGFnZSByZXR1cm5lZAorICAgICAgICBieSBodHRwczovL3B5cGkub3JnL3NpbXBsZS9mYXN0ZW5l cnMvIG5vdyBjb250YWlucyBhIDxtZXRhPiB0YWcsIHdoaWNoCisgICAgICAgIGlzIG5vdCBwYXJz ZWFibGUgYXMgWE1MIHdpdGhvdXQgdGhlIHRyYWlsaW5nIHNsYXNoLgorCisgICAgICAgIERlc3Bp dGUgd2hhdCBhbiBpbml0aWFsIGZpeCBpbiByMjcyMDQxIHN0YXRlZCwgdGhpcyBpcyBub3QgY2F1 c2VkIGJ5CisgICAgICAgIGludmFsaWQgSFRNTDogPG1ldGE+IHRhZ3MgYXJlIG5vdCByZXF1aXJl ZCB0byBoYXZlIGFuIGVuZGluZyBzbGFzaCB0bworICAgICAgICBiZSBzdGFuZGFyZHMgY29tcGxp YW50IGluIGFueSB2ZXJzaW9uIG9mIEhUTUwuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXBsYWNl cyB0aGF0IGNvZGUgdG8gdXNlIGFuIEhUTUwgcGFyc2VyIGluc3RlYWQgb2YgYW4gWE1MCisgICAg ICAgIHBhcnNlciwgbWFraW5nIGl0IG1vcmUgcm9idXN0LgorCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAg ICAgKFNpbXBseVB5cGlJbmRleFBhZ2VQYXJzZXIpOgorICAgICAgICAoU2ltcGx5UHlwaUluZGV4 UGFnZVBhcnNlci5fX2luaXRfXyk6CisgICAgICAgIChTaW1wbHlQeXBpSW5kZXhQYWdlUGFyc2Vy LmhhbmRsZV9zdGFydHRhZyk6CisgICAgICAgIChTaW1wbHlQeXBpSW5kZXhQYWdlUGFyc2VyLmhh bmRsZV9kYXRhKToKKyAgICAgICAgKFNpbXBseVB5cGlJbmRleFBhZ2VQYXJzZXIuaGFuZGxlX2Vu ZHRhZyk6CisgICAgICAgIChTaW1wbHlQeXBpSW5kZXhQYWdlUGFyc2VyLnBhcnNlKToKKyAgICAg ICAgKFBhY2thZ2UuYXJjaGl2ZXMpOgorCiAyMDIxLTAxLTI5ICBNeWxlcyBDLiBNYXhmaWVsZCAg PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgVXBncmFkZSBtb3Rpb25tYXJrMS4xLnBs YW4gdG8gcjI3MjA0NApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKaW5kZXggYTM4MWYw ZGYyYTJjYmM1YmNmZTMyYzQwNjMxNTcyNjFlN2U3YjM2OC4uMzZhMDFkZjAyNTZlZDM4Yzg4NzJh NzQxYjg2NzUwYzhhN2IyYzY5NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQorKysgYi9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CkBA IC0zOCwxMyArMzgsNDMgQEAgZnJvbSBjb2xsZWN0aW9ucyBpbXBvcnQgZGVmYXVsdGRpY3QKIGZy b20gbG9nZ2luZyBpbXBvcnQgTnVsbEhhbmRsZXIKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBs b2cKIGZyb20gd2Via2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KLWZyb20geG1sLmRv bSBpbXBvcnQgbWluaWRvbQogCiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgogICAgIGZy b20gdXJsbGliLnJlcXVlc3QgaW1wb3J0IHVybG9wZW4KICAgICBmcm9tIHVybGxpYi5lcnJvciBp bXBvcnQgVVJMRXJyb3IKKyAgICBmcm9tIGh0bWwucGFyc2VyIGltcG9ydCBIVE1MUGFyc2VyCiBl bHNlOgogICAgIGZyb20gdXJsbGliMiBpbXBvcnQgdXJsb3BlbiwgVVJMRXJyb3IKKyAgICBmcm9t IEhUTUxQYXJzZXIgaW1wb3J0IEhUTUxQYXJzZXIKKworCitjbGFzcyBTaW1wbHlQeXBpSW5kZXhQ YWdlUGFyc2VyKEhUTUxQYXJzZXIpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAg SFRNTFBhcnNlci5fX2luaXRfXyhzZWxmKQorICAgICAgICBzZWxmLnBhY2thZ2VzID0gW10KKyAg ICAgICAgc2VsZi5jdXJyZW50X3BhY2thZ2UgPSBOb25lCisKKyAgICBkZWYgaGFuZGxlX3N0YXJ0 dGFnKHNlbGYsIHRhZywgYXR0cnMpOgorICAgICAgICBpZiB0YWcgPT0gImEiOgorICAgICAgICAg ICAgYXR0cnNfZGljdCA9IGRpY3QoYXR0cnMpCisgICAgICAgICAgICBpZiAiaHJlZiIgbm90IGlu IGF0dHJzX2RpY3Q6CisgICAgICAgICAgICAgICAgcmV0dXJuCisgICAgICAgICAgICBzZWxmLmN1 cnJlbnRfcGFja2FnZSA9IGF0dHJzX2RpY3QKKworICAgIGRlZiBoYW5kbGVfZGF0YShzZWxmLCBk YXRhKToKKyAgICAgICAgaWYgc2VsZi5jdXJyZW50X3BhY2thZ2UgaXMgbm90IE5vbmU6CisgICAg ICAgICAgICBzZWxmLmN1cnJlbnRfcGFja2FnZVsibmFtZSJdID0gZGF0YQorCisgICAgZGVmIGhh bmRsZV9lbmR0YWcoc2VsZiwgdGFnKToKKyAgICAgICAgaWYgdGFnID09ICJhIiBhbmQgc2VsZi5j dXJyZW50X3BhY2thZ2UgaXMgbm90IE5vbmU6CisgICAgICAgICAgICBzZWxmLnBhY2thZ2VzLmFw cGVuZChzZWxmLmN1cnJlbnRfcGFja2FnZSkKKyAgICAgICAgICAgIHNlbGYuY3VycmVudF9wYWNr YWdlID0gTm9uZQorCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBwYXJzZShodG1sX3RleHQp OgorICAgICAgICBwYXJzZXIgPSBTaW1wbHlQeXBpSW5kZXhQYWdlUGFyc2VyKCkKKyAgICAgICAg cGFyc2VyLmZlZWQoaHRtbF90ZXh0KQorICAgICAgICByZXR1cm4gcGFyc2VyLnBhY2thZ2VzCiAK IAogY2xhc3MgUGFja2FnZShvYmplY3QpOgpAQCAtMTI2LDI3ICsxNTYsMTIgQEAgY2xhc3MgUGFj a2FnZShvYmplY3QpOgogICAgICAgICAgICAgaWYgcmVzcG9uc2UuY29kZSAhPSAyMDA6CiAgICAg ICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignVGhlIHBhY2thZ2Uge30gd2FzIG5vdCBmb3Vu ZCBvbiB7fScuZm9ybWF0KHNlbGYucHlwaV9uYW1lLCBBdXRvSW5zdGFsbC5pbmRleCkpCiAKLSAg ICAgICAgICAgICMgSW4gc29tZSBjYXNlcywgcHlwaSBzZXJ2ZXMgaW52YWxpZCBodG1sCi0gICAg ICAgICAgICBjb250ZW50ID0gcmVzcG9uc2UucmVhZCgpCi0gICAgICAgICAgICBjb250ZW50ID0g cmUuc3ViKGInXHMrPG1ldGEgW15cbl0rPlxuJywgYicnLCBjb250ZW50KQotCi0gICAgICAgICAg ICBwYWdlID0gbWluaWRvbS5wYXJzZVN0cmluZyhjb250ZW50KQorICAgICAgICAgICAgcGFja2Fn ZXMgPSBTaW1wbHlQeXBpSW5kZXhQYWdlUGFyc2VyLnBhcnNlKHJlc3BvbnNlLnJlYWQoKS5kZWNv ZGUoIlVURi04IikpCiAgICAgICAgICAgICBjYWNoZWRfdGFncyA9IE5vbmUKIAotICAgICAgICAg ICAgZm9yIGVsZW1lbnQgaW4gcmV2ZXJzZWQocGFnZS5nZXRFbGVtZW50c0J5VGFnTmFtZSgiYSIp KToKLSAgICAgICAgICAgICAgICBpZiBub3QgbGVuKGVsZW1lbnQuY2hpbGROb2Rlcyk6Ci0gICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAgaWYgZWxlbWVudC5jaGls ZE5vZGVzWzBdLm5vZGVUeXBlICE9IG1pbmlkb20uTm9kZS5URVhUX05PREU6Ci0gICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlCi0KLSAgICAgICAgICAgICAgICBhdHRyaWJ1dGVzID0ge30KLSAg ICAgICAgICAgICAgICBmb3IgaW5kZXggaW4gcmFuZ2UoZWxlbWVudC5hdHRyaWJ1dGVzLmxlbmd0 aCk6Ci0gICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZXNbZWxlbWVudC5hdHRyaWJ1dGVzLml0 ZW0oaW5kZXgpLm5hbWVdID0gZWxlbWVudC5hdHRyaWJ1dGVzLml0ZW0oaW5kZXgpLnZhbHVlCi0g ICAgICAgICAgICAgICAgaWYgbm90IGF0dHJpYnV0ZXMuZ2V0KCdocmVmJywgTm9uZSk6Ci0gICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0KKyAgICAgICAgICAgIGZvciBwYWNrYWdlIGluIHJl dmVyc2VkKHBhY2thZ2VzKToKICAgICAgICAgICAgICAgICBpZiBzZWxmLndoZWVsOgotICAgICAg ICAgICAgICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaChyJy4rLShbXi1dKy1bXi1dKy1bXi1dKyku d2hsJywgZWxlbWVudC5jaGlsZE5vZGVzWzBdLmRhdGEpCisgICAgICAgICAgICAgICAgICAgIG1h dGNoID0gcmUuc2VhcmNoKHInListKFteLV0rLVteLV0rLVteLV0rKS53aGwnLCBwYWNrYWdlWydu YW1lJ10pCiAgICAgICAgICAgICAgICAgICAgIGlmIG5vdCBtYXRjaDoKICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlCiAKQEAgLTE2MSwyNSArMTc2LDI1IEBAIGNsYXNzIFBhY2thZ2Uo b2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9uID0gJ3dobCcKIAogICAgICAg ICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIGlmIGVsZW1lbnQuY2hpbGROb2Rl c1swXS5kYXRhLmVuZHN3aXRoKCgnLnRhci5neicsICcudGFyLmJ6MicpKToKKyAgICAgICAgICAg ICAgICAgICAgaWYgcGFja2FnZVsnbmFtZSddLmVuZHN3aXRoKCgnLnRhci5neicsICcudGFyLmJ6 MicpKToKICAgICAgICAgICAgICAgICAgICAgICAgIGV4dGVuc2lvbiA9ICd0YXIuZ3onCi0gICAg ICAgICAgICAgICAgICAgIGVsaWYgZWxlbWVudC5jaGlsZE5vZGVzWzBdLmRhdGEuZW5kc3dpdGgo Jy56aXAnKToKKyAgICAgICAgICAgICAgICAgICAgZWxpZiBwYWNrYWdlWyduYW1lJ10uZW5kc3dp dGgoJy56aXAnKToKICAgICAgICAgICAgICAgICAgICAgICAgIGV4dGVuc2lvbiA9ICd6aXAnCiAg ICAgICAgICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51 ZQogCi0gICAgICAgICAgICAgICAgcmVxdWlyZXMgPSBhdHRyaWJ1dGVzLmdldCgnZGF0YS1yZXF1 aXJlcy1weXRob24nKQorICAgICAgICAgICAgICAgIHJlcXVpcmVzID0gcGFja2FnZS5nZXQoJ2Rh dGEtcmVxdWlyZXMtcHl0aG9uJykKICAgICAgICAgICAgICAgICBpZiByZXF1aXJlcyBhbmQgbm90 IEF1dG9JbnN0YWxsLnZlcnNpb24ubWF0Y2hlcyhyZXF1aXJlcyk6CiAgICAgICAgICAgICAgICAg ICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAgICAgICB2ZXJzaW9uX2NhbmRpZGF0ZSA9IHJlLnNl YXJjaChyJ1xkK1wuXGQrKFwuXGQrKT8nLCBlbGVtZW50LmNoaWxkTm9kZXNbMF0uZGF0YSkKKyAg ICAgICAgICAgICAgICB2ZXJzaW9uX2NhbmRpZGF0ZSA9IHJlLnNlYXJjaChyJ1xkK1wuXGQrKFwu XGQrKT8nLCBwYWNrYWdlWyJuYW1lIl0pCiAgICAgICAgICAgICAgICAgaWYgbm90IHZlcnNpb25f Y2FuZGlkYXRlOgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgICAg IHZlcnNpb24gPSBWZXJzaW9uKCp2ZXJzaW9uX2NhbmRpZGF0ZS5ncm91cCgpLnNwbGl0KCcuJykp CiAgICAgICAgICAgICAgICAgaWYgc2VsZi52ZXJzaW9uIGFuZCB2ZXJzaW9uIG5vdCBpbiBzZWxm LnZlcnNpb246CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAgICAg ICBsaW5rID0gYXR0cmlidXRlc1snaHJlZiddLnNwbGl0KCcjJylbMF0KKyAgICAgICAgICAgICAg ICBsaW5rID0gcGFja2FnZVsnaHJlZiddLnNwbGl0KCcjJylbMF0KICAgICAgICAgICAgICAgICBp ZiAnOi8vJyBub3QgaW4gbGluazoKICAgICAgICAgICAgICAgICAgICAgZGVwdGggPSAwCiAgICAg ICAgICAgICAgICAgICAgIHdoaWxlIGxpbmsuc3RhcnRzd2l0aCgnLi4vJyk6Cg==