162070 2016-09-16 10:49:03 -0700 Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/console 2016-09-19 13:51:49 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 161634 1 hi hi bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1230465 0 hi 2016-09-16 10:49:03 -0700 . 1230467 1 webkit-bug-importer 2016-09-16 10:49:33 -0700 <rdar://problem/28340025> 1230667 2 289128 hi 2016-09-16 16:23:01 -0700 Created attachment 289128 Patch 1231049 3 289128 bburg 2016-09-19 03:13:53 -0700 Comment on attachment 289128 Patch r=me 1231301 4 289128 commit-queue 2016-09-19 13:51:45 -0700 Comment on attachment 289128 Patch Clearing flags on attachment: 289128 Committed r206116: <http://trac.webkit.org/changeset/206116> 1231302 5 commit-queue 2016-09-19 13:51:49 -0700 All reviewed patches have been landed. Closing bug. 289128 2016-09-16 16:23:01 -0700 2016-09-19 13:51:45 -0700 Patch bug-162070-20160916162021.patch text/plain 27732 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjOTU5YjMyMmFlMjAyYzg5MjEzMjMxYzNlY2Q4YjhlOTY5YjNjYjAzLi5lZDQ0ZTdm OTAwY2U5ZTZlZWNhNWRiYTdlYWMxMzJkNDQ3MjI4NGM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTYtMDktMTYgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRvcHQgT2JqZWN0LmF3YWl0RXZlbnQgaW4gTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2MjA3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlcGxhY2UgaW5zdGFuY2VzIG9mIHNpbmdsZUZpcmVFdmVudExpc3Rl bmVyIHdpdGggYXdhaXRFdmVudCBhbmQgdXNlIHByb21pc2UgbG9naWMgdG8gbWFrZQorICAgICAg ICB0ZXN0cyBtb3JlIHJlYWRhYmxlLgorCisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY2xl YXJNZXNzYWdlcy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbW1hbmQtbGlu ZS1hcGkuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXRpbWUuaHRt bDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS9tZXNzYWdlQWRkZWQtZnJvbS1uYW1lZC1l dmFsdWF0aW9ucy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VBZGRl ZC1mcm9tLXdvcmtlci5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VS ZXBlYXRDb3VudFVwZGF0ZWQuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS9tZXNz YWdlc0NsZWFyZWQuaHRtbDoKKwogMjAxNi0wOS0xNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGdhcmRlbmluZzsgZW5hYmxlIG5ld2x5IHBh c3NpbmcgbWVkaWEvbWVkaWEtc291cmNlLyB0ZXN0cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9jb25zb2xlL2NsZWFyTWVzc2FnZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jb25zb2xlL2NsZWFyTWVzc2FnZXMuaHRtbAppbmRleCBiZWJkODkyYjY3MjlmMmM2OWRj NzY0YzJlMzE0ZTNhNjVjMDk0OGE1Li4zMmJjOTVhY2JlMzM1NjEzMmIxMzhhZGJhZjA4MDJiODQ4 MGQ5YTFhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jbGVhck1l c3NhZ2VzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY2xlYXJNZXNz YWdlcy5odG1sCkBAIC0xMCwxOCArMTAsMjAgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgc3VpdGUu YWRkVGVzdENhc2UoewogICAgICAgICBuYW1lOiAiQ2FsbENsZWFyTWVzc2FnZXMiLAogICAgICAg ICBkZXNjcmlwdGlvbjogIkNhbGxpbmcgdGhlIENvbnNvbGUuY2xlYXJNZXNzYWdlcyBjb21tYW5k IHNob3VsZCB0cmlnZ2VyIENvbnNvbGUubWVzc2FnZXNDbGVhcmVkLiIsCi0gICAgICAgIHRlc3Q6 IChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsK ICAgICAgICAgICAgIENvbnNvbGVBZ2VudC5jbGVhck1lc3NhZ2VzKCk7CiAKLSAgICAgICAgICAg IFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1lc3NhZ2VBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAg ICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5hd2FpdEV2ZW50KFdlYkluc3BlY3Rvci5Mb2dN YW5hZ2VyLkV2ZW50Lk1lc3NhZ2VBZGRlZCkKKyAgICAgICAgICAgIC50aGVuKChldmVudCkgPT4g ewogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KGZhbHNlLCAiTWVzc2FnZUFk ZGVkIGV2ZW50IHNob3VsZCBub3QgZmlyZS4iKTsKLSAgICAgICAgICAgICAgICByZWplY3QoKTsK LSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKHJlamVj dCwgcmVqZWN0KTsKIAotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIuc2luZ2xl RmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuQ2xlYXJlZCwg KGV2ZW50KSA9PiB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5hd2FpdEV2 ZW50KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LkNsZWFyZWQpCisgICAgICAgICAgICAu dGhlbigoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRo YXQoZXZlbnQsICJDbGVhcmVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwotICAgICAgICAgICAgICAg IHJlc29sdmUoKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAg IC50aGVuKHJlc29sdmUsIHJlamVjdCk7CiAgICAgICAgIH0KICAgICB9KTsKIApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29tbWFuZC1saW5lLWFwaS5odG1sIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29tbWFuZC1saW5lLWFwaS5odG1sCmluZGV4 IDBjNGQyZjNhNDA1MjA4ZTEwZDA4NjM1NWY1NzdkNTU4ODJlMDlhMjYuLmJmMzdlYWM4ZmZjNzRi NmEyYmMwMWI0MTU0ZGM3ZDc2ZGRhYWI2NGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jb25zb2xlL2NvbW1hbmQtbGluZS1hcGkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvY29uc29sZS9jb21tYW5kLWxpbmUtYXBpLmh0bWwKQEAgLTUzLDEyICs1MywxMSBAQCBm dW5jdGlvbiB0ZXN0KCkKIAogICAgIGxldCBzdWl0ZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlQXN5 bmNTdWl0ZSgiQ29uc29sZS5UZXN0Q29tbWFuZExpbmVBUEkiKTsKIAotICAgIGZ1bmN0aW9uIGFk ZEFQSVRlc3RDYXNlKGFyZ3MpIHsKLSAgICAgICAgbGV0IHt0aXRsZSwgaW5wdXQsIHNldHVwfSA9 IGFyZ3M7CisgICAgZnVuY3Rpb24gYWRkQVBJVGVzdENhc2Uoe3RpdGxlLCBpbnB1dCwgc2V0dXB9 KSB7CiAgICAgICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgICAgIG5hbWU6IGBFdmFs dWF0ZSR7dGl0bGV9YCwKICAgICAgICAgICAgIHNldHVwLAotICAgICAgICAgICAgdGVzdDogKHJl c29sdmUsIHJlamVjdCkgPT4geworICAgICAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsK ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhgSW5wdXQ6ICR7aW5wdXR9YCk7CiAK ICAgICAgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhyZXN1bHQsIHdhc1Rocm93bikgewpA QCAtOTEsMTQgKzkwLDE0IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIH0KIAogICAgIGZ1bmN0aW9u IHNlbGVjdEVsZW1lbnRGb3JEb2xsYXJaZXJvKHJlc29sdmUsIHJlamVjdCkgewotICAgICAgICBX ZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIucmVxdWVzdERvY3VtZW50KGZ1bmN0aW9uKGRvY3Vt ZW50Tm9kZSkgeworICAgICAgICBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIucmVxdWVzdERv Y3VtZW50KChkb2N1bWVudE5vZGUpID0+IHsKICAgICAgICAgICAgIGlmICghZG9jdW1lbnROb2Rl KSB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIkZBSUw6IERPTSBub2RlIG5v dCBmb3VuZC4iKTsKICAgICAgICAgICAgICAgICByZXR1cm4gcmVqZWN0KCk7CiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIC8vIFNlbGVjdCBkaXYjZm9vIGZvciAkMC4KLSAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5xdWVyeVNlbGVjdG9yKGRvY3VtZW50Tm9kZS5p ZCwgIiNmb28iLCBmdW5jdGlvbihjb250ZW50Tm9kZUlkKSB7CisgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuZG9tVHJlZU1hbmFnZXIucXVlcnlTZWxlY3Rvcihkb2N1bWVudE5vZGUuaWQsICIjZm9v IiwgKGNvbnRlbnROb2RlSWQpID0+IHsKICAgICAgICAgICAgICAgICBpZiAoIWNvbnRlbnROb2Rl SWQpIHsKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIkZBSUw6IERPTSBu b2RlIG5vdCBmb3VuZC4iKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlamVjdCgpOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS10aW1lLmh0 bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXRpbWUuaHRtbAppbmRl eCBjZGQ1YzcxZGVlNDM3MTg3YjIxYTEwNDA1ODllNzZjMjkwOWQwNWY1Li5mMTVhOGJhYjliYWU3 ZDAwMzY1MDhjOTRmZDQzYjdiNWEzZTE2MDE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvY29uc29sZS9jb25zb2xlLXRpbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY29uc29sZS9jb25zb2xlLXRpbWUuaHRtbApAQCAtMTAsNyArMTAsNyBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJEZWZhdWx0TGFi ZWwiLAogICAgICAgICBkZXNjcmlwdGlvbjogIlRlc3QgdGhhdCBkZWZhdWx0IGxhYmVsIHdvcmtz IGFzIGV4cGVjdGVkLiIsCi0gICAgICAgIHRlc3Q6IChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAg ICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKICAgICAgICAgICAgIGxldCBzZWVuID0gMDsK ICAgICAgICAgICAgIGNvbnN0IGV4cGVjdGVkID0gMzsKICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5sb2dNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZl bnQuTWVzc2FnZUFkZGVkLCBoYW5kbGVyKTsKQEAgLTM4LDEzICszOCwxNCBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJVc2VyTGFiZWxz IiwKICAgICAgICAgZGVzY3JpcHRpb246ICJUZXN0IHRoYXQgdXNlciBsYWJlbHMgd29ya3MgYXMg ZXhwZWN0ZWQuIiwKLSAgICAgICAgdGVzdDogKHJlc29sdmUsIHJlamVjdCkgPT4gewotICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuTWVzc2FnZUFkZGVkLCAoZXZlbnQpID0+IHsKKyAg ICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5s b2dNYW5hZ2VyLmF3YWl0RXZlbnQoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuTWVzc2Fn ZUFkZGVkKQorICAgICAgICAgICAgLnRoZW4oKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAg bGV0IG1lc3NhZ2UgPSBldmVudC5kYXRhLm1lc3NhZ2U7CiAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KG1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlRpbWluZywgIlNob3VsZCByZWNlaXZlIGEgVGltaW5nIHR5cGUg bWVzc2FnZS4iKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQobWVz c2FnZS5tZXNzYWdlVGV4dC5pbmNsdWRlcygibXktbGFiZWwiKSwgIk1lc3NhZ2Ugc2hvdWxkIGNv bnRhaW4gdGhlICdteS1sYWJlbCcgbGFiZWwgbmFtZSBzb21ld2hlcmUuIik7Ci0gICAgICAgICAg ICAgICAgcmVzb2x2ZSgpOwotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9KQorICAgICAg ICAgICAgLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsKIAogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5ldmFsdWF0ZUluUGFnZSgiY29uc29sZS50aW1lKCdteS1sYWJlbCcpIik7CiAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJjb25zb2xlLnRpbWVFbmQoJ215LWxhYmVs JykiKTsKQEAgLTU0LDcgKzU1LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgc3VpdGUuYWRkVGVz dENhc2UoewogICAgICAgICBuYW1lOiAiTXVsdGlwbGVUaW1lcnMiLAogICAgICAgICBkZXNjcmlw dGlvbjogIlRlc3QgdGhhdCBtdWx0aXBsZSB0aW1lcnMgcnVubmluZyBhdCB0aGUgc2FtZSB0aW1l IHdvcmsgYXMgZXhwZWN0ZWQuIiwKLSAgICAgICAgdGVzdDogKHJlc29sdmUsIHJlamVjdCkgPT4g eworICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAgbGV0IHNlZW4g PSAwOwogICAgICAgICAgICAgY29uc3QgZXhwZWN0ZWQgPSAyOwogICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmxvZ01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdl ci5FdmVudC5NZXNzYWdlQWRkZWQsIGhhbmRsZXIpOwpAQCAtNzksNyArODAsNyBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJXYXJuV2hl bkV4aXN0aW5nIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJUZXN0IGZvciBhIHdhcm5pbmcgd2hl biB0cnlpbmcgdG8gc3RhcnQgYW4gYWxyZWFkeSBzdGFydGVkIHRpbWVyLiIsCi0gICAgICAgIHRl c3Q6IChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3Qp IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuTWVzc2FnZUFkZGVkLCBoYW5kbGVyKTsKICAg ICAgICAgICAgIGZ1bmN0aW9uIGhhbmRsZXIoZXZlbnQpIHsKICAgICAgICAgICAgICAgICBsZXQg bWVzc2FnZSA9IGV2ZW50LmRhdGEubWVzc2FnZTsKQEAgLTEwNCwxNCArMTA1LDE1IEBAIGZ1bmN0 aW9uIHRlc3QoKQogICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIldhcm5X aGVuTm90RXhpc3RpbmciLAogICAgICAgICBkZXNjcmlwdGlvbjogIlRlc3QgZm9yIGEgd2Fybmlu ZyB3aGVuIHRyeWluZyB0byBzdGFydCBhbiBhbHJlYWR5IHN0YXJ0ZWQgdGltZXIuIiwKLSAgICAg ICAgdGVzdDogKHJlc29sdmUsIHJlamVjdCkgPT4gewotICAgICAgICAgICAgV2ViSW5zcGVjdG9y LmxvZ01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFn ZXIuRXZlbnQuTWVzc2FnZUFkZGVkLCAoZXZlbnQpID0+IHsKKyAgICAgICAgdGVzdChyZXNvbHZl LCByZWplY3QpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLmF3YWl0RXZl bnQoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuTWVzc2FnZUFkZGVkKQorICAgICAgICAg ICAgLnRoZW4oKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgbGV0IG1lc3NhZ2UgPSBldmVu dC5kYXRhLm1lc3NhZ2U7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0 KG1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBl LlRpbWluZywgIlNob3VsZCByZWNlaXZlIGEgVGltaW5nIHR5cGUgbWVzc2FnZS4iKTsKICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQobWVzc2FnZS5sZXZlbCA9PT0gV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5nLCAiU2hvdWxkIHJl Y2VpdmUgYSBXYXJuaW5nIGxldmVsIG1lc3NhZ2UuIik7CiAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KG1lc3NhZ2UubWVzc2FnZVRleHQuaW5jbHVkZXMoImRlZmF1bHQi KSwgIk1lc3NhZ2Ugc2hvdWxkIGNvbnRhaW4gdGhlICdkZWZhdWx0JyBsYWJlbCBuYW1lIHNvbWV3 aGVyZS4iKTsKLSAgICAgICAgICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICB9KTsKKyAg ICAgICAgICAgIH0pCisgICAgICAgICAgICAudGhlbihyZXNvbHZlLCByZWplY3QpOwogCiAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJjb25zb2xlLnRpbWVFbmQoKSIp OwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9t ZXNzYWdlQWRkZWQtZnJvbS1uYW1lZC1ldmFsdWF0aW9ucy5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2NvbnNvbGUvbWVzc2FnZUFkZGVkLWZyb20tbmFtZWQtZXZhbHVhdGlvbnMuaHRtbApp bmRleCA4MzA5M2RiMWFjMjJjNGNlYWY3NjBmZjcyNTdkNmFmNmIwMzM5MGVjLi5kZmQ0OTI0Zjk1 N2E3NjlmYjAzNmFmMTllNWU4NWYxZDA3NTIxNWQ5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvY29uc29sZS9tZXNzYWdlQWRkZWQtZnJvbS1uYW1lZC1ldmFsdWF0aW9ucy5odG1s CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VBZGRlZC1mcm9tLW5h bWVkLWV2YWx1YXRpb25zLmh0bWwKQEAgLTIwLDI4ICsyMCwzMiBAQCBmdW5jdGlvbiB0ZXN0KCkK ICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJUcmlnZ2VyTWVzc2FnZUZy b21OYW1lRXZhbHVhdGlvbiIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiTWVzc2FnZSBmcm9tIG5h bWVkIGV2YWx1YXRpb24gc2hvdWxkIGhhdmUgYSBzb3VyY2UgbG9jYXRpb24uIiwKLSAgICAgICAg dGVzdDogKHJlc29sdmUsIHJlamVjdCkgPT4gewotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l dmFsdWF0ZUluUGFnZSgidHJpZ2dlck1lc3NhZ2VGcm9tTmFtZWRFdmFsdWF0aW9uKCkiKTsKLSAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1lc3NhZ2VBZGRlZCwgKGV2ZW50KSA9PiB7 CisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0 b3IubG9nTWFuYWdlci5hd2FpdEV2ZW50KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1l c3NhZ2VBZGRlZCkKKyAgICAgICAgICAgIC50aGVuKChldmVudCkgPT4gewogICAgICAgICAgICAg ICAgIGxldCBtZXNzYWdlID0gZXZlbnQuZGF0YS5tZXNzYWdlOwogICAgICAgICAgICAgICAgIGxl dCB0b3BDYWxsRnJhbWUgPSBtZXNzYWdlLnN0YWNrVHJhY2UuY2FsbEZyYW1lc1swXTsKICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQodG9wQ2FsbEZyYW1lLnNvdXJjZUNv ZGVMb2NhdGlvbi5zb3VyY2VDb2RlLmRpc3BsYXlOYW1lID09PSAibmFtZWQtZXZhbC5qcyIsICJM b2cgQ29uc29sZU1lc3NhZ2UgdG9wIGNhbGwgZnJhbWUgc2hvdWxkIGhhdmUgc291cmNlVVJMIG5h bWUuIik7Ci0gICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwotICAgICAgICAgICAgfSk7CisgICAg ICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsKKworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgidHJpZ2dlck1lc3NhZ2VGcm9tTmFt ZWRFdmFsdWF0aW9uKCkiKTsKICAgICAgICAgfQogICAgIH0pOwogCiAgICAgc3VpdGUuYWRkVGVz dENhc2UoewogICAgICAgICBuYW1lOiAiVHJpZ2dlckV4Y2VwdGlvbkZyb21OYW1lRnVuY3Rpb25D b25zdHJ1Y3RvckV2YWx1YXRpb24iLAogICAgICAgICBkZXNjcmlwdGlvbjogIkV4Y2VwdGlvbiBt ZXNzYWdlIGZyb20gbmFtZWQgRnVuY3Rpb24gY29uc3RydWN0b3IgZXZhbHVhdGlvbiBzaG91bGQg aGF2ZSBhIHNvdXJjZSBsb2NhdGlvbi4iLAotICAgICAgICB0ZXN0OiAocmVzb2x2ZSwgcmVqZWN0 KSA9PiB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJzZXRUaW1l b3V0KHRyaWdnZXJFeGNlcHRpb25Gcm9tTmFtZWRGdW5jdGlvbkNvbnN0cnVjdG9yRXZhbHVhdGlv bikiKTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZpcmVFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1lc3NhZ2VBZGRlZCwgKGV2 ZW50KSA9PiB7CisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBX ZWJJbnNwZWN0b3IubG9nTWFuYWdlci5hd2FpdEV2ZW50KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2Vy LkV2ZW50Lk1lc3NhZ2VBZGRlZCkKKyAgICAgICAgICAgIC50aGVuKChldmVudCkgPT4gewogICAg ICAgICAgICAgICAgIGxldCBtZXNzYWdlID0gZXZlbnQuZGF0YS5tZXNzYWdlOwogICAgICAgICAg ICAgICAgIGxldCB0b3BDYWxsRnJhbWUgPSBtZXNzYWdlLnN0YWNrVHJhY2UuY2FsbEZyYW1lc1sw XTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQodG9wQ2FsbEZyYW1l LnNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlLmRpc3BsYXlOYW1lID09PSAibmFtZWQtZnVu Y3Rpb24tY29uc3RydWN0b3IuanMiLCAiRXhjZXB0aW9uIENvbnNvbGVNZXNzYWdlIHRvcCBjYWxs IGZyYW1lIHNob3VsZCBoYXZlIHNvdXJjZVVSTCBuYW1lLiIpOwotICAgICAgICAgICAgICAgIHJl c29sdmUoKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50 aGVuKHJlc29sdmUsIHJlamVjdCk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVh dGVJblBhZ2UoInNldFRpbWVvdXQodHJpZ2dlckV4Y2VwdGlvbkZyb21OYW1lZEZ1bmN0aW9uQ29u c3RydWN0b3JFdmFsdWF0aW9uKSIpOwogICAgICAgICB9CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VBZGRlZC1mcm9tLXdvcmtlci5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvbWVzc2FnZUFkZGVkLWZyb20td29y a2VyLmh0bWwKaW5kZXggMGM1NjdiNTgzZTM4ZGNkMjAxZTQyOWI5MjhjMTBmMDJmY2JjY2YzYy4u NWEyOWQ1OWNjZTc5NWRmY2I5OWM4MTVkNzI2ODc1NWEwMzM3NjEyOCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvbWVzc2FnZUFkZGVkLWZyb20td29ya2VyLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvbWVzc2FnZUFkZGVkLWZyb20td29y a2VyLmh0bWwKQEAgLTE1LDE1ICsxNSwyMSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBzdWl0ZS5h ZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJUcmlnZ2VyQ29uc29sZU1lc3NhZ2VzSW5Xb3Jr ZXIiLAogICAgICAgICBkZXNjcmlwdGlvbjogIlRyaWdnZXJlZCBjb25zb2xlIG1lc3NhZ2VzIGlu IGEgV29ya2VyIHNob3VsZCBiZSByZWNlaXZlZC4iLAotICAgICAgICB0ZXN0OiAocmVzb2x2ZSwg cmVqZWN0KSA9PiB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJ0 cmlnZ2VyV29ya2VyQ29uc29sZUxvZygpIik7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9n TWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5F dmVudC5NZXNzYWdlQWRkZWQsIChldmVudCkgPT4gewotICAgICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZXhwZWN0VGhhdChldmVudC5kYXRhLm1lc3NhZ2UubWVzc2FnZVRleHQgPT09ICJXT1JL RVIgU1RBUlRFRCIsICJNZXNzYWdlQWRkZWQgZXZlbnQgc2hvdWxkIGZpcmUgZm9yIHN0YXJ0ZWQg bG9nLiIpOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZp cmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1lc3NhZ2VBZGRl ZCwgKGV2ZW50KSA9PiB7CisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAg ICAgICBsZXQgZXZlbnRDb3VudCA9IDA7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFu YWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1lc3Nh Z2VBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgKytldmVudENvdW50OworCisg ICAgICAgICAgICAgICAgaWYgKGV2ZW50Q291bnQgPT09IDEpCisgICAgICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChldmVudC5kYXRhLm1lc3NhZ2UubWVzc2FnZVRleHQg PT09ICJXT1JLRVIgU1RBUlRFRCIsICJNZXNzYWdlQWRkZWQgZXZlbnQgc2hvdWxkIGZpcmUgZm9y IHN0YXJ0ZWQgbG9nLiIpOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKGV2ZW50Q291bnQgPT09 IDIpIHsKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGV2ZW50 LmRhdGEubWVzc2FnZS5tZXNzYWdlVGV4dCA9PT0gIldPUktFUiBSRUNFSVZFRCBNRVNTQUdFIiwg Ik1lc3NhZ2VBZGRlZCBldmVudCBzaG91bGQgZmlyZSBmb3IgcmVjZWl2ZWQgbWVzc2FnZSBsb2cu Iik7CiAgICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAgICAgICB9KTsK KyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgcmVqZWN0KCk7CiAg ICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFn ZSgidHJpZ2dlcldvcmtlckNvbnNvbGVMb2coKSIpOwogICAgICAgICB9CiAgICAgfSk7CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VSZXBlYXRDb3Vu dFVwZGF0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VSZXBl YXRDb3VudFVwZGF0ZWQuaHRtbAppbmRleCA2ZTgwMmYyYmEzMDM2MzJhYjVmZTExYzE3N2VmOTU4 OGRhZDBjMDNhLi4yZmZmNDFkMWMzNzkzZjAwODA3MzQwZWUxOTc4NjRhYjY5YTU4ZjAzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9tZXNzYWdlUmVwZWF0Q291bnRV cGRhdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvbWVzc2FnZVJl cGVhdENvdW50VXBkYXRlZC5odG1sCkBAIC0xMywyMCArMTMsMjEgQEAgZnVuY3Rpb24gdGVzdCgp CiAgICAgc3VpdGUuYWRkVGVzdENhc2UoewogICAgICAgICBuYW1lOiAiQWRkVGVzdE1lc3NhZ2Ui LAogICAgICAgICBkZXNjcmlwdGlvbjogIkFkZCBhIG5ldyBtZXNzYWdlLCBpdCBzaG91bGQgaGF2 ZSBhIHNpbmdsZSByZXBlYXQgY291bnQuIiwKLSAgICAgICAgdGVzdDogKHJlc29sdmUsIHJlamVj dCkgPT4gewotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSh0ZXN0TWVz c2FnZSk7Ci0KKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKICAgICAgICAgICAgIGxl dCBsaXN0ZW5lciA9IFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LlByZXZpb3VzTWVzc2FnZVJlcGVhdENv dW50VXBkYXRlZCwgKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5h c3NlcnQoZmFsc2UsICJTaG91bGQgbm90IGZpcmUgUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRV cGRhdGVkIHlldC4iKTsKICAgICAgICAgICAgICAgICByZWplY3QoKTsKICAgICAgICAgICAgIH0p OwogCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQsIChldmVu dCkgPT4geworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIuYXdhaXRFdmVudChX ZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQpCisgICAgICAgICAgICAu dGhlbigoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRo YXQoZXZlbnQuZGF0YS5tZXNzYWdlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLCAiTWVzc2FnZUFkZGVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwogICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChldmVudC5kYXRhLm1lc3NhZ2UucmVwZWF0Q291bnQg PT09IDEsICJDb25zb2xlTWVzc2FnZSByZXBlYXRDb3VudCBpcyAxLiIpOwogICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkxvZ01hbmFnZXIuRXZlbnQuUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLCBs aXN0ZW5lciwgbnVsbCk7Ci0gICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwotICAgICAgICAgICAg fSk7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsK KworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSh0ZXN0TWVzc2FnZSk7 CiAgICAgICAgIH0KICAgICB9KTsKIApAQCAtMzQsMjAgKzM1LDIxIEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgICAgICBuYW1lOiBgUmVwZWF0 VGVzdE1lc3NhZ2Uke2l9YCwKICAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAiUmVwZWF0IHRoZSBs YXN0IG1lc3NhZ2UsIGl0IHNob3VsZCB0cmlnZ2VyIG1lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQu IiwKLSAgICAgICAgICAgIHRlc3Q6IChyZXNvbHZlLCByZWplY3QpID0+IHsKLSAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKHRlc3RNZXNzYWdlKTsKLQorICAgICAg ICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKICAgICAgICAgICAgICAgICBsZXQgbGlzdGVu ZXIgPSBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQsIChldmVudCkgPT4gewogICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChmYWxzZSwgIlNob3VsZCBub3Qg ZmlyZSBNZXNzYWdlQWRkZWQsIHRoaXMgc2hvdWxkIGJlIGEgcmVwZWF0LiIpOwogICAgICAgICAg ICAgICAgICAgICByZWplY3QoKTsKICAgICAgICAgICAgICAgICB9KTsKIAotICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LlByZXZpb3VzTWVzc2FnZVJlcGVhdENvdW50VXBkYXRl ZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIu YXdhaXRFdmVudChXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5QcmV2aW91c01lc3NhZ2VS ZXBlYXRDb3VudFVwZGF0ZWQpCisgICAgICAgICAgICAgICAgLnRoZW4oKGV2ZW50KSA9PiB7CiAg ICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChldmVudCwgIlByZXZp b3VzTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZCBzaG91bGQgZmlyZS4iKTsKICAgICAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGV2ZW50LmRhdGEuY291bnQgPT09IChp ICsgMSksIGBDb3VudCBzaG91bGQgYmUgJHtpICsgMX0uYCk7CiAgICAgICAgICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LkxvZ01hbmFnZXIuRXZlbnQuTWVzc2FnZUFkZGVkLCBsaXN0ZW5lciwgbnVsbCk7Ci0gICAgICAg ICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg ICAgICB9KQorICAgICAgICAgICAgICAgIC50aGVuKHJlc29sdmUsIHJlamVjdCk7CisKKyAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKHRlc3RNZXNzYWdlKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfSk7CiAgICAgfQpAQCAtNTUsNjAgKzU3LDYzIEBAIGZ1bmN0 aW9uIHRlc3QoKQogICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIkFkZERp ZmZlcmVudE1lc3NhZ2UiLAogICAgICAgICBkZXNjcmlwdGlvbjogIkFkZCBhIGRpZmZlcmVudCBt ZXNzYWdlLCBpdCBzaG91bGQgcmVzZXQgdGhlIHJlcGVhdCBjb3VudC4iLAotICAgICAgICB0ZXN0 OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1 YXRlSW5QYWdlKGRpZmZlcmVudE1lc3NhZ2UpOwotCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVq ZWN0KSB7CiAgICAgICAgICAgICBsZXQgbGlzdGVuZXIgPSBXZWJJbnNwZWN0b3IubG9nTWFuYWdl ci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5Q cmV2aW91c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQsIChldmVudCkgPT4gewogICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KGZhbHNlLCAiU2hvdWxkIG5vdCBmaXJlIFByZXZp b3VzTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZCwgdGhpcyBtZXNzYWdlIGlzIGRpZmZlcmVudC4i KTsKICAgICAgICAgICAgICAgICByZWplY3QoKTsKICAgICAgICAgICAgIH0pOwogCi0gICAgICAg ICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQsIChldmVudCkgPT4geworICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIuYXdhaXRFdmVudChXZWJJbnNwZWN0b3Iu TG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQpCisgICAgICAgICAgICAudGhlbigoZXZlbnQp ID0+IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZXZlbnQuZGF0 YS5tZXNzYWdlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLCAiTWVzc2Fn ZUFkZGVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuZXhwZWN0VGhhdChldmVudC5kYXRhLm1lc3NhZ2UucmVwZWF0Q291bnQgPT09IDEsICJDb25z b2xlTWVzc2FnZSByZXBlYXRDb3VudCBpcyAxLiIpOwogICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5sb2dNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFn ZXIuRXZlbnQuUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLCBsaXN0ZW5lciwgbnVs bCk7Ci0gICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwotICAgICAgICAgICAgfSk7CisgICAgICAg ICAgICB9KQorICAgICAgICAgICAgLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsKKworICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShkaWZmZXJlbnRNZXNzYWdlKTsKICAgICAg ICAgfQogICAgIH0pOwogCiAgICAgc3VpdGUuYWRkVGVzdENhc2UoewogICAgICAgICBuYW1lOiAi UmVwZWF0RGlmZmVyZW50TWVzc2FnZSIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiUmVwZWF0IHRo aXMgZGlmZmVyZW50IG1lc3NhZ2UsIGl0IHNob3VsZCBpbmNyZW1lbnQgdGhlIHJlcGVhdCBjb3Vu dC4iLAotICAgICAgICB0ZXN0OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7Ci0gICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGRpZmZlcmVudE1lc3NhZ2UpOwotCisgICAgICAg IHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CiAgICAgICAgICAgICBsZXQgbGlzdGVuZXIgPSBXZWJJ bnNwZWN0b3IubG9nTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu TG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQsIChldmVudCkgPT4gewogICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KGZhbHNlLCAiU2hvdWxkIG5vdCBmaXJlIE1lc3NhZ2VB ZGRlZCwgdGhpcyBzaG91bGQgYmUgYSByZXBlYXQuIik7CiAgICAgICAgICAgICAgICAgcmVqZWN0 KCk7CiAgICAgICAgICAgICB9KTsKIAotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFn ZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQu UHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLCAoZXZlbnQpID0+IHsKKyAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLmF3YWl0RXZlbnQoV2ViSW5zcGVjdG9yLkxvZ01h bmFnZXIuRXZlbnQuUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkKQorICAgICAgICAg ICAgLnRoZW4oKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RUaGF0KGV2ZW50LCAiUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkIHNob3VsZCBm aXJlLiIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChldmVudC5k YXRhLmNvdW50ID09PSAyLCAiQ291bnQgc2hvdWxkIGJlIDIuIik7CiAgICAgICAgICAgICAgICAg V2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu TG9nTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQsIGxpc3RlbmVyLCBudWxsKTsKLSAgICAgICAg ICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pCisgICAg ICAgICAgICAudGhlbihyZXNvbHZlLCByZWplY3QpOworCisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV2YWx1YXRlSW5QYWdlKGRpZmZlcmVudE1lc3NhZ2UpOwogICAgICAgICB9CiAgICAgfSk7 CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJBZGRUZXN0TWVzc2Fn ZUFnYWluIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJBZGQgdGhlIG9yaWdpbmFsIG1lc3NhZ2Ug YWdhaW4sIGl0IHNob3VsZCBoYXZlIGEgc2luZ2xlIHJlcGVhdCBjb3VudC4iLAotICAgICAgICB0 ZXN0OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2 YWx1YXRlSW5QYWdlKHRlc3RNZXNzYWdlKTsKLQorICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVj dCkgewogICAgICAgICAgICAgbGV0IGxpc3RlbmVyID0gV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIu c2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuUHJl dmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLCAoZXZlbnQpID0+IHsKICAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChmYWxzZSwgIlNob3VsZCBub3QgZmlyZSBQcmV2aW91 c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQgeWV0LiIpOwogICAgICAgICAgICAgICAgIHJlamVj dCgpOwogICAgICAgICAgICAgfSk7CiAKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5h Z2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50 Lk1lc3NhZ2VBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9n TWFuYWdlci5hd2FpdEV2ZW50KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50Lk1lc3NhZ2VB ZGRlZCkKKyAgICAgICAgICAgIC50aGVuKChldmVudCkgPT4gewogICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0VGhhdChldmVudC5kYXRhLm1lc3NhZ2UgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UsICJNZXNzYWdlQWRkZWQgZXZlbnQgc2hvdWxkIGZpcmUu Iik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGV2ZW50LmRhdGEu bWVzc2FnZS5yZXBlYXRDb3VudCA9PT0gMSwgIkNvbnNvbGVNZXNzYWdlIHJlcGVhdENvdW50IGlz IDEuIik7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIucmVtb3ZlRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5QcmV2aW91c01lc3NhZ2VS ZXBlYXRDb3VudFVwZGF0ZWQsIGxpc3RlbmVyLCBudWxsKTsKLSAgICAgICAgICAgICAgICByZXNv bHZlKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pCisgICAgICAgICAgICAudGhl bihyZXNvbHZlLCByZWplY3QpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRl SW5QYWdlKHRlc3RNZXNzYWdlKTsKICAgICAgICAgfQogICAgIH0pOwogCkBAIC0xMTcsMjYgKzEy MiwyMyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAg IG5hbWU6ICJNZXNzYWdlc1dpdGhFcXVhbFZhbHVlc1JlcGVhdHMiLAogICAgICAgICBkZXNjcmlw dGlvbjogIlJlcGVhdCBtZXNzYWdlcyB3aXRoIGVxdWFsIHZhbHVlcyBzaG91bGQgdHJpZ2dlciBt ZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLiIsCi0gICAgICAgIHRlc3Q6IChyZXNvbHZlLCByZWpl Y3QpID0+IHsKKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5sb2dNYW5hZ2VyLmF3YWl0RXZlbnQoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIu RXZlbnQuUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkKQorICAgICAgICAgICAgLnRo ZW4oKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0 KGV2ZW50LCAiUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkIHNob3VsZCBmaXJlIGZv ciByZXBlYXQgbWVzc2FnZXMgd2l0aCBlcXVhbCB2YWx1ZXMuIik7CisgICAgICAgICAgICB9KQor ICAgICAgICAgICAgLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsKKwogICAgICAgICAgICAgY29uc3Qg bWVzc2FnZVdpdGhWYWx1ZXMgPSAiY29uc29sZS5sb2coJ2VxdWFsIHBhcmFtZXRlciB2YWx1ZXMn LCAxLCAyKSI7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKG1lc3Nh Z2VXaXRoVmFsdWVzKTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2Uo bWVzc2FnZVdpdGhWYWx1ZXMpOwotCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdl ci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5Q cmV2aW91c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQsIChldmVudCkgPT4gewotICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChldmVudCwgIlByZXZpb3VzTWVzc2FnZVJl cGVhdENvdW50VXBkYXRlZCBzaG91bGQgZmlyZSBmb3IgcmVwZWF0IG1lc3NhZ2VzIHdpdGggZXF1 YWwgdmFsdWVzLiIpOwotICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAgIH0p OwogICAgICAgICB9CiAgICAgfSk7CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAg IG5hbWU6ICJNZXNzYWdlc1dpdGhPYmplY3RzRG9Ob3RSZXBlYXQiLAogICAgICAgICBkZXNjcmlw dGlvbjogIlJlcGVhdCBtZXNzYWdlcyB3aXRoIG9iamVjdHMgc2hvdWxkIG5vdCB0cmlnZ2VyIG1l c3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQuIiwKLSAgICAgICAgdGVzdDogKHJlc29sdmUsIHJlamVj dCkgPT4gewotICAgICAgICAgICAgY29uc3QgbWVzc2FnZVdpdGhPYmplY3QgPSAiY29uc29sZS5s b2coJ29iamVjdCcsIHdpbmRvdykiOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0 ZUluUGFnZShtZXNzYWdlV2l0aE9iamVjdCk7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2 YWx1YXRlSW5QYWdlKG1lc3NhZ2VXaXRoT2JqZWN0KTsKLQorICAgICAgICB0ZXN0KHJlc29sdmUs IHJlamVjdCkgewogICAgICAgICAgICAgbGV0IHJlcGVhdExpc3RlbmVyID0gV2ViSW5zcGVjdG9y LmxvZ01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFn ZXIuRXZlbnQuUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLCAoZXZlbnQpID0+IHsK ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChmYWxzZSwgIlByZXZpb3VzTWVz c2FnZVJlcGVhdENvdW50VXBkYXRlZCBzaG91bGQgbm90IGZpcmUgZm9yIHJlcGVhdCBtZXNzYWdl cyB3aXRoIG9iamVjdCBhcmd1bWVudHMuIik7CiAgICAgICAgICAgICAgICAgcmVqZWN0KCk7CkBA IC0xNTAsMTggKzE1MiwxOSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICAgICAg V2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu TG9nTWFuYWdlci5FdmVudC5QcmV2aW91c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQsIHJlcGVh dExpc3RlbmVyLCBudWxsKTsKICAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01h bmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5N ZXNzYWdlQWRkZWQsIGFkZExpc3RlbmVyLCBudWxsKTsKICAgICAgICAgICAgICAgICAgICAgcmVz b2x2ZSgpOwotICAgICAgICAgICAgICAgIH0gICAgICAgICAgICAgICAgCisgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgIGNvbnN0IG1lc3NhZ2VXaXRoT2Jq ZWN0ID0gImNvbnNvbGUubG9nKCdvYmplY3QnLCB3aW5kb3cpIjsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXZhbHVhdGVJblBhZ2UobWVzc2FnZVdpdGhPYmplY3QpOworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShtZXNzYWdlV2l0aE9iamVjdCk7CiAgICAgICAg IH0KICAgICB9KTsKIAogICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIk1l c3NhZ2VzV2l0aERpZmZlcmVudExldmVsc0RvTm90UmVwZWF0IiwKICAgICAgICAgZGVzY3JpcHRp b246ICJSZXBlYXQgbWVzc2FnZXMgd2l0aCBkaWZmZXJlbnQgbGV2ZWxzIHNob3VsZCBub3QgdHJp Z2dlciBtZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLiIsCi0gICAgICAgIHRlc3Q6IChyZXNvbHZl LCByZWplY3QpID0+IHsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2Uo ImNvbnNvbGUud2FybignbGV2ZWwnKSIpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFs dWF0ZUluUGFnZSgiY29uc29sZS5lcnJvcignbGV2ZWwnKSIpOwotCisgICAgICAgIHRlc3QocmVz b2x2ZSwgcmVqZWN0KSB7CiAgICAgICAgICAgICBsZXQgcmVwZWF0TGlzdGVuZXIgPSBXZWJJbnNw ZWN0b3IubG9nTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9n TWFuYWdlci5FdmVudC5QcmV2aW91c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQsIChldmVudCkg PT4gewogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KGZhbHNlLCAiUHJldmlv dXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkIHNob3VsZCBub3QgZmlyZSBmb3IgcmVwZWF0IG1l c3NhZ2VzIHdpdGggZGlmZmVyZW50IGxldmVscy4iKTsKICAgICAgICAgICAgICAgICByZWplY3Qo KTsKQEAgLTE3NSw4ICsxNzgsMTEgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkxvZ01hbmFnZXIuRXZlbnQuUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkLCBy ZXBlYXRMaXN0ZW5lciwgbnVsbCk7CiAgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5s b2dNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZl bnQuTWVzc2FnZUFkZGVkLCBhZGRMaXN0ZW5lciwgbnVsbCk7CiAgICAgICAgICAgICAgICAgICAg IHJlc29sdmUoKTsKLSAgICAgICAgICAgICAgICB9ICAgICAgICAgICAgICAgIAorICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2 YWx1YXRlSW5QYWdlKCJjb25zb2xlLndhcm4oJ2xldmVsJykiKTsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoImNvbnNvbGUuZXJyb3IoJ2xldmVsJykiKTsKICAgICAg ICAgfQogICAgIH0pOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29s ZS9tZXNzYWdlc0NsZWFyZWQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21l c3NhZ2VzQ2xlYXJlZC5odG1sCmluZGV4IDgxN2M5NjQxOGZkODE1Mjk5ZWZkNmVlNjE2ZmY2ZDli ZmYzYThmMWUuLjYxOGNmYjZjZGRjODVkYzM0NDhkNWEzNjY5YjkxYzIwMmQ0ZTBkNWYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VzQ2xlYXJlZC5odG1s CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VzQ2xlYXJlZC5odG1s CkBAIC0xMCw0OCArMTAsNTYgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgc3VpdGUuYWRkVGVzdENh c2UoewogICAgICAgICBuYW1lOiAiQ2xlYXJWaWFDb25zb2xlQ2xlYXJNZXNzYWdlc0FQSSIsCiAg ICAgICAgIGRlc2NyaXB0aW9uOiAiQ2FsbGluZyBDb25zb2xlLmNsZWFyTWVzc2FnZXMgc2hvdWxk IHRyaWdnZXIgQ29uc29sZS5tZXNzYWdlc0NsZWFyZWQuIiwKLSAgICAgICAgdGVzdDogKHJlc29s dmUsIHJlamVjdCkgPT4gewotICAgICAgICAgICAgQ29uc29sZUFnZW50LmNsZWFyTWVzc2FnZXMo KTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LkNsZWFyZWQsIChldmVudCkgPT4g eworICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmxvZ01hbmFnZXIuYXdhaXRFdmVudChXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5D bGVhcmVkKQorICAgICAgICAgICAgLnRoZW4oKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGV2ZW50LCAiQ2xlYXJlZCBldmVudCBzaG91bGQgZmly ZS4iKTsKLSAgICAgICAgICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgIH0pCisgICAgICAgICAgICAudGhlbihyZXNvbHZlLCByZWplY3QpOworCisgICAgICAg ICAgICBDb25zb2xlQWdlbnQuY2xlYXJNZXNzYWdlcygpOwogICAgICAgICB9CiAgICAgfSk7CiAK ICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJDbGVhclZpYUNvbnNvbGVB UEkiLAogICAgICAgICBkZXNjcmlwdGlvbjogIkNhbGxpbmcgY29uc29sZS5jbGVhcigpIHNob3Vs ZCB0cmlnZ2VyIENvbnNvbGUubWVzc2FnZXNDbGVhcmVkLiIsCi0gICAgICAgIHRlc3Q6IChyZXNv bHZlLCByZWplY3QpID0+IHsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBh Z2UoImNvbnNvbGUuY2xlYXIoKSIpOwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFn ZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQu Q2xlYXJlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7Cisg ICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5hd2FpdEV2ZW50KFdlYkluc3BlY3Rv ci5Mb2dNYW5hZ2VyLkV2ZW50LkNsZWFyZWQpCisgICAgICAgICAgICAudGhlbigoZXZlbnQpID0+ IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZXZlbnQsICJDbGVh cmVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwotICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAg ICAgICAgICAgIH0pOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKHJlc29sdmUs IHJlamVjdCk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoImNv bnNvbGUuY2xlYXIoKSIpOwogICAgICAgICB9CiAgICAgfSk7CiAKICAgICBzdWl0ZS5hZGRUZXN0 Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJDbGVhclZpYUNvbW1hbmRMaW5lQVBJIiwKICAgICAgICAg ZGVzY3JpcHRpb246ICJDYWxsaW5nIGBjbGVhcigpYCBpbiB0aGUgY29tbWFuZCBsaW5lIEFQSSBz aG91bGQgdHJpZ2dlciBDb25zb2xlLm1lc3NhZ2VzQ2xlYXJlZC4iLAotICAgICAgICB0ZXN0OiAo cmVzb2x2ZSwgcmVqZWN0KSA9PiB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1h bmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdygiY2xlYXIoKSIsIHtvYmplY3RHcm91cDog InRlc3QiLCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IHRydWV9LCBmdW5jdGlvbigpe30pOwotICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuQ2xlYXJlZCwgKGV2ZW50KSA9PiB7CisgICAg ICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9n TWFuYWdlci5hd2FpdEV2ZW50KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LkNsZWFyZWQp CisgICAgICAgICAgICAudGhlbigoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdFRoYXQoZXZlbnQsICJDbGVhcmVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwot ICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAg fSkKKyAgICAgICAgICAgIC50aGVuKHJlc29sdmUsIHJlamVjdCk7CisKKyAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCJjbGVh cigpIiwge29iamVjdEdyb3VwOiAidGVzdCIsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogdHJ1ZX0s IGZ1bmN0aW9uKCl7fSk7CiAgICAgICAgIH0KICAgICB9KTsKIAogICAgIHN1aXRlLmFkZFRlc3RD YXNlKHsKICAgICAgICAgbmFtZTogIkNsZWFyVmlhUGFnZVJlbG9hZCIsCiAgICAgICAgIGRlc2Ny aXB0aW9uOiAiUmVsb2FkaW5nIHRoZSBwYWdlIHNob3VsZCB0cmlnZ2VyIENvbnNvbGUubWVzc2Fn ZXNDbGVhcmVkLiIsCi0gICAgICAgIHRlc3Q6IChyZXNvbHZlLCByZWplY3QpID0+IHsKLSAgICAg ICAgICAgIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZSgpOwotICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmxvZ01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01h bmFnZXIuRXZlbnQuQ2xlYXJlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgIHRlc3QocmVzb2x2ZSwg cmVqZWN0KSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5hd2FpdEV2ZW50 KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LkNsZWFyZWQpCisgICAgICAgICAgICAudGhl bigoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQo ZXZlbnQsICJDbGVhcmVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwotICAgICAgICAgICAgICAgIHJl c29sdmUoKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50 aGVuKHJlc29sdmUsIHJlamVjdCk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QucmVsb2Fk UGFnZSgpOwogICAgICAgICB9CiAgICAgfSk7CiAK