149994 2015-10-09 20:26:54 -0700 Perf dashboard tools shouldn't require server credentials in multiple configuration files 2016-02-16 13:52:19 -0800 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez jake.nielsen.webkit jond lforschler rniwa slewis timothy oldest_to_newest 1132099 0 rniwa 2015-10-09 20:26:54 -0700 Right now, change detection script's configurations, subversion configurations, and the dashboard access configurations each require username/password. Consolidate all those into one JSON at most. 1132104 1 262817 rniwa 2015-10-09 21:26:17 -0700 Created attachment 262817 Patch 1132533 2 262817 cdumez 2015-10-12 15:41:29 -0700 Comment on attachment 262817 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262817&action=review r=me with comments. > Websites/perf.webkit.org/ChangeLog:3 > + Perf dashboard tools shouldn't require sever credentials in multiple configuration files s/sever/server > Websites/perf.webkit.org/tools/detect-changes.js:31 > + for (var i = 0; i < args.length; i+=2) { missing spaces around += > Websites/perf.webkit.org/tools/detect-changes.js:42 > + console.error('Invalid arguemnt:', current); typo: argument. 1132555 3 rniwa 2015-10-12 16:06:14 -0700 Committed r190900: <http://trac.webkit.org/changeset/190900> 262817 2015-10-09 21:26:17 -0700 2015-10-12 15:41:29 -0700 Patch bug-149994-20151009212544.patch text/plain 12186 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwODM1KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQzIEBACisyMDE1LTEwLTA5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFBlcmYgZGFzaGJvYXJkIHRvb2xzIHNob3VsZG4ndCByZXF1aXJlIHNldmVyIGNy ZWRlbnRpYWxzIGluIG11bHRpcGxlIGNvbmZpZ3VyYXRpb24gZmlsZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTk5NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hZGUgZGV0ZWN0LWNoYW5nZXMuanMg YW5kIHB1bGwtc3ZuLnB5IHB1bGwgdXNlcm5hbWUgYW5kIHBhc3N3b3JkcyBmcm9tIHRoZSBzZXJ2 ZXIgY29uZmlnIEpTT04gdG8gcmVkdWNlCisgICAgICAgIHRoZSBudW1iZXIgb2YgSlNPTiBmaWxl cyB0aGF0IG5lZWQgdG8gaW5jbHVkZSBjcmVkZW50aWFscy4KKworICAgICAgICBBbHNvIG1hZGUg ZWFjaCBzY3JpcHQgcmVsb2FkIHRoZSBzZXJ2ZXIgY29uZmlnIGFmdGVyIHNsZWVwIHRvIGFsbG93 IGR5bmFtaWMgY3JlZGVudGlhbCB1cGRhdGVzLgorCisgICAgICAgIEluIGFkZGl0aW9uLCBjaGFu Z2UgdGhlIHNlcnZlciBjb25maWcgSlNPTidzIGZvcm1hdCB0byBpbmNsdWRlIHNjaGVtZSwgaG9z dCwgYW5kIHBvcnQgbnVtYmVycyBzZXBhcmF0ZWx5CisgICAgICAgIGluc3RlYWQgb2YgYSB1cmwg c2luY2UgZGV0ZWN0LWNoYW5nZXMuanMgbmVlZHMgZWFjaCB2YWx1ZSBzZXBhcmF0ZWx5LgorCisg ICAgICAgIFRoaXMgcmVkdWNlcyB0aGUgbnVtYmVyIG9mIEpTT05zIHdpdGggY3JlZGVudGlhbHMg dG8gdHdvIGZvciBvdXIgaW50ZXJuYWwgZGFzaGJvYXJkLgorCisgICAgICAgICogdG9vbHMvZGV0 ZWN0LWNoYW5nZXMuanM6CisgICAgICAgIChtYWluKTogQWRkZWQgYSBwcm9wZXJ0eSBhcmd1bWVu dCBwYXJzaW5nLiBOb3cgdGFrZXMgLS1zZXJ2ZXItY29uZmlnLWpzb24sIC0tY2hhbmdlLWRldGVj dGlvbi1jb25maWctanNvbiwKKyAgICAgICAgYW5kIC0tc2Vjb25kcy10by1zbGVlcCBsaWtlIG90 aGVyIHNjcmlwdHMuCisgICAgICAgIChwYXJzZUFyZ3VtZW50KTogQWRkZWQuCisgICAgICAgIChm ZXRjaE1hbmlmZXN0QW5kQW5hbHl6ZURhdGEpOiBSZWxvYWQgdGhlIHNlcnZlciBjb25maWcgSlNP Ti4KKyAgICAgICAgKGxvYWRTZXJ2ZXJDb25maWcpOiBBZGRlZC4gU2V0IHNldHRpbmdzLnBlcmZz ZXJ2ZXIgYW5kIHNldHRpbmdzLnNsYXZlIGZyb20gdGhlIHNlcnZlciBjb25maWcgSlNPTi4gQWxz bworICAgICAgICBhZGQgc2V0dGluZ3MucGVyZnNlcnZlci5ob3N0IHRvIG1hdGNoIHRoZSBvbGQg Zm9ybWF0LgorICAgICAgICAoY29uZmlndXJhdGlvbnNGb3JUZXN0aW5nKTogRml4ZWQgYSBidWcg dGhhdCB3ZSB0aHJvdyBhbiBleGNlcHRpb24gd2hlbiBhIGRhc2hib2FyZCBjb250YWlucyBhbiBl bXB0eSBjZWxsLgorCisgICAgICAgICogdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weToKKyAgICAg ICAgKG1haW4pOiBVc2UgbG9hZF9zZXJ2ZXJfY29uZmlnIGFmdGVyIGVhY2ggc2xlZXAuCisKKyAg ICAgICAgKiB0b29scy9wdWxsLXN2bi5weToKKyAgICAgICAgKG1haW4pOiBVc2UgbG9hZF9zZXJ2 ZXJfY29uZmlnIGFmdGVyIGVhY2ggc2xlZXAuCisgICAgICAgIChmZXRjaF9jb21taXRzX2FuZF9z dWJtaXQpOiBVc2UgdGhlIHBlcmYgZGFzaGJvYXJkJ3MgYXV0aCBhcyBzdWJ2ZXJzaW9uIGNyZWRl bnRpYWwgd2hlbiB1c2VTZXJ2ZXJBdXRoIGlzIHNldC4KKworICAgICAgICAqIHRvb2xzL3N5bmMt d2l0aC1idWlsZGJvdC5weToKKyAgICAgICAgKG1haW4pOiBVc2UgbG9hZF9zZXJ2ZXJfY29uZmln IGFmdGVyIGVhY2ggc2xlZXAuCisKKyAgICAgICAgKiB0b29scy91dGlsLnB5OgorICAgICAgICAo bG9hZF9zZXJ2ZXJfY29uZmlnKTogRXh0cmFjdGVkIGZyb20gcHl0aG9uIHNjcmlwdHMuIENvbXB1 dGVzIHNlcnZlcidzIHVybCBmcm9tIHNjaGVtZSwgaG9zdCwgYW5kIHBvcnQgbnVtYmVyCisgICAg ICAgIHRvIG1hdGNoIHRoZSBvbGQgZm9ybWF0IHB5dGhvbiBzY3JpcHRzIGV4Y2VwdC4KKwogMjAx NS0xMC0wOCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQZXJm IGRhc2hib2FyZCBlcnJvbmVvdXNseSBzaG93cyBhbiBvbGQgT1MgYnVpbGQgaW4gQS9CIHRlc3Rp bmcgcmFuZ2UKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9kZXRlY3QtY2hh bmdlcy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvZGV0 ZWN0LWNoYW5nZXMuanMJKHJldmlzaW9uIDE5MDgzNCkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy90b29scy9kZXRlY3QtY2hhbmdlcy5qcwkod29ya2luZyBjb3B5KQpAQCAtNywzMiArNyw4 NCBAQCB2YXIgZGF0YSA9IHJlcXVpcmUoJy4uL3B1YmxpYy92Mi9kYXRhLmpzCiB2YXIgUnVuc0Rh dGEgPSBkYXRhLlJ1bnNEYXRhOwogdmFyIFN0YXRpc3RpY3MgPSByZXF1aXJlKCcuLi9wdWJsaWMv djIvanMvc3RhdGlzdGljcy5qcycpOwogCisvLyBGSVhNRTogV2Ugc2hvdWxkbid0IHVzZSBhIGds b2JhbCB2YXJpYWJsZSBsaWtlIHRoaXMuCiB2YXIgc2V0dGluZ3M7CiBmdW5jdGlvbiBtYWluKGFy Z3YpCiB7Ci0gICAgaWYgKGFyZ3YubGVuZ3RoIDwgMykgewotICAgICAgICBjb25zb2xlLmVycm9y KCdQbGVhc2Ugc3BlY2lmeSB0aGUgc2V0dGluZ3MgSlNPTiBwYXRoJyk7Ci0gICAgICAgIHJldHVy biAxOwotICAgIH0KKyAgICB2YXIgb3B0aW9ucyA9IHBhcnNlQXJndW1lbnQoYXJndiwgWworICAg ICAgICB7bmFtZTogJy0tc2VydmVyLWNvbmZpZy1qc29uJywgcmVxdWlyZWQ6IHRydWV9LAorICAg ICAgICB7bmFtZTogJy0tY2hhbmdlLWRldGVjdGlvbi1jb25maWctanNvbicsIHJlcXVpcmVkOiB0 cnVlfSwKKyAgICAgICAge25hbWU6ICctLXNlY29uZHMtdG8tc2xlZXAnLCB0eXBlOiBwYXJzZUZs b2F0LCBkZWZhdWx0OiAxMjAwfSwKKyAgICBdKTsKKyAgICBpZiAoIW9wdGlvbnMpCisgICAgICAg IHJldHVybjsKIAotICAgIHNldHRpbmdzID0gSlNPTi5wYXJzZShmcy5yZWFkRmlsZVN5bmMoYXJn dlsyXSwgJ3V0ZjgnKSk7CisgICAgc2V0dGluZ3MgPSBKU09OLnBhcnNlKGZzLnJlYWRGaWxlU3lu YyhvcHRpb25zWyctLWNoYW5nZS1kZXRlY3Rpb24tY29uZmlnLWpzb24nXSwgJ3V0ZjgnKSk7Cisg ICAgc2V0dGluZ3Muc2Vjb25kc1RvU2xlZXAgPSBvcHRpb25zWyctLXNlY29uZHMtdG8tc2xlZXAn XTsKIAotICAgIGZldGNoTWFuaWZlc3RBbmRBbmFseXplRGF0YSgpOworICAgIGZldGNoTWFuaWZl c3RBbmRBbmFseXplRGF0YShvcHRpb25zWyctLXNlcnZlci1jb25maWctanNvbiddKTsKIH0KIAot ZnVuY3Rpb24gZmV0Y2hNYW5pZmVzdEFuZEFuYWx5emVEYXRhKCkKK2Z1bmN0aW9uIHBhcnNlQXJn dW1lbnQoYXJndiwgYWNjZXB0ZWRPcHRpb25zKSB7CisgICAgdmFyIGFyZ3MgPSBhcmd2LnNsaWNl KDIpOworICAgIHZhciBvcHRpb25zID0ge30KKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFyZ3Mu bGVuZ3RoOyBpKz0yKSB7CisgICAgICAgIHZhciBjdXJyZW50ID0gYXJnc1tpXTsKKyAgICAgICAg dmFyIG5leHQgPSBhcmdzW2kgKyAxXTsKKyAgICAgICAgZm9yICh2YXIgb3B0aW9uIG9mIGFjY2Vw dGVkT3B0aW9ucykgeworICAgICAgICAgICAgaWYgKGN1cnJlbnQgPT0gb3B0aW9uWyduYW1lJ10p IHsKKyAgICAgICAgICAgICAgICBvcHRpb25zW29wdGlvblsnbmFtZSddXSA9IG5leHQ7CisgICAg ICAgICAgICAgICAgbmV4dCA9IG51bGw7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgIH0KKyAgICAgICAgaWYgKG5leHQpIHsKKyAgICAgICAgICAgIGNvbnNv bGUuZXJyb3IoJ0ludmFsaWQgYXJndWVtbnQ6JywgY3VycmVudCk7CisgICAgICAgICAgICByZXR1 cm4gbnVsbDsKKyAgICAgICAgfQorICAgIH0KKyAgICBmb3IgKHZhciBvcHRpb24gb2YgYWNjZXB0 ZWRPcHRpb25zKSB7CisgICAgICAgIHZhciBuYW1lID0gb3B0aW9uWyduYW1lJ107CisgICAgICAg IGlmIChvcHRpb25bJ3JlcXVpcmVkJ10gJiYgIShuYW1lIGluIG9wdGlvbnMpKSB7CisgICAgICAg ICAgICBjb25zb2xlLmxvZygnUmVxdWlyZWQgYXJndW1lbnQnLCBuYW1lLCAnaXMgbWlzc2luZycp OworICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIH0KKyAgICAgICAgdmFyIHZhbHVl ID0gb3B0aW9uc1tuYW1lXSB8fCBvcHRpb25bJ2RlZmF1bHQnXTsKKyAgICAgICAgdmFyIGNvbnZl cnRlciA9IG9wdGlvblsndHlwZSddOworICAgICAgICBvcHRpb25zW25hbWVdID0gY29udmVydGVy ID8gY29udmVydGVyKHZhbHVlKSA6IHZhbHVlOworICAgIH0KKyAgICByZXR1cm4gb3B0aW9uczsK K30KKworZnVuY3Rpb24gZmV0Y2hNYW5pZmVzdEFuZEFuYWx5emVEYXRhKHNlcnZlckNvbmZpZ0pT T04pCiB7CisgICAgbG9hZFNlcnZlckNvbmZpZyhzZXJ2ZXJDb25maWdKU09OKTsKKwogICAgIGdl dEpTT04oc2V0dGluZ3MucGVyZnNlcnZlciwgJy9kYXRhL21hbmlmZXN0Lmpzb24nKS50aGVuKGZ1 bmN0aW9uIChtYW5pZmVzdCkgewogICAgICAgICByZXR1cm4gbWFwSW5PcmRlcihjb25maWd1cmF0 aW9uc0ZvclRlc3RpbmcobWFuaWZlc3QpLCBhbmFseXplQ29uZmlndXJhdGlvbik7CiAgICAgfSku Y2F0Y2goZnVuY3Rpb24gKHJlYXNvbikgewotICAgICAgICBjb25zb2xlLmVycm9yKCdGYWlsZWQg dG8gb2J0YWluIHRoZSBtYW5pZmVzdCBmaWxlJyk7CisgICAgICAgIGNvbnNvbGUuZXJyb3IoJ0Zh aWxlZCB0byBvYnRhaW4gdGhlIG1hbmlmZXN0IGZpbGUnLCByZWFzb24pOwogICAgIH0pLnRoZW4o ZnVuY3Rpb24gKCkgewogICAgICAgICBjb25zb2xlLmxvZygnJyk7CiAgICAgICAgIGNvbnNvbGUu bG9nKCdTbGVlaW5nIGZvcicsIHNldHRpbmdzLnNlY29uZHNUb1NsZWVwLCAnc2Vjb25kcycpOwot ICAgICAgICBzZXRUaW1lb3V0KGZldGNoTWFuaWZlc3RBbmRBbmFseXplRGF0YSwgc2V0dGluZ3Mu c2Vjb25kc1RvU2xlZXAgKiAxMDAwKTsKKyAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbiAoKSB7 CisgICAgICAgICAgICBmZXRjaE1hbmlmZXN0QW5kQW5hbHl6ZURhdGEoc2VydmVyQ29uZmlnSlNP Tik7CisgICAgICAgIH0sIHNldHRpbmdzLnNlY29uZHNUb1NsZWVwICogMTAwMCk7CiAgICAgfSk7 CiB9CiAKK2Z1bmN0aW9uIGxvYWRTZXJ2ZXJDb25maWcoc2VydmVyQ29uZmlnSlNPTikKK3sKKyAg ICB2YXIgc2VydmVyQ29uZmlnID0gSlNPTi5wYXJzZShmcy5yZWFkRmlsZVN5bmMoc2VydmVyQ29u ZmlnSlNPTiwgJ3V0ZjgnKSk7CisKKyAgICB2YXIgc2VydmVyID0gc2VydmVyQ29uZmlnWydzZXJ2 ZXInXTsKKyAgICBpZiAoJ2F1dGgnIGluIHNlcnZlcikKKyAgICAgICAgc2VydmVyWydhdXRoJ10g PSBzZXJ2ZXJbJ2F1dGgnXVsndXNlcm5hbWUnXSArICc6JyArIHNlcnZlclsnYXV0aCddWydwYXNz d29yZCddOworCisgICAgc2V0dGluZ3MucGVyZnNlcnZlciA9IHNlcnZlcjsKKyAgICBzZXR0aW5n cy5zbGF2ZSA9IHNlcnZlckNvbmZpZ1snc2xhdmUnXTsKK30KKwogZnVuY3Rpb24gbWFwSW5PcmRl cihhcnJheSwgY2FsbGJhY2ssIHN0YXJ0SW5kZXgpCiB7CiAgICAgaWYgKHN0YXJ0SW5kZXggPT09 IHVuZGVmaW5lZCkKQEAgLTU0LDggKzEwNiwxMiBAQCBmdW5jdGlvbiBjb25maWd1cmF0aW9uc0Zv clRlc3RpbmcobWFuaWZlCiAgICAgICAgIHZhciBkYXNoYm9hcmQgPSBtYW5pZmVzdC5kYXNoYm9h cmRzW25hbWVdOwogICAgICAgICBmb3IgKHZhciByb3cgb2YgZGFzaGJvYXJkKSB7CiAgICAgICAg ICAgICBmb3IgKHZhciBjZWxsIG9mIHJvdykgewotICAgICAgICAgICAgICAgIGlmIChjZWxsIGlu c3RhbmNlb2YgQXJyYXkpCi0gICAgICAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25zLnB1c2go e3BsYXRmb3JtSWQ6IHBhcnNlSW50KGNlbGxbMF0pLCBtZXRyaWNJZDogcGFyc2VJbnQoY2VsbFsx XSl9KTsKKyAgICAgICAgICAgICAgICBpZiAoY2VsbCBpbnN0YW5jZW9mIEFycmF5KSB7CisgICAg ICAgICAgICAgICAgICAgIHZhciBwbGF0Zm9ybUlkID0gcGFyc2VJbnQoY2VsbFswXSk7CisgICAg ICAgICAgICAgICAgICAgIHZhciBtZXRyaWNJZCA9IHBhcnNlSW50KGNlbGxbMV0pOworICAgICAg ICAgICAgICAgICAgICBpZiAoIWlzTmFOKHBsYXRmb3JtSWQpICYmICFpc05hTihtZXRyaWNJZCkp CisgICAgICAgICAgICAgICAgICAgICAgICBjb25maWd1cmF0aW9ucy5wdXNoKHtwbGF0Zm9ybUlk OiBwbGF0Zm9ybUlkLCBtZXRyaWNJZDogbWV0cmljSWR9KTsKKyAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weQkocmV2aXNpb24gMTkwODM0 KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL3B1bGwtb3MtdmVyc2lvbnMucHkJ KHdvcmtpbmcgY29weSkKQEAgLTE0LDcgKzE0LDcgQEAgZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0 ZXRpbWUKIGZyb20geG1sLmRvbS5taW5pZG9tIGltcG9ydCBwYXJzZVN0cmluZyBhcyBwYXJzZVht bFN0cmluZwogZnJvbSB1dGlsIGltcG9ydCBzdWJtaXRfY29tbWl0cwogZnJvbSB1dGlsIGltcG9y dCB0ZXh0X2NvbnRlbnQKLWZyb20gdXRpbCBpbXBvcnQgc2V0dXBfYXV0aAorZnJvbSB1dGlsIGlt cG9ydCBsb2FkX3NlcnZlcl9jb25maWcKIAogCiBkZWYgbWFpbihhcmd2KToKQEAgLTI3LDEzICsy NywxMCBAQCBkZWYgbWFpbihhcmd2KToKICAgICB3aXRoIG9wZW4oYXJncy5vc19jb25maWdfanNv bikgYXMgb3NfY29uZmlnX2pzb246CiAgICAgICAgIG9zX2NvbmZpZ19saXN0ID0ganNvbi5sb2Fk KG9zX2NvbmZpZ19qc29uKQogCi0gICAgd2l0aCBvcGVuKGFyZ3Muc2VydmVyX2NvbmZpZ19qc29u KSBhcyBzZXJ2ZXJfY29uZmlnX2pzb246Ci0gICAgICAgIHNlcnZlcl9jb25maWcgPSBqc29uLmxv YWQoc2VydmVyX2NvbmZpZ19qc29uKQotICAgICAgICBzZXR1cF9hdXRoKHNlcnZlcl9jb25maWdb J3NlcnZlciddKQotCiAgICAgZmV0Y2hlcnMgPSBbT1NCdWlsZEZldGNoZXIob3NfY29uZmlnKSBm b3Igb3NfY29uZmlnIGluIG9zX2NvbmZpZ19saXN0XQogCiAgICAgd2hpbGUgVHJ1ZToKKyAgICAg ICAgc2VydmVyX2NvbmZpZyA9IGxvYWRfc2VydmVyX2NvbmZpZyhhcmdzLnNlcnZlcl9jb25maWdf anNvbikKICAgICAgICAgZm9yIGZldGNoZXIgaW4gZmV0Y2hlcnM6CiAgICAgICAgICAgICBmZXRj aGVyLmZldGNoX2FuZF9yZXBvcnRfbmV3X2J1aWxkcyhzZXJ2ZXJfY29uZmlnKQogICAgICAgICBw cmludCAiU2xlZXBpbmcgZm9yICVkIHNlY29uZHMiICUgYXJncy5zZWNvbmRzX3RvX3NsZWVwCklu ZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1zdm4ucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL3B1bGwtc3ZuLnB5CShyZXZpc2lv biAxOTA4MzQpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1zdm4ucHkJ KHdvcmtpbmcgY29weSkKQEAgLTksNyArOSw3IEBAIGltcG9ydCB0aW1lCiBpbXBvcnQgdXJsbGli MgogCiBmcm9tIHhtbC5kb20ubWluaWRvbSBpbXBvcnQgcGFyc2VTdHJpbmcgYXMgcGFyc2VYbWxT dHJpbmcKLWZyb20gdXRpbCBpbXBvcnQgc2V0dXBfYXV0aAorZnJvbSB1dGlsIGltcG9ydCBsb2Fk X3NlcnZlcl9jb25maWcKIGZyb20gdXRpbCBpbXBvcnQgc3VibWl0X2NvbW1pdHMKIGZyb20gdXRp bCBpbXBvcnQgdGV4dF9jb250ZW50CiAKQEAgLTIyLDE0ICsyMiwxMSBAQCBkZWYgbWFpbihhcmd2 KToKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLW1heC1mZXRjaC1jb3VudCcsIHR5cGU9aW50 LCBkZWZhdWx0PTEwLCBoZWxwPSdUaGUgbnVtYmVyIG9mIGNvbW1pdHMgdG8gZmV0Y2ggYXQgb25j ZScpCiAgICAgYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkKIAotICAgIHdpdGggb3Blbihhcmdz LnNlcnZlcl9jb25maWdfanNvbikgYXMgc2VydmVyX2NvbmZpZ19qc29uOgotICAgICAgICBzZXJ2 ZXJfY29uZmlnID0ganNvbi5sb2FkKHNlcnZlcl9jb25maWdfanNvbikKLSAgICAgICAgc2V0dXBf YXV0aChzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXSkKLQogICAgIHdpdGggb3BlbihhcmdzLnN2bl9j b25maWdfanNvbikgYXMgc3ZuX2NvbmZpZ19qc29uOgogICAgICAgICBzdm5fY29uZmlnID0ganNv bi5sb2FkKHN2bl9jb25maWdfanNvbikKIAogICAgIHdoaWxlIFRydWU6CisgICAgICAgIHNlcnZl cl9jb25maWcgPSBsb2FkX3NlcnZlcl9jb25maWcoYXJncy5zZXJ2ZXJfY29uZmlnX2pzb24pCiAg ICAgICAgIGZvciByZXBvc2l0b3J5X2luZm8gaW4gc3ZuX2NvbmZpZzoKICAgICAgICAgICAgIGZl dGNoX2NvbW1pdHNfYW5kX3N1Ym1pdChyZXBvc2l0b3J5X2luZm8sIHNlcnZlcl9jb25maWcsIGFy Z3MubWF4X2ZldGNoX2NvdW50KQogICAgICAgICBwcmludCAiU2xlZXBpbmcgZm9yICVkIHNlY29u ZHMuLi4iICUgYXJncy5zZWNvbmRzX3RvX3NsZWVwCkBAIC00NCw2ICs0MSwxMCBAQCBkZWYgZmV0 Y2hfY29tbWl0c19hbmRfc3VibWl0KHJlcG9zaXRvcnksCiAgICAgICAgIHByaW50ICJEZXRlcm1p bmluZyB0aGUgc3RhdGluZyByZXZpc2lvbiBmb3IgJXMiICUgcmVwb3NpdG9yeVsnbmFtZSddCiAg ICAgICAgIHJlcG9zaXRvcnlbJ3JldmlzaW9uVG9GZWN0aCddID0gZGV0ZXJtaW5lX2ZpcnN0X3Jl dmlzaW9uX3RvX2ZldGNoKHNlcnZlcl9jb25maWdbJ3NlcnZlciddWyd1cmwnXSwgcmVwb3NpdG9y eVsnbmFtZSddKQogCisgICAgaWYgJ3VzZVNlcnZlckF1dGgnIGluIHJlcG9zaXRvcnk6CisgICAg ICAgIHJlcG9zaXRvcnlbJ3VzZXJuYW1lJ10gPSBzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXVsnYXV0 aCddWyd1c2VybmFtZSddCisgICAgICAgIHJlcG9zaXRvcnlbJ3Bhc3N3b3JkJ10gPSBzZXJ2ZXJf Y29uZmlnWydzZXJ2ZXInXVsnYXV0aCddWydwYXNzd29yZCddCisKICAgICBwZW5kaW5nX2NvbW1p dHMgPSBbXQogICAgIGZvciB1bnVzZWQgaW4gcmFuZ2UobWF4X2ZldGNoX2NvdW50KToKICAgICAg ICAgY29tbWl0ID0gZmV0Y2hfY29tbWl0X2FuZF9yZXNvbHZlX2F1dGhvcihyZXBvc2l0b3J5LCBy ZXBvc2l0b3J5LmdldCgnYWNjb3VudE5hbWVGaW5kZXJTY3JpcHQnLCBOb25lKSwgcmVwb3NpdG9y eVsncmV2aXNpb25Ub0ZlY3RoJ10pCkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9v bHMvc3luYy13aXRoLWJ1aWxkYm90LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy90b29scy9zeW5jLXdpdGgtYnVpbGRib3QucHkJKHJldmlzaW9uIDE5MDgzNCkKKysr IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9zeW5jLXdpdGgtYnVpbGRib3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTksNyArOSw3IEBAIGltcG9ydCB0aW1lCiBpbXBvcnQgdXJsbGliCiBp bXBvcnQgdXJsbGliMgogCi1mcm9tIHV0aWwgaW1wb3J0IHNldHVwX2F1dGgKK2Zyb20gdXRpbCBp bXBvcnQgbG9hZF9zZXJ2ZXJfY29uZmlnCiAKIAogZGVmIG1haW4oKToKQEAgLTI3LDE0ICsyNyw5 IEBAIGRlZiBtYWluKCk6CiAKICAgICBjb25maWd1cmF0aW9ucyA9IGxvYWRfY29uZmlnKGFyZ3Mu YnVpbGRlcl9jb25maWdfanNvbiwgYXJncy5idWlsZGJvdF91cmwuc3RyaXAoJy8nKSkKIAotICAg IHdpdGggb3BlbihhcmdzLnNlcnZlcl9jb25maWdfanNvbikgYXMgc2VydmVyX2NvbmZpZ19qc29u OgotICAgICAgICBzZXJ2ZXJfY29uZmlnID0ganNvbi5sb2FkKHNlcnZlcl9jb25maWdfanNvbikK LSAgICAgICAgc2V0dXBfYXV0aChzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXSkKLQotICAgIGJ1aWxk X3JlcXVlc3RzX3VybCA9IHNlcnZlcl9jb25maWdbJ3NlcnZlciddWyd1cmwnXSArICcvYXBpL2J1 aWxkLXJlcXVlc3RzLycgKyBhcmdzLnRyaWdnZXJhYmxlCi0KICAgICByZXF1ZXN0X3VwZGF0ZXMg PSB7fQogICAgIHdoaWxlIFRydWU6CisgICAgICAgIHNlcnZlcl9jb25maWcgPSBsb2FkX3NlcnZl cl9jb25maWcoYXJncy5zZXJ2ZXJfY29uZmlnX2pzb24pCiAgICAgICAgIHJlcXVlc3RfdXBkYXRl cy51cGRhdGUoZmluZF9yZXF1ZXN0X3VwZGF0ZXMoY29uZmlndXJhdGlvbnMsIGFyZ3MubG9va2Jh Y2tfY291bnQpKQogICAgICAgICBpZiByZXF1ZXN0X3VwZGF0ZXM6CiAgICAgICAgICAgICBwcmlu dCAnVXBkYXRpbmcgdGhlIGJ1aWxkIHJlcXVlc3RzICVzLi4uJyAlICcsICcuam9pbihtYXAoc3Ry LCByZXF1ZXN0X3VwZGF0ZXMua2V5cygpKSkKQEAgLTQ1LDYgKzQwLDggQEAgZGVmIG1haW4oKToK ICAgICAgICAgICAgICdidWlsZFJlcXVlc3RVcGRhdGVzJzogcmVxdWVzdF91cGRhdGVzLAogICAg ICAgICAgICAgJ3NsYXZlTmFtZSc6IHNlcnZlcl9jb25maWdbJ3NsYXZlJ11bJ25hbWUnXSwKICAg ICAgICAgICAgICdzbGF2ZVBhc3N3b3JkJzogc2VydmVyX2NvbmZpZ1snc2xhdmUnXVsncGFzc3dv cmQnXX0KKworICAgICAgICBidWlsZF9yZXF1ZXN0c191cmwgPSBzZXJ2ZXJfY29uZmlnWydzZXJ2 ZXInXVsndXJsJ10gKyAnL2FwaS9idWlsZC1yZXF1ZXN0cy8nICsgYXJncy50cmlnZ2VyYWJsZQog ICAgICAgICByZXNwb25zZSA9IHVwZGF0ZV9hbmRfZmV0Y2hfYnVpbGRfcmVxdWVzdHMoYnVpbGRf cmVxdWVzdHNfdXJsLCBwYXlsb2FkKQogICAgICAgICBvcGVuX3JlcXVlc3RzID0gcmVzcG9uc2Uu Z2V0KCdidWlsZFJlcXVlc3RzJywgW10pCiAKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy90b29scy91dGlsLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90 b29scy91dGlsLnB5CShyZXZpc2lvbiAxOTA4MzQpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvdG9vbHMvdXRpbC5weQkod29ya2luZyBjb3B5KQpAQCAtNTEsMyArNTEsMTIgQEAgZGVmIHNl dHVwX2F1dGgoc2VydmVyKToKICAgICBwYXNzd29yZF9tYW5hZ2VyLmFkZF9wYXNzd29yZChyZWFs bT1hdXRoWydyZWFsbSddLCB1cmk9c2VydmVyWyd1cmwnXSwgdXNlcj1hdXRoWyd1c2VybmFtZSdd LCBwYXNzd2Q9YXV0aFsncGFzc3dvcmQnXSkKICAgICBhdXRoX2hhbmRsZXIgPSBIVFRQX0FVVEhf SEFORExFUlNbYXV0aFsndHlwZSddXShwYXNzd29yZF9tYW5hZ2VyKQogICAgIHVybGxpYjIuaW5z dGFsbF9vcGVuZXIodXJsbGliMi5idWlsZF9vcGVuZXIoYXV0aF9oYW5kbGVyKSkKKworCitkZWYg bG9hZF9zZXJ2ZXJfY29uZmlnKGpzb25fcGF0aCk6CisgICAgd2l0aCBvcGVuKGpzb25fcGF0aCkg YXMgc2VydmVyX2NvbmZpZ19qc29uOgorICAgICAgICBzZXJ2ZXJfY29uZmlnID0ganNvbi5sb2Fk KHNlcnZlcl9jb25maWdfanNvbikKKyAgICAgICAgc2VydmVyID0gc2VydmVyX2NvbmZpZ1snc2Vy dmVyJ10KKyAgICAgICAgc2VydmVyWyd1cmwnXSA9IHNlcnZlclsnc2NoZW1lJ10gKyAnOi8vJyAr IHNlcnZlclsnaG9zdCddICsgJzonICsgc3RyKHNlcnZlclsncG9ydCddKQorICAgICAgICBzZXR1 cF9hdXRoKHNlcnZlcikKKyAgICAgICAgcmV0dXJuIHNlcnZlcl9jb25maWcK