229185 2021-08-17 05:05:21 -0700 [Flatpak SDK] Increase the startup performance of webkit-flatpak 2021-08-18 02:14:20 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mrobinson mrobinson pnormand webkit-bug-importer oldest_to_newest 1784784 0 mrobinson 2021-08-17 05:05:21 -0700 There's currently quite a log of lag when running webkit-flatpak, which affects everything from build-webkit to run-webkit-tests. We can improve this lag by making sure that webkit-flatpak calls flatpak to get remote and package lists the minimal number of times. 1784847 1 435694 mrobinson 2021-08-17 09:20:47 -0700 Created attachment 435694 Patch 1785071 2 435694 pnormand 2021-08-18 01:39:24 -0700 Comment on attachment 435694 Patch Impressive speed-up, thank you so much for working on this. 1785072 3 435694 mrobinson 2021-08-18 01:44:06 -0700 Comment on attachment 435694 Patch Thank you kindly for the review. 1785074 4 ews-feeder 2021-08-18 02:13:54 -0700 Committed r281184 (240629@main): <https://commits.webkit.org/240629@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435694. 1785075 5 webkit-bug-importer 2021-08-18 02:14:20 -0700 <rdar://problem/82067811> 435694 2021-08-17 09:20:47 -0700 2021-08-18 02:13:55 -0700 Patch bug-229185-20210817182046.patch text/plain 13041 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDdlZDBkZjM0NDA0ODE4YjVjNzc3MGQ3MjU0ZDY0NjBm YjY1MDJlOS4uOGZmZjg0MTFlMzFjOTk0OTY5OGYyNWY1NTBkNmUzNTNhNzY1NTE5ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUy IEBACisyMDIxLTA4LTE3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4K KworICAgICAgICBbRmxhdHBhayBTREtdIEluY3JlYXNlIHRoZSBzdGFydHVwIHBlcmZvcm1hbmNl IG9mIHdlYmtpdC1mbGF0cGFrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjkxODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbXByb3ZlIGZsYXRwYWt1dGlscy5weSBieSBlbnN1cmluZyB0aGF0IHdlIGRv bid0IG1ha2UgcmVkdW5kYW50CisgICAgICAgIGNhbGxzIHRvIGZsYXRwYWsgZHVyaW5nIGluaXRp YWxpemF0aW9uIG9mIHRoZSBkYXRhIHN0cnVjdHVyZXMuIFRoaXMKKyAgICAgICAgc2F2ZXMgNSBz ZWNvbmRzIG9uIGV2ZXJ5IGNhbGwgdG8gYnVpbGQtd2Via2l0IGFuZCBydW4td2Via2l0LXRlc3Rz LgorCisgICAgICAgIEJlZm9yZToKKyAgICAgICAgICAgICQgdGltZSAuL1Rvb2xzL1NjcmlwdHMv d2Via2l0LWZsYXRwYWsgLWMgdHJ1ZQorICAgICAgICAgICAgcmVhbCAgICAwbTYsMjk3cworICAg ICAgICAgICAgdXNlciAgICAwbTAsNzg2cworICAgICAgICAgICAgc3lzICAgICAwbTAsNTEzcwor CisgICAgICAgIEFmdGVyOgorICAgICAgICAgICAgJCB0aW1lIC4vVG9vbHMvU2NyaXB0cy93ZWJr aXQtZmxhdHBhayAtYyB0cnVlCisgICAgICAgICAgICByZWFsICAgIDBtMSwyNDNzCisgICAgICAg ICAgICB1c2VyICAgIDBtMCwzNzVzCisgICAgICAgICAgICBzeXMgICAgIDBtMCwxNjJzCisKKyAg ICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAgKEZsYXRwYWtQYWNrYWdl cy5fX2luaXRfXyk6IFNlcGFyYXRlIHRoZSB1cGRhdGUgaW50byBhbm90aGVyCisgICAgICAgIG1l dGhvZCBzbyB0aGF0IGl0IGNhbiBiZSBjYWxsZWQgZGlyZWN0bHkgd2hlbiBhIHBhY2thZ2UgaXMg aW5zdGFsbGVkLgorICAgICAgICBBZGQgbmV3IHBhY2thZ2VzIGRpcmVjdGx5IHRvIHNlbGYucGFj a2FnZXMuCisgICAgICAgIChGbGF0cGFrUmVwb3MuX19pbml0X18pOiBFbnN1cmUgdGhhdCB3ZSBv bmx5IHVwZGF0ZSBvdXIgcmVwb3NpdG9yaWVzCisgICAgICAgIGFuZCBwYWNrYWdlIGxpc3Qgb25j ZSB3ZSd2ZSBpbml0aWFsaXplZCBvdXIgbGlzdCBvZiByZXBvc2l0b3JpZXMuCisgICAgICAgIChG bGF0cGFrUmVwb3MuYWRkKTogUmV0dXJuIFRydWUgaWYgdGhpcyBtZXRob2QgYWN0dWFsbHkgY2hh bmdlZCBhbnl0aGluZworICAgICAgICBhbmQgYWNjZXB0IGEgcGFyYW1ldGVyIGRldGVybWluaW5n IHdoZXRoZXIgYW4gdXBkYXRlIGlzIGRvbmUgdG8KKyAgICAgICAgdGhlIHJlcG9zaXRvcnkgYW5k IHBhY2thZ2UgbGlzdC4KKyAgICAgICAgKEZsYXRwYWtSZXBvcy5pc19wYWNrYWdlX2luc3RhbGxl ZCk6IEFkZGVkIHRoaXMgbWV0aG9kIHdoaWNoIHJlcGxhY2VzCisgICAgICAgIEZsYXRwYWtSZXBv LmlzX2FwcF9pbnN0YWxsZWQuCisgICAgICAgIChGbGF0cGFrUmVwby5fX2luaXRfXyk6IFJlbW92 ZSB0aGUgYXBwIHJlZ2lzdHJ5IGJlY2F1c2UgaXQgaXMgZHVwbGljYXRlZAorICAgICAgICBieSBG bGF0cGFrUGFja2FnZXMuCisgICAgICAgIChGbGF0cGFrUGFja2FnZS5pc19pbnN0YWxsZWQpOiBO b3cgY2FsbCBGbGF0cGFrUmVwb3MuaXNfcGFja2FnZV9pbnN0YWxsZWQuCisgICAgICAgIChXZWJr aXRGbGF0cGFrLl9yZXNldF9yZXBvc2l0b3J5KTogU2V0IHVwIGJvdGggcmVwb3NpdG9yaWVzIGhl cmUgYW5kCisgICAgICAgIHBhc3MgdGhlbiBhcyBwYXJ0IG9mIHRoZSBGbGF0cGFrUmVwb3MgY29u c3RydWN0b3IuCisgICAgICAgIChXZWJraXRGbGF0cGFrLm1haW4pOiBTZXBhcmF0ZSBvdXQgdGhl IGNoZWNrIHdoaWNoIGRlbGV0ZXMgdGhlIEZsYXRwYWsKKyAgICAgICAgcmVwb3NpdG9yeSBmcm9t IHRoZSBvbmUgdGhhdCBjaGVja3MgaWYgdGhlIHBhY2thZ2VzIGFyZSBpbnN0YWxsZWQuIFRoaXMK KyAgICAgICAgbWFrZXMgc3VyZSB3ZSBkb24ndCBpbnN0YWxsIHBhY2thZ2VzIGFuZCB0aGVuIGlt bWVkaWF0ZWx5IGRlbGV0ZSB0aGVtLgorICAgICAgICAoV2Via2l0RmxhdHBhay5jaGVja19pbnN0 YWxsZWRfcGFja2FnZXMpOiByZW5hbWUgX2dldF9wYWNrYWdlcyB0byBfZ2V0X2RlcGVuZGVuY3lf cGFja2FnZXMKKyAgICAgICAgaW4gb3JkZXIgdG8gbWFrZSBpdCBjbGVhciB0aGF0IGl0IGRvZXNu J3QgcmV0dXJuIGluc3RhbGxlZCBwYWNrYWdlcy4KKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX2dl dF9kZXBlbmRlbmN5X3BhY2thZ2VzKTogRGl0dG8uCisgICAgICAgIChXZWJraXRGbGF0cGFrLmlu c3RhbGxfYWxsKTogRGl0dG8uCisgICAgICAgIChGbGF0cGFrUmVwby5pc19hcHBfaW5zdGFsbGVk KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX2dldF9wYWNrYWdlcyk6IERlbGV0 ZWQuCisKIDIwMjEtMDgtMTYgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTihyMjgxMDc5KSBbR0xJQl0gQVBJIHRlc3QgV2ViS2l0V2Vic2l0ZURh dGEvZGV2aWNlaWRoYXNoc2FsdCBpcyBub3Qgd2FpdGluZyBmb3IgdGl0bGUgY2hhbmdlCmRpZmYg LS1naXQgYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxh dHBha3V0aWxzLnB5CmluZGV4IGI0ZDE5ZjA5MDdlMTIyODY0MjUxYTA0Y2EzYmY2YjNhZmJkMTkx MTEuLjI0NGVmZjg1YWY3Y2VkOTA2ZmIyYzhmNjA4NmM1NmQ3ZTU4NjVmMjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBh a3V0aWxzLnB5CkBAIC0yMjgsMTAgKzIyOCwxMSBAQCBjbGFzcyBGbGF0cGFrUGFja2FnZXMoRmxh dHBha09iamVjdCk6CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgcmVwb3MsIHVzZXI9VHJ1ZSk6 CiAgICAgICAgIEZsYXRwYWtPYmplY3QuX19pbml0X18oc2VsZiwgdXNlcj11c2VyKQotCiAgICAg ICAgIHNlbGYucmVwb3MgPSByZXBvcworICAgICAgICBzZWxmLnVwZGF0ZSgpCiAKLSAgICAgICAg cGFja3MgPSBbXQorICAgIGRlZiB1cGRhdGUoc2VsZik6CisgICAgICAgIHNlbGYucGFja2FnZXMg PSBbXQogICAgICAgICBvdXQgPSBzZWxmLmZsYXRwYWsoImxpc3QiLCAiLS1jb2x1bW5zPWFwcGxp Y2F0aW9uLGFyY2gsYnJhbmNoLG9yaWdpbiIsICItYSIsIGdhdGhlcl9vdXRwdXQ9VHJ1ZSkKICAg ICAgICAgcGFja2FnZV9kZWZzID0gW2xpbmUgZm9yIGxpbmUgaW4gb3V0LnNwbGl0KCJcbiIpIGlm IGxpbmVdCiAgICAgICAgIGZvciBwYWNrYWdlX2RlZiBpbiBwYWNrYWdlX2RlZnM6CkBAIC0yMzks MTAgKzI0MCw3IEBAIGNsYXNzIEZsYXRwYWtQYWNrYWdlcyhGbGF0cGFrT2JqZWN0KToKIAogICAg ICAgICAgICAgIyBJZiBpbnN0YWxsZWQgZnJvbSBhIGZpbGUsIHRoZSBwYWNrYWdlIGlzIGluIG5v IHJlcG8KICAgICAgICAgICAgIHJlcG8gPSBzZWxmLnJlcG9zLnJlcG9zLmdldChvcmlnaW4pCi0K LSAgICAgICAgICAgIHBhY2tzLmFwcGVuZChGbGF0cGFrUGFja2FnZShuYW1lLCBicmFuY2gsIHJl cG8sIGFyY2gpKQotCi0gICAgICAgIHNlbGYucGFja2FnZXMgPSBwYWNrcworICAgICAgICAgICAg c2VsZi5wYWNrYWdlcy5hcHBlbmQoRmxhdHBha1BhY2thZ2UobmFtZSwgYnJhbmNoLCByZXBvLCBh cmNoKSkKIAogICAgIGRlZiBfX2l0ZXJfXyhzZWxmKToKICAgICAgICAgZm9yIHBhY2thZ2UgaW4g c2VsZi5wYWNrYWdlczoKQEAgLTI1MSwxMSArMjQ5LDE4IEBAIGNsYXNzIEZsYXRwYWtQYWNrYWdl cyhGbGF0cGFrT2JqZWN0KToKIAogY2xhc3MgRmxhdHBha1JlcG9zKEZsYXRwYWtPYmplY3QpOgog Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHVzZXI9VHJ1ZSk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIHJlcG9zLCB1c2VyPVRydWUpOgogICAgICAgICBGbGF0cGFrT2JqZWN0Ll9faW5pdF9fKHNl bGYsIHVzZXI9dXNlcikKLSAgICAgICAgc2VsZi5yZXBvcyA9IHt9CiAgICAgICAgIHNlbGYudXBk YXRlKCkKIAorICAgICAgICB1cGRhdGVkID0gRmFsc2UKKyAgICAgICAgZm9yIHJlcG8gaW4gcmVw b3M6CisgICAgICAgICAgICB1cGRhdGVkID0gc2VsZi5hZGQocmVwbywgdXBkYXRlPUZhbHNlKSBv ciB1cGRhdGVkCisKKyAgICAgICAgIyBPbmx5IGZldGNoIHRoZSByZW1vdGUgYW5kIHBhY2thZ2Ug bGlzdCBhZ2FpbiBpZiB3ZSB1cGRhdGVkIGFueXRoaW5nLgorICAgICAgICBpZiB1cGRhdGVkOgor ICAgICAgICAgICAgc2VsZi51cGRhdGUoKQorCiAgICAgZGVmIHVwZGF0ZShzZWxmKToKICAgICAg ICAgc2VsZi5yZXBvcyA9IHt9CiAgICAgICAgIG91dCA9IHNlbGYuZmxhdHBhaygicmVtb3RlLWxp c3QiLCAiLS1jb2x1bW5zPW5hbWUsdGl0bGUsdXJsIiwgZ2F0aGVyX291dHB1dD1UcnVlKQpAQCAt MjcxLDM1ICsyNzYsNDYgQEAgY2xhc3MgRmxhdHBha1JlcG9zKEZsYXRwYWtPYmplY3QpOgogCiAg ICAgICAgIHNlbGYucGFja2FnZXMgPSBGbGF0cGFrUGFja2FnZXMoc2VsZikKIAotICAgIGRlZiBh ZGQoc2VsZiwgcmVwbywgb3ZlcnJpZGU9VHJ1ZSk6CisgICAgZGVmIGFkZChzZWxmLCByZXBvLCB1 cGRhdGU9VHJ1ZSwgb3ZlcnJpZGU9VHJ1ZSk6CiAgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJl cG8ucmVwb3MgPSBzZWxmCisKICAgICAgICAgICAgIHNhbWVfbmFtZSA9IE5vbmUKICAgICAgICAg ICAgIGZvciBuYW1lLCB0bXByZXBvIGluIHNlbGYucmVwb3MuaXRlbXMoKToKICAgICAgICAgICAg ICAgICBpZiByZXBvLnVybCA9PSB0bXByZXBvLnVybDoKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHRtcHJlcG8KKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgICAg ICAgICAgZWxpZiByZXBvLm5hbWUgPT0gbmFtZToKICAgICAgICAgICAgICAgICAgICAgc2FtZV9u YW1lID0gdG1wcmVwbwogCiAgICAgICAgICAgICBpZiBzYW1lX25hbWU6Ci0gICAgICAgICAgICAg ICAgaWYgb3ZlcnJpZGU6CisgICAgICAgICAgICAgICAgaWYgb3ZlcnJpZGUgYW5kIHNhbWVfbmFt ZS51cmwgIT0gcmVwby51cmw6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuZmxhdHBhaygicmVt b3RlLW1vZGlmeSIsIHJlcG8ubmFtZSwgIi0tdXJsPSIgKyByZXBvLnVybCkKICAgICAgICAgICAg ICAgICAgICAgc2FtZV9uYW1lLnVybCA9IHJlcG8udXJsCi0KLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHNhbWVfbmFtZQotICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAg ICAgIHJldHVybiBOb25lCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIGFyZ3Mg PSBbInJlbW90ZS1hZGQiLCByZXBvLm5hbWUsICItLWlmLW5vdC1leGlzdHMiXQotICAgICAgICAg ICAgICAgIGlmIHJlcG8ucmVwb19maWxlOgotICAgICAgICAgICAgICAgICAgICBhcmdzLmV4dGVu ZChbIi0tZnJvbSIsIHJlcG8ucmVwb19maWxlLm5hbWVdKQorICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gVHJ1ZQogICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIGFy Z3MuZXh0ZW5kKFsiLS1uby1ncGctdmVyaWZ5IiwgcmVwby51cmxdKQotICAgICAgICAgICAgICAg IHNlbGYuZmxhdHBhaygqYXJncywgY29tbWVudD0iQWRkaW5nIHJlcG8gJXMiICUgcmVwby5uYW1l KQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICAgICAgcmVwby5y ZXBvcyA9IHNlbGYKLSAgICAgICAgICAgIHJldHVybiByZXBvCisgICAgICAgICAgICBhcmdzID0g WyJyZW1vdGUtYWRkIiwgcmVwby5uYW1lLCAiLS1pZi1ub3QtZXhpc3RzIl0KKyAgICAgICAgICAg IGlmIHJlcG8ucmVwb19maWxlOgorICAgICAgICAgICAgICAgIGFyZ3MuZXh0ZW5kKFsiLS1mcm9t IiwgcmVwby5yZXBvX2ZpbGUubmFtZV0pCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAg ICAgIGFyZ3MuZXh0ZW5kKFsiLS1uby1ncGctdmVyaWZ5IiwgcmVwby51cmxdKQorICAgICAgICAg ICAgc2VsZi5mbGF0cGFrKCphcmdzLCBjb21tZW50PSJBZGRpbmcgcmVwbyAlcyIgJSByZXBvLm5h bWUpCisgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICBmaW5hbGx5OgotICAgICAgICAg ICAgc2VsZi51cGRhdGUoKQorICAgICAgICAgICAgaWYgdXBkYXRlOgorICAgICAgICAgICAgICAg IHNlbGYucGFja2FnZXMgPSBGbGF0cGFrUGFja2FnZXMoc2VsZikKKworICAgIGRlZiBpc19wYWNr YWdlX2luc3RhbGxlZChzZWxmLCBuYW1lLCBicmFuY2g9Tm9uZSwgYXJjaD1Ob25lKToKKyAgICAg ICAgZm9yIHBhY2thZ2UgaW4gc2VsZi5wYWNrYWdlczoKKyAgICAgICAgICAgIGlmIG5hbWUgIT0g cGFja2FnZS5uYW1lOgorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgICAgICBpZiBi cmFuY2ggYW5kIGJyYW5jaCAhPSBwYWNrYWdlLmJyYW5jaDoKKyAgICAgICAgICAgICAgICBjb250 aW51ZQorICAgICAgICAgICAgaWYgYXJjaCBhbmQgYXJjaCAhPSBwYWNrYWdlLmFyY2g6CisgICAg ICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIHJldHVybiBUcnVlCisgICAgICAgIHJl dHVybiBGYWxzZQogCiAKIGNsYXNzIEZsYXRwYWtSZXBvKEZsYXRwYWtPYmplY3QpOgpAQCAtMzI1 LDIxICszNDEsNiBAQCBjbGFzcyBGbGF0cGFrUmVwbyhGbGF0cGFrT2JqZWN0KToKICAgICAgICAg ZWxzZToKICAgICAgICAgICAgIGFzc2VydCB1cmwKIAotICAgICAgICBzZWxmLl9hcHBfcmVnaXN0 cnkgPSB7fQotICAgICAgICBvdXRwdXQgPSBzZWxmLmZsYXRwYWsoImxpc3QiLCAiLS1jb2x1bW5z PWFwcGxpY2F0aW9uLGJyYW5jaCIsICItYSIsIGdhdGhlcl9vdXRwdXQ9VHJ1ZSkKLSAgICAgICAg Zm9yIGxpbmUgaW4gb3V0cHV0LnNwbGl0bGluZXMoKToKLSAgICAgICAgICAgIG5hbWUsIGJyYW5j aCA9IGxpbmUuc3BsaXQoIlx0IikKLSAgICAgICAgICAgIHNlbGYuX2FwcF9yZWdpc3RyeVtuYW1l XSA9IGJyYW5jaAotCi0gICAgZGVmIGlzX2FwcF9pbnN0YWxsZWQoc2VsZiwgbmFtZSwgYnJhbmNo PU5vbmUpOgotICAgICAgICBpZiBicmFuY2g6Ci0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAg ICAgICAgcmV0dXJuIHNlbGYuX2FwcF9yZWdpc3RyeVtuYW1lXSA9PSBicmFuY2gKLSAgICAgICAg ICAgIGV4Y2VwdCBLZXlFcnJvcjoKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAg ICAgZWxzZToKLSAgICAgICAgICAgIHJldHVybiBuYW1lIGluIHNlbGYuX2FwcF9yZWdpc3RyeS5r ZXlzKCkKLQogICAgIEBwcm9wZXJ0eQogICAgIGRlZiByZXBvX2ZpbGUoc2VsZik6CiAgICAgICAg IGlmIHNlbGYuX3JlcG9fZmlsZToKQEAgLTM3MywxNSArMzc0LDEwIEBAIGNsYXNzIEZsYXRwYWtQ YWNrYWdlKEZsYXRwYWtPYmplY3QpOgogICAgICAgICByZXR1cm4gIiVzLyVzLyVzIiAlIChzZWxm Lm5hbWUsIHNlbGYuYXJjaCwgc2VsZi5icmFuY2gpCiAKICAgICBkZWYgaXNfaW5zdGFsbGVkKHNl bGYsIGJyYW5jaCk6CisgICAgICAgICMgQnVuZGxlcyBpbnN0YWxsZWQgZnJvbSBmaWxlcyBkbyBu b3QgaGF2ZSByZXBvc2l0b3JpZXMuCiAgICAgICAgIGlmIG5vdCBzZWxmLnJlcG86Ci0gICAgICAg ICAgICAjIEJ1bmRsZSBpbnN0YWxsZWQgZnJvbSBmaWxlCiAgICAgICAgICAgICByZXR1cm4gVHJ1 ZQotCi0gICAgICAgIGZvciBwYWNrYWdlIGluIHNlbGYucmVwby5yZXBvcy5wYWNrYWdlczoKLSAg ICAgICAgICAgIGlmIHBhY2thZ2UubmFtZSA9PSBzZWxmLm5hbWUgYW5kIHBhY2thZ2UuYnJhbmNo ID09IGJyYW5jaCBhbmQgcGFja2FnZS5hcmNoID09IHNlbGYuYXJjaDoKLSAgICAgICAgICAgICAg ICByZXR1cm4gVHJ1ZQotCi0gICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICByZXR1cm4gc2Vs Zi5yZXBvLnJlcG9zLmlzX3BhY2thZ2VfaW5zdGFsbGVkKHNlbGYubmFtZSwgYnJhbmNoLCBzZWxm LmFyY2gpCiAKICAgICBkZWYgaW5zdGFsbChzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYucmVw bzoKQEAgLTM5MSw2ICszODcsNyBAQCBjbGFzcyBGbGF0cGFrUGFja2FnZShGbGF0cGFrT2JqZWN0 KToKICAgICAgICAgYXJncyA9ICgiaW5zdGFsbCIsIHNlbGYucmVwby5uYW1lLCBzZWxmLm5hbWUs ICItLXJlaW5zdGFsbCIsIGJyYW5jaCkKICAgICAgICAgY29tbWVudCA9ICJJbnN0YWxsaW5nIGZy b20gIiArIHNlbGYucmVwby5uYW1lICsgIiAiICsgc2VsZi5uYW1lICsgIiAiICsgc2VsZi5hcmNo ICsgIiAiICsgYnJhbmNoCiAgICAgICAgIHNlbGYuZmxhdHBhaygqYXJncywgY29tbWVudD1jb21t ZW50KQorICAgICAgICBzZWxmLnJlcG8ucmVwb3MucGFja2FnZXMudXBkYXRlKCkKIAogICAgIGRl ZiB1cGRhdGUoc2VsZik6CiAgICAgICAgIGlmIG5vdCBzZWxmLmlzX2luc3RhbGxlZChzZWxmLmJy YW5jaCk6CkBAIC02MDMsMTMgKzYwMCwxNiBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAg ICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIF9yZXNldF9yZXBvc2l0b3J5KHNlbGYpOgotICAgICAg ICBzZWxmLnJlcG9zID0gRmxhdHBha1JlcG9zKCkKICAgICAgICAgdXJsID0gImh0dHBzOi8vc29m dHdhcmUuaWdhbGlhLmNvbS93ZWJraXQtc2RrLXJlcG8vIgogICAgICAgICByZXBvX2ZpbGUgPSAi aHR0cHM6Ly9zb2Z0d2FyZS5pZ2FsaWEuY29tL2ZsYXRwYWstcmVmcy93ZWJraXQtc2RrLmZsYXRw YWtyZXBvIgogICAgICAgICBpZiBzZWxmLnVzZXJfcmVwbzoKICAgICAgICAgICAgIHVybCA9ICJm aWxlOi8vJXMiICUgc2VsZi51c2VyX3JlcG8KICAgICAgICAgICAgIHJlcG9fZmlsZSA9IE5vbmUK LSAgICAgICAgc2VsZi5zZGtfcmVwbyA9IHNlbGYucmVwb3MuYWRkKEZsYXRwYWtSZXBvKCJ3ZWJr aXQtc2RrIiwgdXJsPXVybCwgcmVwb19maWxlPXJlcG9fZmlsZSkpCisKKyAgICAgICAgc2VsZi5z ZGtfcmVwbyA9IEZsYXRwYWtSZXBvKCJ3ZWJraXQtc2RrIiwgdXJsPXVybCwgcmVwb19maWxlPXJl cG9fZmlsZSkKKyAgICAgICAgc2VsZi5mbGF0aHViX3JlcG8gPSBGbGF0cGFrUmVwbygiZmxhdGh1 YiIsIHVybD0iaHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9yZXBvLyIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmVwb19maWxlPSJodHRwczovL2RsLmZsYXRodWIub3Jn L3JlcG8vZmxhdGh1Yi5mbGF0cGFrcmVwbyIpCisgICAgICAgIHNlbGYucmVwb3MgPSBGbGF0cGFr UmVwb3MoW3NlbGYuc2RrX3JlcG8sIHNlbGYuIGZsYXRodWJfcmVwb10pCiAKICAgICBkZWYgc2V0 dXBfYnVpbGRkaXIoc2VsZik6CiAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9p bihzZWxmLmZsYXRwYWtfYnVpbGRfcGF0aCwgIm1ldGFkYXRhIikpOgpAQCAtOTg2LDE3ICs5ODYs MjEgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAgIHJlcG8uZmxhdHBhaygidXBk YXRlIiwgY29tbWVudD0iVXBkYXRpbmcgRmxhdHBhayAlcyBlbnZpcm9ubWVudCIgJSBzZWxmLmJ1 aWxkX3R5cGUpCiAgICAgICAgICAgICByZWdlbmVyYXRlX3Rvb2xjaGFpbnMgPSAocmVwby52ZXJz aW9uKCJvcmcud2Via2l0LlNkayIpICE9IHZlcnNpb25fYmVmb3JlX3VwZGF0ZSkgb3Igbm90IHNl bGYuY2hlY2tfdG9vbGNoYWluc19nZW5lcmF0ZWQoKQogCi0gICAgICAgICAgICBmb3IgcGFja2Fn ZSBpbiBzZWxmLl9nZXRfcGFja2FnZXMoKToKLSAgICAgICAgICAgICAgICBpZiBwYWNrYWdlLm5h bWUuc3RhcnRzd2l0aCgib3JnLndlYmtpdCIpIGFuZCByZXBvLmlzX2FwcF9pbnN0YWxsZWQocGFj a2FnZS5uYW1lKSBcCi0gICAgICAgICAgICAgICAgICAgYW5kIG5vdCByZXBvLmlzX2FwcF9pbnN0 YWxsZWQocGFja2FnZS5uYW1lLCBicmFuY2g9c2VsZi5zZGtfYnJhbmNoKToKKyAgICAgICAgICAg ICMgSWYgd2UgaGF2ZSBhbiBvdXQtb2YtZGF0ZSBwYWNrYWdlLCBzaW1wbHkgcmVtb3ZlIHRoZSBl bnRpcmUgZmxhdHBhayBkaXJlY3RvcnkgYW5kIHN0YXJ0IG92ZXIuCisgICAgICAgICAgICBmb3Ig cGFja2FnZSBpbiBzZWxmLl9nZXRfZGVwZW5kZW5jeV9wYWNrYWdlcygpOgorICAgICAgICAgICAg ICAgIGlmIHBhY2thZ2UubmFtZS5zdGFydHN3aXRoKCJvcmcud2Via2l0IikgXAorICAgICAgICAg ICAgICAgICAgIGFuZCBzZWxmLnJlcG9zLmlzX3BhY2thZ2VfaW5zdGFsbGVkKHBhY2thZ2UubmFt ZSkgXAorICAgICAgICAgICAgICAgICAgIGFuZCBub3Qgc2VsZi5yZXBvcy5pc19wYWNrYWdlX2lu c3RhbGxlZChwYWNrYWdlLm5hbWUsIGJyYW5jaD1zZWxmLnNka19icmFuY2gpOgogICAgICAgICAg ICAgICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIk5ldyBTREsgdmVyc2lvbiBhdmFpbGFibGUsIHJl bW92aW5nIGxvY2FsIFVzZXJGbGF0cGFrIGRpcmVjdG9yeSBiZWZvcmUgc3dpdGNoaW5nIHRvIG5l dyB2ZXJzaW9uIikKICAgICAgICAgICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShzZWxmLmZsYXRw YWtfYnVpbGRfcGF0aCkKICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcmVzZXRfcmVwb3NpdG9y eSgpCi0gICAgICAgICAgICAgICAgICAgIHJlZ2VuZXJhdGVfdG9vbGNoYWlucyA9IFRydWUKICAg ICAgICAgICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAgICAgICBlbGlmIG5vdCByZXBvLmlz X2FwcF9pbnN0YWxsZWQocGFja2FnZS5uYW1lKToKKworICAgICAgICAgICAgZm9yIHBhY2thZ2Ug aW4gc2VsZi5fZ2V0X2RlcGVuZGVuY3lfcGFja2FnZXMoKToKKyAgICAgICAgICAgICAgICBpZiBu b3Qgc2VsZi5yZXBvcy5pc19wYWNrYWdlX2luc3RhbGxlZChwYWNrYWdlLm5hbWUpOgogICAgICAg ICAgICAgICAgICAgICBwYWNrYWdlLmluc3RhbGwoKQogICAgICAgICAgICAgICAgICAgICByZWdl bmVyYXRlX3Rvb2xjaGFpbnMgPSBUcnVlCisKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHJl Z2VuZXJhdGVfdG9vbGNoYWlucyA9IHNlbGYucmVnZW5lcmF0ZV90b29sY2hhaW5zCiAKQEAgLTEx MDAsNyArMTEwNCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICByZXR1cm4g KHJlbGF0aXZlX2ZpbGVuYW1lLCBzY2NhY2hlX3Rvb2xjaGFpbnMpCiAKICAgICBkZWYgY2hlY2tf aW5zdGFsbGVkX3BhY2thZ2VzKHNlbGYpOgotICAgICAgICBmb3IgcGFja2FnZSBpbiBzZWxmLl9n ZXRfcGFja2FnZXMoKToKKyAgICAgICAgZm9yIHBhY2thZ2UgaW4gc2VsZi5fZ2V0X2RlcGVuZGVu Y3lfcGFja2FnZXMoKToKICAgICAgICAgICAgIGlmIHBhY2thZ2UubmFtZS5zdGFydHN3aXRoKCJv cmcud2Via2l0IikgYW5kIG5vdCBwYWNrYWdlLmlzX2luc3RhbGxlZChzZWxmLnNka19icmFuY2gp OgogICAgICAgICAgICAgICAgIENvbnNvbGUuZXJyb3JfbWVzc2FnZSgiRmxhdHBhayBwYWNrYWdl ICVzIG5vdCBpbnN0YWxsZWQuIFBsZWFzZSB1cGRhdGUgeW91ciBTREs6IFRvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdC1mbGF0cGFrIiwgcGFja2FnZSkKICAgICAgICAgICAgICAgICByZXR1cm4g RmFsc2UKQEAgLTExMjgsNyArMTEzMiw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAg ICAgcmV0dXJuIDAKIAotICAgIGRlZiBfZ2V0X3BhY2thZ2VzKHNlbGYpOgorICAgIGRlZiBfZ2V0 X2RlcGVuZGVuY3lfcGFja2FnZXMoc2VsZik6CiAgICAgICAgIGFyY2ggPSBwbGF0Zm9ybS5tYWNo aW5lKCkKICAgICAgICAgc2VsZi5ydW50aW1lID0gRmxhdHBha1BhY2thZ2UoIm9yZy53ZWJraXQu UGxhdGZvcm0iLCBzZWxmLnNka19icmFuY2gsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYuc2RrX3JlcG8sIGFyY2gpCkBAIC0xMTM4LDkgKzExNDIsNiBAQCBjbGFz cyBXZWJraXRGbGF0cGFrOgogICAgICAgICBwYWNrYWdlcy5hcHBlbmQoRmxhdHBha1BhY2thZ2Uo J29yZy53ZWJraXQuU2RrLkRlYnVnJywgc2VsZi5zZGtfYnJhbmNoLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5zZGtfcmVwbywgYXJjaCkpCiAKLSAgICAgICAg c2VsZi5mbGF0aHViX3JlcG8gPSBzZWxmLnJlcG9zLmFkZChGbGF0cGFrUmVwbygiZmxhdGh1YiIs IHVybD0iaHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9yZXBvLyIsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVwb19maWxlPSJodHRwczovL2Rs LmZsYXRodWIub3JnL3JlcG8vZmxhdGh1Yi5mbGF0cGFrcmVwbyIpKQotCiAgICAgICAgIGZkb19i cmFuY2ggPSAiMjAuMDgiCiAgICAgICAgIGV4dGVuc2lvbnMgPSAoInJ1c3Qtc3RhYmxlIiwgImxs dm0xMSIpCiAgICAgICAgIGZvciBuYW1lIGluIGV4dGVuc2lvbnM6CkBAIC0xMTUzLDcgKzExNTQs NyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5w YXRoLmpvaW4oc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgsICJydW50aW1lIiwgIm9yZy53ZWJraXQu U2RrIikpOgogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiSW5z dGFsbGluZyAlcyBkZXBlbmRlbmNpZXMgaW4gJXMiLCBzZWxmLmJ1aWxkX3R5cGUsIHNlbGYuZmxh dHBha19idWlsZF9wYXRoKQotICAgICAgICBmb3IgcGFja2FnZSBpbiBzZWxmLl9nZXRfcGFja2Fn ZXMoKToKKyAgICAgICAgZm9yIHBhY2thZ2UgaW4gc2VsZi5fZ2V0X2RlcGVuZGVuY3lfcGFja2Fn ZXMoKToKICAgICAgICAgICAgIGlmIG5vdCBwYWNrYWdlLmlzX2luc3RhbGxlZChzZWxmLnNka19i cmFuY2gpOgogICAgICAgICAgICAgICAgIHBhY2thZ2UuaW5zdGFsbCgpCiAK