211370 2020-05-04 00:53:02 -0700 [Flatpak SDK] Support for local repository and drive-by fixes 2020-05-04 01:32:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand ews-watchlist glenn jbedard webkit-bug-importer zan oldest_to_newest 1648469 0 pnormand 2020-05-04 00:53:02 -0700 . 1648470 1 398352 pnormand 2020-05-04 00:57:14 -0700 Created attachment 398352 Patch 1648472 2 pnormand 2020-05-04 01:03:50 -0700 EWS broke though. Checking! 1648473 3 398354 pnormand 2020-05-04 01:12:15 -0700 Created attachment 398354 Patch 1648477 4 pnormand 2020-05-04 01:31:34 -0700 Committed r261078: <https://trac.webkit.org/changeset/261078> 1648478 5 webkit-bug-importer 2020-05-04 01:32:17 -0700 <rdar://problem/62835745> 398352 2020-05-04 00:57:14 -0700 2020-05-04 01:12:11 -0700 Patch bug-211370-20200504085713.patch text/plain 13670 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmJiMGJkZWI0ODk0ODhjYTEwMDZjMGFlMWJkNTc4Mzlm NDhiNWY3Yy4uMWM1M2FiODk2MzQ1MTAzMWFlYWI3YmViYWFlMWYyZjdiY2Y0MWViMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIwLTA1LTA0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIFN1cHBvcnQgZm9yIGxvY2FsIHJlcG9zaXRvcnkgYW5k IGRyaXZlLWJ5IGZpeGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTEzNzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBuZXcgLS1yZXBvIG9wdGlvbiB0byB3ZWJraXQtZmxh dHBhaywgYWxsb3dpbmcKKyAgICAgICAgU0RLIGRldmVsb3BlcnMgdG8gdGVzdCBsb2NhbCBjaGFu Z2VzIG1hZGUgdG8gdGhlIFNESy4gQXMgZnV0dXJlCisgICAgICAgIHZlcnNpb25zIG9mIHRoZSBT REsgd2lsbCBkZXBlbmQgb24gdGhlIGZmbXBlZyBGRE8gZXh0ZW5zaW9uLAorICAgICAgICBmbGF0 cGFrdXRpbHMgaW5zdGFsbHMgaXQgZnJvbSBub3cgb24uIE9uZSBjb25zZXF1ZW5jZSBpcyB0aGF0 IHRoZQorICAgICAgICBMRF9MSUJSQVJZX1BBVEggc2V0IGluIHRoZSBHVEsgbGF5b3V0IHRlc3Qg ZHJpdmVyIGlzIG5vIGxvbmdlcgorICAgICAgICBvdmVycmlkZW4gd2hlbiBydW5uaW5nIGluIHRo ZSBmbGF0cGFrIFNESywgaW4gb3JkZXIgdG8gYWxsb3cgdGhlCisgICAgICAgIGV4dGVuc2lvbiB0 byBzZXQgaXQgY29ycmVjdGx5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0 ay5weToKKyAgICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKToKKyAgICAg ICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAgKEZsYXRwYWtSZXBvcy5hZGQp OgorICAgICAgICAoRmxhdHBha1JlcG8ucmVwb19maWxlKToKKyAgICAgICAgKFdlYmtpdEZsYXRw YWsubG9hZF9mcm9tX2FyZ3MpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5fX2luaXRfXyk6Cisg ICAgICAgIChXZWJraXRGbGF0cGFrLmNsZWFuX2FyZ3MpOgorICAgICAgICAoV2Via2l0RmxhdHBh ay5fcmVzZXRfcmVwb3NpdG9yeSk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5k Ym94KToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX2dldF9wYWNrYWdlcyk6CisgICAgICAgIChy dW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUpOgorCiAyMDIwLTA1LTA0ICBFbWlsaW8gQ29ib3Mg w4FsdmFyZXogIDxlbWlsaW9AY3Jpc2FsLmlvPgogCiAgICAgICAgIFB1dCBsaCAvIHJsaCB1bml0 cyBiZWhpbmQgYSBmbGFnIHVudGlsIGJ1ZyAyMTEzNTEgaXMgc29ydGVkIG91dC4KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvZ3RrLnB5CmluZGV4IGUzYmYzNzBmNTA2YjNkYTkzNjg3ZGE5NmZiMjBkMDRh M2ViNzAyOTguLmQzMWVlOTNmOTQ4M2I0ODljNWQ4MjA4OWQ1NDVhNGYzZmUzZDNmMzEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQpAQCAtMTQ3LDkgKzE0Nyw2IEBAIGNsYXNzIEd0a1Bv cnQoUG9ydCk6CiAgICAgICAgICAgICAgICAgIyBGb3JjZSB0aGUgR2FsbGl1bSBsbHZtcGlwZSBz b2Z0d2FyZSByYXN0ZXJpemVyCiAgICAgICAgICAgICAgICAgZW52aXJvbm1lbnRbJ0xJQkdMX0FM V0FZU19TT0ZUV0FSRSddID0gIjEiCiAgICAgICAgICAgICAgICAgZW52aXJvbm1lbnRbJ0xJQkdM X0RSSVZFUlNfUEFUSCddID0gZHJpX2xpYmdsX3BhdGgKLSAgICAgICAgICAgICAgICBlbnZpcm9u bWVudFsnTERfTElCUkFSWV9QQVRIJ10gPSBsbHZtcGlwZV9saWJnbF9wYXRoCi0gICAgICAgICAg ICAgICAgaWYgb3MuZW52aXJvbi5nZXQoJ0xEX0xJQlJBUllfUEFUSCcpOgotICAgICAgICAgICAg ICAgICAgICBlbnZpcm9ubWVudFsnTERfTElCUkFSWV9QQVRIJ10gKz0gJzolcycgJSBvcy5lbnZp cm9uLmdldCgnTERfTElCUkFSWV9QQVRIJykKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAg ICAgICAgX2xvZy53YXJuaW5nKCJDYW4ndCBmaW5kIEdhbGxpdW0gbGx2bXBpcGUgZHJpdmVyLiBU cnkgdG8gcnVuIHVwZGF0ZS13ZWJraXRndGstbGlicyBvciB1cGRhdGUtd2Via2l0LWZsYXRwYWsi KQogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oImxlYWtzIik6CmRpZmYgLS1naXQgYS9Ub29s cy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5 CmluZGV4IDQ0NjNjNGQxNDZlODg5Mjg2ZDhhZWFmNWQ0NDQ3MDFhMGQzYzM1YWIuLmY2ZmJhZjI3 NjlhYjM0OTNjZTcxY2I2MzQ2YWQ3MTcyNzEwNDNmZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRw YWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBA IC0xLDMgKzEsNCBAQAorIyAtKi0gY29kaW5nOiB1dGYtOCAtKi0KICMgQ29weXJpZ2h0IChDKSAy MDE3IElnYWxpYSBTLkwuCiAjCiAjIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTI1NCwxOCArMjU1LDE5IEBAIGNsYXNzIEZs YXRwYWtSZXBvcyhGbGF0cGFrT2JqZWN0KToKIAogICAgICAgICBpZiBzYW1lX25hbWU6CiAgICAg ICAgICAgICBpZiBvdmVycmlkZToKLSAgICAgICAgICAgICAgICBzZWxmLmZsYXRwYWsoInJlbW90 ZS1tb2RpZnkiLCByZXBvLm5hbWUsICItLXVybD0iICsgcmVwby51cmwsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbW1lbnQ9IlNldHRpbmcgcmVwbyAlcyBVUkwgZnJvbSAlcyB0byAl cyIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSAocmVwby5uYW1lLCBzYW1lX25hbWUu dXJsLCByZXBvLnVybCkpCisgICAgICAgICAgICAgICAgc2VsZi5mbGF0cGFrKCJyZW1vdGUtbW9k aWZ5IiwgcmVwby5uYW1lLCAiLS11cmw9IiArIHJlcG8udXJsKQogICAgICAgICAgICAgICAgIHNh bWVfbmFtZS51cmwgPSByZXBvLnVybAogCiAgICAgICAgICAgICAgICAgcmV0dXJuIHNhbWVfbmFt ZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQogICAgICAg ICBlbHNlOgotICAgICAgICAgICAgc2VsZi5mbGF0cGFrKCJyZW1vdGUtYWRkIiwgcmVwby5uYW1l LCAiLS1mcm9tIiwgcmVwby5yZXBvX2ZpbGUubmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAiLS1pZi1ub3QtZXhpc3RzIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICBjb21tZW50PSJB ZGRpbmcgcmVwbyAlcyIgJSByZXBvLm5hbWUpCisgICAgICAgICAgICBhcmdzID0gWyJyZW1vdGUt YWRkIiwgcmVwby5uYW1lLCAiLS1pZi1ub3QtZXhpc3RzIl0KKyAgICAgICAgICAgIGlmIHJlcG8u cmVwb19maWxlOgorICAgICAgICAgICAgICAgIGFyZ3MuZXh0ZW5kKFsiLS1mcm9tIiwgcmVwby5y ZXBvX2ZpbGUubmFtZV0pCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGFyZ3Mu ZXh0ZW5kKFsiLS1uby1ncGctdmVyaWZ5IiwgcmVwby51cmxdKQorICAgICAgICAgICAgc2VsZi5m bGF0cGFrKCphcmdzLCBjb21tZW50PSJBZGRpbmcgcmVwbyAlcyIgJSByZXBvLm5hbWUpCiAKICAg ICAgICAgcmVwby5yZXBvcyA9IHNlbGYKICAgICAgICAgcmV0dXJuIHJlcG8KQEAgLTMxNCw3ICsz MTYsOSBAQCBjbGFzcyBGbGF0cGFrUmVwbyhGbGF0cGFrT2JqZWN0KToKICAgICAgICAgaWYgc2Vs Zi5fcmVwb19maWxlOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3JlcG9fZmlsZQogCi0gICAg ICAgIGFzc2VydCBzZWxmLnJlcG9fZmlsZV9uYW1lCisgICAgICAgIGlmIG5vdCBzZWxmLnJlcG9f ZmlsZV9uYW1lOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKwogICAgICAgICBzZWxmLl9yZXBv X2ZpbGUgPSB0ZW1wZmlsZS5OYW1lZFRlbXBvcmFyeUZpbGUobW9kZT0id2IiKQogICAgICAgICBz ZWxmLl9yZXBvX2ZpbGUud3JpdGUodXJsb3BlbihzZWxmLnJlcG9fZmlsZV9uYW1lKS5yZWFkKCkp CiAgICAgICAgIHNlbGYuX3JlcG9fZmlsZS5mbHVzaCgpCkBAIC00MTYsNiArNDIwLDcgQEAgY2xh c3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi0tdXNlLWlj ZWNyZWFtIiwgZGVzdD0idXNlX2ljZWNyZWFtIiwgaGVscD0iVXNlIHRoZSBkaXN0cmlidXRlZCBp Y2VjcmVhbSAoaWNlY2MpIGNvbXBpbGVyLiIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIpCiAgICAgICAg IGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItciIsICItLXJlZ2VuZXJhdGUtdG9vbGNoYWlucyIsIGRl c3Q9InJlZ2VuZXJhdGVfdG9vbGNoYWlucyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IlJlZ2VuZXJhdGUgSWNlQ0MgZGlzdHJpYnVhYmxl IHRvb2xjaGFpbiBhcmNoaXZlcyIpCisgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItLXJl cG8iLCBoZWxwPSJGaWxlc3lzdGVtIGFic29sdXRlIHBhdGggdG8gdGhlIEZsYXRwYWsgcmVwb3Np dG9yeSB0byB1c2UiLCBkZXN0PSJ1c2VyX3JlcG8iKQogCiAgICAgICAgIGRlYnVnb3B0aW9ucyA9 IHBhcnNlci5hZGRfYXJndW1lbnRfZ3JvdXAoIkRlYnVnZ2luZyIpCiAgICAgICAgIGRlYnVnb3B0 aW9ucy5hZGRfYXJndW1lbnQoIi0tZ2RiIiwgbmFyZ3M9Ij8iLCBoZWxwPSJBY3RpdmF0ZSBnZGIs IHBhc3NpbmcgZXh0cmEgYXJncyB0byBpdCBpZiB3YW50ZWQuIikKQEAgLTQzOCw2ICs0NDMsNyBA QCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBzZWxmLnNka19yZXBvID0gTm9uZQogICAg ICAgICBzZWxmLnJ1bnRpbWUgPSBOb25lCiAgICAgICAgIHNlbGYuc2RrID0gTm9uZQorICAgICAg ICBzZWxmLnVzZXJfcmVwbyA9IE5vbmUKIAogICAgICAgICBzZWxmLnZlcmJvc2UgPSBGYWxzZQog ICAgICAgICBzZWxmLnF1aWV0ID0gRmFsc2UKQEAgLTQ4NywxNCArNDkzLDE4IEBAIGNsYXNzIFdl YmtpdEZsYXRwYWs6CiAgICAgICAgIHJldHVybiByZXN1bHQKIAogICAgIGRlZiBjbGVhbl9hcmdz KHNlbGYpOgotICAgICAgICBvcy5lbnZpcm9uWyJGTEFUUEFLX1VTRVJfRElSIl0gPSBvcy5lbnZp cm9uLmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIiLCBGTEFUUEFLX1VTRVJfRElSX1BBVEgp CisgICAgICAgIGlmIHNlbGYudXNlcl9yZXBvOgorICAgICAgICAgICAgb3MuZW52aXJvblsiRkxB VFBBS19VU0VSX0RJUiJdID0gRkxBVFBBS19VU0VSX0RJUl9QQVRIICsgIi5Mb2NhbCIKKyAgICAg ICAgZWxzZToKKyAgICAgICAgICAgIG9zLmVudmlyb25bIkZMQVRQQUtfVVNFUl9ESVIiXSA9IG9z LmVudmlyb24uZ2V0KCJXRUJLSVRfRkxBVFBBS19VU0VSX0RJUiIsIEZMQVRQQUtfVVNFUl9ESVJf UEFUSCkKKyAgICAgICAgc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGggPSBvcy5lbnZpcm9uWyJGTEFU UEFLX1VTRVJfRElSIl0KICAgICAgICAgdHJ5OgotICAgICAgICAgICAgb3MubWFrZWRpcnMob3Mu ZW52aXJvblsiRkxBVFBBS19VU0VSX0RJUiJdKQorICAgICAgICAgICAgb3MubWFrZWRpcnMoc2Vs Zi5mbGF0cGFrX2J1aWxkX3BhdGgpCiAgICAgICAgIGV4Y2VwdCBPU0Vycm9yIGFzIGU6CiAgICAg ICAgICAgICBwYXNzCiAKICAgICAgICAgY29uZmlndXJlX2xvZ2dpbmcobG9nZ2luZy5ERUJVRyBp ZiBzZWxmLnZlcmJvc2UgZWxzZSBsb2dnaW5nLklORk8pCi0gICAgICAgIF9sb2cuZGVidWcoIlVz aW5nIGZsYXRwYWsgdXNlciBkaXI6ICVzIiAlIG9zLmVudmlyb25bIkZMQVRQQUtfVVNFUl9ESVIi XSkKKyAgICAgICAgX2xvZy5kZWJ1ZygiVXNpbmcgZmxhdHBhayB1c2VyIGRpcjogJXMiICUgc2Vs Zi5mbGF0cGFrX2J1aWxkX3BhdGgpCiAKICAgICAgICAgaWYgbm90IHNlbGYuZGVidWcgYW5kIG5v dCBzZWxmLnJlbGVhc2U6CiAgICAgICAgICAgICBmYWN0b3J5ID0gUG9ydEZhY3RvcnkoU3lzdGVt SG9zdCgpKQpAQCAtNTA3LDggKzUxNyw2IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAg IGlmIHNlbGYuZ2RiIGlzIE5vbmUgYW5kICctLWdkYicgaW4gc3lzLmFyZ3Y6CiAgICAgICAgICAg ICBzZWxmLmdkYiA9IFRydWUKIAotICAgICAgICBzZWxmLmZsYXRwYWtfYnVpbGRfcGF0aCA9IG9z LmVudmlyb25bIkZMQVRQQUtfVVNFUl9ESVIiXQotCiAgICAgICAgIHNlbGYuYnVpbGRfcm9vdCA9 IG9zLnBhdGguam9pbihzZWxmLnNvdXJjZV9yb290LCAnV2ViS2l0QnVpbGQnKQogICAgICAgICBz ZWxmLmJ1aWxkX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5idWlsZF9yb290LCBzZWxmLnBsYXRm b3JtLCBzZWxmLmJ1aWxkX3R5cGUpCiAgICAgICAgIHNlbGYuY29uZmlnX2ZpbGUgPSBvcy5wYXRo LmpvaW4oc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgsICd3ZWJraXRfZmxhdHBha19jb25maWcuanNv bicpCkBAIC01MzAsMTEgKzUzOCwxMiBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogCiAgICAgZGVm IF9yZXNldF9yZXBvc2l0b3J5KHNlbGYpOgogICAgICAgICBzZWxmLnJlcG9zID0gRmxhdHBha1Jl cG9zKCkKLSAgICAgICAgc2VsZi5zZGtfcmVwbyA9IHNlbGYucmVwb3MuYWRkKAotICAgICAgICAg ICAgRmxhdHBha1JlcG8oIndlYmtpdC1zZGsiLAotICAgICAgICAgICAgICAgICAgICAgICAgdXJs PSJodHRwczovL3NvZnR3YXJlLmlnYWxpYS5jb20vd2Via2l0LXNkay1yZXBvLyIsCi0gICAgICAg ICAgICAgICAgICAgICAgICByZXBvX2ZpbGU9Imh0dHBzOi8vc29mdHdhcmUuaWdhbGlhLmNvbS9m bGF0cGFrLXJlZnMvd2Via2l0LXNkay5mbGF0cGFrcmVwbyIpCi0gICAgICAgICkKKyAgICAgICAg dXJsID0gImh0dHBzOi8vc29mdHdhcmUuaWdhbGlhLmNvbS93ZWJraXQtc2RrLXJlcG8vIgorICAg ICAgICByZXBvX2ZpbGUgPSAiaHR0cHM6Ly9zb2Z0d2FyZS5pZ2FsaWEuY29tL2ZsYXRwYWstcmVm cy93ZWJraXQtc2RrLmZsYXRwYWtyZXBvIgorICAgICAgICBpZiBzZWxmLnVzZXJfcmVwbzoKKyAg ICAgICAgICAgIHVybCA9ICJmaWxlOi8vJXMiICUgc2VsZi51c2VyX3JlcG8KKyAgICAgICAgICAg IHJlcG9fZmlsZSA9IE5vbmUKKyAgICAgICAgc2VsZi5zZGtfcmVwbyA9IHNlbGYucmVwb3MuYWRk KEZsYXRwYWtSZXBvKCJ3ZWJraXQtc2RrIiwgdXJsPXVybCwgcmVwb19maWxlPXJlcG9fZmlsZSkp CiAKICAgICBkZWYgc2V0dXBfYnVpbGRkaXIoc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBpZiBv cy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgsICJtZXRh ZGF0YSIpKToKQEAgLTYwOCw2ICs2MTcsMTIgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAg ICAgaWYgbm90IGlzaW5zdGFuY2UoYXJncywgbGlzdCk6CiAgICAgICAgICAgICBhcmdzID0gbGlz dChhcmdzKQogCisgICAgICAgIHNhbmRib3hfYnVpbGRfcGF0aCA9IG9zLnBhdGguam9pbihzZWxm LnNhbmRib3hfc291cmNlX3Jvb3QsICJXZWJLaXRCdWlsZCIsIHNlbGYuYnVpbGRfdHlwZSkKKyAg ICAgICAgc2FuZGJveF9lbnZpcm9ubWVudCA9IHsKKyAgICAgICAgICAgICJXRUJLSVRfVE9QX0xF VkVMIjogIi9hcHAvIiwKKyAgICAgICAgICAgICJURVNUX1JVTk5FUl9JTkpFQ1RFRF9CVU5ETEVf RklMRU5BTUUiOiBvcy5wYXRoLmpvaW4oc2FuZGJveF9idWlsZF9wYXRoLCAibGliL2xpYlRlc3RS dW5uZXJJbmplY3RlZEJ1bmRsZS5zbyIpLAorICAgICAgICB9CisKICAgICAgICAgaWYgYXJnczoK ICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGFyZ3NbMF0pOgogICAgICAgICAgICAgICAg IGNvbW1hbmQgPSBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGguYWJzcGF0aChhcmdzWzBdKSkKQEAg LTYxNSwxMSArNjMwLDE0IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAgICAg YXJnc1swXSA9IGNvbW1hbmQucmVwbGFjZShzZWxmLnNvdXJjZV9yb290LCBzZWxmLnNhbmRib3hf c291cmNlX3Jvb3QpCiAgICAgICAgICAgICBpZiBhcmdzWzBdLmVuZHN3aXRoKCJidWlsZC13ZWJr aXQiKToKICAgICAgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLS1wcmVmaXg9L2FwcCIpCisKKyAg ICAgICAgICAgIGlmIGFyZ3NbMF0gPT0gImJhc2giOgorICAgICAgICAgICAgICAgIGFyZ3MuZXh0 ZW5kKFsnLS1ub3Byb2ZpbGUnLCAnLS1ub3JjJywgJy1pJ10pCisgICAgICAgICAgICAgICAgc2Fu ZGJveF9lbnZpcm9ubWVudFsiUFMxIl0gPSAiW/Cfk6bwn4yQ8J+QsSAkRkxBVFBBS19JRCBcXFdd XFwkICIKICAgICAgICAgICAgIGJ1aWxkaW5nID0gb3MucGF0aC5iYXNlbmFtZShhcmdzWzBdKS5z dGFydHN3aXRoKCJidWlsZCIpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBidWlsZGluZyA9 IEZhbHNlCiAKLSAgICAgICAgc2FuZGJveF9idWlsZF9wYXRoID0gb3MucGF0aC5qb2luKHNlbGYu c2FuZGJveF9zb3VyY2Vfcm9vdCwgIldlYktpdEJ1aWxkIiwgc2VsZi5idWlsZF90eXBlKQogICAg ICAgICAjIEZJWE1FOiBVc2luZyB0aGUgYHJ1bmAgZmxhdHBhayBjb21tYW5kIHdvdWxkIGJlIGJl dHRlciwgYnV0IGl0IGRvZXNuJ3QKICAgICAgICAgIyBoYXZlIGEgLS1iaW5kLW1vdW50IG9wdGlv bi4KICAgICAgICAgZmxhdHBha19jb21tYW5kID0gWyJmbGF0cGFrIiwgImJ1aWxkIiwKQEAgLTY1 MSwxMSArNjY5LDYgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgb3MucGF0aC5p c2RpcihzZWxmLmJ1aWxkX3BhdGgpOgogICAgICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVu ZCgiLS1iaW5kLW1vdW50PSVzPSVzIiAlIChzYW5kYm94X2J1aWxkX3BhdGgsIHNlbGYuYnVpbGRf cGF0aCkpCiAKLSAgICAgICAgZm9yd2FyZGVkID0gewotICAgICAgICAgICAgIldFQktJVF9UT1Bf TEVWRUwiOiAiL2FwcC8iLAotICAgICAgICAgICAgIlRFU1RfUlVOTkVSX0lOSkVDVEVEX0JVTkRM RV9GSUxFTkFNRSI6IG9zLnBhdGguam9pbihzYW5kYm94X2J1aWxkX3BhdGgsICJsaWIvbGliVGVz dFJ1bm5lckluamVjdGVkQnVuZGxlLnNvIiksCi0gICAgICAgIH0KLQogICAgICAgICBpZiBub3Qg YnVpbGRpbmc6CiAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuZXh0ZW5kKFsKICAgICAgICAg ICAgICAgICAiLS1kZXZpY2U9YWxsIiwKQEAgLTY5MCw5ICs3MDMsOSBAQCBjbGFzcyBXZWJraXRG bGF0cGFrOgogICAgICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAgIF9sb2cu ZGVidWcoIkNhbid0IGZpbmQgdXNlciBkb2N1bWVudCBwYXRoIGF0ICd7dWlkX2RvY19wYXRofScu IE5vdCBtb3VudGluZyBpdC4iLmZvcm1hdCh1aWRfZG9jX3BhdGg9dWlkX2RvY19wYXRoKSkKIAot ICAgICAgICAgICAgZm9yd2FyZGVkLnVwZGF0ZSh7CisgICAgICAgICAgICBzYW5kYm94X2Vudmly b25tZW50LnVwZGF0ZSh7CiAgICAgICAgICAgICAgICAgIlRaIjogIlBTVDhQRFQiLAotICAgICAg ICAgICAgICAgICJMQU5HIjogImVuX1VTLlVURi04IgorICAgICAgICAgICAgICAgICJMQU5HIjog ImVuX1VTLlVURi04IiwKICAgICAgICAgICAgIH0pCiAKICAgICAgICAgZW52X3Zhcl9wcmVmaXhl c190b19rZWVwID0gWwpAQCAtNzAzLDYgKzcxNiw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAg ICAgICAgICAgICAiSUNFQ0MiLAogICAgICAgICAgICAgIkpTQyIsCiAgICAgICAgICAgICAiU0ND QUNIRSIsCisgICAgICAgICAgICAiV0FZTEFORCIsCiAgICAgICAgICAgICAiV0VCS0lUIiwKICAg ICAgICAgICAgICJXRUJLSVQyIiwKICAgICAgICAgICAgICJXUEUiLApAQCAtNzEwLDYgKzcyNCw3 IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgZW52X3Zhcl9zdWZmaXhlc190b19r ZWVwID0gWwogICAgICAgICAgICAgIkpTQ19BUkdTIiwKKyAgICAgICAgICAgICJQUk9DRVNTX0NN RF9QUkVGSVgiLAogICAgICAgICAgICAgIldFQktJVF9BUkdTIiwKICAgICAgICAgXQogCkBAIC03 MjQsMTYgKzczOSwxMCBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgIkxBTkci LAogICAgICAgICAgICAgIkxERkxBR1MiLAogICAgICAgICAgICAgIk1hbGxvYyIsCi0gICAgICAg ICAgICAiR1BVX1BST0NFU1NfQ01EX1BSRUZJWCIsCi0gICAgICAgICAgICAiTkVUV09SS19QUk9D RVNTX0NNRF9QUkVGSVgiLAogICAgICAgICAgICAgIk5VTUJFUl9PRl9QUk9DRVNTT1JTIiwKLSAg ICAgICAgICAgICJQTFVHSU5fUFJPQ0VTU19DTURfUFJFRklYIiwKICAgICAgICAgICAgICJRTUwy X0lNUE9SVF9QQVRIIiwKICAgICAgICAgICAgICJSRVNVTFRTX1NFUlZFUl9BUElfS0VZIiwKICAg ICAgICAgICAgICJTU0xLRVlMT0dGSUxFIiwKLSAgICAgICAgICAgICJXQVlMQU5EX0RJU1BMQVki LAotICAgICAgICAgICAgIldBWUxBTkRfU09DS0VUIiwKLSAgICAgICAgICAgICJXRUJfUFJPQ0VT U19DTURfUFJFRklYIgogICAgICAgICBdCiAKICAgICAgICAgZW52X3ZhcnMgPSBvcy5lbnZpcm9u CkBAIC03NDEsNyArNzUwLDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZm9yIGVu dnZhciwgdmFsdWUgaW4gZW52X3ZhcnMuaXRlbXMoKToKICAgICAgICAgICAgIHZhcl90b2tlbnMg PSBlbnZ2YXIuc3BsaXQoIl8iKQogICAgICAgICAgICAgaWYgdmFyX3Rva2Vuc1swXSBpbiBlbnZf dmFyX3ByZWZpeGVzX3RvX2tlZXAgb3IgZW52dmFyIGluIGVudl92YXJzX3RvX2tlZXAgb3IgdmFy X3Rva2Vuc1stMV0gaW4gZW52X3Zhcl9zdWZmaXhlc190b19rZWVwOgotICAgICAgICAgICAgICAg IGZvcndhcmRlZFtlbnZ2YXJdID0gdmFsdWUKKyAgICAgICAgICAgICAgICBzYW5kYm94X2Vudmly b25tZW50W2VudnZhcl0gPSB2YWx1ZQogCiAgICAgICAgIHNoYXJlX25ldHdvcmtfb3B0aW9uID0g Ii0tc2hhcmU9bmV0d29yayIKICAgICAgICAgcmVtb3RlX3NjY2FjaGVfY29uZmlncyA9IHNldChb IlNDQ0FDSEVfUkVESVMiLCAiU0NDQUNIRV9CVUNLRVQiLCAiU0NDQUNIRV9NRU1DQUNIRUQiLApA QCAtNzU0LDcgKzc2Myw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIG92ZXJyaWRl X3NjY2FjaGVfc2VydmVyX3BvcnQgPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX1NDQ0FDSEVfU0VS VkVSX1BPUlQiKQogICAgICAgICBpZiBvdmVycmlkZV9zY2NhY2hlX3NlcnZlcl9wb3J0OgogICAg ICAgICAgICAgX2xvZy5kZWJ1ZygiT3ZlcnJpZGluZyBzY2NhY2hlIHNlcnZlciBwb3J0IHRvICVz IiAlIG92ZXJyaWRlX3NjY2FjaGVfc2VydmVyX3BvcnQpCi0gICAgICAgICAgICBmb3J3YXJkZWRb IlNDQ0FDSEVfU0VSVkVSX1BPUlQiXSA9IG92ZXJyaWRlX3NjY2FjaGVfc2VydmVyX3BvcnQKKyAg ICAgICAgICAgIHNhbmRib3hfZW52aXJvbm1lbnRbIlNDQ0FDSEVfU0VSVkVSX1BPUlQiXSA9IG92 ZXJyaWRlX3NjY2FjaGVfc2VydmVyX3BvcnQKIAogICAgICAgICBpZiBzZWxmLnVzZV9pY2VjcmVh bSBhbmQgbm90IHNlbGYucmVnZW5lcmF0ZV90b29sY2hhaW5zOgogICAgICAgICAgICAgX2xvZy5k ZWJ1ZygnRW5hYmxpbmcgdGhlIGljZWNyZWFtIGNvbXBpbGVyJykKQEAgLTc2OSwxMyArNzc4LDEz IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBpZiBub3Qgb3MucGF0aC5pc2Zp bGUodG9vbGNoYWluX3BhdGgpOgogICAgICAgICAgICAgICAgIENvbnNvbGUuZXJyb3JfbWVzc2Fn ZSgiJXMgaXMgbm90IGEgdmFsaWQgSWNlQ0MgdG9vbGNoYWluLiBQbGVhc2UgcnVuIHdlYmtpdC1m bGF0cGFrIC1yIiwgdG9vbGNoYWluX3BhdGgpCiAgICAgICAgICAgICAgICAgcmV0dXJuIDEKLSAg ICAgICAgICAgIGZvcndhcmRlZC51cGRhdGUoeworICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9u bWVudC51cGRhdGUoewogICAgICAgICAgICAgICAgICJDQ0FDSEVfUFJFRklYIjogImljZWNjIiwK ICAgICAgICAgICAgICAgICAiSUNFQ0NfVkVSU0lPTiI6IHRvb2xjaGFpbl9wYXRoLAogICAgICAg ICAgICAgICAgICJOVU1CRVJfT0ZfUFJPQ0VTU09SUyI6IG5fY29yZXMsCiAgICAgICAgICAgICB9 KQogCi0gICAgICAgIGZvciBlbnZ2YXIsIHZhbHVlIGluIGZvcndhcmRlZC5pdGVtcygpOgorICAg ICAgICBmb3IgZW52dmFyLCB2YWx1ZSBpbiBzYW5kYm94X2Vudmlyb25tZW50Lml0ZW1zKCk6CiAg ICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBwZW5kKCItLWVudj0lcz0lcyIgJSAoZW52dmFy LCB2YWx1ZSkpCiAKICAgICAgICAgZ3N0X2VudiA9IFtdCkBAIC04OTMsOSArOTAyLDExIEBAIGNs YXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYuZmxhdGh1Yl9yZXBvID0gc2VsZi5yZXBv cy5hZGQoCiAgICAgICAgICAgICBGbGF0cGFrUmVwbygiZmxhdGh1YiIsIHJlcG9fZmlsZT0iaHR0 cHM6Ly9kbC5mbGF0aHViLm9yZy9yZXBvL2ZsYXRodWIuZmxhdHBha3JlcG8iKQogICAgICAgICAp Ci0gICAgICAgIGdsX2V4dGVuc2lvbiA9IEZsYXRwYWtQYWNrYWdlKCJvcmcuZnJlZWRlc2t0b3Au UGxhdGZvcm0uR0wuZGVmYXVsdCIsICIxOS4wOCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuZmxhdGh1Yl9yZXBvLCAieDg2XzY0IikKLSAgICAgICAgcGFja2Fn ZXMuYXBwZW5kKGdsX2V4dGVuc2lvbikKKworICAgICAgICBwYWNrYWdlcy5hcHBlbmQoRmxhdHBh a1BhY2thZ2UoIm9yZy5mcmVlZGVza3RvcC5QbGF0Zm9ybS5HTC5kZWZhdWx0IiwgIjE5LjA4IiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZmxhdGh1Yl9yZXBv LCAieDg2XzY0IikpCisgICAgICAgIHBhY2thZ2VzLmFwcGVuZChGbGF0cGFrUGFja2FnZSgib3Jn LmZyZWVkZXNrdG9wLlBsYXRmb3JtLmZmbXBlZy1mdWxsIiwgIjE5LjA4IiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZmxhdGh1Yl9yZXBvLCAieDg2XzY0Iikp CiAKICAgICAgICAgaWYgc2VsZi5kZWJ1ZzoKICAgICAgICAgICAgIHNka19kZWJ1ZyA9IEZsYXRw YWtQYWNrYWdlKCdvcmcud2Via2l0LlNkay5EZWJ1ZycsIHNlbGYuc2RrX2JyYW5jaCwKQEAgLTk1 Myw3ICs5NjQsOCBAQCBkZWYgcnVuX2luX3NhbmRib3hfaWZfYXZhaWxhYmxlKGFyZ3MpOgogICAg IGlmIG9zLmVudmlyb24uZ2V0KCdXRUJLSVRfSkhCVUlMRCcsICcwJykgPT0gJzEnOgogICAgICAg ICByZXR1cm4gTm9uZQogCi0gICAgaWYgbm90IG9zLnBhdGguaXNkaXIoRkxBVFBBS19VU0VSX0RJ Ul9QQVRIKToKKyAgICBvcy5lbnZpcm9uWyJGTEFUUEFLX1VTRVJfRElSIl0gPSBvcy5lbnZpcm9u LmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIiLCBGTEFUUEFLX1VTRVJfRElSX1BBVEgpCisg ICAgaWYgbm90IG9zLnBhdGguaXNkaXIob3MuZW52aXJvblsiRkxBVFBBS19VU0VSX0RJUiJdKToK ICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGlmIGlzX3NhbmRib3hlZCgpOgo= 398354 2020-05-04 01:12:15 -0700 2020-05-04 01:12:15 -0700 Patch bug-211370-20200504091214.patch text/plain 13982 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmJiMGJkZWI0ODk0ODhjYTEwMDZjMGFlMWJkNTc4Mzlm NDhiNWY3Yy4uNWY4MTg0MmJiOTg2ZjI3MjAwZTgzZmNjYmJlMTg2MWQ5N2IwM2RmNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIwLTA1LTA0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIFN1cHBvcnQgZm9yIGxvY2FsIHJlcG9zaXRvcnkgYW5k IGRyaXZlLWJ5IGZpeGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTEzNzAKKworICAgICAgICBSZXZpZXdlZCBieSDFvWFuIERvYmVyxaFlay4KKwor ICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBuZXcgLS1yZXBvIG9wdGlvbiB0byB3ZWJraXQtZmxh dHBhaywgYWxsb3dpbmcKKyAgICAgICAgU0RLIGRldmVsb3BlcnMgdG8gdGVzdCBsb2NhbCBjaGFu Z2VzIG1hZGUgdG8gdGhlIFNESy4gQXMgZnV0dXJlCisgICAgICAgIHZlcnNpb25zIG9mIHRoZSBT REsgd2lsbCBkZXBlbmQgb24gdGhlIGZmbXBlZyBGRE8gZXh0ZW5zaW9uLAorICAgICAgICBmbGF0 cGFrdXRpbHMgaW5zdGFsbHMgaXQgZnJvbSBub3cgb24uIE9uZSBjb25zZXF1ZW5jZSBpcyB0aGF0 IHRoZQorICAgICAgICBMRF9MSUJSQVJZX1BBVEggc2V0IGluIHRoZSBHVEsgbGF5b3V0IHRlc3Qg ZHJpdmVyIGlzIG5vIGxvbmdlcgorICAgICAgICBvdmVycmlkZW4gd2hlbiBydW5uaW5nIGluIHRo ZSBmbGF0cGFrIFNESywgaW4gb3JkZXIgdG8gYWxsb3cgdGhlCisgICAgICAgIGV4dGVuc2lvbiB0 byBzZXQgaXQgY29ycmVjdGx5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0 ay5weToKKyAgICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKToKKyAgICAg ICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAgKEZsYXRwYWtSZXBvcy5hZGQp OgorICAgICAgICAoRmxhdHBha1JlcG8ucmVwb19maWxlKToKKyAgICAgICAgKFdlYmtpdEZsYXRw YWsubG9hZF9mcm9tX2FyZ3MpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5fX2luaXRfXyk6Cisg ICAgICAgIChXZWJraXRGbGF0cGFrLmNsZWFuX2FyZ3MpOgorICAgICAgICAoV2Via2l0RmxhdHBh ay5fcmVzZXRfcmVwb3NpdG9yeSk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5k Ym94KToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX2dldF9wYWNrYWdlcyk6CisgICAgICAgIChy dW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUpOgorCiAyMDIwLTA1LTA0ICBFbWlsaW8gQ29ib3Mg w4FsdmFyZXogIDxlbWlsaW9AY3Jpc2FsLmlvPgogCiAgICAgICAgIFB1dCBsaCAvIHJsaCB1bml0 cyBiZWhpbmQgYSBmbGFnIHVudGlsIGJ1ZyAyMTEzNTEgaXMgc29ydGVkIG91dC4KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvZ3RrLnB5CmluZGV4IGUzYmYzNzBmNTA2YjNkYTkzNjg3ZGE5NmZiMjBkMDRh M2ViNzAyOTguLmQzMWVlOTNmOTQ4M2I0ODljNWQ4MjA4OWQ1NDVhNGYzZmUzZDNmMzEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQpAQCAtMTQ3LDkgKzE0Nyw2IEBAIGNsYXNzIEd0a1Bv cnQoUG9ydCk6CiAgICAgICAgICAgICAgICAgIyBGb3JjZSB0aGUgR2FsbGl1bSBsbHZtcGlwZSBz b2Z0d2FyZSByYXN0ZXJpemVyCiAgICAgICAgICAgICAgICAgZW52aXJvbm1lbnRbJ0xJQkdMX0FM V0FZU19TT0ZUV0FSRSddID0gIjEiCiAgICAgICAgICAgICAgICAgZW52aXJvbm1lbnRbJ0xJQkdM X0RSSVZFUlNfUEFUSCddID0gZHJpX2xpYmdsX3BhdGgKLSAgICAgICAgICAgICAgICBlbnZpcm9u bWVudFsnTERfTElCUkFSWV9QQVRIJ10gPSBsbHZtcGlwZV9saWJnbF9wYXRoCi0gICAgICAgICAg ICAgICAgaWYgb3MuZW52aXJvbi5nZXQoJ0xEX0xJQlJBUllfUEFUSCcpOgotICAgICAgICAgICAg ICAgICAgICBlbnZpcm9ubWVudFsnTERfTElCUkFSWV9QQVRIJ10gKz0gJzolcycgJSBvcy5lbnZp cm9uLmdldCgnTERfTElCUkFSWV9QQVRIJykKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAg ICAgICAgX2xvZy53YXJuaW5nKCJDYW4ndCBmaW5kIEdhbGxpdW0gbGx2bXBpcGUgZHJpdmVyLiBU cnkgdG8gcnVuIHVwZGF0ZS13ZWJraXRndGstbGlicyBvciB1cGRhdGUtd2Via2l0LWZsYXRwYWsi KQogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oImxlYWtzIik6CmRpZmYgLS1naXQgYS9Ub29s cy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5 CmluZGV4IDQ0NjNjNGQxNDZlODg5Mjg2ZDhhZWFmNWQ0NDQ3MDFhMGQzYzM1YWIuLjdiOWMyYmNm YzM3YTA2NDM4ODhmOGJiMGZlOTYzYTVjNWJkNWYyOGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRw YWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBA IC0xLDMgKzEsNCBAQAorIyAtKi0gY29kaW5nOiB1dGYtOCAtKi0KICMgQ29weXJpZ2h0IChDKSAy MDE3IElnYWxpYSBTLkwuCiAjCiAjIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTE5Myw3ICsxOTQsNyBAQCBjbGFzcyBGbGF0 cGFrT2JqZWN0OgogICAgICAgICBfbG9nLmRlYnVnKCJFeGVjdXRpbmcgJXMiICUgJyAnLmpvaW4o Y29tbWFuZCkpCiAgICAgICAgIG91dHB1dCA9IGZsYXRwYWtfcnVuX3Nhbml0aXplZChjb21tYW5k LCBnYXRoZXJfb3V0cHV0PWdhdGhlcl9vdXRwdXQgb3Igc2hvd19vdXRwdXQpCiAgICAgICAgIGlm IHNob3dfb3V0cHV0OgotICAgICAgICAgICAgcHJpbnQob3V0cHV0KQorICAgICAgICAgICAgcHJp bnQob3V0cHV0LmVuY29kZSgndXRmLTgnKSkKIAogICAgICAgICByZXR1cm4gb3V0cHV0CiAKQEAg LTI1NCwxOCArMjU1LDE5IEBAIGNsYXNzIEZsYXRwYWtSZXBvcyhGbGF0cGFrT2JqZWN0KToKIAog ICAgICAgICBpZiBzYW1lX25hbWU6CiAgICAgICAgICAgICBpZiBvdmVycmlkZToKLSAgICAgICAg ICAgICAgICBzZWxmLmZsYXRwYWsoInJlbW90ZS1tb2RpZnkiLCByZXBvLm5hbWUsICItLXVybD0i ICsgcmVwby51cmwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1lbnQ9IlNldHRp bmcgcmVwbyAlcyBVUkwgZnJvbSAlcyB0byAlcyIKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJSAocmVwby5uYW1lLCBzYW1lX25hbWUudXJsLCByZXBvLnVybCkpCisgICAgICAgICAgICAg ICAgc2VsZi5mbGF0cGFrKCJyZW1vdGUtbW9kaWZ5IiwgcmVwby5uYW1lLCAiLS11cmw9IiArIHJl cG8udXJsKQogICAgICAgICAgICAgICAgIHNhbWVfbmFtZS51cmwgPSByZXBvLnVybAogCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHNhbWVfbmFtZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAg ICAgICAgICByZXR1cm4gTm9uZQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5mbGF0 cGFrKCJyZW1vdGUtYWRkIiwgcmVwby5uYW1lLCAiLS1mcm9tIiwgcmVwby5yZXBvX2ZpbGUubmFt ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAiLS1pZi1ub3QtZXhpc3RzIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICBjb21tZW50PSJBZGRpbmcgcmVwbyAlcyIgJSByZXBvLm5hbWUpCisg ICAgICAgICAgICBhcmdzID0gWyJyZW1vdGUtYWRkIiwgcmVwby5uYW1lLCAiLS1pZi1ub3QtZXhp c3RzIl0KKyAgICAgICAgICAgIGlmIHJlcG8ucmVwb19maWxlOgorICAgICAgICAgICAgICAgIGFy Z3MuZXh0ZW5kKFsiLS1mcm9tIiwgcmVwby5yZXBvX2ZpbGUubmFtZV0pCisgICAgICAgICAgICBl bHNlOgorICAgICAgICAgICAgICAgIGFyZ3MuZXh0ZW5kKFsiLS1uby1ncGctdmVyaWZ5IiwgcmVw by51cmxdKQorICAgICAgICAgICAgc2VsZi5mbGF0cGFrKCphcmdzLCBjb21tZW50PSJBZGRpbmcg cmVwbyAlcyIgJSByZXBvLm5hbWUpCiAKICAgICAgICAgcmVwby5yZXBvcyA9IHNlbGYKICAgICAg ICAgcmV0dXJuIHJlcG8KQEAgLTMxNCw3ICszMTYsOSBAQCBjbGFzcyBGbGF0cGFrUmVwbyhGbGF0 cGFrT2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5fcmVwb19maWxlOgogICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX3JlcG9fZmlsZQogCi0gICAgICAgIGFzc2VydCBzZWxmLnJlcG9fZmlsZV9uYW1l CisgICAgICAgIGlmIG5vdCBzZWxmLnJlcG9fZmlsZV9uYW1lOgorICAgICAgICAgICAgcmV0dXJu IE5vbmUKKwogICAgICAgICBzZWxmLl9yZXBvX2ZpbGUgPSB0ZW1wZmlsZS5OYW1lZFRlbXBvcmFy eUZpbGUobW9kZT0id2IiKQogICAgICAgICBzZWxmLl9yZXBvX2ZpbGUud3JpdGUodXJsb3Blbihz ZWxmLnJlcG9fZmlsZV9uYW1lKS5yZWFkKCkpCiAgICAgICAgIHNlbGYuX3JlcG9fZmlsZS5mbHVz aCgpCkBAIC00MTYsNiArNDIwLDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZ2Vu ZXJhbC5hZGRfYXJndW1lbnQoIi0tdXNlLWljZWNyZWFtIiwgZGVzdD0idXNlX2ljZWNyZWFtIiwg aGVscD0iVXNlIHRoZSBkaXN0cmlidXRlZCBpY2VjcmVhbSAoaWNlY2MpIGNvbXBpbGVyLiIsIGFj dGlvbj0ic3RvcmVfdHJ1ZSIpCiAgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItciIsICIt LXJlZ2VuZXJhdGUtdG9vbGNoYWlucyIsIGRlc3Q9InJlZ2VuZXJhdGVfdG9vbGNoYWlucyIsIGFj dGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IlJl Z2VuZXJhdGUgSWNlQ0MgZGlzdHJpYnVhYmxlIHRvb2xjaGFpbiBhcmNoaXZlcyIpCisgICAgICAg IGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItLXJlcG8iLCBoZWxwPSJGaWxlc3lzdGVtIGFic29sdXRl IHBhdGggdG8gdGhlIEZsYXRwYWsgcmVwb3NpdG9yeSB0byB1c2UiLCBkZXN0PSJ1c2VyX3JlcG8i KQogCiAgICAgICAgIGRlYnVnb3B0aW9ucyA9IHBhcnNlci5hZGRfYXJndW1lbnRfZ3JvdXAoIkRl YnVnZ2luZyIpCiAgICAgICAgIGRlYnVnb3B0aW9ucy5hZGRfYXJndW1lbnQoIi0tZ2RiIiwgbmFy Z3M9Ij8iLCBoZWxwPSJBY3RpdmF0ZSBnZGIsIHBhc3NpbmcgZXh0cmEgYXJncyB0byBpdCBpZiB3 YW50ZWQuIikKQEAgLTQzOCw2ICs0NDMsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAg ICBzZWxmLnNka19yZXBvID0gTm9uZQogICAgICAgICBzZWxmLnJ1bnRpbWUgPSBOb25lCiAgICAg ICAgIHNlbGYuc2RrID0gTm9uZQorICAgICAgICBzZWxmLnVzZXJfcmVwbyA9IE5vbmUKIAogICAg ICAgICBzZWxmLnZlcmJvc2UgPSBGYWxzZQogICAgICAgICBzZWxmLnF1aWV0ID0gRmFsc2UKQEAg LTQ4NywxNCArNDkzLDE4IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHJldHVybiBy ZXN1bHQKIAogICAgIGRlZiBjbGVhbl9hcmdzKHNlbGYpOgotICAgICAgICBvcy5lbnZpcm9uWyJG TEFUUEFLX1VTRVJfRElSIl0gPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9E SVIiLCBGTEFUUEFLX1VTRVJfRElSX1BBVEgpCisgICAgICAgIGlmIHNlbGYudXNlcl9yZXBvOgor ICAgICAgICAgICAgb3MuZW52aXJvblsiRkxBVFBBS19VU0VSX0RJUiJdID0gRkxBVFBBS19VU0VS X0RJUl9QQVRIICsgIi5Mb2NhbCIKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIG9zLmVudmly b25bIkZMQVRQQUtfVVNFUl9ESVIiXSA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRfRkxBVFBBS19V U0VSX0RJUiIsIEZMQVRQQUtfVVNFUl9ESVJfUEFUSCkKKyAgICAgICAgc2VsZi5mbGF0cGFrX2J1 aWxkX3BhdGggPSBvcy5lbnZpcm9uWyJGTEFUUEFLX1VTRVJfRElSIl0KICAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgb3MubWFrZWRpcnMob3MuZW52aXJvblsiRkxBVFBBS19VU0VSX0RJUiJdKQor ICAgICAgICAgICAgb3MubWFrZWRpcnMoc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgpCiAgICAgICAg IGV4Y2VwdCBPU0Vycm9yIGFzIGU6CiAgICAgICAgICAgICBwYXNzCiAKICAgICAgICAgY29uZmln dXJlX2xvZ2dpbmcobG9nZ2luZy5ERUJVRyBpZiBzZWxmLnZlcmJvc2UgZWxzZSBsb2dnaW5nLklO Rk8pCi0gICAgICAgIF9sb2cuZGVidWcoIlVzaW5nIGZsYXRwYWsgdXNlciBkaXI6ICVzIiAlIG9z LmVudmlyb25bIkZMQVRQQUtfVVNFUl9ESVIiXSkKKyAgICAgICAgX2xvZy5kZWJ1ZygiVXNpbmcg ZmxhdHBhayB1c2VyIGRpcjogJXMiICUgc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgpCiAKICAgICAg ICAgaWYgbm90IHNlbGYuZGVidWcgYW5kIG5vdCBzZWxmLnJlbGVhc2U6CiAgICAgICAgICAgICBm YWN0b3J5ID0gUG9ydEZhY3RvcnkoU3lzdGVtSG9zdCgpKQpAQCAtNTA3LDggKzUxNyw2IEBAIGNs YXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGlmIHNlbGYuZ2RiIGlzIE5vbmUgYW5kICctLWdk YicgaW4gc3lzLmFyZ3Y6CiAgICAgICAgICAgICBzZWxmLmdkYiA9IFRydWUKIAotICAgICAgICBz ZWxmLmZsYXRwYWtfYnVpbGRfcGF0aCA9IG9zLmVudmlyb25bIkZMQVRQQUtfVVNFUl9ESVIiXQot CiAgICAgICAgIHNlbGYuYnVpbGRfcm9vdCA9IG9zLnBhdGguam9pbihzZWxmLnNvdXJjZV9yb290 LCAnV2ViS2l0QnVpbGQnKQogICAgICAgICBzZWxmLmJ1aWxkX3BhdGggPSBvcy5wYXRoLmpvaW4o c2VsZi5idWlsZF9yb290LCBzZWxmLnBsYXRmb3JtLCBzZWxmLmJ1aWxkX3R5cGUpCiAgICAgICAg IHNlbGYuY29uZmlnX2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgs ICd3ZWJraXRfZmxhdHBha19jb25maWcuanNvbicpCkBAIC01MzAsMTEgKzUzOCwxMiBAQCBjbGFz cyBXZWJraXRGbGF0cGFrOgogCiAgICAgZGVmIF9yZXNldF9yZXBvc2l0b3J5KHNlbGYpOgogICAg ICAgICBzZWxmLnJlcG9zID0gRmxhdHBha1JlcG9zKCkKLSAgICAgICAgc2VsZi5zZGtfcmVwbyA9 IHNlbGYucmVwb3MuYWRkKAotICAgICAgICAgICAgRmxhdHBha1JlcG8oIndlYmtpdC1zZGsiLAot ICAgICAgICAgICAgICAgICAgICAgICAgdXJsPSJodHRwczovL3NvZnR3YXJlLmlnYWxpYS5jb20v d2Via2l0LXNkay1yZXBvLyIsCi0gICAgICAgICAgICAgICAgICAgICAgICByZXBvX2ZpbGU9Imh0 dHBzOi8vc29mdHdhcmUuaWdhbGlhLmNvbS9mbGF0cGFrLXJlZnMvd2Via2l0LXNkay5mbGF0cGFr cmVwbyIpCi0gICAgICAgICkKKyAgICAgICAgdXJsID0gImh0dHBzOi8vc29mdHdhcmUuaWdhbGlh LmNvbS93ZWJraXQtc2RrLXJlcG8vIgorICAgICAgICByZXBvX2ZpbGUgPSAiaHR0cHM6Ly9zb2Z0 d2FyZS5pZ2FsaWEuY29tL2ZsYXRwYWstcmVmcy93ZWJraXQtc2RrLmZsYXRwYWtyZXBvIgorICAg ICAgICBpZiBzZWxmLnVzZXJfcmVwbzoKKyAgICAgICAgICAgIHVybCA9ICJmaWxlOi8vJXMiICUg c2VsZi51c2VyX3JlcG8KKyAgICAgICAgICAgIHJlcG9fZmlsZSA9IE5vbmUKKyAgICAgICAgc2Vs Zi5zZGtfcmVwbyA9IHNlbGYucmVwb3MuYWRkKEZsYXRwYWtSZXBvKCJ3ZWJraXQtc2RrIiwgdXJs PXVybCwgcmVwb19maWxlPXJlcG9fZmlsZSkpCiAKICAgICBkZWYgc2V0dXBfYnVpbGRkaXIoc2Vs ZiwgKiprd2FyZ3MpOgogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oc2Vs Zi5mbGF0cGFrX2J1aWxkX3BhdGgsICJtZXRhZGF0YSIpKToKQEAgLTYwOCw2ICs2MTcsMTIgQEAg Y2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJncywgbGlz dCk6CiAgICAgICAgICAgICBhcmdzID0gbGlzdChhcmdzKQogCisgICAgICAgIHNhbmRib3hfYnVp bGRfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLnNhbmRib3hfc291cmNlX3Jvb3QsICJXZWJLaXRC dWlsZCIsIHNlbGYuYnVpbGRfdHlwZSkKKyAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudCA9IHsK KyAgICAgICAgICAgICJXRUJLSVRfVE9QX0xFVkVMIjogIi9hcHAvIiwKKyAgICAgICAgICAgICJU RVNUX1JVTk5FUl9JTkpFQ1RFRF9CVU5ETEVfRklMRU5BTUUiOiBvcy5wYXRoLmpvaW4oc2FuZGJv eF9idWlsZF9wYXRoLCAibGliL2xpYlRlc3RSdW5uZXJJbmplY3RlZEJ1bmRsZS5zbyIpLAorICAg ICAgICB9CisKICAgICAgICAgaWYgYXJnczoKICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3Rz KGFyZ3NbMF0pOgogICAgICAgICAgICAgICAgIGNvbW1hbmQgPSBvcy5wYXRoLm5vcm1wYXRoKG9z LnBhdGguYWJzcGF0aChhcmdzWzBdKSkKQEAgLTYxNSwxMSArNjMwLDE0IEBAIGNsYXNzIFdlYmtp dEZsYXRwYWs6CiAgICAgICAgICAgICAgICAgYXJnc1swXSA9IGNvbW1hbmQucmVwbGFjZShzZWxm LnNvdXJjZV9yb290LCBzZWxmLnNhbmRib3hfc291cmNlX3Jvb3QpCiAgICAgICAgICAgICBpZiBh cmdzWzBdLmVuZHN3aXRoKCJidWlsZC13ZWJraXQiKToKICAgICAgICAgICAgICAgICBhcmdzLmFw cGVuZCgiLS1wcmVmaXg9L2FwcCIpCisKKyAgICAgICAgICAgIGlmIGFyZ3NbMF0gPT0gImJhc2gi OgorICAgICAgICAgICAgICAgIGFyZ3MuZXh0ZW5kKFsnLS1ub3Byb2ZpbGUnLCAnLS1ub3JjJywg Jy1pJ10pCisgICAgICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudFsiUFMxIl0gPSAiW/Cf k6bwn4yQ8J+QsSAkRkxBVFBBS19JRCBcXFddXFwkICIKICAgICAgICAgICAgIGJ1aWxkaW5nID0g b3MucGF0aC5iYXNlbmFtZShhcmdzWzBdKS5zdGFydHN3aXRoKCJidWlsZCIpCiAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICBidWlsZGluZyA9IEZhbHNlCiAKLSAgICAgICAgc2FuZGJveF9idWls ZF9wYXRoID0gb3MucGF0aC5qb2luKHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwgIldlYktpdEJ1 aWxkIiwgc2VsZi5idWlsZF90eXBlKQogICAgICAgICAjIEZJWE1FOiBVc2luZyB0aGUgYHJ1bmAg ZmxhdHBhayBjb21tYW5kIHdvdWxkIGJlIGJldHRlciwgYnV0IGl0IGRvZXNuJ3QKICAgICAgICAg IyBoYXZlIGEgLS1iaW5kLW1vdW50IG9wdGlvbi4KICAgICAgICAgZmxhdHBha19jb21tYW5kID0g WyJmbGF0cGFrIiwgImJ1aWxkIiwKQEAgLTY1MSwxMSArNjY5LDYgQEAgY2xhc3MgV2Via2l0Rmxh dHBhazoKICAgICAgICAgaWYgb3MucGF0aC5pc2RpcihzZWxmLmJ1aWxkX3BhdGgpOgogICAgICAg ICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgiLS1iaW5kLW1vdW50PSVzPSVzIiAlIChzYW5k Ym94X2J1aWxkX3BhdGgsIHNlbGYuYnVpbGRfcGF0aCkpCiAKLSAgICAgICAgZm9yd2FyZGVkID0g ewotICAgICAgICAgICAgIldFQktJVF9UT1BfTEVWRUwiOiAiL2FwcC8iLAotICAgICAgICAgICAg IlRFU1RfUlVOTkVSX0lOSkVDVEVEX0JVTkRMRV9GSUxFTkFNRSI6IG9zLnBhdGguam9pbihzYW5k Ym94X2J1aWxkX3BhdGgsICJsaWIvbGliVGVzdFJ1bm5lckluamVjdGVkQnVuZGxlLnNvIiksCi0g ICAgICAgIH0KLQogICAgICAgICBpZiBub3QgYnVpbGRpbmc6CiAgICAgICAgICAgICBmbGF0cGFr X2NvbW1hbmQuZXh0ZW5kKFsKICAgICAgICAgICAgICAgICAiLS1kZXZpY2U9YWxsIiwKQEAgLTY5 MCw5ICs3MDMsOSBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgICAgIGVsc2U6 CiAgICAgICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIkNhbid0IGZpbmQgdXNlciBkb2N1bWVu dCBwYXRoIGF0ICd7dWlkX2RvY19wYXRofScuIE5vdCBtb3VudGluZyBpdC4iLmZvcm1hdCh1aWRf ZG9jX3BhdGg9dWlkX2RvY19wYXRoKSkKIAotICAgICAgICAgICAgZm9yd2FyZGVkLnVwZGF0ZSh7 CisgICAgICAgICAgICBzYW5kYm94X2Vudmlyb25tZW50LnVwZGF0ZSh7CiAgICAgICAgICAgICAg ICAgIlRaIjogIlBTVDhQRFQiLAotICAgICAgICAgICAgICAgICJMQU5HIjogImVuX1VTLlVURi04 IgorICAgICAgICAgICAgICAgICJMQU5HIjogImVuX1VTLlVURi04IiwKICAgICAgICAgICAgIH0p CiAKICAgICAgICAgZW52X3Zhcl9wcmVmaXhlc190b19rZWVwID0gWwpAQCAtNzAzLDYgKzcxNiw3 IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAiSUNFQ0MiLAogICAgICAgICAg ICAgIkpTQyIsCiAgICAgICAgICAgICAiU0NDQUNIRSIsCisgICAgICAgICAgICAiV0FZTEFORCIs CiAgICAgICAgICAgICAiV0VCS0lUIiwKICAgICAgICAgICAgICJXRUJLSVQyIiwKICAgICAgICAg ICAgICJXUEUiLApAQCAtNzEwLDYgKzcyNCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAg ICAgICAgZW52X3Zhcl9zdWZmaXhlc190b19rZWVwID0gWwogICAgICAgICAgICAgIkpTQ19BUkdT IiwKKyAgICAgICAgICAgICJQUk9DRVNTX0NNRF9QUkVGSVgiLAogICAgICAgICAgICAgIldFQktJ VF9BUkdTIiwKICAgICAgICAgXQogCkBAIC03MjQsMTYgKzczOSwxMCBAQCBjbGFzcyBXZWJraXRG bGF0cGFrOgogICAgICAgICAgICAgIkxBTkciLAogICAgICAgICAgICAgIkxERkxBR1MiLAogICAg ICAgICAgICAgIk1hbGxvYyIsCi0gICAgICAgICAgICAiR1BVX1BST0NFU1NfQ01EX1BSRUZJWCIs Ci0gICAgICAgICAgICAiTkVUV09SS19QUk9DRVNTX0NNRF9QUkVGSVgiLAogICAgICAgICAgICAg Ik5VTUJFUl9PRl9QUk9DRVNTT1JTIiwKLSAgICAgICAgICAgICJQTFVHSU5fUFJPQ0VTU19DTURf UFJFRklYIiwKICAgICAgICAgICAgICJRTUwyX0lNUE9SVF9QQVRIIiwKICAgICAgICAgICAgICJS RVNVTFRTX1NFUlZFUl9BUElfS0VZIiwKICAgICAgICAgICAgICJTU0xLRVlMT0dGSUxFIiwKLSAg ICAgICAgICAgICJXQVlMQU5EX0RJU1BMQVkiLAotICAgICAgICAgICAgIldBWUxBTkRfU09DS0VU IiwKLSAgICAgICAgICAgICJXRUJfUFJPQ0VTU19DTURfUFJFRklYIgogICAgICAgICBdCiAKICAg ICAgICAgZW52X3ZhcnMgPSBvcy5lbnZpcm9uCkBAIC03NDEsNyArNzUwLDcgQEAgY2xhc3MgV2Vi a2l0RmxhdHBhazoKICAgICAgICAgZm9yIGVudnZhciwgdmFsdWUgaW4gZW52X3ZhcnMuaXRlbXMo KToKICAgICAgICAgICAgIHZhcl90b2tlbnMgPSBlbnZ2YXIuc3BsaXQoIl8iKQogICAgICAgICAg ICAgaWYgdmFyX3Rva2Vuc1swXSBpbiBlbnZfdmFyX3ByZWZpeGVzX3RvX2tlZXAgb3IgZW52dmFy IGluIGVudl92YXJzX3RvX2tlZXAgb3IgdmFyX3Rva2Vuc1stMV0gaW4gZW52X3Zhcl9zdWZmaXhl c190b19rZWVwOgotICAgICAgICAgICAgICAgIGZvcndhcmRlZFtlbnZ2YXJdID0gdmFsdWUKKyAg ICAgICAgICAgICAgICBzYW5kYm94X2Vudmlyb25tZW50W2VudnZhcl0gPSB2YWx1ZQogCiAgICAg ICAgIHNoYXJlX25ldHdvcmtfb3B0aW9uID0gIi0tc2hhcmU9bmV0d29yayIKICAgICAgICAgcmVt b3RlX3NjY2FjaGVfY29uZmlncyA9IHNldChbIlNDQ0FDSEVfUkVESVMiLCAiU0NDQUNIRV9CVUNL RVQiLCAiU0NDQUNIRV9NRU1DQUNIRUQiLApAQCAtNzU0LDcgKzc2Myw3IEBAIGNsYXNzIFdlYmtp dEZsYXRwYWs6CiAgICAgICAgIG92ZXJyaWRlX3NjY2FjaGVfc2VydmVyX3BvcnQgPSBvcy5lbnZp cm9uLmdldCgiV0VCS0lUX1NDQ0FDSEVfU0VSVkVSX1BPUlQiKQogICAgICAgICBpZiBvdmVycmlk ZV9zY2NhY2hlX3NlcnZlcl9wb3J0OgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiT3ZlcnJpZGlu ZyBzY2NhY2hlIHNlcnZlciBwb3J0IHRvICVzIiAlIG92ZXJyaWRlX3NjY2FjaGVfc2VydmVyX3Bv cnQpCi0gICAgICAgICAgICBmb3J3YXJkZWRbIlNDQ0FDSEVfU0VSVkVSX1BPUlQiXSA9IG92ZXJy aWRlX3NjY2FjaGVfc2VydmVyX3BvcnQKKyAgICAgICAgICAgIHNhbmRib3hfZW52aXJvbm1lbnRb IlNDQ0FDSEVfU0VSVkVSX1BPUlQiXSA9IG92ZXJyaWRlX3NjY2FjaGVfc2VydmVyX3BvcnQKIAog ICAgICAgICBpZiBzZWxmLnVzZV9pY2VjcmVhbSBhbmQgbm90IHNlbGYucmVnZW5lcmF0ZV90b29s Y2hhaW5zOgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygnRW5hYmxpbmcgdGhlIGljZWNyZWFtIGNv bXBpbGVyJykKQEAgLTc2OSwxMyArNzc4LDEzIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAg ICAgICAgICBpZiBub3Qgb3MucGF0aC5pc2ZpbGUodG9vbGNoYWluX3BhdGgpOgogICAgICAgICAg ICAgICAgIENvbnNvbGUuZXJyb3JfbWVzc2FnZSgiJXMgaXMgbm90IGEgdmFsaWQgSWNlQ0MgdG9v bGNoYWluLiBQbGVhc2UgcnVuIHdlYmtpdC1mbGF0cGFrIC1yIiwgdG9vbGNoYWluX3BhdGgpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIDEKLSAgICAgICAgICAgIGZvcndhcmRlZC51cGRhdGUoewor ICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudC51cGRhdGUoewogICAgICAgICAgICAgICAg ICJDQ0FDSEVfUFJFRklYIjogImljZWNjIiwKICAgICAgICAgICAgICAgICAiSUNFQ0NfVkVSU0lP TiI6IHRvb2xjaGFpbl9wYXRoLAogICAgICAgICAgICAgICAgICJOVU1CRVJfT0ZfUFJPQ0VTU09S UyI6IG5fY29yZXMsCiAgICAgICAgICAgICB9KQogCi0gICAgICAgIGZvciBlbnZ2YXIsIHZhbHVl IGluIGZvcndhcmRlZC5pdGVtcygpOgorICAgICAgICBmb3IgZW52dmFyLCB2YWx1ZSBpbiBzYW5k Ym94X2Vudmlyb25tZW50Lml0ZW1zKCk6CiAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBw ZW5kKCItLWVudj0lcz0lcyIgJSAoZW52dmFyLCB2YWx1ZSkpCiAKICAgICAgICAgZ3N0X2VudiA9 IFtdCkBAIC04OTMsOSArOTAyLDExIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNl bGYuZmxhdGh1Yl9yZXBvID0gc2VsZi5yZXBvcy5hZGQoCiAgICAgICAgICAgICBGbGF0cGFrUmVw bygiZmxhdGh1YiIsIHJlcG9fZmlsZT0iaHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9yZXBvL2ZsYXRo dWIuZmxhdHBha3JlcG8iKQogICAgICAgICApCi0gICAgICAgIGdsX2V4dGVuc2lvbiA9IEZsYXRw YWtQYWNrYWdlKCJvcmcuZnJlZWRlc2t0b3AuUGxhdGZvcm0uR0wuZGVmYXVsdCIsICIxOS4wOCIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZmxhdGh1Yl9yZXBv LCAieDg2XzY0IikKLSAgICAgICAgcGFja2FnZXMuYXBwZW5kKGdsX2V4dGVuc2lvbikKKworICAg ICAgICBwYWNrYWdlcy5hcHBlbmQoRmxhdHBha1BhY2thZ2UoIm9yZy5mcmVlZGVza3RvcC5QbGF0 Zm9ybS5HTC5kZWZhdWx0IiwgIjE5LjA4IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYuZmxhdGh1Yl9yZXBvLCAieDg2XzY0IikpCisgICAgICAgIHBhY2thZ2Vz LmFwcGVuZChGbGF0cGFrUGFja2FnZSgib3JnLmZyZWVkZXNrdG9wLlBsYXRmb3JtLmZmbXBlZy1m dWxsIiwgIjE5LjA4IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNl bGYuZmxhdGh1Yl9yZXBvLCAieDg2XzY0IikpCiAKICAgICAgICAgaWYgc2VsZi5kZWJ1ZzoKICAg ICAgICAgICAgIHNka19kZWJ1ZyA9IEZsYXRwYWtQYWNrYWdlKCdvcmcud2Via2l0LlNkay5EZWJ1 ZycsIHNlbGYuc2RrX2JyYW5jaCwKQEAgLTk1Myw3ICs5NjQsOCBAQCBkZWYgcnVuX2luX3NhbmRi b3hfaWZfYXZhaWxhYmxlKGFyZ3MpOgogICAgIGlmIG9zLmVudmlyb24uZ2V0KCdXRUJLSVRfSkhC VUlMRCcsICcwJykgPT0gJzEnOgogICAgICAgICByZXR1cm4gTm9uZQogCi0gICAgaWYgbm90IG9z LnBhdGguaXNkaXIoRkxBVFBBS19VU0VSX0RJUl9QQVRIKToKKyAgICBvcy5lbnZpcm9uWyJGTEFU UEFLX1VTRVJfRElSIl0gPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIi LCBGTEFUUEFLX1VTRVJfRElSX1BBVEgpCisgICAgaWYgbm90IG9zLnBhdGguaXNkaXIob3MuZW52 aXJvblsiRkxBVFBBS19VU0VSX0RJUiJdKToKICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGlm IGlzX3NhbmRib3hlZCgpOgo=