33638 2010-01-13 16:32:44 -0800 REGRESSION(53133): commit-queue no longer rejects patches with invalid committers, instead it hangs 2010-01-14 16:50:46 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth oldest_to_newest 180461 0 eric 2010-01-13 16:32:44 -0800 REGRESSION(53133): commit-queue no longer rejects patches with invalid committers it simply ignores them. It logs a message to the commit-queue logs, but doesn't actually update the bug to say it was rejected. I expect this came of my Attachment refactoring: http://trac.webkit.org/changeset/53133 180617 1 eric 2010-01-14 01:53:29 -0800 This is worse than expected. I think that this causes the commit queue to spin. It doesn't process the patch and I think that it ends up "thinking" that it's empty and waiting another 5 minutes after the failed processing instead of correcting rejecting the patch from the queue and moving on. So right now someone setting an commit-queue or review flag w/o having proper permissionss looks like it will HANG the queue! I think the commit-queue was delayed for a day due to this bug! 180907 2 eric 2010-01-14 13:58:02 -0800 I'm working on a fix now. 180987 3 46618 eric 2010-01-14 16:14:26 -0800 Created attachment 46618 Patch 180988 4 eric 2010-01-14 16:16:01 -0800 I fixed the bug, and then realizing that I had to pile yet another hack into MockBugzillaTool, so I ended up fixing MockBugzillaTool too use a more dynamic system for handling mock bugs and attachments. 180989 5 46618 abarth 2010-01-14 16:19:52 -0800 Comment on attachment 46618 Patch Nice and epic! 181006 6 eric 2010-01-14 16:50:46 -0800 Committed r53298: <http://trac.webkit.org/changeset/53298> 46618 2010-01-14 16:14:26 -0800 2010-01-14 16:19:51 -0800 Patch bug-33638-20100114161425.patch text/plain 18307 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2YjIyZGM1Li5iZTUwYThmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTAtMDEt MTQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04oNTMxMzMpOiBjb21taXQtcXVl dWUgbm8gbG9uZ2VyIHJlamVjdHMgcGF0Y2hlcyB3aXRoIGludmFsaWQgY29tbWl0dGVycywgaW5z dGVhZCBpdCBoYW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzM2MzgKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYnVnemlsbGEucHk6Cisg ICAgICAgICAtIEFkZCBCdWcuaWQoKSB0byBtYXRjaCBBdHRhY2htZW50LmlkKCkKKyAgICAgICAg IC0gR2l2ZSBCdWcucmV2aWV3ZWRfcGF0Y2hlcyBhbmQgY29tbWl0X3F1ZXVlZF9wYXRjaGVzIHRo ZSBvcHRpb24gdG8gcmV0dXJuIHBhdGNoZXMgd2l0aCBpbnZhbGlkIGNvbW1pdHRlcnMvcmV2aWV3 ZXJzLgorICAgICAgICAgLSBBZGQgYmFjayBhIG1pc3NpbmcgdmFyaWFibGUgdG8gX3ZhbGlkYXRl X3NldHRlcl9lbWFpbCBmb3VuZCBieSB0aGUgbmV3IHVuaXQgdGVzdHMhCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tYW5kcy9xdWVyaWVzLnB5OgorICAgICAgICAgLSBBZGQgRklYTUVz IGFib3V0IHRoZSBjb21tYW5kcyBiZWluZyBjb25mdXNpbmdseSBuYW1lZC4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXJpZXNfdW5pdHRlc3QucHk6CisgICAgICAgICAt IFVwZGF0ZSByZXN1bHRzIHRvIHJlZmxlY3QgdGhlIG5ld2x5IHJlc3RydWN0dXJlZCBtb2NrIGJ1 ZyBjYWNoZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXVlcy5weToK KyAgICAgICAgIC0gQWRkIGEgbmV3IF92YWxpZGF0ZV9wYXRjaGVzX2luX2NvbW1pdF9xdWV1ZSBt ZXRob2QgKHRoaXMgaXMgd2hhdCBmaXhlcyB0aGUgcmVncmVzc2lvbikuCisgICAgICAgICAtIEFk ZCBhIEZJWE1FIGFib3V0IGV2ZW50dWFsbHkgc29ydGluZyB0aGUgcGF0Y2hlcyBpbnRvIHNvbWUg b3JkZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9xdWV1ZXNfdW5pdHRl c3QucHk6CisgICAgICAgICAtIFVwZGF0ZSByZXN1bHRzIG5vdyB0aGF0IHdpdGggdGhlIG5ld2x5 IHJlc3RydWN0dXJlIG1vY2sgYnVnIGNhY2hlIHdlJ3JlIHRlc3RpbmcgY3ErJ2QgcGF0Y2hlcyB3 aXRoIGFuIGludmFsaWQgY29tbWl0dGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5OgorICAgICAgICAgLSBVcGRhdGUgcmVzdWx0cyB0byBt YXRjaCB0aGUgbmV3bHkgcmVzdHJ1Y3R1cmVkIG1vY2sgYnVnIGNhY2hlLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbW9ja19idWd6aWxsYXRvb2wucHk6CisgICAgICAgICAtIFJlc3RydWN0 dXJlIGZldGNoXyBtZXRob2RzIHRvIG5vdCB1c2UgYSBtYW51YWwgbGlzdCBvZiBpZHMsIGJ1dCBy YXRoZXIgdXNlIEJ1ZyBhbmQgQXR0YWNobWVudCBjbGFzc2VzIHRvIG1ha2UgcmVhbCBxdWVyaWVz IGZyb20gYWxsIG9mIHRoZSBCdWdzLgorICAgICAgICAgLSBBZGQgYSBmZXcgbW9yZSBhdHRhY2ht ZW50cyBhbmQgYnVnIGRpY3Rpb25hcmllcyBmb3IgdXNlIGJ5IHRoZSB0ZXN0cy4KKwogMjAxMC0w MS0xMyAgRGllZ28gR29uemFsZXogIDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvYnVnemlsbGEucHkKaW5kZXggYzBiYmIwNy4uYTY2NjEzYyAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9idWd6aWxsYS5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2J1Z3ppbGxhLnB5CkBAIC0xMzAsNiArMTMwLDkgQEAgY2xh c3MgQnVnKG9iamVjdCk6CiAgICAgICAgIHNlbGYuYnVnX2RpY3Rpb25hcnkgPSBidWdfZGljdGlv bmFyeQogICAgICAgICBzZWxmLl9idWd6aWxsYSA9IGJ1Z3ppbGxhCiAKKyAgICBkZWYgaWQoc2Vs Zik6CisgICAgICAgIHJldHVybiBzZWxmLmJ1Z19kaWN0aW9uYXJ5WyJpZCJdCisKICAgICBkZWYg YXNzaWduZWRfdG9fZW1haWwoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLmJ1Z19kaWN0aW9u YXJ5WyJhc3NpZ25lZF90b19lbWFpbCJdCiAKQEAgLTE0NiwxMyArMTQ5LDE5IEBAIGNsYXNzIEJ1 ZyhvYmplY3QpOgogICAgIGRlZiB1bnJldmlld2VkX3BhdGNoZXMoc2VsZik6CiAgICAgICAgIHJl dHVybiBbcGF0Y2ggZm9yIHBhdGNoIGluIHNlbGYucGF0Y2hlcygpIGlmIHBhdGNoLnJldmlldygp ID09ICI/Il0KIAotICAgIGRlZiByZXZpZXdlZF9wYXRjaGVzKHNlbGYpOgorICAgIGRlZiByZXZp ZXdlZF9wYXRjaGVzKHNlbGYsIGluY2x1ZGVfaW52YWxpZD1GYWxzZSk6CisgICAgICAgIHBhdGNo ZXMgPSBbcGF0Y2ggZm9yIHBhdGNoIGluIHNlbGYucGF0Y2hlcygpIGlmIHBhdGNoLnJldmlldygp ID09ICIrIl0KKyAgICAgICAgaWYgaW5jbHVkZV9pbnZhbGlkOgorICAgICAgICAgICAgcmV0dXJu IHBhdGNoZXMKICAgICAgICAgIyBDaGVja2luZyByZXZpZXdlcigpIGVuc3VyZXMgdGhhdCBpdCB3 YXMgYm90aCByZXZpZXdlZCBhbmQgaGFzIGEgdmFsaWQgcmV2aWV3ZXIuCi0gICAgICAgIHJldHVy biBbcGF0Y2ggZm9yIHBhdGNoIGluIHNlbGYucGF0Y2hlcygpIGlmIHBhdGNoLnJldmlldygpID09 ICIrIiBhbmQgcGF0Y2gucmV2aWV3ZXIoKV0KKyAgICAgICAgcmV0dXJuIGZpbHRlcihsYW1iZGEg cGF0Y2g6IHBhdGNoLnJldmlld2VyKCksIHBhdGNoZXMpCiAKLSAgICBkZWYgY29tbWl0X3F1ZXVl ZF9wYXRjaGVzKHNlbGYpOgorICAgIGRlZiBjb21taXRfcXVldWVkX3BhdGNoZXMoc2VsZiwgaW5j bHVkZV9pbnZhbGlkPUZhbHNlKToKKyAgICAgICAgcGF0Y2hlcyA9IFtwYXRjaCBmb3IgcGF0Y2gg aW4gc2VsZi5wYXRjaGVzKCkgaWYgcGF0Y2guY29tbWl0X3F1ZXVlKCkgPT0gIisiXQorICAgICAg ICBpZiBpbmNsdWRlX2ludmFsaWQ6CisgICAgICAgICAgICByZXR1cm4gcGF0Y2hlcwogICAgICAg ICAjIENoZWNraW5nIGNvbW1pdHRlcigpIGVuc3VyZXMgdGhhdCBpdCB3YXMgYm90aCBjb21taXQt cXVldWUrJ2QgYW5kIGhhcyBhIHZhbGlkIGNvbW1pdHRlci4KLSAgICAgICAgcmV0dXJuIFtwYXRj aCBmb3IgcGF0Y2ggaW4gc2VsZi5wYXRjaGVzKCkgaWYgcGF0Y2guY29tbWl0X3F1ZXVlKCkgPT0g IisiIGFuZCBwYXRjaC5jb21taXR0ZXIoKV0KKyAgICAgICAgcmV0dXJuIGZpbHRlcihsYW1iZGEg cGF0Y2g6IHBhdGNoLmNvbW1pdHRlcigpLCBwYXRjaGVzKQogCiAKICMgQSBjb250YWluZXIgZm9y IGFsbCBvZiB0aGUgbG9naWMgZm9yIG1ha2luZyBhIHBhcnNpbmcgYnV6aWxsYSBxdWVyaWVzLgpA QCAtMTk1LDYgKzIwNCw3IEBAIGNsYXNzIEJ1Z3ppbGxhUXVlcmllcyhvYmplY3QpOgogICAgICAg ICBjb21taXRfcXVldWVfdXJsID0gImJ1Z2xpc3QuY2dpP3F1ZXJ5X2Zvcm1hdD1hZHZhbmNlZCZi dWdfc3RhdHVzPVVOQ09ORklSTUVEJmJ1Z19zdGF0dXM9TkVXJmJ1Z19zdGF0dXM9QVNTSUdORUQm YnVnX3N0YXR1cz1SRU9QRU5FRCZmaWVsZDAtMC0wPWZsYWd0eXBlcy5uYW1lJnR5cGUwLTAtMD1l cXVhbHMmdmFsdWUwLTAtMD1jb21taXQtcXVldWUlMkIiCiAgICAgICAgIHJldHVybiBzZWxmLl9m ZXRjaF9idWdfaWRzX2FkdmFuY2VkX3F1ZXJ5KGNvbW1pdF9xdWV1ZV91cmwpCiAKKyAgICAjIFRo aXMgZnVuY3Rpb24gd2lsbCBvbmx5IHJldHVybiBwYXRjaGVzIHdoaWNoIGhhdmUgdmFsaWQgY29t bWl0dGVycyBzZXQuICBJdCB3b24ndCByZWplY3QgcGF0Y2hlcyB3aXRoIGludmFsaWQgY29tbWl0 dGVycy9yZXZpZXdlcnMuCiAgICAgZGVmIGZldGNoX3BhdGNoZXNfZnJvbV9jb21taXRfcXVldWUo c2VsZik6CiAgICAgICAgIHJldHVybiBzdW0oW3NlbGYuX2ZldGNoX2J1ZyhidWdfaWQpLmNvbW1p dF9xdWV1ZWRfcGF0Y2hlcygpIGZvciBidWdfaWQgaW4gc2VsZi5mZXRjaF9idWdfaWRzX2Zyb21f Y29tbWl0X3F1ZXVlKCldLCBbXSkKIApAQCAtMjM2LDcgKzI0Niw4IEBAIGNsYXNzIENvbW1pdHRl clZhbGlkYXRvcihvYmplY3QpOgogICAgIGRlZiBfdmFsaWRhdGVfc2V0dGVyX2VtYWlsKHNlbGYs IHBhdGNoLCByZXN1bHRfa2V5LCByZWplY3Rpb25fZnVuY3Rpb24pOgogICAgICAgICBjb21taXR0 ZXIgPSBnZXRhdHRyKHBhdGNoLCByZXN1bHRfa2V5KSgpCiAgICAgICAgICMgSWYgdGhlIGZsYWcg aXMgc2V0LCBhbmQgd2UgZG9uJ3QgcmVjb2duaXplIHRoZSBzZXR0ZXIsIHJlamVjdCB0aGUgZmxh ZyEKLSAgICAgICAgaWYgcGF0Y2guX2F0dGFjaG1lbnRfZGljdGlvbmFyeS5nZXQoIiVzX2VtYWls IiAlIHJlc3VsdF9rZXkpIGFuZCBub3QgY29tbWl0dGVyOgorICAgICAgICBzZXR0ZXJfZW1haWwg PSBwYXRjaC5fYXR0YWNobWVudF9kaWN0aW9uYXJ5LmdldCgiJXNfZW1haWwiICUgcmVzdWx0X2tl eSkKKyAgICAgICAgaWYgc2V0dGVyX2VtYWlsIGFuZCBub3QgY29tbWl0dGVyOgogICAgICAgICAg ICAgcmVqZWN0aW9uX2Z1bmN0aW9uKHBhdGNoLmlkKCksIHNlbGYuX2ZsYWdfcGVybWlzc2lvbl9y ZWplY3Rpb25fbWVzc2FnZShzZXR0ZXJfZW1haWwsIHJlc3VsdF9rZXkpKQogICAgICAgICAgICAg cmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBUcnVlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXJpZXMucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXJpZXMucHkKaW5kZXggYzExZmI4NS4uMjg4MDE3MiAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9xdWVyaWVz LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVlcmllcy5w eQpAQCAtNDIsNiArNDIsNyBAQCBjbGFzcyBCdWdzVG9Db21taXQoQWJzdHJhY3REZWNsYXJhdGl2 ZUNvbW1hbmQpOgogICAgIGhlbHBfdGV4dCA9ICJMaXN0IGJ1Z3MgaW4gdGhlIGNvbW1pdC1xdWV1 ZSIKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAg ICAjIEZJWE1FOiBUaGlzIGNvbW1hbmQgaXMgcG9vcmx5IG5hbWVkLiAgSXQncyBmZXRjaGluZyB0 aGUgY29tbWl0LXF1ZXVlIGxpc3QgaGVyZS4gIFRoZSBuYW1lIGltcGxpZXMgaXQncyBmZXRjaGlu ZyBwZW5kaW5nLWNvbW1pdCAoYWxsIHIrJ2QgcGF0Y2hlcykuCiAgICAgICAgIGJ1Z19pZHMgPSB0 b29sLmJ1Z3MucXVlcmllcy5mZXRjaF9idWdfaWRzX2Zyb21fY29tbWl0X3F1ZXVlKCkKICAgICAg ICAgZm9yIGJ1Z19pZCBpbiBidWdfaWRzOgogICAgICAgICAgICAgcHJpbnQgIiVzIiAlIGJ1Z19p ZApAQCAtNTIsNiArNTMsNyBAQCBjbGFzcyBQYXRjaGVzVG9Db21taXQoQWJzdHJhY3REZWNsYXJh dGl2ZUNvbW1hbmQpOgogICAgIGhlbHBfdGV4dCA9ICJMaXN0IHBhdGNoZXMgaW4gdGhlIGNvbW1p dC1xdWV1ZSIKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgor ICAgICAgICAjIEZJWE1FOiBUaGlzIGNvbW1hbmQgaXMgcG9vcmx5IG5hbWVkLiAgSXQncyBmZXRj aGluZyB0aGUgY29tbWl0LXF1ZXVlIGxpc3QgaGVyZS4gIFRoZSBuYW1lIGltcGxpZXMgaXQncyBm ZXRjaGluZyBwZW5kaW5nLWNvbW1pdCAoYWxsIHIrJ2QgcGF0Y2hlcykuCiAgICAgICAgIHBhdGNo ZXMgPSB0b29sLmJ1Z3MucXVlcmllcy5mZXRjaF9wYXRjaGVzX2Zyb21fY29tbWl0X3F1ZXVlKCkK ICAgICAgICAgbG9nKCJQYXRjaGVzIGluIGNvbW1pdCBxdWV1ZToiKQogICAgICAgICBmb3IgcGF0 Y2ggaW4gcGF0Y2hlczoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weQppbmRleCBkYTc3YmUxLi5kNDJmMzYzIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXJpZXNf dW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9x dWVyaWVzX3VuaXR0ZXN0LnB5CkBAIC0zNiwyNiArMzYsMjcgQEAgZnJvbSB3ZWJraXRweS5tb2Nr X2J1Z3ppbGxhdG9vbCBpbXBvcnQgTW9ja0J1Z3ppbGxhVG9vbAogCiBjbGFzcyBRdWVyeUNvbW1h bmRzVGVzdChDb21tYW5kc1Rlc3QpOgogICAgIGRlZiB0ZXN0X2J1Z3NfdG9fY29tbWl0KHNlbGYp OgotICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoQnVnc1RvQ29tbWl0KCksIE5v bmUsICI0MlxuNzVcbiIpCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJXYXJuaW5nLCBhdHRh Y2htZW50IDEyOCBvbiBidWcgNDIgaGFzIGludmFsaWQgY29tbWl0dGVyIChub24tY29tbWl0dGVy QGV4YW1wbGUuY29tKVxuIgorICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoQnVn c1RvQ29tbWl0KCksIE5vbmUsICI0MlxuNzdcbiIsIGV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRl ZiB0ZXN0X3BhdGNoZXNfdG9fY29tbWl0KHNlbGYpOgotICAgICAgICBleHBlY3RlZF9zdGRvdXQg PSAiaHR0cDovL2V4YW1wbGUuY29tLzE5N1xuaHR0cDovL2V4YW1wbGUuY29tLzEyOFxuIgotICAg ICAgICBleHBlY3RlZF9zdGRlcnIgPSAiUGF0Y2hlcyBpbiBjb21taXQgcXVldWU6XG4iCisgICAg ICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJodHRwOi8vZXhhbXBsZS5jb20vMTk3XG5odHRwOi8vZXhh bXBsZS5jb20vMTAzXG4iCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJXYXJuaW5nLCBhdHRh Y2htZW50IDEyOCBvbiBidWcgNDIgaGFzIGludmFsaWQgY29tbWl0dGVyIChub24tY29tbWl0dGVy QGV4YW1wbGUuY29tKVxuUGF0Y2hlcyBpbiBjb21taXQgcXVldWU6XG4iCiAgICAgICAgIHNlbGYu YXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhQYXRjaGVzVG9Db21taXQoKSwgTm9uZSwgZXhwZWN0ZWRf c3Rkb3V0LCBleHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9wYXRjaGVzX3RvX2NvbW1p dF9xdWV1ZShzZWxmKToKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gImh0dHA6Ly9leGFtcGxl LmNvbS8xOTcmYWN0aW9uPWVkaXRcbiIKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIjEyOCBj b21taXR0ZXIgPSBcIkVyaWMgU2VpZGVsXCIgPGVyaWNAd2Via2l0Lm9yZz5cbiIKKyAgICAgICAg ZXhwZWN0ZWRfc3Rkb3V0ID0gImh0dHA6Ly9leGFtcGxlLmNvbS8xMDQmYWN0aW9uPWVkaXRcbiIK KyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIjE5NyBhbHJlYWR5IGhhcyBjcT0rXG4xMjggYWxy ZWFkeSBoYXMgY3E9K1xuMTA1IGNvbW1pdHRlciA9IFwiRXJpYyBTZWlkZWxcIiA8ZXJpY0B3ZWJr aXQub3JnPlxuIgogICAgICAgICBvcHRpb25zID0gTW9jaygpCiAgICAgICAgIG9wdGlvbnMuYnVn cyA9IEZhbHNlCiAgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhQYXRjaGVzVG9D b21taXRRdWV1ZSgpLCBOb25lLCBleHBlY3RlZF9zdGRvdXQsIGV4cGVjdGVkX3N0ZGVyciwgb3B0 aW9ucz1vcHRpb25zKQogCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJodHRwOi8vZXhhbXBs ZS5jb20vNDJcbiIKKyAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gImh0dHA6Ly9leGFtcGxlLmNv bS83N1xuIgogICAgICAgICBvcHRpb25zLmJ1Z3MgPSBUcnVlCiAgICAgICAgIHNlbGYuYXNzZXJ0 X2V4ZWN1dGVfb3V0cHV0cyhQYXRjaGVzVG9Db21taXRRdWV1ZSgpLCBOb25lLCBleHBlY3RlZF9z dGRvdXQsIGV4cGVjdGVkX3N0ZGVyciwgb3B0aW9ucz1vcHRpb25zKQogCiAgICAgZGVmIHRlc3Rf cGF0Y2hlc190b19yZXZpZXcoc2VsZik6Ci0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICIxOTdc bjEyOFxuIgorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiMTAzXG4iCiAgICAgICAgIGV4cGVj dGVkX3N0ZGVyciA9ICJQYXRjaGVzIHBlbmRpbmcgcmV2aWV3OlxuIgogICAgICAgICBzZWxmLmFz c2VydF9leGVjdXRlX291dHB1dHMoUGF0Y2hlc1RvUmV2aWV3KCksIE5vbmUsIGV4cGVjdGVkX3N0 ZG91dCwgZXhwZWN0ZWRfc3RkZXJyKQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXVlcy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IDQxMzNlMzQuLmY1YTZkOTEgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVldWVzLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVldWVzLnB5CkBAIC0xNDMsOSAr MTQzLDE1IEBAIGNsYXNzIENvbW1pdFF1ZXVlKEFic3RyYWN0UXVldWUsIFN0ZXBTZXF1ZW5jZUVy cm9ySGFuZGxlcik6CiAgICAgICAgIEFic3RyYWN0UXVldWUuYmVnaW5fd29ya19xdWV1ZShzZWxm KQogICAgICAgICBzZWxmLmNvbW1pdHRlcl92YWxpZGF0b3IgPSBDb21taXR0ZXJWYWxpZGF0b3Io c2VsZi50b29sLmJ1Z3MpCiAKKyAgICBkZWYgX3ZhbGlkYXRlX3BhdGNoZXNfaW5fY29tbWl0X3F1 ZXVlKHNlbGYpOgorICAgICAgICAjIE5vdCB1c2luZyBCdWd6aWxsYVF1ZXJpZXMuZmV0Y2hfcGF0 Y2hlc19mcm9tX2NvbW1pdF9xdWV1ZSgpIHNvIHdlIGNhbiByZWplY3QgcGF0Y2hlcyB3aXRoIGlu dmFsaWQgY29tbWl0dGVycy9yZXZpZXdlcnMuCisgICAgICAgIGJ1Z19pZHMgPSBzZWxmLnRvb2wu YnVncy5xdWVyaWVzLmZldGNoX2J1Z19pZHNfZnJvbV9jb21taXRfcXVldWUoKQorICAgICAgICBh bGxfcGF0Y2hlcyA9IHN1bShbc2VsZi50b29sLmJ1Z3MuZmV0Y2hfYnVnKGJ1Z19pZCkuY29tbWl0 X3F1ZXVlZF9wYXRjaGVzKGluY2x1ZGVfaW52YWxpZD1UcnVlKSBmb3IgYnVnX2lkIGluIGJ1Z19p ZHNdLCBbXSkKKyAgICAgICAgcmV0dXJuIHNlbGYuY29tbWl0dGVyX3ZhbGlkYXRvci5wYXRjaGVz X2FmdGVyX3JlamVjdGluZ19pbnZhbGlkX2NvbW1pdGVyc19hbmRfcmV2aWV3ZXJzKGFsbF9wYXRj aGVzKQorCiAgICAgZGVmIG5leHRfd29ya19pdGVtKHNlbGYpOgotICAgICAgICBwYXRjaGVzID0g c2VsZi50b29sLmJ1Z3MucXVlcmllcy5mZXRjaF9wYXRjaGVzX2Zyb21fY29tbWl0X3F1ZXVlKCkK LSAgICAgICAgcGF0Y2hlcyA9IHNlbGYuY29tbWl0dGVyX3ZhbGlkYXRvci5wYXRjaGVzX2FmdGVy X3JlamVjdGluZ19pbnZhbGlkX2NvbW1pdGVyc19hbmRfcmV2aWV3ZXJzKHBhdGNoZXMpCisgICAg ICAgIHBhdGNoZXMgPSBzZWxmLl92YWxpZGF0ZV9wYXRjaGVzX2luX2NvbW1pdF9xdWV1ZSgpCisg ICAgICAgICMgRklYTUU6IFdlIGNvdWxkIHNvcnQgdGhlIHBhdGNoZXMgaW4gYSBzcGVjaWZpYyBv cmRlciBoZXJlLCB3YXMgc3VnZ2VzdGVkIGJ5IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMzM5NQogICAgICAgICBpZiBub3QgcGF0Y2hlczoKICAgICAgICAgICAgIHNl bGYuX3VwZGF0ZV9zdGF0dXMoIkVtcHR5IHF1ZXVlIikKICAgICAgICAgICAgIHJldHVybiBOb25l CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXVl c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVl dWVzX3VuaXR0ZXN0LnB5CmluZGV4IDBjOTEyZjguLmE0MjI0NTYgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5 CkBAIC02NCwxMCArNjQsMTQgQEAgY2xhc3MgQWJzdHJhY3RRdWV1ZVRlc3QoQ29tbWFuZHNUZXN0 KToKIAogCiBjbGFzcyBDb21taXRRdWV1ZVRlc3QoUXVldWVzVGVzdCk6Ci0gICAgZGVmIHRlc3Rf c3R5bGVfcXVldWUoc2VsZik6CisgICAgZGVmIHRlc3RfY29tbWl0X3F1ZXVlKHNlbGYpOgogICAg ICAgICBleHBlY3RlZF9zdGRlcnIgPSB7CiAgICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSIg OiAiQ0FVVElPTjogY29tbWl0LXF1ZXVlIHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdlcyBp biBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IGNvbW1pdC1xdWV1ZS5cbiIgJSBvcy5nZXRjd2QoKSwK LSAgICAgICAgICAgICJuZXh0X3dvcmtfaXRlbSIgOiAiMiBwYXRjaGVzIGluIGNvbW1pdC1xdWV1 ZSBbMTk3LCAxMjhdXG4iLAorICAgICAgICAgICAgIyBGSVhNRTogVGhlIGNvbW1pdC1xdWV1ZSB3 YXJucyBhYm91dCBiYWQgY29tbWl0dGVycyB0d2ljZS4gIFRoaXMgaXMgZHVlIHRvIHRoZSBmYWN0 IHRoYXQgd2UgYWNjZXNzIEF0dGFjaG1lbnQucmV2aWV3ZXIoKSB0d2ljZSBhbmQgaXQgbG9ncyBl YWNoIHRpbWUuCisgICAgICAgICAgICAibmV4dF93b3JrX2l0ZW0iIDogIiIiV2FybmluZywgYXR0 YWNobWVudCAxMjggb24gYnVnIDQyIGhhcyBpbnZhbGlkIGNvbW1pdHRlciAobm9uLWNvbW1pdHRl ckBleGFtcGxlLmNvbSkKK1dhcm5pbmcsIGF0dGFjaG1lbnQgMTI4IG9uIGJ1ZyA0MiBoYXMgaW52 YWxpZCBjb21taXR0ZXIgKG5vbi1jb21taXR0ZXJAZXhhbXBsZS5jb20pCisyIHBhdGNoZXMgaW4g Y29tbWl0LXF1ZXVlIFsxOTcsIDEwNl0KKyIiIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFz c2VydF9xdWV1ZV9vdXRwdXRzKENvbW1pdFF1ZXVlKCksIGV4cGVjdGVkX3N0ZGVycj1leHBlY3Rl ZF9zdGRlcnIpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKaW5kZXggNzQ2YTYxYS4uYjBkNDFlZSAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy91cGxvYWRfdW5pdHRl c3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy91cGxvYWRf dW5pdHRlc3QucHkKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xhc3MgVXBsb2FkQ29tbWFuZHNUZXN0KENv bW1hbmRzVGVzdCk6CiAKICAgICBkZWYgdGVzdF9hc3NpZ25fdG9fY29tbWl0dGVyKHNlbGYpOgog ICAgICAgICB0b29sID0gTW9ja0J1Z3ppbGxhVG9vbCgpCi0gICAgICAgIGV4cGVjdGVkX3N0ZGVy ciA9ICJCdWcgNzUgaXMgYWxyZWFkeSBhc3NpZ25lZCB0byBmb29AZm9vLmNvbSAoTm9uZSkuXG5C dWcgNzYgaGFzIG5vIG5vbi1vYnNvbGV0ZSBwYXRjaGVzLCBpZ25vcmluZy5cbiIKKyAgICAgICAg ZXhwZWN0ZWRfc3RkZXJyID0gIkJ1ZyA3NyBpcyBhbHJlYWR5IGFzc2lnbmVkIHRvIGZvb0Bmb28u Y29tIChOb25lKS5cbkJ1ZyA3NiBoYXMgbm8gbm9uLW9ic29sZXRlIHBhdGNoZXMsIGlnbm9yaW5n LlxuIgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoQXNzaWduVG9Db21taXR0 ZXIoKSwgW10sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIHRvb2w9dG9vbCkKICAg ICAgICAgdG9vbC5idWdzLnJlYXNzaWduX2J1Zy5hc3NlcnRfY2FsbGVkX3dpdGgoNDIsICJlcmlj QHdlYmtpdC5vcmciLCAiQXR0YWNobWVudCAxMjggd2FzIHBvc3RlZCBieSBhIGNvbW1pdHRlciBh bmQgaGFzIHJldmlldyssIGFzc2lnbmluZyB0byBFcmljIFNlaWRlbCBmb3IgY29tbWl0LiIpCiAK QEAgLTc0LDcgKzc0LDcgQEAgY2xhc3MgVXBsb2FkQ29tbWFuZHNUZXN0KENvbW1hbmRzVGVzdCk6 CiAgICAgICAgIHRvb2wuX3NjbS5sYXN0X3N2bl9jb21taXRfbG9nID0gbGFtYmRhOiAicjk4NzYg fCIKICAgICAgICAgb3B0aW9ucyA9IE1vY2soKQogICAgICAgICBvcHRpb25zLmJ1Z19pZCA9IDQy Ci0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJCdWc6IDxodHRwOi8vZXhhbXBsZS5jb20vNDI+ IFRoZSBmaXJzdCBidWdcblJldmlzaW9uOiA5ODc2XG5BZGRpbmcgY29tbWVudCB0byBCdWcgNDIu XG4iCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJCdWc6IDxodHRwOi8vZXhhbXBsZS5jb20v NDI+IEJ1ZyB3aXRoIHR3byByKydkIGFuZCBjcSsnZCBwYXRjaGVzLCBvbmUgb2Ygd2hpY2ggaGFz IGFuIGludmFsaWQgY29tbWl0LXF1ZXVlIHNldHRlci5cblJldmlzaW9uOiA5ODc2XG5BZGRpbmcg Y29tbWVudCB0byBCdWcgNDIuXG4iCiAgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0 cyhNYXJrQnVnRml4ZWQoKSwgW10sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIHRv b2w9dG9vbCwgb3B0aW9ucz1vcHRpb25zKQogCiAgICAgZGVmIHRlc3RfZWRpdF9jaGFuZ2Vsb2co c2VsZik6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L21vY2tfYnVn emlsbGF0b29sLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9tb2NrX2J1Z3ppbGxh dG9vbC5weQppbmRleCA5NzhiOGM0Li42YTI5NDA3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L21vY2tfYnVnemlsbGF0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbW9ja19idWd6aWxsYXRvb2wucHkKQEAgLTQ4LDYgKzQ4LDggQEAgX3Bh dGNoMSA9IHsKICAgICAiaXNfcGF0Y2giIDogVHJ1ZSwKICAgICAicmV2aWV3IiA6ICIrIiwKICAg ICAicmV2aWV3ZXJfZW1haWwiIDogImZvb0BiYXIuY29tIiwKKyAgICAiY29tbWl0LXF1ZXVlIiA6 ICIrIiwKKyAgICAiY29tbWl0dGVyX2VtYWlsIiA6ICJmb29AYmFyLmNvbSIsCiAgICAgImF0dGFj aGVyX2VtYWlsIiA6ICJDb250cmlidXRlcjEiLAogfQogX3BhdGNoMiA9IHsKQEAgLTU4LDggKzYw LDYxIEBAIF9wYXRjaDIgPSB7CiAgICAgImlzX3BhdGNoIiA6IFRydWUsCiAgICAgInJldmlldyIg OiAiKyIsCiAgICAgInJldmlld2VyX2VtYWlsIiA6ICJmb29AYmFyLmNvbSIsCisgICAgImNvbW1p dC1xdWV1ZSIgOiAiKyIsCisgICAgImNvbW1pdHRlcl9lbWFpbCIgOiAibm9uLWNvbW1pdHRlckBl eGFtcGxlLmNvbSIsCiAgICAgImF0dGFjaGVyX2VtYWlsIiA6ICJlcmljQHdlYmtpdC5vcmciLAog fQorX3BhdGNoMyA9IHsKKyAgICAiaWQiIDogMTAzLAorICAgICJidWdfaWQiIDogNzUsCisgICAg InVybCIgOiAiaHR0cDovL2V4YW1wbGUuY29tLzEwMyIsCisgICAgImlzX29ic29sZXRlIiA6IEZh bHNlLAorICAgICJpc19wYXRjaCIgOiBUcnVlLAorICAgICJyZXZpZXciIDogIj8iLAorICAgICJh dHRhY2hlcl9lbWFpbCIgOiAiZXJpY0B3ZWJraXQub3JnIiwKK30KK19wYXRjaDQgPSB7CisgICAg ImlkIiA6IDEwNCwKKyAgICAiYnVnX2lkIiA6IDc3LAorICAgICJ1cmwiIDogImh0dHA6Ly9leGFt cGxlLmNvbS8xMDMiLAorICAgICJpc19vYnNvbGV0ZSIgOiBGYWxzZSwKKyAgICAiaXNfcGF0Y2gi IDogVHJ1ZSwKKyAgICAicmV2aWV3IiA6ICIrIiwKKyAgICAiY29tbWl0LXF1ZXVlIiA6ICI/IiwK KyAgICAicmV2aWV3ZXJfZW1haWwiIDogImZvb0BiYXIuY29tIiwKKyAgICAiYXR0YWNoZXJfZW1h aWwiIDogIkNvbnRyaWJ1dGVyMiIsCit9CitfcGF0Y2g1ID0geworICAgICJpZCIgOiAxMDUsCisg ICAgImJ1Z19pZCIgOiA3NywKKyAgICAidXJsIiA6ICJodHRwOi8vZXhhbXBsZS5jb20vMTAzIiwK KyAgICAiaXNfb2Jzb2xldGUiIDogRmFsc2UsCisgICAgImlzX3BhdGNoIiA6IFRydWUsCisgICAg InJldmlldyIgOiAiKyIsCisgICAgInJldmlld2VyX2VtYWlsIiA6ICJmb29AYmFyLmNvbSIsCisg ICAgImF0dGFjaGVyX2VtYWlsIiA6ICJlcmljQHdlYmtpdC5vcmciLAorfQorX3BhdGNoNiA9IHsg IyBWYWxpZCBjb21taXR0ZXIsIGJ1dCBubyByZXZpZXdlci4KKyAgICAiaWQiIDogMTA2LAorICAg ICJidWdfaWQiIDogNzcsCisgICAgInVybCIgOiAiaHR0cDovL2V4YW1wbGUuY29tLzEwMyIsCisg ICAgImlzX29ic29sZXRlIiA6IEZhbHNlLAorICAgICJpc19wYXRjaCIgOiBUcnVlLAorICAgICJj b21taXQtcXVldWUiIDogIisiLAorICAgICJjb21taXR0ZXJfZW1haWwiIDogImZvb0BiYXIuY29t IiwKKyAgICAiYXR0YWNoZXJfZW1haWwiIDogImVyaWNAd2Via2l0Lm9yZyIsCit9CitfcGF0Y2g3 ID0geyAjIFZhbGlkIHJldmlldywgcGF0Y2ggaXMgbWFya2VkIG9ic29sZXRlLgorICAgICJpZCIg OiAxMDcsCisgICAgImJ1Z19pZCIgOiA3NiwKKyAgICAidXJsIiA6ICJodHRwOi8vZXhhbXBsZS5j b20vMTAzIiwKKyAgICAiaXNfb2Jzb2xldGUiIDogVHJ1ZSwKKyAgICAiaXNfcGF0Y2giIDogVHJ1 ZSwKKyAgICAicmV2aWV3IiA6ICIrIiwKKyAgICAicmV2aWV3ZXJfZW1haWwiIDogImZvb0BiYXIu Y29tIiwKKyAgICAiYXR0YWNoZXJfZW1haWwiIDogImVyaWNAd2Via2l0Lm9yZyIsCit9CisKIAog IyBUaGlzIG11c3QgYmUgZGVmaW5lZCBiZWZvcmUgd2UgZGVmaW5lIHRoZSBidWdzLCB0aHVzIHdl IGRvbid0IHVzZSBNb2NrQnVnemlsbGEudW5hc3NpZ25lZF9lbWFpbCBkaXJlY3RseS4KIF91bmFz c2lnbmVkX2VtYWlsID0gInVuYXNzaWduZWRAZXhhbXBsZS5jb20iCkBAIC02NywyMSArMTIyLDI3 IEBAIF91bmFzc2lnbmVkX2VtYWlsID0gInVuYXNzaWduZWRAZXhhbXBsZS5jb20iCiAjIEZJWE1F OiBUaGUgaWRzIHNob3VsZCBiZSAxLCAyLCAzIGluc3RlYWQgb2YgY3JhenkgbnVtYmVycy4KIF9i dWcxID0gewogICAgICJpZCIgOiA0MiwKLSAgICAidGl0bGUiIDogIlRoZSBmaXJzdCBidWciLAor ICAgICJ0aXRsZSIgOiAiQnVnIHdpdGggdHdvIHIrJ2QgYW5kIGNxKydkIHBhdGNoZXMsIG9uZSBv ZiB3aGljaCBoYXMgYW4gaW52YWxpZCBjb21taXQtcXVldWUgc2V0dGVyLiIsCiAgICAgImFzc2ln bmVkX3RvX2VtYWlsIiA6IF91bmFzc2lnbmVkX2VtYWlsLAogICAgICJhdHRhY2htZW50cyIgOiBb X3BhdGNoMSwgX3BhdGNoMl0sCiB9CiBfYnVnMiA9IHsKICAgICAiaWQiIDogNzUsCi0gICAgInRp dGxlIiA6ICJUaGUgc2Vjb25kIGJ1ZyIsCisgICAgInRpdGxlIiA6ICJCdWcgd2l0aCBhIHBhdGNo IG5lZWRpbmcgcmV2aWV3LiIsCiAgICAgImFzc2lnbmVkX3RvX2VtYWlsIiA6ICJmb29AZm9vLmNv bSIsCi0gICAgImF0dGFjaG1lbnRzIiA6IFtdLAorICAgICJhdHRhY2htZW50cyIgOiBbX3BhdGNo M10sCiB9CiBfYnVnMyA9IHsKICAgICAiaWQiIDogNzYsCiAgICAgInRpdGxlIiA6ICJUaGUgdGhp cmQgYnVnIiwKICAgICAiYXNzaWduZWRfdG9fZW1haWwiIDogX3VuYXNzaWduZWRfZW1haWwsCi0g ICAgImF0dGFjaG1lbnRzIiA6IFtdLAorICAgICJhdHRhY2htZW50cyIgOiBbX3BhdGNoN10sCit9 CitfYnVnNCA9IHsKKyAgICAiaWQiIDogNzcsCisgICAgInRpdGxlIiA6ICJUaGUgZm91cnRoIGJ1 ZyIsCisgICAgImFzc2lnbmVkX3RvX2VtYWlsIiA6ICJmb29AZm9vLmNvbSIsCisgICAgImF0dGFj aG1lbnRzIiA6IFtfcGF0Y2g0LCBfcGF0Y2g1LCBfcGF0Y2g2XSwKIH0KIAogY2xhc3MgTW9ja0J1 Z3ppbGxhUXVlcmllcyhNb2NrKToKQEAgLTg5LDIwICsxNTAsMzAgQEAgY2xhc3MgTW9ja0J1Z3pp bGxhUXVlcmllcyhNb2NrKToKICAgICAgICAgTW9jay5fX2luaXRfXyhzZWxmKQogICAgICAgICBz ZWxmLl9idWd6aWxsYSA9IGJ1Z3ppbGxhCiAKKyAgICBkZWYgX2FsbF9idWdzKHNlbGYpOgorICAg ICAgICByZXR1cm4gbWFwKGxhbWJkYSBidWdfZGljdGlvbmFyeTogQnVnKGJ1Z19kaWN0aW9uYXJ5 LCBzZWxmLl9idWd6aWxsYSksIHNlbGYuX2J1Z3ppbGxhLmJ1Z19jYWNoZS52YWx1ZXMoKSkKKwog ICAgIGRlZiBmZXRjaF9idWdfaWRzX2Zyb21fY29tbWl0X3F1ZXVlKHNlbGYpOgotICAgICAgICBy ZXR1cm4gWzQyLCA3NV0KKyAgICAgICAgYnVnc193aXRoX2NvbW1pdF9xdWV1ZWRfcGF0Y2hlcyA9 IGZpbHRlcihsYW1iZGEgYnVnOiBidWcuY29tbWl0X3F1ZXVlZF9wYXRjaGVzKCksIHNlbGYuX2Fs bF9idWdzKCkpCisgICAgICAgIHJldHVybiBtYXAobGFtYmRhIGJ1ZzogYnVnLmlkKCksIGJ1Z3Nf d2l0aF9jb21taXRfcXVldWVkX3BhdGNoZXMpCiAKICAgICBkZWYgZmV0Y2hfYXR0YWNobWVudF9p ZHNfZnJvbV9yZXZpZXdfcXVldWUoc2VsZik6Ci0gICAgICAgIHJldHVybiBbMTk3LCAxMjhdCisg ICAgICAgIHVucmV2aWV3ZWRfcGF0Y2hlcyA9IHN1bShbYnVnLnVucmV2aWV3ZWRfcGF0Y2hlcygp IGZvciBidWcgaW4gc2VsZi5fYWxsX2J1Z3MoKV0sIFtdKQorICAgICAgICByZXR1cm4gbWFwKGxh bWJkYSBwYXRjaDogcGF0Y2guaWQoKSwgdW5yZXZpZXdlZF9wYXRjaGVzKQogCi0gICAgZGVmIGZl dGNoX3BhdGNoZXNfZnJvbV9jb21taXRfcXVldWUoc2VsZiwgcmVqZWN0X2ludmFsaWRfcGF0Y2hl cz1GYWxzZSk6Ci0gICAgICAgIHJldHVybiBbc2VsZi5fYnVnemlsbGEuZmV0Y2hfYXR0YWNobWVu dChfcGF0Y2gxWyJpZCJdKSwgc2VsZi5fYnVnemlsbGEuZmV0Y2hfYXR0YWNobWVudChfcGF0Y2gy WyJpZCJdKV0KKyAgICBkZWYgZmV0Y2hfcGF0Y2hlc19mcm9tX2NvbW1pdF9xdWV1ZShzZWxmKToK KyAgICAgICAgcmV0dXJuIHN1bShbYnVnLmNvbW1pdF9xdWV1ZWRfcGF0Y2hlcygpIGZvciBidWcg aW4gc2VsZi5fYWxsX2J1Z3MoKV0sIFtdKQogCiAgICAgZGVmIGZldGNoX2J1Z19pZHNfZnJvbV9w ZW5kaW5nX2NvbW1pdF9saXN0KHNlbGYpOgotICAgICAgICByZXR1cm4gWzQyLCA3NSwgNzZdCi0g ICAgCisgICAgICAgIGJ1Z3Nfd2l0aF9yZXZpZXdlZF9wYXRjaGVzID0gZmlsdGVyKGxhbWJkYSBi dWc6IGJ1Zy5yZXZpZXdlZF9wYXRjaGVzKCksIHNlbGYuX2FsbF9idWdzKCkpCisgICAgICAgIGJ1 Z19pZHMgPSBtYXAobGFtYmRhIGJ1ZzogYnVnLmlkKCksIGJ1Z3Nfd2l0aF9yZXZpZXdlZF9wYXRj aGVzKQorICAgICAgICAjIE5PVEU6IFRoaXMgbWFudWFsIGhhY2sgaGVyZSBpcyB0byBhbGxvdyB0 ZXN0aW5nIGxvZ2dpbmcgaW4gdGVzdF9hc3NpZ25fdG9fY29tbWl0dGVyCisgICAgICAgICMgdGhl IHJlYWwgcGVuZGluZy1jb21taXQgcXVlcnkgb24gYnVnemlsbGEgd2lsbCByZXR1cm4gYnVncyB3 aXRoIHBhdGNoZXMgd2hpY2ggaGF2ZSByKywgYnV0IGFyZSBhbHNvIG9ic29sZXRlLgorICAgICAg ICByZXR1cm4gYnVnX2lkcyArIFs3Nl0KKwogICAgIGRlZiBmZXRjaF9wYXRjaGVzX2Zyb21fcGVu ZGluZ19jb21taXRfbGlzdChzZWxmKToKLSAgICAgICAgcmV0dXJuIFtzZWxmLl9idWd6aWxsYS5m ZXRjaF9hdHRhY2htZW50KF9wYXRjaDFbImlkIl0pLCBzZWxmLl9idWd6aWxsYS5mZXRjaF9hdHRh Y2htZW50KF9wYXRjaDJbImlkIl0pXQorICAgICAgICByZXR1cm4gc3VtKFtidWcucmV2aWV3ZWRf cGF0Y2hlcygpIGZvciBidWcgaW4gc2VsZi5fYWxsX2J1Z3MoKV0sIFtdKQorCiAKIAogIyBGSVhN RTogQnVnemlsbGEgaXMgdGhlIHdyb25nIE1vY2stcG9pbnQuICBPbmNlIHdlIGhhdmUgYSBCdWd6 aWxsYU5ldHdvcmsgY2xhc3Mgd2Ugc2hvdWxkIG1vY2sgdGhhdCBpbnN0ZWFkLgpAQCAtMTEwLDgg KzE4MSw4IEBAIGNsYXNzIE1vY2tCdWd6aWxsYVF1ZXJpZXMoTW9jayk6CiBjbGFzcyBNb2NrQnVn emlsbGEoTW9jayk6CiAgICAgYnVnX3NlcnZlcl91cmwgPSAiaHR0cDovL2V4YW1wbGUuY29tIgog ICAgIHVuYXNzaWduZWRfZW1haWwgPSBfdW5hc3NpZ25lZF9lbWFpbAotICAgIGJ1Z19jYWNoZSA9 IF9pZF90b19vYmplY3RfZGljdGlvbmFyeShfYnVnMSwgX2J1ZzIsIF9idWczKQotICAgIGF0dGFj aG1lbnRfY2FjaGUgPSBfaWRfdG9fb2JqZWN0X2RpY3Rpb25hcnkoX3BhdGNoMSwgX3BhdGNoMikK KyAgICBidWdfY2FjaGUgPSBfaWRfdG9fb2JqZWN0X2RpY3Rpb25hcnkoX2J1ZzEsIF9idWcyLCBf YnVnMywgX2J1ZzQpCisgICAgYXR0YWNobWVudF9jYWNoZSA9IF9pZF90b19vYmplY3RfZGljdGlv bmFyeShfcGF0Y2gxLCBfcGF0Y2gyLCBfcGF0Y2gzLCBfcGF0Y2g0LCBfcGF0Y2g1LCBfcGF0Y2g2 LCBfcGF0Y2g3KQogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBNb2NrLl9faW5p dF9fKHNlbGYpCg==