146375 2015-06-26 19:21:52 -0700 build-requests should use conform to JSON API format 2015-06-27 14:32:11 -0700 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 146374 1 rniwa rniwa cdumez commit-queue kling slewis oldest_to_newest 1105129 0 rniwa 2015-06-26 19:21:52 -0700 Make build-requests conform to http://jsonapi.org/ This will simplify the work to support custom roots in the bug 146374. 1105135 1 255686 rniwa 2015-06-26 19:41:06 -0700 Created attachment 255686 Fixes the bug 1105198 2 255686 commit-queue 2015-06-27 14:32:06 -0700 Comment on attachment 255686 Fixes the bug Clearing flags on attachment: 255686 Committed r186033: <http://trac.webkit.org/changeset/186033> 1105199 3 commit-queue 2015-06-27 14:32:11 -0700 All reviewed patches have been landed. Closing bug. 255686 2015-06-26 19:41:06 -0700 2015-06-27 14:32:06 -0700 Fixes the bug bug-146375-20150626194019.patch text/plain 20583 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTg2MDIxKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDUwIEBACisyMDE1LTA2LTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIGJ1aWxkLXJlcXVlc3RzIHNob3VsZCB1c2UgY29uZm9ybSB0byBKU09OIEFQSSBm b3JtYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NjM3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElu c3RlYWQgb2YgcmV0dXJuaW5nIHNpbmdsZSBkaWN0aW9uYXJ5IHRoYXQgbWFwcyByb290IHNldCBp ZCB0byBhIGRpY3Rpb25hcnkgb2YgcmVwb3NpdG9yeSBuYW1lcworICAgICAgICB0byByZXZpc2lv bnMsIHRpbWVzdGFtcHMsIHNpbXBseSByZXR1cm4gcm9vdCBzZXRzIGFuZCByb290cyAicm93cyIg b3IgIm9iamVjdHMiIGFzIGRlZmluZWQgaW4KKyAgICAgICAgSlNPTiBBUEkgKGh0dHA6Ly9qc29u YXBpLm9yZy8pLiBUaGlzIEFQSSBjaGFuZ2UgbWFrZXMgaXQgZWFzaWVyIHRvIHJlc29sdmUgdGhl IGJ1ZyAxNDYzNzQgYW5kCisgICAgICAgIG1hdGNoZXMgd2hhdCB3ZSBkbyBpbiAvYXBpL3Rlc3Qt Z3JvdXBzLgorCisgICAgICAgIEFsc28gYWRkIHRoZSBzdXBwb3J0IGZvciAvYXBpL2J1aWxkLXJl cXVlc3RzLz9pZD08aWQ+IHRvIGZldGNoIHRoZSBidWlsZCByZXF1ZXN0IHdpdGggPGlkPi4KKyAg ICAgICAgVGhpcyBpcyB1c2VmdWwgZm9yIGRlYnVnZ2luZyBwdXJwb3Nlcy4KKworICAgICAgICAq IHB1YmxpYy9hcGkvYnVpbGQtcmVxdWVzdHMucGhwOgorICAgICAgICAobWFpbik6IEFkZGVkIHRo ZSBzdXBwb3J0IGZvciAkX0dFVFsnaWQnXS4gQWxzbyByZXR1cm4gInJvb3RTZXRzIiBhbmQgInJv b3RzIi4KKyAgICAgICAgKHVwZGF0ZV9idWlsZHMpOiBFeHRyYWN0ZWQgZnJvbSBtYWluLgorCisg ICAgICAgICogcHVibGljL2luY2x1ZGUvYnVpbGQtcmVxdWVzdHMtZmV0Y2hlci5waHA6CisgICAg ICAgIChCdWlsZFJlcXVlc3RGZXRjaGVyOjpmZXRjaF9yZXF1ZXN0KTogQWRkZWQuIFVzZWQgZm9y IC9hcGkvYnVpbGQtcmVxdWVzdHMvP2lkPTxpZD4uCisgICAgICAgIChCdWlsZFJlcXVlc3RGZXRj aGVyOjpyZXN1bHRzX2ludGVybmFsKTogQWx3YXlzIGNhbGwgZmV0Y2hfcm9vdHNfZm9yX3NldF9p Zl9uZWVkZWQuCisgICAgICAgIChCdWlsZFJlcXVlc3RGZXRjaGVyOjpmZXRjaF9yb290c19mb3Jf c2V0X2lmX25lZWRlZCk6IFJlbmFtZWQgZnJvbSBmZXRjaF9yb290c19mb3Jfc2V0LgorICAgICAg ICBNb3ZlZCB0aGUgbG9naWMgdG8gZXhpdCBlYXJseSB3aGVuIHRoZSByb290IHNldCBoYWQgYWxy ZWFkeSBiZWVuIGZldGNoZWQgaGVyZS4KKworICAgICAgICAqIHB1YmxpYy92Mi9hbmFseXNpcy5q czoKKyAgICAgICAgKEFwcC5UZXN0R3JvdXAuX2ZldGNoVGVzdFJlc3VsdHMpOiBGaXhlZCB0aGUg YnVnIHRoYXQgdGVzdCBncm91cHMgd2l0aG91dCBhbnkgc3VjY2Vzc2Z1bCByZXN1bHRzCisgICAg ICAgIHdvbid0IGJlIHNob3duLgorCisgICAgICAgICogdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5w eToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAoc2V0dXBfYXV0aCk6IE1vdmVkIHRvIHV0aWwu cHkKKworICAgICAgICAqIHRvb2xzL3N5bmMtd2l0aC1idWlsZGJvdC5weToKKyAgICAgICAgKG1h aW4pOiBSZXBsYWNlZCBhIGJ1bmNoIG9mIHBlcmYgZGFzaGJvYXJkIHJlbGF0ZWQgb3B0aW9ucyBi eSAtLXNlcnZlci1jb25maWctanNvbi4KKyAgICAgICAgKHVwZGF0ZV9hbmRfZmV0Y2hfYnVpbGRf cmVxdWVzdHMpOiBObyBsb25nZXIgdGFrZXMgYnVpbGRfcmVxdWVzdF9hdXRoIHNpbmNlIHRoYXQn cyBub3cgdGFrZW4gY2FyZQorICAgICAgICBvZiBieSBzZXR1cF9hdXRoLgorICAgICAgICAob3Jn YW5pemVfcm9vdF9zZXRzX2J5X2lkX2FuZF9yZXBvc2l0b3J5X25hbWVzKTogQWRkZWQuIEJ1aWxk cyB0aGUgb2xkIHJvb3RzU2V0cyBkaXJlY3RvcnkgYmFzZWQKKyAgICAgICAgb24gInJvb3RzIiBh bmQgInJvb3RTZXRzIiBkaWN0aW9uYXJpZXMgcmV0dXJuZWQgYnkgL2FwaS9idWlsZC1yZXF1ZXN0 cy4KKyAgICAgICAgKGNvbmZpZ19mb3JfcmVxdWVzdCk6IEZpeGVkIGEgYnVnIHRoYXQgdGhlIHNj cmlwdCBibG93cyB1cCB3aGVuIHRoZSBidWlsZCByZXF1ZXN0IGlzIG1pc3NpbmcKKyAgICAgICAg dGhlIHJlcG9zaXRvcnkgc3BlY2lmaWVkIGluIHRoZSBjb25maWd1cmF0aW9uLiBUaGlzIHRvbGVy YW5jZSBpcyBuZWNlc3Nhcnkgd2hlbiBhIG5ldyByZXBvc2l0b3J5CisgICAgICAgIGRlcGVuZGVu Y3kgaXMgYWRkZWQgYnV0IHdlIHdhbnQgdG8gcnVuIEEvQiB0ZXN0cyBmb3Igb2xkIGJ1aWxkcyB3 aXRob3V0IHRoZSBkZXBlbmRlbmN5LgorICAgICAgICAoZmV0Y2hfanNvbik6IE5vIGxvbmdlciB0 YWtlcyBhdXRoLgorCisgICAgICAgICogdG9vbHMvdXRpbC5weToKKyAgICAgICAgKHNldHVwX2F1 dGgpOiBNb3ZlZCBmcm9tIHB1bGwtb3MtdmVyc2lvbnMucHkgdG8gYmUgc2hhcmVkIHdpdGggc3lu Yy13aXRoLWJ1aWxkYm90LnB5LgorCiAyMDE1LTA2LTIzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkIGZpeC4gQS9CIHRlc3RpbmcgaXMgYnJva2VuIHdo ZW4gY29udGludW91cyBidWlsZGVycyByZXBvcnQgcmV2aXNpb25zIG91dCBvZiBvcmRlci4KSW5k ZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvYXBpL2J1aWxkLXJlcXVlc3RzLnBo cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2FwaS9idWls ZC1yZXF1ZXN0cy5waHAJKHJldmlzaW9uIDE4NjAyMSkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvYXBpL2J1aWxkLXJlcXVlc3RzLnBocAkod29ya2luZyBjb3B5KQpAQCAtMyw1 NCArMyw2MyBAQAogcmVxdWlyZV9vbmNlKCcuLi9pbmNsdWRlL2pzb24taGVhZGVyLnBocCcpOwog cmVxdWlyZV9vbmNlKCcuLi9pbmNsdWRlL2J1aWxkLXJlcXVlc3RzLWZldGNoZXIucGhwJyk7CiAK LWZ1bmN0aW9uIG1haW4oJHBhdGgsICRwb3N0X2RhdGEpIHsKLSAgICBpZiAoY291bnQoJHBhdGgp IDwgMSB8fCBjb3VudCgkcGF0aCkgPiAyKQorZnVuY3Rpb24gbWFpbigkaWQsICRwYXRoLCAkcG9z dF9kYXRhKSB7CisgICAgaWYgKCEkaWQgJiYgKGNvdW50KCRwYXRoKSA8IDEgfHwgY291bnQoJHBh dGgpID4gMikpCiAgICAgICAgIGV4aXRfd2l0aF9lcnJvcignSW52YWxpZFJlcXVlc3QnKTsKIAog ICAgICRkYiA9IG5ldyBEYXRhYmFzZTsKICAgICBpZiAoISRkYi0+Y29ubmVjdCgpKQogICAgICAg ICBleGl0X3dpdGhfZXJyb3IoJ0RhdGFiYXNlQ29ubmVjdGlvbkZhaWx1cmUnKTsKIAotICAgICR0 cmlnZ2VyYWJsZV9xdWVyeSA9IGFycmF5KCduYW1lJyA9PiBhcnJheV9nZXQoJHBhdGgsIDApKTsK LSAgICAkdHJpZ2dlcmFibGUgPSAkZGItPnNlbGVjdF9maXJzdF9yb3coJ2J1aWxkX3RyaWdnZXJh YmxlcycsICd0cmlnZ2VyYWJsZScsICR0cmlnZ2VyYWJsZV9xdWVyeSk7Ci0gICAgaWYgKCEkdHJp Z2dlcmFibGUpCi0gICAgICAgIGV4aXRfd2l0aF9lcnJvcignVHJpZ2dlcmFibGVOb3RGb3VuZCcs ICR0cmlnZ2VyYWJsZV9xdWVyeSk7Ci0KICAgICAkcmVwb3J0ID0gJHBvc3RfZGF0YSA/IGpzb25f ZGVjb2RlKCRwb3N0X2RhdGEsIHRydWUpIDogYXJyYXkoKTsKICAgICAkdXBkYXRlcyA9IGFycmF5 X2dldCgkcmVwb3J0LCAnYnVpbGRSZXF1ZXN0VXBkYXRlcycpOwogICAgIGlmICgkdXBkYXRlcykg ewogICAgICAgICB2ZXJpZnlfc2xhdmUoJGRiLCAkcmVwb3J0KTsKLQotICAgICAgICAkZGItPmJl Z2luX3RyYW5zYWN0aW9uKCk7Ci0gICAgICAgIGZvcmVhY2ggKCR1cGRhdGVzIGFzICRpZCA9PiAk aW5mbykgewotICAgICAgICAgICAgJGlkID0gaW50dmFsKCRpZCk7Ci0gICAgICAgICAgICAkc3Rh dHVzID0gJGluZm9bJ3N0YXR1cyddOwotICAgICAgICAgICAgJHVybCA9IGFycmF5X2dldCgkaW5m bywgJ3VybCcpOwotICAgICAgICAgICAgaWYgKCRzdGF0dXMgPT0gJ2ZhaWxlZElmTm90Q29tcGxl dGVkJykgewotICAgICAgICAgICAgICAgICRkYi0+cXVlcnlfYW5kX2dldF9hZmZlY3RlZF9yb3dz KCdVUERBVEUgYnVpbGRfcmVxdWVzdHMgU0VUIChyZXF1ZXN0X3N0YXR1cywgcmVxdWVzdF91cmwp ID0gKCQxLCAkMikKLSAgICAgICAgICAgICAgICAgICAgV0hFUkUgcmVxdWVzdF9pZCA9ICQzIEFO RCByZXF1ZXN0X3N0YXR1cyAhPSAkNCcsIGFycmF5KCdmYWlsZWQnLCAkdXJsLCAkaWQsICdjb21w bGV0ZWQnKSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGlmICghaW5f YXJyYXkoJHN0YXR1cywgYXJyYXkoJ3BlbmRpbmcnLCAnc2NoZWR1bGVkJywgJ3J1bm5pbmcnLCAn ZmFpbGVkJywgJ2NvbXBsZXRlZCcpKSkgewotICAgICAgICAgICAgICAgICAgICAkZGItPnJvbGxi YWNrX3RyYW5zYWN0aW9uKCk7Ci0gICAgICAgICAgICAgICAgICAgIGV4aXRfd2l0aF9lcnJvcign VW5rbm93bkJ1aWxkUmVxdWVzdFN0YXR1cycsIGFycmF5KCdidWlsZFJlcXVlc3QnID0+ICRpZCwg J3N0YXR1cycgPT4gJHN0YXR1cykpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAg ICAkZGItPnVwZGF0ZV9yb3coJ2J1aWxkX3JlcXVlc3RzJywgJ3JlcXVlc3QnLCBhcnJheSgnaWQn ID0+ICRpZCksIGFycmF5KCdzdGF0dXMnID0+ICRzdGF0dXMsICd1cmwnID0+ICR1cmwpKTsKLSAg ICAgICAgICAgIH0gCi0gICAgICAgIH0KLSAgICAgICAgJGRiLT5jb21taXRfdHJhbnNhY3Rpb24o KTsKKyAgICAgICAgdXBkYXRlX2J1aWxkcygkZGIsICR1cGRhdGVzKTsKICAgICB9CiAKICAgICAk cmVxdWVzdHNfZmV0Y2hlciA9IG5ldyBCdWlsZFJlcXVlc3RzRmV0Y2hlcigkZGIpOwotICAgICRy ZXF1ZXN0c19mZXRjaGVyLT5mZXRjaF9pbmNvbXBsZXRlX3JlcXVlc3RzX2Zvcl90cmlnZ2VyYWJs ZSgkdHJpZ2dlcmFibGVbJ3RyaWdnZXJhYmxlX2lkJ10pOworCisgICAgaWYgKCRpZCkKKyAgICAg ICAgJHJlcXVlc3RzX2ZldGNoZXItPmZldGNoX3JlcXVlc3QoJGlkKTsKKyAgICBlbHNlIHsKKyAg ICAgICAgJHRyaWdnZXJhYmxlX3F1ZXJ5ID0gYXJyYXkoJ25hbWUnID0+IGFycmF5X2dldCgkcGF0 aCwgMCkpOworICAgICAgICAkdHJpZ2dlcmFibGUgPSAkZGItPnNlbGVjdF9maXJzdF9yb3coJ2J1 aWxkX3RyaWdnZXJhYmxlcycsICd0cmlnZ2VyYWJsZScsICR0cmlnZ2VyYWJsZV9xdWVyeSk7Cisg ICAgICAgIGlmICghJHRyaWdnZXJhYmxlKQorICAgICAgICAgICAgZXhpdF93aXRoX2Vycm9yKCdU cmlnZ2VyYWJsZU5vdEZvdW5kJywgJHRyaWdnZXJhYmxlX3F1ZXJ5KTsKKyAgICAgICAgJHJlcXVl c3RzX2ZldGNoZXItPmZldGNoX2luY29tcGxldGVfcmVxdWVzdHNfZm9yX3RyaWdnZXJhYmxlKCR0 cmlnZ2VyYWJsZVsndHJpZ2dlcmFibGVfaWQnXSk7CisgICAgfQogCiAgICAgZXhpdF93aXRoX3N1 Y2Nlc3MoYXJyYXkoCiAgICAgICAgICdidWlsZFJlcXVlc3RzJyA9PiAkcmVxdWVzdHNfZmV0Y2hl ci0+cmVzdWx0c193aXRoX3Jlc29sdmVkX2lkcygpLAotICAgICAgICAncm9vdFNldHMnID0+ICRy ZXF1ZXN0c19mZXRjaGVyLT5yb290X3NldHNfYnlfaWQoKSwKKyAgICAgICAgJ3Jvb3RTZXRzJyA9 PiAkcmVxdWVzdHNfZmV0Y2hlci0+cm9vdF9zZXRzKCksCisgICAgICAgICdyb290cycgPT4gJHJl cXVlc3RzX2ZldGNoZXItPnJvb3RzKCksCiAgICAgICAgICd1cGRhdGVzJyA9PiAkdXBkYXRlcywK ICAgICApKTsKIH0KIAotbWFpbihhcnJheV9rZXlfZXhpc3RzKCdQQVRIX0lORk8nLCAkX1NFUlZF UikgPyBleHBsb2RlKCcvJywgdHJpbSgkX1NFUlZFUlsnUEFUSF9JTkZPJ10sICcvJykpIDogYXJy YXkoKSwKK2Z1bmN0aW9uIHVwZGF0ZV9idWlsZHMoJGRiLCAkdXBkYXRlcykgeworICAgICRkYi0+ YmVnaW5fdHJhbnNhY3Rpb24oKTsKKyAgICBmb3JlYWNoICgkdXBkYXRlcyBhcyAkaWQgPT4gJGlu Zm8pIHsKKyAgICAgICAgJGlkID0gaW50dmFsKCRpZCk7CisgICAgICAgICRzdGF0dXMgPSAkaW5m b1snc3RhdHVzJ107CisgICAgICAgICR1cmwgPSBhcnJheV9nZXQoJGluZm8sICd1cmwnKTsKKyAg ICAgICAgaWYgKCRzdGF0dXMgPT0gJ2ZhaWxlZElmTm90Q29tcGxldGVkJykgeworICAgICAgICAg ICAgJGRiLT5xdWVyeV9hbmRfZ2V0X2FmZmVjdGVkX3Jvd3MoJ1VQREFURSBidWlsZF9yZXF1ZXN0 cyBTRVQgKHJlcXVlc3Rfc3RhdHVzLCByZXF1ZXN0X3VybCkgPSAoJDEsICQyKQorICAgICAgICAg ICAgICAgIFdIRVJFIHJlcXVlc3RfaWQgPSAkMyBBTkQgcmVxdWVzdF9zdGF0dXMgIT0gJDQnLCBh cnJheSgnZmFpbGVkJywgJHVybCwgJGlkLCAnY29tcGxldGVkJykpOworICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgaWYgKCFpbl9hcnJheSgkc3RhdHVzLCBhcnJheSgncGVuZGluZycsICdz Y2hlZHVsZWQnLCAncnVubmluZycsICdmYWlsZWQnLCAnY29tcGxldGVkJykpKSB7CisgICAgICAg ICAgICAgICAgJGRiLT5yb2xsYmFja190cmFuc2FjdGlvbigpOworICAgICAgICAgICAgICAgIGV4 aXRfd2l0aF9lcnJvcignVW5rbm93bkJ1aWxkUmVxdWVzdFN0YXR1cycsIGFycmF5KCdidWlsZFJl cXVlc3QnID0+ICRpZCwgJ3N0YXR1cycgPT4gJHN0YXR1cykpOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgJGRiLT51cGRhdGVfcm93KCdidWlsZF9yZXF1ZXN0cycsICdyZXF1ZXN0JywgYXJy YXkoJ2lkJyA9PiAkaWQpLCBhcnJheSgnc3RhdHVzJyA9PiAkc3RhdHVzLCAndXJsJyA9PiAkdXJs KSk7CisgICAgICAgIH0KKyAgICB9CisgICAgJGRiLT5jb21taXRfdHJhbnNhY3Rpb24oKTsKK30K KworbWFpbihhcnJheV9nZXQoJF9HRVQsICdpZCcpLAorICAgIGFycmF5X2tleV9leGlzdHMoJ1BB VEhfSU5GTycsICRfU0VSVkVSKSA/IGV4cGxvZGUoJy8nLCB0cmltKCRfU0VSVkVSWydQQVRIX0lO Rk8nXSwgJy8nKSkgOiBhcnJheSgpLAogICAgIGZpbGVfZ2V0X2NvbnRlbnRzKCJwaHA6Ly9pbnB1 dCIpKTsKIAogPz4KSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVk ZS9idWlsZC1yZXF1ZXN0cy1mZXRjaGVyLnBocAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvYnVpbGQtcmVxdWVzdHMtZmV0Y2hlci5waHAJKHJl dmlzaW9uIDE4NjAyMSkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVk ZS9idWlsZC1yZXF1ZXN0cy1mZXRjaGVyLnBocAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAs MTAgQEAgY2xhc3MgQnVpbGRSZXF1ZXN0c0ZldGNoZXIgewogICAgICAgICAgICAgT1JERVIgQlkg cmVxdWVzdF9jcmVhdGVkX2F0LCByZXF1ZXN0X2dyb3VwLCByZXF1ZXN0X29yZGVyJywgYXJyYXko JHRyaWdnZXJhYmxlX2lkKSk7CiAgICAgfQogCisgICAgZnVuY3Rpb24gZmV0Y2hfcmVxdWVzdCgk cmVxdWVzdF9pZCkgeworICAgICAgICAkdGhpcy0+cm93cyA9ICR0aGlzLT5kYi0+c2VsZWN0X3Jv d3MoJ2J1aWxkX3JlcXVlc3RzJywgJ3JlcXVlc3QnLCBhcnJheSgnaWQnID0+ICRyZXF1ZXN0X2lk KSk7CisgICAgfQorCiAgICAgZnVuY3Rpb24gaGFzX3Jlc3VsdHMoKSB7IHJldHVybiBpc19hcnJh eSgkdGhpcy0+cm93cyk7IH0KICAgICBmdW5jdGlvbiByZXN1bHRzKCkgeyByZXR1cm4gJHRoaXMt PnJlc3VsdHNfaW50ZXJuYWwoZmFsc2UpOyB9CiAgICAgZnVuY3Rpb24gcmVzdWx0c193aXRoX3Jl c29sdmVkX2lkcygpIHsgcmV0dXJuICR0aGlzLT5yZXN1bHRzX2ludGVybmFsKHRydWUpOyB9CkBA IC01MSw4ICs1NSw3IEBAIGNsYXNzIEJ1aWxkUmVxdWVzdHNGZXRjaGVyIHsKICAgICAgICAgICAg ICRwbGF0Zm9ybV9pZCA9ICRyb3dbJ3JlcXVlc3RfcGxhdGZvcm0nXTsKICAgICAgICAgICAgICRy b290X3NldF9pZCA9ICRyb3dbJ3JlcXVlc3Rfcm9vdF9zZXQnXTsKIAotICAgICAgICAgICAgaWYg KCFhcnJheV9rZXlfZXhpc3RzKCRyb290X3NldF9pZCwgJHRoaXMtPnJvb3Rfc2V0c19ieV9pZCkp Ci0gICAgICAgICAgICAgICAgJHRoaXMtPnJvb3Rfc2V0c19ieV9pZFskcm9vdF9zZXRfaWRdID0g JHRoaXMtPmZldGNoX3Jvb3RzX2Zvcl9zZXQoJHJvb3Rfc2V0X2lkLCAkcmVzb2x2ZV9pZHMpOwor ICAgICAgICAgICAgJHRoaXMtPmZldGNoX3Jvb3RzX2Zvcl9zZXRfaWZfbmVlZGVkKCRyb290X3Nl dF9pZCwgJHJlc29sdmVfaWRzKTsKIAogICAgICAgICAgICAgYXJyYXlfcHVzaCgkcmVxdWVzdHMs IGFycmF5KAogICAgICAgICAgICAgICAgICdpZCcgPT4gJHJvd1sncmVxdWVzdF9pZCddLApAQCAt NzEsMTAgKzc0LDYgQEAgY2xhc3MgQnVpbGRSZXF1ZXN0c0ZldGNoZXIgewogICAgICAgICByZXR1 cm4gJHJlcXVlc3RzOwogICAgIH0KIAotICAgIGZ1bmN0aW9uIHJvb3Rfc2V0c19ieV9pZCgpIHsK LSAgICAgICAgcmV0dXJuICR0aGlzLT5yb290X3NldHNfYnlfaWQ7Ci0gICAgfQotCiAgICAgZnVu Y3Rpb24gcm9vdF9zZXRzKCkgewogICAgICAgICByZXR1cm4gJHRoaXMtPnJvb3Rfc2V0czsKICAg ICB9CkBAIC04MywxMiArODIsMTQgQEAgY2xhc3MgQnVpbGRSZXF1ZXN0c0ZldGNoZXIgewogICAg ICAgICByZXR1cm4gJHRoaXMtPnJvb3RzOwogICAgIH0KIAotICAgIHByaXZhdGUgZnVuY3Rpb24g ZmV0Y2hfcm9vdHNfZm9yX3NldCgkcm9vdF9zZXRfaWQsICRyZXNvbHZlX2lkcykgeworICAgIHBy aXZhdGUgZnVuY3Rpb24gZmV0Y2hfcm9vdHNfZm9yX3NldF9pZl9uZWVkZWQoJHJvb3Rfc2V0X2lk LCAkcmVzb2x2ZV9pZHMpIHsKKyAgICAgICAgaWYgKGFycmF5X2tleV9leGlzdHMoJHJvb3Rfc2V0 X2lkLCAkdGhpcy0+cm9vdF9zZXRzX2J5X2lkKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAg ICAgICAkcm9vdF9yb3dzID0gJHRoaXMtPmRiLT5xdWVyeV9hbmRfZmV0Y2hfYWxsKCdTRUxFQ1Qg KgogICAgICAgICAgICAgRlJPTSByb290cywgY29tbWl0cyBMRUZUIE9VVEVSIEpPSU4gcmVwb3Np dG9yaWVzIE9OIGNvbW1pdF9yZXBvc2l0b3J5ID0gcmVwb3NpdG9yeV9pZAogICAgICAgICAgICAg V0hFUkUgcm9vdF9jb21taXQgPSBjb21taXRfaWQgQU5EIHJvb3Rfc2V0ID0gJDEnLCBhcnJheSgk cm9vdF9zZXRfaWQpKTsKIAotICAgICAgICAkcm9vdHMgPSBhcnJheSgpOwogICAgICAgICAkcm9v dF9pZHMgPSBhcnJheSgpOwogICAgICAgICBmb3JlYWNoICgkcm9vdF9yb3dzIGFzICRyb3cpIHsK ICAgICAgICAgICAgICRyZXBvc2l0b3J5ID0gJHJvd1sncmVwb3NpdG9yeV9pZCddOwpAQCAtOTYs MTMgKzk3LDE3IEBAIGNsYXNzIEJ1aWxkUmVxdWVzdHNGZXRjaGVyIHsKICAgICAgICAgICAgICRj b21taXRfdGltZSA9ICRyb3dbJ2NvbW1pdF90aW1lJ107CiAgICAgICAgICAgICAkcm9vdF9pZCA9 ICRyb290X3NldF9pZCAuICctJyAuICRyZXBvc2l0b3J5OwogICAgICAgICAgICAgYXJyYXlfcHVz aCgkcm9vdF9pZHMsICRyb290X2lkKTsKLSAgICAgICAgICAgIGFycmF5X3B1c2goJHRoaXMtPnJv b3RzLCBhcnJheSgnaWQnID0+ICRyb290X2lkLCAncmVwb3NpdG9yeScgPT4gJHJlcG9zaXRvcnks ICdyZXZpc2lvbicgPT4gJHJldmlzaW9uKSk7Ci0gICAgICAgICAgICAkcm9vdHNbJHJlc29sdmVf aWRzID8gJHJvd1sncmVwb3NpdG9yeV9uYW1lJ10gOiAkcm93WydyZXBvc2l0b3J5X2lkJ11dID0g YXJyYXkoCi0gICAgICAgICAgICAgICAgJ3JldmlzaW9uJyA9PiAkcmV2aXNpb24sICd0aW1lJyA9 PiBEYXRhYmFzZTo6dG9fanNfdGltZSgkY29tbWl0X3RpbWUpKTsKKyAgICAgICAgICAgICRyZXBv c2l0b3J5X2lkID0gJHJlc29sdmVfaWRzID8gJHJvd1sncmVwb3NpdG9yeV9uYW1lJ10gOiAkcm93 WydyZXBvc2l0b3J5X2lkJ107CisgICAgICAgICAgICBhcnJheV9wdXNoKCR0aGlzLT5yb290cywg YXJyYXkoCisgICAgICAgICAgICAgICAgJ2lkJyA9PiAkcm9vdF9pZCwKKyAgICAgICAgICAgICAg ICAncmVwb3NpdG9yeScgPT4gJHJlcG9zaXRvcnlfaWQsCisgICAgICAgICAgICAgICAgJ3Jldmlz aW9uJyA9PiAkcmV2aXNpb24sCisgICAgICAgICAgICAgICAgJ3RpbWUnID0+IERhdGFiYXNlOjp0 b19qc190aW1lKCRjb21taXRfdGltZSkpKTsKICAgICAgICAgfQotICAgICAgICBhcnJheV9wdXNo KCR0aGlzLT5yb290X3NldHMsIGFycmF5KCdpZCcgPT4gJHJvb3Rfc2V0X2lkLCAncm9vdHMnID0+ ICRyb290X2lkcykpOwogCi0gICAgICAgIHJldHVybiAkcm9vdHM7CisgICAgICAgICR0aGlzLT5y b290X3NldHNfYnlfaWRbJHJvb3Rfc2V0X2lkXSA9IFRSVUU7CisKKyAgICAgICAgYXJyYXlfcHVz aCgkdGhpcy0+cm9vdF9zZXRzLCBhcnJheSgnaWQnID0+ICRyb290X3NldF9pZCwgJ3Jvb3RzJyA9 PiAkcm9vdF9pZHMpKTsKICAgICB9CiB9CiAKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9wdWJsaWMvdjIvYW5hbHlzaXMuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy92Mi9hbmFseXNpcy5qcwkocmV2aXNpb24gMTg2MDIxKQorKysgV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9hbmFseXNpcy5qcwkod29ya2luZyBjb3B5KQpA QCAtMTMzLDcgKzEzMyw3IEBAIEFwcC5UZXN0R3JvdXAgPSBBcHAuTmFtZUxhYmVsTW9kZWwuZXh0 ZW4KICAgICBfZmV0Y2hUZXN0UmVzdWx0czogZnVuY3Rpb24gKCkKICAgICB7CiAgICAgICAgIHZh ciB0YXNrID0gdGhpcy5nZXQoJ3Rhc2snKTsKLSAgICAgICAgdmFyIHBsYXRmb3JtID0gdGhpcy5n ZXQoJ3BsYXRmb3JtJyk7CisgICAgICAgIHZhciBwbGF0Zm9ybSA9IHRoaXMuZ2V0KCdwbGF0Zm9y bScpIHx8ICh0YXNrID8gdGFzay5nZXQoJ3BsYXRmb3JtJykgOiBudWxsKQogICAgICAgICBpZiAo IXRhc2sgfHwgIXBsYXRmb3JtKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIHZh ciBzZWxmID0gdGhpczsKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9wdWxs LW9zLXZlcnNpb25zLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90 b29scy9wdWxsLW9zLXZlcnNpb25zLnB5CShyZXZpc2lvbiAxODYwMjEpCisrKyBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weQkod29ya2luZyBjb3B5KQpA QCAtMTIsMTIgKzEyLDcgQEAgaW1wb3J0IHVybGxpYjIKIGZyb20geG1sLmRvbS5taW5pZG9tIGlt cG9ydCBwYXJzZVN0cmluZyBhcyBwYXJzZVhtbFN0cmluZwogZnJvbSB1dGlsIGltcG9ydCBzdWJt aXRfY29tbWl0cwogZnJvbSB1dGlsIGltcG9ydCB0ZXh0X2NvbnRlbnQKLQotCi1IVFRQX0FVVEhf SEFORExFUlMgPSB7Ci0gICAgJ2Jhc2ljJzogdXJsbGliMi5IVFRQQmFzaWNBdXRoSGFuZGxlciwK LSAgICAnZGlnZXN0JzogdXJsbGliMi5IVFRQRGlnZXN0QXV0aEhhbmRsZXIsCi19Citmcm9tIHV0 aWwgaW1wb3J0IHNldHVwX2F1dGgKIAogCiBkZWYgbWFpbihhcmd2KToKQEAgLTYzLDE3ICs1OCw2 IEBAIGRlZiBtYWluKGFyZ3YpOgogICAgICAgICB0aW1lLnNsZWVwKGNvbmZpZ1snZmV0Y2hJbnRl cnZhbCddKQogCiAKLWRlZiBzZXR1cF9hdXRoKHNlcnZlcik6Ci0gICAgYXV0aCA9IHNlcnZlci5n ZXQoJ2F1dGgnKQotICAgIGlmIG5vdCBhdXRoOgotICAgICAgICByZXR1cm4KLQotICAgIHBhc3N3 b3JkX21hbmFnZXIgPSB1cmxsaWIyLkhUVFBQYXNzd29yZE1ncigpCi0gICAgcGFzc3dvcmRfbWFu YWdlci5hZGRfcGFzc3dvcmQocmVhbG09YXV0aFsncmVhbG0nXSwgdXJpPXNlcnZlclsndXJsJ10s IHVzZXI9YXV0aFsndXNlcm5hbWUnXSwgcGFzc3dkPWF1dGhbJ3Bhc3N3b3JkJ10pCi0gICAgYXV0 aF9oYW5kbGVyID0gSFRUUF9BVVRIX0hBTkRMRVJTW2F1dGhbJ3R5cGUnXV0ocGFzc3dvcmRfbWFu YWdlcikKLSAgICB1cmxsaWIyLmluc3RhbGxfb3BlbmVyKHVybGxpYjIuYnVpbGRfb3BlbmVyKGF1 dGhfaGFuZGxlcikpCi0KLQogZGVmIGF2YWlsYWJsZV9idWlsZHNfZnJvbV9jb21tYW5kKHJlcG9z aXRvcnlfbmFtZSwgY29tbWFuZCwgbGluZXNfdG9faWdub3JlKToKICAgICB0cnk6CiAgICAgICAg IG91dHB1dCA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KGNvbW1hbmQsIHN0ZGVycj1zdWJwcm9j ZXNzLlNURE9VVCkKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9zeW5jLXdp dGgtYnVpbGRib3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rv b2xzL3N5bmMtd2l0aC1idWlsZGJvdC5weQkocmV2aXNpb24gMTg2MDIxKQorKysgV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3Rvb2xzL3N5bmMtd2l0aC1idWlsZGJvdC5weQkod29ya2luZyBjb3B5 KQpAQCAtOSwyNCArOSwzMCBAQCBpbXBvcnQgdGltZQogaW1wb3J0IHVybGxpYgogaW1wb3J0IHVy bGxpYjIKIAorZnJvbSB1dGlsIGltcG9ydCBzZXR1cF9hdXRoCisKIAogZGVmIG1haW4oKToKICAg ICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcigpCi0gICAgcGFyc2VyLmFkZF9hcmd1 bWVudCgnLS1idWlsZC1yZXF1ZXN0cy11cmwnLCByZXF1aXJlZD1UcnVlLCBoZWxwPSdVUkwgZm9y IHRoZSBidWlsZCByZXF1ZXN0cyBKU09OIEFQSTsgZS5nLiBodHRwczovL3BlcmYud2Via2l0Lm9y Zy9hcGkvYnVpbGQtcmVxdWVzdHMvYnVpbGQud2Via2l0Lm9yZy8nKQotICAgIHBhcnNlci5hZGRf YXJndW1lbnQoJy0tYnVpbGQtcmVxdWVzdHMtdXNlcicsIGhlbHA9J1RoZSB1c2VybmFtZSBmb3Ig QmFzaWMgQXV0aGVudGljYXRpb24gdG8gYWNjZXNzIHRoZSBidWlsZCByZXF1ZXN0cyBKU09OIEFQ SScpCi0gICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1idWlsZC1yZXF1ZXN0cy1wYXNzd29yZCcs IGhlbHA9J1RoZSBwYXNzd29yZCBmb3IgQmFzaWMgQXV0aGVudGljYXRpb24gdG8gYWNjZXNzIHRo ZSBidWlsZCByZXF1ZXN0cyBKU09OIEFQSScpCi0gICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1z bGF2ZS1uYW1lJywgcmVxdWlyZWQ9VHJ1ZSwgaGVscD0nVGhlIHNsYXZlIG5hbWUgdXNlZCB0byB1 cGRhdGUgdGhlIGJ1aWxkIHJlcXVldHMgc3RhdHVzJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50 KCctLXNsYXZlLXBhc3N3b3JkJywgcmVxdWlyZWQ9VHJ1ZSwgaGVscD0nVGhlIHNsYXZlIHBhc3N3 b3JkIHVzZWQgdG8gdXBkYXRlIHRoZSBidWlsZCByZXF1ZXRzIHN0YXR1cycpCisgICAgcGFyc2Vy LmFkZF9hcmd1bWVudCgnLS10cmlnZ2VyYWJsZScsIHJlcXVpcmVkPVRydWUsIGhlbHA9J1RoZSBu YW1lIG9mIHRoZSB0cmlnZ2VyYWJsZSB0byBwcm9jZXNzLiBlLmcuIGJ1aWxkLXdlYmtpdCcpCiAg ICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1idWlsZGJvdC11cmwnLCByZXF1aXJlZD1UcnVlLCBo ZWxwPSdVUkwgZm9yIGEgYnVpbGRib3QgYnVpbGRlcjsgZS5nLiAiaHR0cHM6Ly9idWlsZC53ZWJr aXQub3JnLyInKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tYnVpbGRlci1jb25maWctanNv bicsIHJlcXVpcmVkPVRydWUsIGhlbHA9J1RoZSBwYXRoIHRvIGEgSlNPTiBmaWxlIHRoYXQgc3Bl Y2lmaWVzIHdoaWNoIHRlc3QgYW5kIHBsYXRmb3JtIHdpbGwgYmUgcG9zdGVkIHRvIHdoaWNoIGJ1 aWxkZXIuICcKICAgICAgICAgJ1RoZSBKU09OIHNob3VsZCBjb250YWluIGFuIGFycmF5IG9mIGRp Y3Rpb25hcmllcyB3aXRoIGtleXMgInBsYXRmb3JtIiwgInRlc3QiLCBhbmQgImJ1aWxkZXIiICcK ICAgICAgICAgJ3dpdGggdGhlIHBsYXRmb3JtIG5hbWUgKGUuZy4gbW91bnRhaW5saW9uKSwgdGhl IHRlc3QgcGF0aCAoZS5nLiBbIlBhcnNlciIsICJodG1sNS1mdWxsLXJlbmRlciJdKSwgYW5kIHRo ZSBidWlsZGVyIG5hbWUgKGUuZy4gQXBwbGUgTW91bnRhaW5MaW9uIFJlbGVhc2UgKFBlcmYpKSBh cyB2YWx1ZXMuJykKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXNlcnZlci1jb25maWctanNv bicsIHJlcXVpcmVkPVRydWUsIGhlbHA9J1RoZSBwYXRoIHRvIGEgSlNPTiBmaWxlIHRoYXQgc3Bl Y2lmaWVzIHRoZSBwZXJmIGRhc2hib2FyZC4nKQorCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgn LS1sb29rYmFjay1jb3VudCcsIHR5cGU9aW50LCBkZWZhdWx0PTEwLCBoZWxwPSdUaGUgbnVtYmVy IG9mIGJ1aWxkcyB0byBsb29rIGJhY2sgd2hlbiBmaW5kaW5nIGluLXByb2dyZXNzIGJ1aWxkcyBv biB0aGUgYnVpbGRib3QnKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tc2Vjb25kcy10by1z bGVlcCcsIHR5cGU9ZmxvYXQsIGRlZmF1bHQ9MTIwLCBoZWxwPSdUaGUgc2Vjb25kcyB0byBzbGVl cCBiZXR3ZWVuIGl0ZXJhdGlvbnMnKQogICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCiAK ICAgICBjb25maWd1cmF0aW9ucyA9IGxvYWRfY29uZmlnKGFyZ3MuYnVpbGRlcl9jb25maWdfanNv biwgYXJncy5idWlsZGJvdF91cmwuc3RyaXAoJy8nKSkKLSAgICBidWlsZF9yZXF1ZXN0X2F1dGgg PSB7J3VzZXInOiBhcmdzLmJ1aWxkX3JlcXVlc3RzX3VzZXIsICdwYXNzd29yZCc6IGFyZ3MuYnVp bGRfcmVxdWVzdHNfcGFzc3dvcmQgb3IgJyd9IGlmIGFyZ3MuYnVpbGRfcmVxdWVzdHNfdXNlciBl bHNlIE5vbmUKKworICAgIHdpdGggb3BlbihhcmdzLnNlcnZlcl9jb25maWdfanNvbikgYXMgc2Vy dmVyX2NvbmZpZ19qc29uOgorICAgICAgICBzZXJ2ZXJfY29uZmlnID0ganNvbi5sb2FkKHNlcnZl cl9jb25maWdfanNvbikKKyAgICAgICAgc2V0dXBfYXV0aChzZXJ2ZXJfY29uZmlnWydzZXJ2ZXIn XSkKKworICAgIGJ1aWxkX3JlcXVlc3RzX3VybCA9IHNlcnZlcl9jb25maWdbJ3NlcnZlciddWyd1 cmwnXSArICcvYXBpL2J1aWxkLXJlcXVlc3RzLycgKyBhcmdzLnRyaWdnZXJhYmxlCisKICAgICBy ZXF1ZXN0X3VwZGF0ZXMgPSB7fQogICAgIHdoaWxlIFRydWU6CiAgICAgICAgIHJlcXVlc3RfdXBk YXRlcy51cGRhdGUoZmluZF9yZXF1ZXN0X3VwZGF0ZXMoY29uZmlndXJhdGlvbnMsIGFyZ3MubG9v a2JhY2tfY291bnQpKQpAQCAtMzUsMTQgKzQxLDIxIEBAIGRlZiBtYWluKCk6CiAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICBwcmludCAnTm8gdXBkYXRlcy4uLicKIAotICAgICAgICBwYXlsb2Fk ID0geydidWlsZFJlcXVlc3RVcGRhdGVzJzogcmVxdWVzdF91cGRhdGVzLCAnc2xhdmVOYW1lJzog YXJncy5zbGF2ZV9uYW1lLCAnc2xhdmVQYXNzd29yZCc6IGFyZ3Muc2xhdmVfcGFzc3dvcmR9Ci0g ICAgICAgIHJlc3BvbnNlID0gdXBkYXRlX2FuZF9mZXRjaF9idWlsZF9yZXF1ZXN0cyhhcmdzLmJ1 aWxkX3JlcXVlc3RzX3VybCwgYnVpbGRfcmVxdWVzdF9hdXRoLCBwYXlsb2FkKQotICAgICAgICBy b290X3NldHMgPSByZXNwb25zZS5nZXQoJ3Jvb3RTZXRzJywge30pCisgICAgICAgIHBheWxvYWQg PSB7CisgICAgICAgICAgICAnYnVpbGRSZXF1ZXN0VXBkYXRlcyc6IHJlcXVlc3RfdXBkYXRlcywK KyAgICAgICAgICAgICdzbGF2ZU5hbWUnOiBzZXJ2ZXJfY29uZmlnWydzbGF2ZSddWyduYW1lJ10s CisgICAgICAgICAgICAnc2xhdmVQYXNzd29yZCc6IHNlcnZlcl9jb25maWdbJ3NsYXZlJ11bJ3Bh c3N3b3JkJ119CisgICAgICAgIHJlc3BvbnNlID0gdXBkYXRlX2FuZF9mZXRjaF9idWlsZF9yZXF1 ZXN0cyhidWlsZF9yZXF1ZXN0c191cmwsIHBheWxvYWQpCiAgICAgICAgIG9wZW5fcmVxdWVzdHMg PSByZXNwb25zZS5nZXQoJ2J1aWxkUmVxdWVzdHMnLCBbXSkKIAorICAgICAgICByb290X3NldHMg PSBvcmdhbml6ZV9yb290X3NldHNfYnlfaWRfYW5kX3JlcG9zaXRvcnlfbmFtZXMocmVzcG9uc2Uu Z2V0KCdyb290U2V0cycsIHt9KSwgcmVzcG9uc2UuZ2V0KCdyb290cycsIFtdKSkKKwogICAgICAg ICBmb3IgcmVxdWVzdCBpbiBmaWx0ZXIobGFtYmRhIHJlcXVlc3Q6IHJlcXVlc3RbJ3N0YXR1cydd ID09ICdwZW5kaW5nJywgb3Blbl9yZXF1ZXN0cyk6CiAgICAgICAgICAgICBjb25maWcgPSBjb25m aWdfZm9yX3JlcXVlc3QoY29uZmlndXJhdGlvbnMsIHJlcXVlc3QpCi0gICAgICAgICAgICBpZiBs ZW4oY29uZmlnWydzY2hlZHVsZWRSZXF1ZXN0cyddKSA8IDE6CisgICAgICAgICAgICBpZiBub3Qg Y29uZmlnOgorICAgICAgICAgICAgICAgIHByaW50ID4+IHN5cy5zdGRlcnIsICJGYWlsZWQgdG8g ZmluZCB0aGUgY29uZmlndXJhdGlvbiBmb3IgcmVxdWVzdCAlczogJXMiICUgKHN0cihyZXF1ZXN0 WydpZCddKSwganNvbi5kdW1wcyhyZXF1ZXN0KSkKKyAgICAgICAgICAgICAgICBjb250aW51ZQor ICAgICAgICAgICAgaWYgY29uZmlnIGFuZCBsZW4oY29uZmlnWydzY2hlZHVsZWRSZXF1ZXN0cydd KSA8IDE6CiAgICAgICAgICAgICAgICAgcHJpbnQgIlNjaGVkdWxpbmcgdGhlIGJ1aWxkIHJlcXVl c3QgJXMuLi4iICUgc3RyKHJlcXVlc3RbJ2lkJ10pCiAgICAgICAgICAgICAgICAgc2NoZWR1bGVf cmVxdWVzdChjb25maWcsIHJlcXVlc3QsIHJvb3Rfc2V0cykKIApAQCAtMTA5LDkgKzEyMiw5IEBA IGRlZiBmaW5kX3JlcXVlc3RfdXBkYXRlcyhjb25maWd1cmF0aW9ucywKICAgICByZXR1cm4gcmVx dWVzdF91cGRhdGVzCiAKIAotZGVmIHVwZGF0ZV9hbmRfZmV0Y2hfYnVpbGRfcmVxdWVzdHMoYnVp bGRfcmVxdWVzdHNfdXJsLCBidWlsZF9yZXF1ZXN0X2F1dGgsIHBheWxvYWQpOgorZGVmIHVwZGF0 ZV9hbmRfZmV0Y2hfYnVpbGRfcmVxdWVzdHMoYnVpbGRfcmVxdWVzdHNfdXJsLCBwYXlsb2FkKToK ICAgICB0cnk6Ci0gICAgICAgIHJlc3BvbnNlID0gZmV0Y2hfanNvbihidWlsZF9yZXF1ZXN0c191 cmwsIHBheWxvYWQ9anNvbi5kdW1wcyhwYXlsb2FkKSwgYXV0aD1idWlsZF9yZXF1ZXN0X2F1dGgp CisgICAgICAgIHJlc3BvbnNlID0gZmV0Y2hfanNvbihidWlsZF9yZXF1ZXN0c191cmwsIHBheWxv YWQ9anNvbi5kdW1wcyhwYXlsb2FkKSkKICAgICAgICAgaWYgcmVzcG9uc2VbJ3N0YXR1cyddICE9 ICdPSyc6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKHJlc3BvbnNlWydzdGF0dXMnXSkK ICAgICAgICAgcmV0dXJuIHJlc3BvbnNlCkBAIC0xMzIsMTUgKzE0NSwzMiBAQCBkZWYgZmluZF9z dGFsZV9yZXF1ZXN0X3VwZGF0ZXMoY29uZmlndXJhCiAgICAgcmV0dXJuIHJlcXVlc3RfdXBkYXRl cwogCiAKLWRlZiBzY2hlZHVsZV9yZXF1ZXN0KGNvbmZpZywgcmVxdWVzdCwgcm9vdF9zZXRzKToK LSAgICByb290cyA9IHJvb3Rfc2V0cy5nZXQocmVxdWVzdFsncm9vdFNldCddLCB7fSkKK2RlZiBv cmdhbml6ZV9yb290X3NldHNfYnlfaWRfYW5kX3JlcG9zaXRvcnlfbmFtZXMocm9vdF9zZXRzLCBy b290cyk6CisgICAgcmVzdWx0ID0ge30KKyAgICByb290X2J5X2lkID0ge30KKyAgICBmb3Igcm9v dCBpbiByb290czoKKyAgICAgICAgcm9vdF9ieV9pZFtyb290WydpZCddXSA9IHJvb3QKKworICAg IGZvciByb290X3NldCBpbiByb290X3NldHM6CisgICAgICAgIHJvb3RzX2J5X3JlcG9zaXRvcnkg PSB7fQorICAgICAgICBmb3Igcm9vdF9pZCBpbiByb290X3NldFsncm9vdHMnXToKKyAgICAgICAg ICAgIHJvb3QgPSByb290X2J5X2lkW3Jvb3RfaWRdCisgICAgICAgICAgICByb290c19ieV9yZXBv c2l0b3J5W3Jvb3RbJ3JlcG9zaXRvcnknXV0gPSByb290CisgICAgICAgIHJlc3VsdFtyb290X3Nl dFsnaWQnXV0gPSByb290c19ieV9yZXBvc2l0b3J5CisKKyAgICByZXR1cm4gcmVzdWx0CiAKKwor ZGVmIHNjaGVkdWxlX3JlcXVlc3QoY29uZmlnLCByZXF1ZXN0LCByb290X3NldHMpOgorICAgIHJv b3RzID0gcm9vdF9zZXRzW3JlcXVlc3RbJ3Jvb3RTZXQnXV0KICAgICBwYXlsb2FkID0ge30KICAg ICBmb3IgcHJvcGVydHlfbmFtZSwgcHJvcGVydHlfdmFsdWUgaW4gY29uZmlnWydhcmd1bWVudHMn XS5pdGVyaXRlbXMoKToKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UocHJvcGVydHlfdmFsdWUs IGRpY3QpOgogICAgICAgICAgICAgcGF5bG9hZFtwcm9wZXJ0eV9uYW1lXSA9IHByb3BlcnR5X3Zh bHVlCiAgICAgICAgIGVsaWYgJ3Jvb3QnIGluIHByb3BlcnR5X3ZhbHVlOgotICAgICAgICAgICAg cGF5bG9hZFtwcm9wZXJ0eV9uYW1lXSA9IHJvb3RzW3Byb3BlcnR5X3ZhbHVlWydyb290J11dWydy ZXZpc2lvbiddCisgICAgICAgICAgICByZXBvc2l0b3J5X25hbWUgPSBwcm9wZXJ0eV92YWx1ZVsn cm9vdCddCisgICAgICAgICAgICBpZiByZXBvc2l0b3J5X25hbWUgaW4gcm9vdHM6CisgICAgICAg ICAgICAgICAgcGF5bG9hZFtwcm9wZXJ0eV9uYW1lXSA9IHJvb3RzW3JlcG9zaXRvcnlfbmFtZV1b J3JldmlzaW9uJ10KICAgICAgICAgZWxpZiAncm9vdHNFeGNsdWRpbmcnIGluIHByb3BlcnR5X3Zh bHVlOgogICAgICAgICAgICAgZXhjbHVkZWRfcm9vdHMgPSBwcm9wZXJ0eV92YWx1ZVsncm9vdHNF eGNsdWRpbmcnXQogICAgICAgICAgICAgZmlsdGVyZWRfcm9vdHMgPSB7fQpAQCAtMTUwLDYgKzE4 MCw3IEBAIGRlZiBzY2hlZHVsZV9yZXF1ZXN0KGNvbmZpZywgcmVxdWVzdCwgcm8KICAgICAgICAg ICAgIHBheWxvYWRbcHJvcGVydHlfbmFtZV0gPSBqc29uLmR1bXBzKGZpbHRlcmVkX3Jvb3RzKQog ICAgICAgICBlbHNlOgogICAgICAgICAgICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgIkZhaWxlZCB0 byBwcm9jZXNzIGFuIGFyZ3VtZW50ICVzOiAlcyIgJSAocHJvcGVydHlfbmFtZSwgcHJvcGVydHlf dmFsdWUpCisgICAgICAgICAgICByZXR1cm4KICAgICBwYXlsb2FkW2NvbmZpZ1snYnVpbGRSZXF1 ZXN0QXJndW1lbnQnXV0gPSByZXF1ZXN0WydpZCddCiAKICAgICB0cnk6CkBAIC0xNjYsMTAgKzE5 Nyw4IEBAIGRlZiBjb25maWdfZm9yX3JlcXVlc3QoY29uZmlndXJhdGlvbnMsIHIKICAgICByZXR1 cm4gTm9uZQogCiAKLWRlZiBmZXRjaF9qc29uKHVybCwgYXV0aD17fSwgcGF5bG9hZD1Ob25lKToK K2RlZiBmZXRjaF9qc29uKHVybCwgcGF5bG9hZD1Ob25lKToKICAgICByZXF1ZXN0ID0gdXJsbGli Mi5SZXF1ZXN0KHVybCkKLSAgICBpZiBhdXRoOgotICAgICAgICByZXF1ZXN0LmFkZF9oZWFkZXIo J0F1dGhvcml6YXRpb24nLCAiQmFzaWMgJXMiICUgYmFzZTY0LmVuY29kZXN0cmluZygnJXM6JXMn ICUgKGF1dGhbJ3VzZXInXSwgYXV0aFsncGFzc3dvcmQnXSkpLnJzdHJpcCgnXG4nKSkKICAgICBy ZXNwb25zZSA9IHVybGxpYjIudXJsb3BlbihyZXF1ZXN0LCBwYXlsb2FkKS5yZWFkKCkKICAgICB0 cnk6CiAgICAgICAgIHJldHVybiBqc29uLmxvYWRzKHJlc3BvbnNlKQpJbmRleDogV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3Rvb2xzL3V0aWwucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3Rvb2xzL3V0aWwucHkJKHJldmlzaW9uIDE4NjAyMSkKKysrIFdlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy90b29scy91dGlsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNCwzICsz NCwyMCBAQCBkZWYgdGV4dF9jb250ZW50KGVsZW1lbnQpOgogICAgICAgICBlbHNlOgogICAgICAg ICAgICAgdGV4dCArPSB0ZXh0X2NvbnRlbnQoY2hpbGQpCiAgICAgcmV0dXJuIHRleHQKKworCitI VFRQX0FVVEhfSEFORExFUlMgPSB7CisgICAgJ2Jhc2ljJzogdXJsbGliMi5IVFRQQmFzaWNBdXRo SGFuZGxlciwKKyAgICAnZGlnZXN0JzogdXJsbGliMi5IVFRQRGlnZXN0QXV0aEhhbmRsZXIsCit9 CisKKworZGVmIHNldHVwX2F1dGgoc2VydmVyKToKKyAgICBhdXRoID0gc2VydmVyLmdldCgnYXV0 aCcpCisgICAgaWYgbm90IGF1dGg6CisgICAgICAgIHJldHVybgorCisgICAgcGFzc3dvcmRfbWFu YWdlciA9IHVybGxpYjIuSFRUUFBhc3N3b3JkTWdyKCkKKyAgICBwYXNzd29yZF9tYW5hZ2VyLmFk ZF9wYXNzd29yZChyZWFsbT1hdXRoWydyZWFsbSddLCB1cmk9c2VydmVyWyd1cmwnXSwgdXNlcj1h dXRoWyd1c2VybmFtZSddLCBwYXNzd2Q9YXV0aFsncGFzc3dvcmQnXSkKKyAgICBhdXRoX2hhbmRs ZXIgPSBIVFRQX0FVVEhfSEFORExFUlNbYXV0aFsndHlwZSddXShwYXNzd29yZF9tYW5hZ2VyKQor ICAgIHVybGxpYjIuaW5zdGFsbF9vcGVuZXIodXJsbGliMi5idWlsZF9vcGVuZXIoYXV0aF9oYW5k bGVyKSkK