220781 2021-01-20 15:19:46 -0800 [Flatpak SDK] Flatpak 1.10 environment variable issues 2021-02-10 12:42:33 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221068 https://bugs.webkit.org/show_bug.cgi?id=221070 https://bugs.webkit.org/show_bug.cgi?id=221711 InRadar P2 Normal --- 1 lmoura pnormand aperez pnormand webkit-bug-importer oldest_to_newest 1721020 0 lmoura 2021-01-20 15:19:46 -0800 Flatpak 1.10 changed how environment variables are passed to bwrap, making our current scripts fail. For example, WEBKIT_BUILD_DIR_BIND_MOUNT and the LC_* variables. These are two cases where webkit-bwrap (our python wrapper around bwrap) does not find them in the os.environ dictionary and fails to process. In the case of WEBKIT_BUILD_DIR_BIND_MOUNT, this is causing the bind-mount from `WebKitBuild/<PORT>/<CONFIG>` (host) to `/app/webkit/WebKitBuild/<CONFIG>` (sandbox) to not be enabled, leading to always building in the `WebKitBuild/<CONFIG>` dir. In the case of LC_*, this brought back the locale issue fixed by r263397. Bisecting flatpak, the commit https://github.com/flatpak/flatpak/commit/6d1773d2a54dde9b099043f07a2094a4f1c2f486 (run: Convert all environment variables into bwrap arguments) is the first failure. Inspecting webkit-bwrap in a call to bash (Tools/Scripts/webkit-flatpak --verbose -c bash + some print's), webkit-bwrap is inkoved three times: * ldconfig, with a normal os.environ * flatpak-dbux-proxy, with the augmented os.environ with the extra info from webkit scripts * bash (actual command). Here things start to differ. Before the mentioned commit, the last invocation has the same environment as the second one, with all extra information. But after the commit, now just LC_CTYPE is forwarded to webkit-bwrap. Trying to use flatpak's `--env=....` did not expose the variable to bwrap, but only to the sandboxed process itself. Meanwhile, falling back to 1.6.5 (Focal's) seems to be working fine. But as the change comes from a security advisory, there's a chance the changes will be picked by distros in the LTS packages. 1721164 1 pnormand 2021-01-21 07:50:58 -0800 I'm afraid we'll need to fix bug 213878 very soon indeed. They're backporting this CVE fix in older flatpak releases... 1721521 2 418118 pnormand 2021-01-22 01:36:49 -0800 Created attachment 418118 Patch 1721974 3 418118 aperez 2021-01-25 00:44:16 -0800 Comment on attachment 418118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418118&action=review > Tools/flatpak/flatpakutils.py:854 > + if envvar.startswith("LC"): It would be safer to list the local-related LC_* variable names only: if envvar in ("LC_CTYPE=", "LC_NUMERIC", "LC_TIME", "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", "LC_IDENTIFICATION", "LC_ALL"): If the above feels like too much of a mouthful (though I think it's fine), at least I would make this check “.startswith("LC_")” — to make sure some other variable like “LCFOO” is not accidentally picked by the loop. Also: This check does not match the “LANG” variable, which can also be used to setup locale attributes. Is that on purpose, or maybe missing a check here? 1722127 4 lmoura 2021-01-25 10:36:39 -0800 (In reply to Adrian Perez from comment #3) > Comment on attachment 418118 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=418118&action=review > > > Tools/flatpak/flatpakutils.py:854 > > + if envvar.startswith("LC"): > > It would be safer to list the local-related LC_* variable names only: > > if envvar in ("LC_CTYPE=", "LC_NUMERIC", "LC_TIME", "LC_COLLATE", > "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", "LC_NAME", > "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", > "LC_IDENTIFICATION", "LC_ALL"): > > If the above feels like too much of a mouthful (though I think it's fine), > at least I would make this check “.startswith("LC_")” — to make sure some > other variable like “LCFOO” is not accidentally picked by the loop. > Indeed `.startswith("LC")` is too greedy. I'm fine with listing them explicitly. But one issue with this I just found was that `--unset-env` was added in flatpak 1.10 (as part of the overall CVE work that triggered this change). The patch as-is failed here with flatpak 1.6.5 from Ubuntu 20.04 LTS due to this. At the time I had tested it only with 1.10.0, sorry. This could lead to duplicate information (and risking the old "nothing is more permanent than a temporary fix"), but what if we end up cleaning up the LC_ vars both in flatpakutils.py (through unset-env is flatpak >=1.10) and webkit-bwrap (for older flatpak versions) while the proper solution in bug213878 is developed? > Also: This check does not match the “LANG” variable, which can also be > used to setup locale attributes. Is that on purpose, or maybe missing a > check here? Currently LANG is always overridden by webkit-bwrap to en_US.UTF-8, but LANGUAGE is also cleared and needs to be added to the list. 1722129 5 pnormand 2021-01-25 10:43:45 -0800 I'm not sure bug 213878 is the way forward anymore, because it would imply a rather large NIH, reinventing what both `flatpak run` and the whole instance concept already implemented there (`flatpak ps`, `flatpak enter ...`). 1722456 6 418395 pnormand 2021-01-26 04:56:06 -0800 Created attachment 418395 Patch 1722471 7 418395 pnormand 2021-01-26 05:40:37 -0800 Comment on attachment 418395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418395&action=review > Tools/flatpak/flatpakutils.py:856 > + if self.flatpak_version >= (1, 10, 0): A version check is not necessarily right, would be better to check the existence of the option instead. I'll revisit this part. 1722508 8 418395 aperez 2021-01-26 07:49:38 -0800 Comment on attachment 418395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418395&action=review >> Tools/flatpak/flatpakutils.py:856 >> + if self.flatpak_version >= (1, 10, 0): > > A version check is not necessarily right, would be better to check the existence of the option instead. I'll revisit this part. A version check is quite likely safer and more robust than trying to parse the output of “flatpak --help” — I think it's okay to leave it like thi =) 1722510 9 pnormand 2021-01-26 07:53:37 -0800 I'm afraid this option will be added in older versions. 1722576 10 418438 pnormand 2021-01-26 10:18:54 -0800 Created attachment 418438 Patch 1722663 11 418438 lmoura 2021-01-26 12:38:14 -0800 Comment on attachment 418438 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418438&action=review Tested here and it's working fine. Just two minor comments. > Tools/flatpak/flatpakutils.py:176 > + return output.find(option) != -1 What about `return option in output`, as it does not need the index? > Tools/flatpak/flatpakutils.py:864 > + if self.flatpak_version >= (1, 10, 0) or self.flatpak_run_has_unsetenv_option: Does it need an explicit 1.10 check? Shouldn't `self.flatpak_has_unsetenv_option` always be true for it? 1722860 12 418395 pnormand 2021-01-27 01:03:50 -0800 Comment on attachment 418395 Patch I got confused thinking that new option was part of the CVE fix, but it's not the case. So it's simpler to land this version. 1722861 13 pnormand 2021-01-27 01:06:40 -0800 Committed r271938: <https://trac.webkit.org/changeset/271938> 1722863 14 webkit-bug-importer 2021-01-27 01:09:42 -0800 <rdar://problem/73653233> 418118 2021-01-22 01:36:49 -0800 2021-01-26 04:56:01 -0800 Patch bug-220781-20210122013647.patch text/plain 4638 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWU1NTM5YTQzZWI0MjhlOGIzZTgxMjg0YWQ0YWZjNmFi YWMyY2IxNS4uNjk1ZjY2ZTRiMjc2NjQ1MjdkZjAxNmY3ZDUwZmQ4OGNkNzhkOGYyNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTAxLTIyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4g YW5kIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0ZsYXRwYWsg U0RLXSBGbGF0cGFrIDEuMTAgZW52aXJvbm1lbnQgdmFyaWFibGUgaXNzdWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3ODEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGbGF0cGFrIG5vIGxvbmdlciBw YXNzZXMgaXRzIGVudiB2YXJpYWJsZXMgdG8gYndyYXAsIHNvIHRoZSB3b3JrYXJvdW5kIGlzIG5v dyB0byBzZXJpYWxpemUKKyAgICAgICAgaXQgb24tZGlzayBpbiBhIEpTT04gZmlsZSBhbmQgbG9h ZCBpdCBmcm9tIG91ciB3ZWJraXQtYndyYXAgc2NyaXB0LgorCisgICAgICAgICogZmxhdHBhay9m bGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToK KyAgICAgICAgKiBmbGF0cGFrL3dlYmtpdC1id3JhcDoKKwogMjAyMS0wMS0yMiAgTGF1cm8gTW91 cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV2ViRHJpdmVyXSBBZGQgaW5mbyBh Ym91dCBpbXBvcnRpbmcgdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0 aWxzLnB5IGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKaW5kZXggNWNlYzJiYjYzY2Uw ZDAyNGY4NWVhZjAwY2RkNTdhOGMxODk3MWZmMS4uZTg0MDFiZDBmODkyZTFhNjhjMDg3OTY0Yzc5 ZWE4MTQ4OGIyNDg1ZiAxMDA2NDQKLS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkK KysrIGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKQEAgLTM3LDYgKzM3LDcgQEAgaW1w b3J0IHBsYXRmb3JtCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5sb2d1dGlscyBpbXBv cnQgY29uZmlndXJlX2xvZ2dpbmcKIGltcG9ydCB0b21sCitpbXBvcnQganNvbgogCiB0cnk6CiAg ICAgZnJvbSB1cmxsaWIucGFyc2UgaW1wb3J0IHVybHBhcnNlICAjIHB5bGludDogZGlzYWJsZT1F MDYxMQpAQCAtODQ5LDYgKzg1MCwxMCBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBm b3IgZW52dmFyLCB2YWx1ZSBpbiBzYW5kYm94X2Vudmlyb25tZW50Lml0ZW1zKCk6CiAgICAgICAg ICAgICBmbGF0cGFrX2NvbW1hbmQuYXBwZW5kKCItLWVudj0lcz0lcyIgJSAoZW52dmFyLCB2YWx1 ZSkpCiAKKyAgICAgICAgZm9yIGVudnZhciBpbiBvcy5lbnZpcm9uLmtleXMoKToKKyAgICAgICAg ICAgIGlmIGVudnZhci5zdGFydHN3aXRoKCJMQyIpOgorICAgICAgICAgICAgICAgIGZsYXRwYWtf Y29tbWFuZC5hcHBlbmQoIi0tdW5zZXQtZW52PSVzIiAlIGVudnZhcikKKwogICAgICAgICBpZiBu b3QgYnVpbGRpbmdfZ3N0IGFuZCBhcmdzWzBdICE9ICJzY2NhY2hlIjoKICAgICAgICAgICAgIGV4 dHJhX2ZsYXRwYWtfYXJncy5leHRlbmQoc2VsZi5zZXR1cF9nc3RidWlsZChidWlsZGluZykpCiAK QEAgLTg2MSwxMCArODY2LDE2IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAi V0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIiOiBvcy5lbnZpcm9uWyJGTEFUUEFLX1VTRVJfRElSIl0s CiAgICAgICAgIH0pCiAKKyAgICAgICAgZW52X2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5idWls ZF9yb290LCAnZmxhdHBhay1lbnYuanNvbicpCisgICAgICAgIHdpdGggb3BlbihlbnZfZmlsZSwg J3cnKSBhcyBmOgorICAgICAgICAgICAganNvbi5kdW1wKGRpY3QoZmxhdHBha19lbnYpLCBmLCBp bmRlbnQ9MikKKwogICAgICAgICB0cnk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5leGVjdXRl X2NvbW1hbmQoZmxhdHBha19jb21tYW5kLCBzdGRvdXQ9c3Rkb3V0LCBlbnY9ZmxhdHBha19lbnYp CiAgICAgICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAgICAgIHJldHVybiAw CisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBvcy5yZW1vdmUoZW52X2ZpbGUpCiAKICAg ICAgICAgcmV0dXJuIDAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAg Yi9Ub29scy9mbGF0cGFrL3dlYmtpdC1id3JhcAppbmRleCAyYjM2OTAwY2UyODIzZTU3ODFhMWFj ZTQ1NjllMGY4NGE3ZmQxM2I2Li45NTRlOGVhM2MzMDhkZGQzNTJjOTQzOWVmMDQ5NDJkMWRmMjJm Y2JkIDEwMDc1NQotLS0gYS9Ub29scy9mbGF0cGFrL3dlYmtpdC1id3JhcAorKysgYi9Ub29scy9m bGF0cGFrL3dlYmtpdC1id3JhcApAQCAtMjIsMTIgKzIyLDE0IEBAIGltcG9ydCBpdGVydG9vbHMK IGltcG9ydCBzaGxleAogaW1wb3J0IHN5cwogaW1wb3J0IHRlbXBmaWxlCitpbXBvcnQganNvbgog CiBzY3JpcHRkaXIgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkK IAogZGVmIG1haW4oYXJnczogbGlzdCkgLT4gaW50OgogICAgIHRtcGRpciA9IHRlbXBmaWxlLmdl dHRlbXBkaXIoKQogICAgIHNvdXJjZV9yb290ID0gb3MucGF0aC5ub3JtcGF0aChvcy5wYXRoLmFi c3BhdGgob3MucGF0aC5qb2luKHNjcmlwdGRpciwgJy4uLy4uLycpKSkKKyAgICBidWlsZF9yb290 ID0gb3MucGF0aC5qb2luKHNvdXJjZV9yb290LCAnV2ViS2l0QnVpbGQnKQogICAgIGJpbmRfbW91 bnRzID0gewogICAgICAgICAiL2FwcC93ZWJraXQiOiAgc291cmNlX3Jvb3QsCiAgICAgICAgICMg QWNjZXNzIHRvIC9ydW4vaG9zdCBpcyByZXF1aXJlZCBieSB0aGUgY3Jhc2ggbG9nIHJlcG9ydGVy LgpAQCAtMzUsNyArMzcsMTEgQEAgZGVmIG1haW4oYXJnczogbGlzdCkgLT4gaW50OgogICAgICAg ICAiL3J1bi9zaG0iOiAiL2Rldi9zaG0iLAogICAgIH0KIAotICAgIGZsYXRwYWtfdXNlcl9kaXIg PSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIiKQorICAgIGVudmlyb24g PSB7fQorICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oYnVpbGRfcm9vdCwgJ2ZsYXRwYWstZW52 Lmpzb24nKSkgYXMgZjoKKyAgICAgICAgZW52aXJvbiA9IGpzb24ubG9hZChmKQorCisgICAgZmxh dHBha191c2VyX2RpciA9IGVudmlyb24uZ2V0KCJXRUJLSVRfRkxBVFBBS19VU0VSX0RJUiIpCiAg ICAgaWYgZmxhdHBha191c2VyX2RpcjoKICAgICAgICAgYmluZF9tb3VudHNbIi92YXIvdG1wIl0g PSBvcy5wYXRoLmpvaW4oZmxhdHBha191c2VyX2RpciwgInZhciIsICJ0bXAiKQogCkBAIC00Mywx NiArNDksMTYgQEAgZGVmIG1haW4oYXJnczogbGlzdCkgLT4gaW50OgogICAgICAgICAiL3J1bi9p Y2VjYyI6ICIvdmFyL3J1bi9pY2VjYyIKICAgICB9CiAKLSAgICBidWlsZF9wYXRoID0gb3MuZW52 aXJvbi5nZXQoIldFQktJVF9CVUlMRF9ESVJfQklORF9NT1VOVCIpCisgICAgYnVpbGRfcGF0aCA9 IGVudmlyb24uZ2V0KCJXRUJLSVRfQlVJTERfRElSX0JJTkRfTU9VTlQiKQogICAgIGlmIGJ1aWxk X3BhdGg6CiAgICAgICAgIGRlc3QsIHNyYyA9IGJ1aWxkX3BhdGguc3BsaXQoIjoiKQogICAgICAg ICB0cnlfYmluZF9tb3VudHNbZGVzdF0gPSBzcmMKIAotICAgIGNvcmVkdW1wc19kaXIgPSBvcy5l bnZpcm9uLmdldCgiV0VCS0lUX0NPUkVfRFVNUFNfRElSRUNUT1JZIikKKyAgICBjb3JlZHVtcHNf ZGlyID0gZW52aXJvbi5nZXQoIldFQktJVF9DT1JFX0RVTVBTX0RJUkVDVE9SWSIpCiAgICAgaWYg Y29yZWR1bXBzX2RpcjoKICAgICAgICAgdHJ5X2JpbmRfbW91bnRzW2NvcmVkdW1wc19kaXJdID0g Y29yZWR1bXBzX2RpcgogCi0gICAgeGRnX3J1bnRpbWVfZGlyID0gb3MuZW52aXJvbi5nZXQoIlhE R19SVU5USU1FX0RJUiIpCisgICAgeGRnX3J1bnRpbWVfZGlyID0gZW52aXJvbi5nZXQoIlhER19S VU5USU1FX0RJUiIpCiAgICAgaWYgeGRnX3J1bnRpbWVfZGlyOgogICAgICAgICBwd19zb2NrZXQg PSBvcy5wYXRoLmpvaW4oeGRnX3J1bnRpbWVfZGlyLCAicGlwZXdpcmUtMCIpCiAgICAgICAgIHRy eV9iaW5kX21vdW50c1twd19zb2NrZXRdID0gcHdfc29ja2V0CkBAIC02NCw3ICs3MCw3IEBAIGRl ZiBtYWluKGFyZ3M6IGxpc3QpIC0+IGludDoKICAgICBmb3IgZHN0LCBzcmMgaW4gdHJ5X2JpbmRf bW91bnRzLml0ZW1zKCk6CiAgICAgICAgIGJ3cmFwX2FyZ3MuZXh0ZW5kKCgiLS1iaW5kLXRyeSIs IHNyYywgZHN0KSkKIAotICAgIGZvciBlbnYgaW4gb3MuZW52aXJvbi5rZXlzKCk6CisgICAgZm9y IGVudiBpbiBlbnZpcm9uLmtleXMoKToKICAgICAgICAgaWYgZW52LnN0YXJ0c3dpdGgoIkxDXyIp IG9yIGVudiA9PSAiTEFOR1VBR0UiOgogICAgICAgICAgICAgYndyYXBfYXJncy5leHRlbmQoKCIt LXVuc2V0ZW52IiwgZW52KSkKICAgICBid3JhcF9hcmdzLmV4dGVuZCgoIi0tc2V0ZW52IiwgIkxB TkciLCAiZW5fVVMuVVRGLTgiKSkK 418395 2021-01-26 04:56:06 -0800 2021-01-26 10:18:49 -0800 Patch bug-220781-20210126045604.patch text/plain 8242 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDI1MmZlNTA0ZTE2MWJlZjJjOGZlOWI3NGMyNmQyZjU0 OGI5OTg2OS4uZGU0YTNjN2FmNmZlMzAzMWJhODYwOTE4NWE2YzVmZjMzN2NjMTdhOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTAxLTIyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4g YW5kIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0ZsYXRwYWsg U0RLXSBGbGF0cGFrIDEuMTAgZW52aXJvbm1lbnQgdmFyaWFibGUgaXNzdWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3ODEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGbGF0cGFrIG5vIGxvbmdlciBw YXNzZXMgaXRzIGVudiB2YXJpYWJsZXMgdG8gYndyYXAsIHNvIHRoZSB3b3JrYXJvdW5kIGlzIG5v dyB0byBzZXJpYWxpemUKKyAgICAgICAgaXQgb24tZGlzayBpbiBhIEpTT04gZmlsZSBhbmQgbG9h ZCBpdCBmcm9tIG91ciB3ZWJraXQtYndyYXAgc2NyaXB0LgorCisgICAgICAgICogZmxhdHBhay9m bGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToK KyAgICAgICAgKiBmbGF0cGFrL3dlYmtpdC1id3JhcDoKKwogMjAyMS0wMS0yNSAgUnlvc3VrZSBO aXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcg cjI3MTUxNCBhbmQgcjI3MTU0OQpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRp bHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCA1Y2VjMmJiNjNjZTBk MDI0Zjg1ZWFmMDBjZGQ1N2E4YzE4OTcxZmYxLi40NTA5ZTg4ZmJiNDI3NzliZWU2MzQ1MzhhYjZj NWJjYTMxZjgyODFkIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQor KysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtMzcsNiArMzcsNyBAQCBpbXBv cnQgcGxhdGZvcm0KIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3V0aWxzIGltcG9y dCBjb25maWd1cmVfbG9nZ2luZwogaW1wb3J0IHRvbWwKK2ltcG9ydCBqc29uCiAKIHRyeToKICAg ICBmcm9tIHVybGxpYi5wYXJzZSBpbXBvcnQgdXJscGFyc2UgICMgcHlsaW50OiBkaXNhYmxlPUUw NjExCkBAIC00OCwxMSArNDksNyBAQCB0cnk6CiBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgZnJv bSB1cmxsaWIyIGltcG9ydCB1cmxvcGVuCiAKLUZMQVRQQUtfUkVRID0gWwotICAgICgiZmxhdHBh ayIsICIxLjQuNCIpLAotXQotCi1GTEFUUEFLX1ZFUlNJT04gPSB7fQorRkxBVFBBS19SRVFVSVJF RF9WRVJTSU9OID0gIjEuNC40IgogCiBzY3JpcHRkaXIgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0 aC5kaXJuYW1lKF9fZmlsZV9fKSkKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykK QEAgLTE0NiwzMyArMTQzLDMyIEBAIGRlZiBydW5fc2FuaXRpemVkKGNvbW1hbmQsIGdhdGhlcl9v dXRwdXQ9RmFsc2UsIGlnbm9yZV9zdGRlcnI9RmFsc2UpOgogZGVmIGNoZWNrX2ZsYXRwYWsodmVy Ym9zZT1UcnVlKToKICAgICAjIEZsYXRwYWsgaXMgb25seSBzdXBwb3J0ZWQgb24gTGludXguCiAg ICAgaWYgbm90IHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCJsaW51eCIpOgotICAgICAgICByZXR1 cm4gRmFsc2UKLQotICAgIGZvciBhcHAsIHJlcXVpcmVkX3ZlcnNpb24gaW4gRkxBVFBBS19SRVE6 Ci0gICAgICAgIHRyeToKLSAgICAgICAgICAgIG91dHB1dCA9IHJ1bl9zYW5pdGl6ZWQoW2FwcCwg Ii0tdmVyc2lvbiJdLCBnYXRoZXJfb3V0cHV0PVRydWUpCi0gICAgICAgIGV4Y2VwdCAoc3VicHJv Y2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3IsIE9TRXJyb3IpOgotICAgICAgICAgICAgaWYgdmVyYm9z ZToKLSAgICAgICAgICAgICAgICBDb25zb2xlLmVycm9yX21lc3NhZ2UoIllvdSBuZWVkIHRvIGlu c3RhbGwgJXMgPj0gJXMiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIg dG8gYmUgYWJsZSB0byB1c2UgdGhlICclcycgc2NyaXB0LlxuXG4iCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJZb3UgY2FuIGZpbmQgc29tZSBpbmZvcm1hdGlvbnMgYWJv dXQiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgaG93IHRvIGluc3Rh bGwgaXQgZm9yIHlvdXIgZGlzdHJpYnV0aW9uIGF0OlxuIgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiICAgICogaHR0cHM6Ly9mbGF0cGFrLm9yZy9cbiIsIGFwcCwgcmVx dWlyZWRfdmVyc2lvbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3lz LmFyZ3ZbMF0pCi0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLQotICAgICAgICBkZWYgY29tcGFy YWJsZV92ZXJzaW9uKHZlcnNpb24pOgotICAgICAgICAgICAgcmV0dXJuIHR1cGxlKG1hcChpbnQs ICh2ZXJzaW9uLnNwbGl0KCIuIikpKSkKLQotICAgICAgICB2ZXJzaW9uID0gb3V0cHV0LnNwbGl0 KCIgIilbMV0uc3RyaXAoIlxuIikKLSAgICAgICAgY3VycmVudCA9IGNvbXBhcmFibGVfdmVyc2lv bih2ZXJzaW9uKQotICAgICAgICBGTEFUUEFLX1ZFUlNJT05bYXBwXSA9IGN1cnJlbnQKLSAgICAg ICAgaWYgY3VycmVudCA8IGNvbXBhcmFibGVfdmVyc2lvbihyZXF1aXJlZF92ZXJzaW9uKToKLSAg ICAgICAgICAgIENvbnNvbGUuZXJyb3JfbWVzc2FnZSgiJXMgJXMgcmVxdWlyZWQgYnV0ICVzIGZv dW5kLiBQbGVhc2UgdXBkYXRlIGFuZCB0cnkgYWdhaW5cbiIsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXBwLCByZXF1aXJlZF92ZXJzaW9uLCB2ZXJzaW9uKQotICAgICAgICAg ICAgcmV0dXJuIEZhbHNlCisgICAgICAgIHJldHVybiAoKQogCi0gICAgcmV0dXJuIFRydWUKKyAg ICByZXF1aXJlZF92ZXJzaW9uID0gRkxBVFBBS19SRVFVSVJFRF9WRVJTSU9OCisgICAgdHJ5Ogor ICAgICAgICBvdXRwdXQgPSBydW5fc2FuaXRpemVkKFsiZmxhdHBhayIsICItLXZlcnNpb24iXSwg Z2F0aGVyX291dHB1dD1UcnVlKQorICAgIGV4Y2VwdCAoc3VicHJvY2Vzcy5DYWxsZWRQcm9jZXNz RXJyb3IsIE9TRXJyb3IpOgorICAgICAgICBpZiB2ZXJib3NlOgorICAgICAgICAgICAgQ29uc29s ZS5lcnJvcl9tZXNzYWdlKCJZb3UgbmVlZCB0byBpbnN0YWxsIGZsYXRwYWsgPj0gJXMiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiB0byBiZSBhYmxlIHRvIHVzZSB0aGUgJyVz JyBzY3JpcHQuXG5cbiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiWW91IGNh biBmaW5kIHNvbWUgaW5mb3JtYXRpb25zIGFib3V0IgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICIgaG93IHRvIGluc3RhbGwgaXQgZm9yIHlvdXIgZGlzdHJpYnV0aW9uIGF0Olxu IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgICAgKiBodHRwczovL2ZsYXRw YWsub3JnL1xuIiwgcmVxdWlyZWRfdmVyc2lvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzeXMuYXJndlswXSkKKyAgICAgICAgICAgIHJldHVybiAoKQorCisgICAgZGVmIGNv bXBhcmFibGVfdmVyc2lvbih2ZXJzaW9uKToKKyAgICAgICAgcmV0dXJuIHR1cGxlKG1hcChpbnQs ICh2ZXJzaW9uLnNwbGl0KCIuIikpKSkKKworICAgIHZlcnNpb24gPSBvdXRwdXQuc3BsaXQoIiAi KVsxXS5zdHJpcCgiXG4iKQorICAgIGN1cnJlbnRfdmVyc2lvbiA9IGNvbXBhcmFibGVfdmVyc2lv bih2ZXJzaW9uKQorICAgIGlmIGN1cnJlbnRfdmVyc2lvbiA8IGNvbXBhcmFibGVfdmVyc2lvbihy ZXF1aXJlZF92ZXJzaW9uKToKKyAgICAgICAgQ29uc29sZS5lcnJvcl9tZXNzYWdlKCJmbGF0cGFr ICVzIHJlcXVpcmVkIGJ1dCAlcyBmb3VuZC4gUGxlYXNlIHVwZGF0ZSBhbmQgdHJ5IGFnYWluXG4i LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVxdWlyZWRfdmVyc2lvbiwgdmVyc2lv bikKKyAgICAgICAgcmV0dXJuICgpCisKKyAgICByZXR1cm4gY3VycmVudF92ZXJzaW9uCiAKIAog Y2xhc3MgRmxhdHBha09iamVjdDoKQEAgLTU1OSw3ICs1NTUsOCBAQCBjbGFzcyBXZWJraXRGbGF0 cGFrOgogICAgICAgICBzZWxmLnNjY2FjaGVfY29uZmlnX2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2Vs Zi5mbGF0cGFrX2J1aWxkX3BhdGgsICdzY2NhY2hlLnRvbWwnKQogCiAgICAgICAgIENvbnNvbGUu cXVpZXQgPSBzZWxmLnF1aWV0Ci0gICAgICAgIGlmIG5vdCBjaGVja19mbGF0cGFrKCk6CisgICAg ICAgIHNlbGYuZmxhdHBha192ZXJzaW9uID0gY2hlY2tfZmxhdHBhaygpCisgICAgICAgIGlmIG5v dCBzZWxmLmZsYXRwYWtfdmVyc2lvbjoKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAg ICAgIHNlbGYuX3Jlc2V0X3JlcG9zaXRvcnkoKQpAQCAtODUyLDE5ICs4NDksMzIgQEAgY2xhc3Mg V2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgbm90IGJ1aWxkaW5nX2dzdCBhbmQgYXJnc1swXSAh PSAic2NjYWNoZSI6CiAgICAgICAgICAgICBleHRyYV9mbGF0cGFrX2FyZ3MuZXh0ZW5kKHNlbGYu c2V0dXBfZ3N0YnVpbGQoYnVpbGRpbmcpKQogCisgICAgICAgIGZsYXRwYWtfZW52ID0gb3MuZW52 aXJvbgorICAgICAgICBmb3IgZW52dmFyIGluIGZsYXRwYWtfZW52LmtleXMoKToKKyAgICAgICAg ICAgIGlmIGVudnZhci5zdGFydHN3aXRoKCJMQ18iKSBvciBlbnZ2YXIuc3RhcnRzd2l0aCgiTEFO RyIpOgorICAgICAgICAgICAgICAgIGRlbCBmbGF0cGFrX2VudltlbnZ2YXJdCisgICAgICAgICAg ICAgICAgaWYgc2VsZi5mbGF0cGFrX3ZlcnNpb24gPj0gKDEsIDEwLCAwKToKKyAgICAgICAgICAg ICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgiLS11bnNldC1lbnY9JXMiICUgZW52dmFy KQorCiAgICAgICAgIGZsYXRwYWtfY29tbWFuZCArPSBleHRyYV9mbGF0cGFrX2FyZ3MgKyBbJy0t Y29tbWFuZD0lcycgJSBhcmdzWzBdLCAib3JnLndlYmtpdC5TZGsiXSArIGFyZ3NbMTpdCiAKLSAg ICAgICAgZmxhdHBha19lbnYgPSBvcy5lbnZpcm9uCisKICAgICAgICAgZmxhdHBha19lbnYudXBk YXRlKHsKICAgICAgICAgICAgICJGTEFUUEFLX0JXUkFQIjogb3MucGF0aC5qb2luKHNjcmlwdGRp ciwgIndlYmtpdC1id3JhcCIpLAogICAgICAgICAgICAgIldFQktJVF9CVUlMRF9ESVJfQklORF9N T1VOVCI6ICIlczolcyIgJSAoc2FuZGJveF9idWlsZF9wYXRoLCBzZWxmLmJ1aWxkX3BhdGgpLAog ICAgICAgICAgICAgIldFQktJVF9GTEFUUEFLX1VTRVJfRElSIjogb3MuZW52aXJvblsiRkxBVFBB S19VU0VSX0RJUiJdLAogICAgICAgICB9KQogCisgICAgICAgIGVudl9maWxlID0gb3MucGF0aC5q b2luKHNlbGYuYnVpbGRfcm9vdCwgJ2ZsYXRwYWstZW52Lmpzb24nKQorICAgICAgICB3aXRoIG9w ZW4oZW52X2ZpbGUsICd3JykgYXMgZjoKKyAgICAgICAgICAgIGpzb24uZHVtcChkaWN0KGZsYXRw YWtfZW52KSwgZiwgaW5kZW50PTIpCisKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgcmV0dXJu IHNlbGYuZXhlY3V0ZV9jb21tYW5kKGZsYXRwYWtfY29tbWFuZCwgc3Rkb3V0PXN0ZG91dCwgZW52 PWZsYXRwYWtfZW52KQogICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CiAgICAgICAg ICAgICByZXR1cm4gMAorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgb3MucmVtb3ZlKGVu dl9maWxlKQogCiAgICAgICAgIHJldHVybiAwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsv d2Via2l0LWJ3cmFwIGIvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAKaW5kZXggMmIzNjkwMGNl MjgyM2U1NzgxYTFhY2U0NTY5ZTBmODRhN2ZkMTNiNi4uOTU0ZThlYTNjMzA4ZGRkMzUyYzk0Mzll ZjA0OTQyZDFkZjIyZmNiZCAxMDA3NTUKLS0tIGEvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAK KysrIGIvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAKQEAgLTIyLDEyICsyMiwxNCBAQCBpbXBv cnQgaXRlcnRvb2xzCiBpbXBvcnQgc2hsZXgKIGltcG9ydCBzeXMKIGltcG9ydCB0ZW1wZmlsZQor aW1wb3J0IGpzb24KIAogc2NyaXB0ZGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFt ZShfX2ZpbGVfXykpCiAKIGRlZiBtYWluKGFyZ3M6IGxpc3QpIC0+IGludDoKICAgICB0bXBkaXIg PSB0ZW1wZmlsZS5nZXR0ZW1wZGlyKCkKICAgICBzb3VyY2Vfcm9vdCA9IG9zLnBhdGgubm9ybXBh dGgob3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3JpcHRkaXIsICcuLi8uLi8nKSkpCisg ICAgYnVpbGRfcm9vdCA9IG9zLnBhdGguam9pbihzb3VyY2Vfcm9vdCwgJ1dlYktpdEJ1aWxkJykK ICAgICBiaW5kX21vdW50cyA9IHsKICAgICAgICAgIi9hcHAvd2Via2l0IjogIHNvdXJjZV9yb290 LAogICAgICAgICAjIEFjY2VzcyB0byAvcnVuL2hvc3QgaXMgcmVxdWlyZWQgYnkgdGhlIGNyYXNo IGxvZyByZXBvcnRlci4KQEAgLTM1LDcgKzM3LDExIEBAIGRlZiBtYWluKGFyZ3M6IGxpc3QpIC0+ IGludDoKICAgICAgICAgIi9ydW4vc2htIjogIi9kZXYvc2htIiwKICAgICB9CiAKLSAgICBmbGF0 cGFrX3VzZXJfZGlyID0gb3MuZW52aXJvbi5nZXQoIldFQktJVF9GTEFUUEFLX1VTRVJfRElSIikK KyAgICBlbnZpcm9uID0ge30KKyAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGJ1aWxkX3Jvb3Qs ICdmbGF0cGFrLWVudi5qc29uJykpIGFzIGY6CisgICAgICAgIGVudmlyb24gPSBqc29uLmxvYWQo ZikKKworICAgIGZsYXRwYWtfdXNlcl9kaXIgPSBlbnZpcm9uLmdldCgiV0VCS0lUX0ZMQVRQQUtf VVNFUl9ESVIiKQogICAgIGlmIGZsYXRwYWtfdXNlcl9kaXI6CiAgICAgICAgIGJpbmRfbW91bnRz WyIvdmFyL3RtcCJdID0gb3MucGF0aC5qb2luKGZsYXRwYWtfdXNlcl9kaXIsICJ2YXIiLCAidG1w IikKIApAQCAtNDMsMTYgKzQ5LDE2IEBAIGRlZiBtYWluKGFyZ3M6IGxpc3QpIC0+IGludDoKICAg ICAgICAgIi9ydW4vaWNlY2MiOiAiL3Zhci9ydW4vaWNlY2MiCiAgICAgfQogCi0gICAgYnVpbGRf cGF0aCA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRfQlVJTERfRElSX0JJTkRfTU9VTlQiKQorICAg IGJ1aWxkX3BhdGggPSBlbnZpcm9uLmdldCgiV0VCS0lUX0JVSUxEX0RJUl9CSU5EX01PVU5UIikK ICAgICBpZiBidWlsZF9wYXRoOgogICAgICAgICBkZXN0LCBzcmMgPSBidWlsZF9wYXRoLnNwbGl0 KCI6IikKICAgICAgICAgdHJ5X2JpbmRfbW91bnRzW2Rlc3RdID0gc3JjCiAKLSAgICBjb3JlZHVt cHNfZGlyID0gb3MuZW52aXJvbi5nZXQoIldFQktJVF9DT1JFX0RVTVBTX0RJUkVDVE9SWSIpCisg ICAgY29yZWR1bXBzX2RpciA9IGVudmlyb24uZ2V0KCJXRUJLSVRfQ09SRV9EVU1QU19ESVJFQ1RP UlkiKQogICAgIGlmIGNvcmVkdW1wc19kaXI6CiAgICAgICAgIHRyeV9iaW5kX21vdW50c1tjb3Jl ZHVtcHNfZGlyXSA9IGNvcmVkdW1wc19kaXIKIAotICAgIHhkZ19ydW50aW1lX2RpciA9IG9zLmVu dmlyb24uZ2V0KCJYREdfUlVOVElNRV9ESVIiKQorICAgIHhkZ19ydW50aW1lX2RpciA9IGVudmly b24uZ2V0KCJYREdfUlVOVElNRV9ESVIiKQogICAgIGlmIHhkZ19ydW50aW1lX2RpcjoKICAgICAg ICAgcHdfc29ja2V0ID0gb3MucGF0aC5qb2luKHhkZ19ydW50aW1lX2RpciwgInBpcGV3aXJlLTAi KQogICAgICAgICB0cnlfYmluZF9tb3VudHNbcHdfc29ja2V0XSA9IHB3X3NvY2tldApAQCAtNjQs NyArNzAsNyBAQCBkZWYgbWFpbihhcmdzOiBsaXN0KSAtPiBpbnQ6CiAgICAgZm9yIGRzdCwgc3Jj IGluIHRyeV9iaW5kX21vdW50cy5pdGVtcygpOgogICAgICAgICBid3JhcF9hcmdzLmV4dGVuZCgo Ii0tYmluZC10cnkiLCBzcmMsIGRzdCkpCiAKLSAgICBmb3IgZW52IGluIG9zLmVudmlyb24ua2V5 cygpOgorICAgIGZvciBlbnYgaW4gZW52aXJvbi5rZXlzKCk6CiAgICAgICAgIGlmIGVudi5zdGFy dHN3aXRoKCJMQ18iKSBvciBlbnYgPT0gIkxBTkdVQUdFIjoKICAgICAgICAgICAgIGJ3cmFwX2Fy Z3MuZXh0ZW5kKCgiLS11bnNldGVudiIsIGVudikpCiAgICAgYndyYXBfYXJncy5leHRlbmQoKCIt LXNldGVudiIsICJMQU5HIiwgImVuX1VTLlVURi04IikpCg== 418438 2021-01-26 10:18:54 -0800 2021-01-26 13:10:58 -0800 Patch bug-220781-20210126101853.patch text/plain 8730 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDI1MmZlNTA0ZTE2MWJlZjJjOGZlOWI3NGMyNmQyZjU0 OGI5OTg2OS4uZGU0YTNjN2FmNmZlMzAzMWJhODYwOTE4NWE2YzVmZjMzN2NjMTdhOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTAxLTIyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4g YW5kIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0ZsYXRwYWsg U0RLXSBGbGF0cGFrIDEuMTAgZW52aXJvbm1lbnQgdmFyaWFibGUgaXNzdWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3ODEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGbGF0cGFrIG5vIGxvbmdlciBw YXNzZXMgaXRzIGVudiB2YXJpYWJsZXMgdG8gYndyYXAsIHNvIHRoZSB3b3JrYXJvdW5kIGlzIG5v dyB0byBzZXJpYWxpemUKKyAgICAgICAgaXQgb24tZGlzayBpbiBhIEpTT04gZmlsZSBhbmQgbG9h ZCBpdCBmcm9tIG91ciB3ZWJraXQtYndyYXAgc2NyaXB0LgorCisgICAgICAgICogZmxhdHBhay9m bGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToK KyAgICAgICAgKiBmbGF0cGFrL3dlYmtpdC1id3JhcDoKKwogMjAyMS0wMS0yNSAgUnlvc3VrZSBO aXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcg cjI3MTUxNCBhbmQgcjI3MTU0OQpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRp bHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCA1Y2VjMmJiNjNjZTBk MDI0Zjg1ZWFmMDBjZGQ1N2E4YzE4OTcxZmYxLi42MzBkNjY0M2ZhZGUzMTZjNDQ1NjMwNWM5Y2Q1 NWExOTMxNzhlODdhIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQor KysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtMzcsNiArMzcsNyBAQCBpbXBv cnQgcGxhdGZvcm0KIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3V0aWxzIGltcG9y dCBjb25maWd1cmVfbG9nZ2luZwogaW1wb3J0IHRvbWwKK2ltcG9ydCBqc29uCiAKIHRyeToKICAg ICBmcm9tIHVybGxpYi5wYXJzZSBpbXBvcnQgdXJscGFyc2UgICMgcHlsaW50OiBkaXNhYmxlPUUw NjExCkBAIC00OCwxMSArNDksNyBAQCB0cnk6CiBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgZnJv bSB1cmxsaWIyIGltcG9ydCB1cmxvcGVuCiAKLUZMQVRQQUtfUkVRID0gWwotICAgICgiZmxhdHBh ayIsICIxLjQuNCIpLAotXQotCi1GTEFUUEFLX1ZFUlNJT04gPSB7fQorRkxBVFBBS19SRVFVSVJF RF9WRVJTSU9OID0gIjEuNC40IgogCiBzY3JpcHRkaXIgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0 aC5kaXJuYW1lKF9fZmlsZV9fKSkKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykK QEAgLTE0NiwzMyArMTQzLDM3IEBAIGRlZiBydW5fc2FuaXRpemVkKGNvbW1hbmQsIGdhdGhlcl9v dXRwdXQ9RmFsc2UsIGlnbm9yZV9zdGRlcnI9RmFsc2UpOgogZGVmIGNoZWNrX2ZsYXRwYWsodmVy Ym9zZT1UcnVlKToKICAgICAjIEZsYXRwYWsgaXMgb25seSBzdXBwb3J0ZWQgb24gTGludXguCiAg ICAgaWYgbm90IHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCJsaW51eCIpOgotICAgICAgICByZXR1 cm4gRmFsc2UKKyAgICAgICAgcmV0dXJuICgpCiAKLSAgICBmb3IgYXBwLCByZXF1aXJlZF92ZXJz aW9uIGluIEZMQVRQQUtfUkVROgotICAgICAgICB0cnk6Ci0gICAgICAgICAgICBvdXRwdXQgPSBy dW5fc2FuaXRpemVkKFthcHAsICItLXZlcnNpb24iXSwgZ2F0aGVyX291dHB1dD1UcnVlKQotICAg ICAgICBleGNlcHQgKHN1YnByb2Nlc3MuQ2FsbGVkUHJvY2Vzc0Vycm9yLCBPU0Vycm9yKToKLSAg ICAgICAgICAgIGlmIHZlcmJvc2U6Ci0gICAgICAgICAgICAgICAgQ29uc29sZS5lcnJvcl9tZXNz YWdlKCJZb3UgbmVlZCB0byBpbnN0YWxsICVzID49ICVzIgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiIHRvIGJlIGFibGUgdG8gdXNlIHRoZSAnJXMnIHNjcmlwdC5cblxu IgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiWW91IGNhbiBmaW5kIHNv bWUgaW5mb3JtYXRpb25zIGFib3V0IgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiIGhvdyB0byBpbnN0YWxsIGl0IGZvciB5b3VyIGRpc3RyaWJ1dGlvbiBhdDpcbiIKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAgICAqIGh0dHBzOi8vZmxhdHBh ay5vcmcvXG4iLCBhcHAsIHJlcXVpcmVkX3ZlcnNpb24sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN5cy5hcmd2WzBdKQotICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisg ICAgcmVxdWlyZWRfdmVyc2lvbiA9IEZMQVRQQUtfUkVRVUlSRURfVkVSU0lPTgorICAgIHRyeToK KyAgICAgICAgb3V0cHV0ID0gcnVuX3Nhbml0aXplZChbImZsYXRwYWsiLCAiLS12ZXJzaW9uIl0s IGdhdGhlcl9vdXRwdXQ9VHJ1ZSkKKyAgICBleGNlcHQgKHN1YnByb2Nlc3MuQ2FsbGVkUHJvY2Vz c0Vycm9yLCBPU0Vycm9yKToKKyAgICAgICAgaWYgdmVyYm9zZToKKyAgICAgICAgICAgIENvbnNv bGUuZXJyb3JfbWVzc2FnZSgiWW91IG5lZWQgdG8gaW5zdGFsbCBmbGF0cGFrID49ICVzIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgdG8gYmUgYWJsZSB0byB1c2UgdGhlICcl cycgc2NyaXB0LlxuXG4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIllvdSBj YW4gZmluZCBzb21lIGluZm9ybWF0aW9ucyBhYm91dCIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiIGhvdyB0byBpbnN0YWxsIGl0IGZvciB5b3VyIGRpc3RyaWJ1dGlvbiBhdDpc biIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiICAgICogaHR0cHM6Ly9mbGF0 cGFrLm9yZy9cbiIsIHJlcXVpcmVkX3ZlcnNpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3lzLmFyZ3ZbMF0pCisgICAgICAgICAgICByZXR1cm4gKCkKIAotICAgICAgICBk ZWYgY29tcGFyYWJsZV92ZXJzaW9uKHZlcnNpb24pOgotICAgICAgICAgICAgcmV0dXJuIHR1cGxl KG1hcChpbnQsICh2ZXJzaW9uLnNwbGl0KCIuIikpKSkKKyAgICBkZWYgY29tcGFyYWJsZV92ZXJz aW9uKHZlcnNpb24pOgorICAgICAgICByZXR1cm4gdHVwbGUobWFwKGludCwgKHZlcnNpb24uc3Bs aXQoIi4iKSkpKQogCi0gICAgICAgIHZlcnNpb24gPSBvdXRwdXQuc3BsaXQoIiAiKVsxXS5zdHJp cCgiXG4iKQotICAgICAgICBjdXJyZW50ID0gY29tcGFyYWJsZV92ZXJzaW9uKHZlcnNpb24pCi0g ICAgICAgIEZMQVRQQUtfVkVSU0lPTlthcHBdID0gY3VycmVudAotICAgICAgICBpZiBjdXJyZW50 IDwgY29tcGFyYWJsZV92ZXJzaW9uKHJlcXVpcmVkX3ZlcnNpb24pOgotICAgICAgICAgICAgQ29u c29sZS5lcnJvcl9tZXNzYWdlKCIlcyAlcyByZXF1aXJlZCBidXQgJXMgZm91bmQuIFBsZWFzZSB1 cGRhdGUgYW5kIHRyeSBhZ2FpblxuIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhcHAsIHJlcXVpcmVkX3ZlcnNpb24sIHZlcnNpb24pCi0gICAgICAgICAgICByZXR1cm4gRmFs c2UKKyAgICB2ZXJzaW9uID0gb3V0cHV0LnNwbGl0KCIgIilbMV0uc3RyaXAoIlxuIikKKyAgICBj dXJyZW50X3ZlcnNpb24gPSBjb21wYXJhYmxlX3ZlcnNpb24odmVyc2lvbikKKyAgICBpZiBjdXJy ZW50X3ZlcnNpb24gPCBjb21wYXJhYmxlX3ZlcnNpb24ocmVxdWlyZWRfdmVyc2lvbik6CisgICAg ICAgIENvbnNvbGUuZXJyb3JfbWVzc2FnZSgiZmxhdHBhayAlcyByZXF1aXJlZCBidXQgJXMgZm91 bmQuIFBsZWFzZSB1cGRhdGUgYW5kIHRyeSBhZ2FpblxuIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJlcXVpcmVkX3ZlcnNpb24sIHZlcnNpb24pCisgICAgICAgIHJldHVybiAoKQor CisgICAgcmV0dXJuIGN1cnJlbnRfdmVyc2lvbgogCi0gICAgcmV0dXJuIFRydWUKKworZGVmIGNo ZWNrX2ZsYXRwYWtfb3B0aW9uKGNvbW1hbmQsIG9wdGlvbik6CisgICAgb3V0cHV0ID0gcnVuX3Nh bml0aXplZChbImZsYXRwYWsiLCBjb21tYW5kLCAiLS1oZWxwIl0sIGdhdGhlcl9vdXRwdXQ9VHJ1 ZSkKKyAgICByZXR1cm4gb3V0cHV0LmZpbmQob3B0aW9uKSAhPSAtMQogCiAKIGNsYXNzIEZsYXRw YWtPYmplY3Q6CkBAIC01NTksOSArNTYwLDExIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAg ICAgIHNlbGYuc2NjYWNoZV9jb25maWdfZmlsZSA9IG9zLnBhdGguam9pbihzZWxmLmZsYXRwYWtf YnVpbGRfcGF0aCwgJ3NjY2FjaGUudG9tbCcpCiAKICAgICAgICAgQ29uc29sZS5xdWlldCA9IHNl bGYucXVpZXQKLSAgICAgICAgaWYgbm90IGNoZWNrX2ZsYXRwYWsoKToKKyAgICAgICAgc2VsZi5m bGF0cGFrX3ZlcnNpb24gPSBjaGVja19mbGF0cGFrKCkKKyAgICAgICAgaWYgbm90IHNlbGYuZmxh dHBha192ZXJzaW9uOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKKyAgICAgICAgc2VsZi5m bGF0cGFrX3J1bl9oYXNfdW5zZXRlbnZfb3B0aW9uID0gY2hlY2tfZmxhdHBha19vcHRpb24oInJ1 biIsICItLXVuc2V0LWVudiIpCiAgICAgICAgIHNlbGYuX3Jlc2V0X3JlcG9zaXRvcnkoKQogCiAg ICAgICAgIHRyeToKQEAgLTg1MiwxOSArODU1LDM0IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAg ICAgICAgIGlmIG5vdCBidWlsZGluZ19nc3QgYW5kIGFyZ3NbMF0gIT0gInNjY2FjaGUiOgogICAg ICAgICAgICAgZXh0cmFfZmxhdHBha19hcmdzLmV4dGVuZChzZWxmLnNldHVwX2dzdGJ1aWxkKGJ1 aWxkaW5nKSkKIAorICAgICAgICBmbGF0cGFrX2VudiA9IG9zLmVudmlyb24KKyAgICAgICAgZm9y IGVudnZhciBpbiBmbGF0cGFrX2Vudi5rZXlzKCk6CisgICAgICAgICAgICBpZiBlbnZ2YXIuc3Rh cnRzd2l0aCgiTENfIikgb3IgZW52dmFyLnN0YXJ0c3dpdGgoIkxBTkciKToKKyAgICAgICAgICAg ICAgICBkZWwgZmxhdHBha19lbnZbZW52dmFyXQorICAgICAgICAgICAgICAgICMgRmxhdHBhayA+ PSAxLjEwIGhhcyB0aGUgdW5zZXQtZW52IG9wdGlvbi4gT2xkZXIgKExUUykgcmVsZWFzZXMgbWln aHQgYWxzbyBhcHBlYXIKKyAgICAgICAgICAgICAgICAjIHdpdGggdGhpcyBvcHRpb24gZW5hYmxl ZCwgaGVuY2Ugd2UgbmVlZCB0byBjaGVjayBib3RoIGNhc2VzLgorICAgICAgICAgICAgICAgIGlm IHNlbGYuZmxhdHBha192ZXJzaW9uID49ICgxLCAxMCwgMCkgb3Igc2VsZi5mbGF0cGFrX3J1bl9o YXNfdW5zZXRlbnZfb3B0aW9uOgorICAgICAgICAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQu YXBwZW5kKCItLXVuc2V0LWVudj0lcyIgJSBlbnZ2YXIpCisKICAgICAgICAgZmxhdHBha19jb21t YW5kICs9IGV4dHJhX2ZsYXRwYWtfYXJncyArIFsnLS1jb21tYW5kPSVzJyAlIGFyZ3NbMF0sICJv cmcud2Via2l0LlNkayJdICsgYXJnc1sxOl0KIAotICAgICAgICBmbGF0cGFrX2VudiA9IG9zLmVu dmlyb24KKwogICAgICAgICBmbGF0cGFrX2Vudi51cGRhdGUoewogICAgICAgICAgICAgIkZMQVRQ QUtfQldSQVAiOiBvcy5wYXRoLmpvaW4oc2NyaXB0ZGlyLCAid2Via2l0LWJ3cmFwIiksCiAgICAg ICAgICAgICAiV0VCS0lUX0JVSUxEX0RJUl9CSU5EX01PVU5UIjogIiVzOiVzIiAlIChzYW5kYm94 X2J1aWxkX3BhdGgsIHNlbGYuYnVpbGRfcGF0aCksCiAgICAgICAgICAgICAiV0VCS0lUX0ZMQVRQ QUtfVVNFUl9ESVIiOiBvcy5lbnZpcm9uWyJGTEFUUEFLX1VTRVJfRElSIl0sCiAgICAgICAgIH0p CiAKKyAgICAgICAgZW52X2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5idWlsZF9yb290LCAnZmxh dHBhay1lbnYuanNvbicpCisgICAgICAgIHdpdGggb3BlbihlbnZfZmlsZSwgJ3cnKSBhcyBmOgor ICAgICAgICAgICAganNvbi5kdW1wKGRpY3QoZmxhdHBha19lbnYpLCBmLCBpbmRlbnQ9MikKKwog ICAgICAgICB0cnk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5leGVjdXRlX2NvbW1hbmQoZmxh dHBha19jb21tYW5kLCBzdGRvdXQ9c3Rkb3V0LCBlbnY9ZmxhdHBha19lbnYpCiAgICAgICAgIGV4 Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAgICAgIHJldHVybiAwCisgICAgICAgIGZp bmFsbHk6CisgICAgICAgICAgICBvcy5yZW1vdmUoZW52X2ZpbGUpCiAKICAgICAgICAgcmV0dXJu IDAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAgYi9Ub29scy9mbGF0 cGFrL3dlYmtpdC1id3JhcAppbmRleCAyYjM2OTAwY2UyODIzZTU3ODFhMWFjZTQ1NjllMGY4NGE3 ZmQxM2I2Li45NTRlOGVhM2MzMDhkZGQzNTJjOTQzOWVmMDQ5NDJkMWRmMjJmY2JkIDEwMDc1NQot LS0gYS9Ub29scy9mbGF0cGFrL3dlYmtpdC1id3JhcAorKysgYi9Ub29scy9mbGF0cGFrL3dlYmtp dC1id3JhcApAQCAtMjIsMTIgKzIyLDE0IEBAIGltcG9ydCBpdGVydG9vbHMKIGltcG9ydCBzaGxl eAogaW1wb3J0IHN5cwogaW1wb3J0IHRlbXBmaWxlCitpbXBvcnQganNvbgogCiBzY3JpcHRkaXIg PSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkKIAogZGVmIG1haW4o YXJnczogbGlzdCkgLT4gaW50OgogICAgIHRtcGRpciA9IHRlbXBmaWxlLmdldHRlbXBkaXIoKQog ICAgIHNvdXJjZV9yb290ID0gb3MucGF0aC5ub3JtcGF0aChvcy5wYXRoLmFic3BhdGgob3MucGF0 aC5qb2luKHNjcmlwdGRpciwgJy4uLy4uLycpKSkKKyAgICBidWlsZF9yb290ID0gb3MucGF0aC5q b2luKHNvdXJjZV9yb290LCAnV2ViS2l0QnVpbGQnKQogICAgIGJpbmRfbW91bnRzID0gewogICAg ICAgICAiL2FwcC93ZWJraXQiOiAgc291cmNlX3Jvb3QsCiAgICAgICAgICMgQWNjZXNzIHRvIC9y dW4vaG9zdCBpcyByZXF1aXJlZCBieSB0aGUgY3Jhc2ggbG9nIHJlcG9ydGVyLgpAQCAtMzUsNyAr MzcsMTEgQEAgZGVmIG1haW4oYXJnczogbGlzdCkgLT4gaW50OgogICAgICAgICAiL3J1bi9zaG0i OiAiL2Rldi9zaG0iLAogICAgIH0KIAotICAgIGZsYXRwYWtfdXNlcl9kaXIgPSBvcy5lbnZpcm9u LmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIiKQorICAgIGVudmlyb24gPSB7fQorICAgIHdp dGggb3Blbihvcy5wYXRoLmpvaW4oYnVpbGRfcm9vdCwgJ2ZsYXRwYWstZW52Lmpzb24nKSkgYXMg ZjoKKyAgICAgICAgZW52aXJvbiA9IGpzb24ubG9hZChmKQorCisgICAgZmxhdHBha191c2VyX2Rp ciA9IGVudmlyb24uZ2V0KCJXRUJLSVRfRkxBVFBBS19VU0VSX0RJUiIpCiAgICAgaWYgZmxhdHBh a191c2VyX2RpcjoKICAgICAgICAgYmluZF9tb3VudHNbIi92YXIvdG1wIl0gPSBvcy5wYXRoLmpv aW4oZmxhdHBha191c2VyX2RpciwgInZhciIsICJ0bXAiKQogCkBAIC00MywxNiArNDksMTYgQEAg ZGVmIG1haW4oYXJnczogbGlzdCkgLT4gaW50OgogICAgICAgICAiL3J1bi9pY2VjYyI6ICIvdmFy L3J1bi9pY2VjYyIKICAgICB9CiAKLSAgICBidWlsZF9wYXRoID0gb3MuZW52aXJvbi5nZXQoIldF QktJVF9CVUlMRF9ESVJfQklORF9NT1VOVCIpCisgICAgYnVpbGRfcGF0aCA9IGVudmlyb24uZ2V0 KCJXRUJLSVRfQlVJTERfRElSX0JJTkRfTU9VTlQiKQogICAgIGlmIGJ1aWxkX3BhdGg6CiAgICAg ICAgIGRlc3QsIHNyYyA9IGJ1aWxkX3BhdGguc3BsaXQoIjoiKQogICAgICAgICB0cnlfYmluZF9t b3VudHNbZGVzdF0gPSBzcmMKIAotICAgIGNvcmVkdW1wc19kaXIgPSBvcy5lbnZpcm9uLmdldCgi V0VCS0lUX0NPUkVfRFVNUFNfRElSRUNUT1JZIikKKyAgICBjb3JlZHVtcHNfZGlyID0gZW52aXJv bi5nZXQoIldFQktJVF9DT1JFX0RVTVBTX0RJUkVDVE9SWSIpCiAgICAgaWYgY29yZWR1bXBzX2Rp cjoKICAgICAgICAgdHJ5X2JpbmRfbW91bnRzW2NvcmVkdW1wc19kaXJdID0gY29yZWR1bXBzX2Rp cgogCi0gICAgeGRnX3J1bnRpbWVfZGlyID0gb3MuZW52aXJvbi5nZXQoIlhER19SVU5USU1FX0RJ UiIpCisgICAgeGRnX3J1bnRpbWVfZGlyID0gZW52aXJvbi5nZXQoIlhER19SVU5USU1FX0RJUiIp CiAgICAgaWYgeGRnX3J1bnRpbWVfZGlyOgogICAgICAgICBwd19zb2NrZXQgPSBvcy5wYXRoLmpv aW4oeGRnX3J1bnRpbWVfZGlyLCAicGlwZXdpcmUtMCIpCiAgICAgICAgIHRyeV9iaW5kX21vdW50 c1twd19zb2NrZXRdID0gcHdfc29ja2V0CkBAIC02NCw3ICs3MCw3IEBAIGRlZiBtYWluKGFyZ3M6 IGxpc3QpIC0+IGludDoKICAgICBmb3IgZHN0LCBzcmMgaW4gdHJ5X2JpbmRfbW91bnRzLml0ZW1z KCk6CiAgICAgICAgIGJ3cmFwX2FyZ3MuZXh0ZW5kKCgiLS1iaW5kLXRyeSIsIHNyYywgZHN0KSkK IAotICAgIGZvciBlbnYgaW4gb3MuZW52aXJvbi5rZXlzKCk6CisgICAgZm9yIGVudiBpbiBlbnZp cm9uLmtleXMoKToKICAgICAgICAgaWYgZW52LnN0YXJ0c3dpdGgoIkxDXyIpIG9yIGVudiA9PSAi TEFOR1VBR0UiOgogICAgICAgICAgICAgYndyYXBfYXJncy5leHRlbmQoKCItLXVuc2V0ZW52Iiwg ZW52KSkKICAgICBid3JhcF9hcmdzLmV4dGVuZCgoIi0tc2V0ZW52IiwgIkxBTkciLCAiZW5fVVMu VVRGLTgiKSkK