111529 2013-03-05 23:55:03 -0800 Web Inspector: use regular eval instead of injectScript for front-end extension API 2019-11-13 14:20:44 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 848520 0 yurys 2013-03-05 23:55:03 -0800 InspectorAgent::didClearWindowObjectInWorld calls InjectedScriptManager::injectScript to install inspector front-end extension API. The script doesn't depend on InjectedScriptHost and can be eval'd as a regular script. 848718 1 191715 yurys 2013-03-06 04:31:05 -0800 Created attachment 191715 Patch 848789 2 yurys 2013-03-06 06:09:45 -0800 Committed r144916: <http://trac.webkit.org/changeset/144916> 191715 2013-03-06 04:31:05 -0800 2019-11-13 14:20:44 -0800 Patch bug-111529-20130306162710.patch text/plain 9123 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0ODgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZhMDM4YzAwYzRiMzcw MTk2MzE0MGI5MTljOWM2OTAwNTMzNTc3Ny4uZjA1MTIyOGI0MGUzZjRhMDk2NzM1OTZkZGQyN2Nl YWQ1YTA2MjcxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAzLTA2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHVzZSByZWd1bGFyIGV2YWwgaW5zdGVhZCBvZiBpbmplY3RTY3JpcHQgZm9yIGZyb250LWVu ZCBleHRlbnNpb24gQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTE1MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmVkIEluamVjdGVkU2NyaXB0TWFuYWdlcjo6aW5qZWN0U2NyaXB0IGFuZCBy ZXBsYWNlZCBhbGwgb2YgaXQgY2FsbHMKKyAgICAgICAgZXhjZXB0IHRoZSBhY3R1YWwgc2NyaXB0 IGluamVjdGlvbiB3aXRoIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHQuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkluamVjdGVkU2NyaXB0TWFuYWdlcjo6aW5qZWN0ZWRTY3JpcHRGb3IpOgorICAgICAgICAq IGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuaDoKKyAgICAgICAgKEluamVjdGVkU2Ny aXB0TWFuYWdlcik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpkaWRDbGVhcldpbmRvd09iamVjdEluV29y bGQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpkaWRDbGVhcldpbmRvd09iamVjdEluV29y bGQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLl9lbXVsYXRlVG91Y2hFdmVudHNDaGFu Z2VkLmdldCBpZik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEku anM6CisgICAgICAgIChidWlsZEV4dGVuc2lvbkFQSUluamVjdGVkU2NyaXB0KToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9vblJlbG9hZCk6CisKIDIwMTMtMDMt MDUgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtTaGFkb3dd IEltcGxlbWVudHMgZXZlbnQgcmUtdGFyZ2V0aW5nIGZvciBUb3VjaCBFdmVudHMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuY3BwCmluZGV4 IDFkNWUzMTc1N2NkODZiM2IyMmI4ZmVkYjMxYWJjZDVlMDJlZmY0NzQuLjk3NTZlZGYyMzYyNTZk NDdmN2I3Njc5YTU3ODgxZGI3ZDI0NjczYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuY3BwCkBAIC00MCw5ICs0MCw2IEBACiAjaW5j bHVkZSAiSW5zcGVjdG9yVmFsdWVzLmgiCiAjaW5jbHVkZSAiU2NyaXB0T2JqZWN0LmgiCiAjaW5j bHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KLSNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+Ci0K LXVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTYzLDEy ICsxNjAsNiBAQCBTdHJpbmcgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjppbmplY3RlZFNjcmlwdFNv dXJjZSgpCiAgICAgcmV0dXJuIFN0cmluZyhyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihJ bmplY3RlZFNjcmlwdFNvdXJjZV9qcyksIHNpemVvZihJbmplY3RlZFNjcmlwdFNvdXJjZV9qcykp OwogfQogCi1wYWlyPGludCwgU2NyaXB0T2JqZWN0PiBJbmplY3RlZFNjcmlwdE1hbmFnZXI6Omlu amVjdFNjcmlwdChjb25zdCBTdHJpbmcmIHNvdXJjZSwgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRl KQotewotICAgIGludCBpZCA9IGluamVjdGVkU2NyaXB0SWRGb3Ioc2NyaXB0U3RhdGUpOwotICAg IHJldHVybiBzdGQ6Om1ha2VfcGFpcihpZCwgY3JlYXRlSW5qZWN0ZWRTY3JpcHQoc291cmNlLCBz Y3JpcHRTdGF0ZSwgaWQpKTsKLX0KLQogSW5qZWN0ZWRTY3JpcHQgSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyOjppbmplY3RlZFNjcmlwdEZvcihTY3JpcHRTdGF0ZSogaW5zcGVjdGVkU2NyaXB0U3RhdGUp CiB7CiAgICAgU2NyaXB0U3RhdGVUb0lkOjppdGVyYXRvciBpdCA9IG1fc2NyaXB0U3RhdGVUb0lk LmZpbmQoaW5zcGVjdGVkU2NyaXB0U3RhdGUpOwpAQCAtMTgxLDkgKzE3MiwxMCBAQCBJbmplY3Rl ZFNjcmlwdCBJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmluamVjdGVkU2NyaXB0Rm9yKFNjcmlwdFN0 YXRlKiBpbnNwZWN0ZWRTYwogICAgIGlmICghbV9pbnNwZWN0ZWRTdGF0ZUFjY2Vzc0NoZWNrKGlu c3BlY3RlZFNjcmlwdFN0YXRlKSkKICAgICAgICAgcmV0dXJuIEluamVjdGVkU2NyaXB0KCk7CiAK LSAgICBwYWlyPGludCwgU2NyaXB0T2JqZWN0PiBpbmplY3RlZFNjcmlwdCA9IGluamVjdFNjcmlw dChpbmplY3RlZFNjcmlwdFNvdXJjZSgpLCBpbnNwZWN0ZWRTY3JpcHRTdGF0ZSk7Ci0gICAgSW5q ZWN0ZWRTY3JpcHQgcmVzdWx0KGluamVjdGVkU2NyaXB0LnNlY29uZCwgbV9pbnNwZWN0ZWRTdGF0 ZUFjY2Vzc0NoZWNrKTsKLSAgICBtX2lkVG9JbmplY3RlZFNjcmlwdC5zZXQoaW5qZWN0ZWRTY3Jp cHQuZmlyc3QsIHJlc3VsdCk7CisgICAgaW50IGlkID0gaW5qZWN0ZWRTY3JpcHRJZEZvcihpbnNw ZWN0ZWRTY3JpcHRTdGF0ZSk7CisgICAgU2NyaXB0T2JqZWN0IGluamVjdGVkU2NyaXB0T2JqZWN0 ID0gY3JlYXRlSW5qZWN0ZWRTY3JpcHQoaW5qZWN0ZWRTY3JpcHRTb3VyY2UoKSwgaW5zcGVjdGVk U2NyaXB0U3RhdGUsIGlkKTsKKyAgICBJbmplY3RlZFNjcmlwdCByZXN1bHQoaW5qZWN0ZWRTY3Jp cHRPYmplY3QsIG1faW5zcGVjdGVkU3RhdGVBY2Nlc3NDaGVjayk7CisgICAgbV9pZFRvSW5qZWN0 ZWRTY3JpcHQuc2V0KGlkLCByZXN1bHQpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuaAppbmRleCAx MTFlMmIyYjgzNzMyNWJmMjEyMTU4MDMzZTQ5ODc4OGVhM2UyNTgxLi4xN2Y4Zjc1NWM2MTkxOTA2 ODY0NzFmYmU4NmU1MzRiMmE5MDJjMDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luamVjdGVkU2NyaXB0TWFuYWdlci5oCkBAIC01NCw3ICs1NCw2IEBAIHB1YmxpYzoKIAog ICAgIEluamVjdGVkU2NyaXB0SG9zdCogaW5qZWN0ZWRTY3JpcHRIb3N0KCk7CiAKLSAgICBwYWly PGludCwgU2NyaXB0T2JqZWN0PiBpbmplY3RTY3JpcHQoY29uc3QgU3RyaW5nJiBzb3VyY2UsIFNj cmlwdFN0YXRlKik7CiAgICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3JpcHRGb3IoU2NyaXB0 U3RhdGUqKTsKICAgICBJbmplY3RlZFNjcmlwdCBpbmplY3RlZFNjcmlwdEZvcklkKGludCk7CiAg ICAgaW50IGluamVjdGVkU2NyaXB0SWRGb3IoU2NyaXB0U3RhdGUqKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCmluZGV4IGVhN2U3ZjM1MzU2ZDg4M2FhNDU2 MjY2N2YyNzgzODQ5NzI5YTJhZTUuLjIxNDkzMzQ3N2I5ODE0OWQ1ZmUzNjAyMTJlOWMwZDM5Njdm YmNjODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2Vu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcApA QCAtODgsOCArODgsMTUgQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZGlkQ2xlYXJXaW5kb3dPYmpl Y3RJbldvcmxkKEZyYW1lKiBmcmFtZSwgRE9NV3JhcHBlcldvcmxkKgogCiAgICAgU3RyaW5nIG9y aWdpbiA9IGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1Jhd1N0cmluZygp OwogICAgIFN0cmluZyBzY3JpcHQgPSBtX2luamVjdGVkU2NyaXB0Rm9yT3JpZ2luLmdldChvcmln aW4pOwotICAgIGlmICghc2NyaXB0LmlzRW1wdHkoKSkKLSAgICAgICAgbV9pbmplY3RlZFNjcmlw dE1hbmFnZXItPmluamVjdFNjcmlwdChzY3JpcHQsIG1haW5Xb3JsZFNjcmlwdFN0YXRlKGZyYW1l KSk7CisgICAgaWYgKHNjcmlwdC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKyAgICBpbnQg aW5qZWN0ZWRTY3JpcHRJZCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlw dElkRm9yKG1haW5Xb3JsZFNjcmlwdFN0YXRlKGZyYW1lKSk7CisgICAgU3RyaW5nQnVpbGRlciBz Y3JpcHRTb3VyY2U7CisgICAgc2NyaXB0U291cmNlLmFwcGVuZChzY3JpcHQpOworICAgIHNjcmlw dFNvdXJjZS5hcHBlbmQoIigiKTsKKyAgICBzY3JpcHRTb3VyY2UuYXBwZW5kTnVtYmVyKGluamVj dGVkU2NyaXB0SWQpOworICAgIHNjcmlwdFNvdXJjZS5hcHBlbmQoIikiKTsKKyAgICBmcmFtZS0+ c2NyaXB0KCktPmV4ZWN1dGVTY3JpcHQoc2NyaXB0U291cmNlLnRvU3RyaW5nKCkpOwogfQogCiB2 b2lkIEluc3BlY3RvckFnZW50OjpzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCogaW5zcGVj dG9yRnJvbnRlbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdl QWdlbnQuY3BwCmluZGV4IGFiYjc5OTEyZmExNzE4ZTkyNjEyN2E2NmM2ZWRhYjdiNzJiOThlMDku LjZjMTQ3ZDUzNDJmNWU4OGIwMjFkZDcwZjgyYWI3MmJjZDAwMGE4MjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBAIC04NTIsMTEgKzg1 MiwxMSBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6ZGlkQ2xlYXJXaW5kb3dPYmplY3RJbldv cmxkKEZyYW1lKiBmcmFtZSwgRE9NV3JhcHBlcldvcgogICAgICAgICBmb3IgKEluc3BlY3Rvck9i amVjdDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBzY3JpcHRzLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsr aXQpIHsKICAgICAgICAgICAgIFN0cmluZyBzY3JpcHRUZXh0OwogICAgICAgICAgICAgaWYgKGl0 LT52YWx1ZS0+YXNTdHJpbmcoJnNjcmlwdFRleHQpKQotICAgICAgICAgICAgICAgIG1faW5qZWN0 ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RTY3JpcHQoc2NyaXB0VGV4dCwgbWFpbldvcmxkU2NyaXB0 U3RhdGUoZnJhbWUpKTsKKyAgICAgICAgICAgICAgICBmcmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVT Y3JpcHQoc2NyaXB0VGV4dCk7CiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKCFtX3NjcmlwdFRv RXZhbHVhdGVPbkxvYWRPbmNlLmlzRW1wdHkoKSkKLSAgICAgICAgbV9pbmplY3RlZFNjcmlwdE1h bmFnZXItPmluamVjdFNjcmlwdChtX3NjcmlwdFRvRXZhbHVhdGVPbkxvYWRPbmNlLCBtYWluV29y bGRTY3JpcHRTdGF0ZShmcmFtZSkpOworICAgICAgICBmcmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVT Y3JpcHQobV9zY3JpcHRUb0V2YWx1YXRlT25Mb2FkT25jZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9y UGFnZUFnZW50Ojpkb21Db250ZW50RXZlbnRGaXJlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCA1MDdmNjgwOGFmOWY0NWJmMTkyOTNl OTRkMmQyYWI5ZmY1NDg1Yjk2Li45MjIxZGNkOWJlZmFiNjlmNTg5MmY1YjY2ZGY5ZjhhNmI3MWI2 MTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFn ZW50LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQu anMKQEAgLTEzMjIsNyArMTMyMiw3IEBAIFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHZhciBlbXVsYXRpb25FbmFibGVkID0gV2ViSW5zcGVjdG9yLnNldHRpbmdz LmVtdWxhdGVUb3VjaEV2ZW50cy5nZXQoKTsKICAgICAgICAgaWYgKGVtdWxhdGlvbkVuYWJsZWQg JiYgIXRoaXMuX2FkZFRvdWNoRXZlbnRzU2NyaXB0SW5qZWN0aW5nKSB7CiAgICAgICAgICAgICB0 aGlzLl9hZGRUb3VjaEV2ZW50c1NjcmlwdEluamVjdGluZyA9IHRydWU7Ci0gICAgICAgICAgICBQ YWdlQWdlbnQuYWRkU2NyaXB0VG9FdmFsdWF0ZU9uTG9hZCgiKCIgKyBpbmplY3RlZEZ1bmN0aW9u LnRvU3RyaW5nKCkgKyAiKSIsIHNjcmlwdEFkZGVkQ2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAg ICAgICAgICBQYWdlQWdlbnQuYWRkU2NyaXB0VG9FdmFsdWF0ZU9uTG9hZCgiKCIgKyBpbmplY3Rl ZEZ1bmN0aW9uLnRvU3RyaW5nKCkgKyAiKSgpIiwgc2NyaXB0QWRkZWRDYWxsYmFjay5iaW5kKHRo aXMpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fYWRk VG91Y2hFdmVudHNTY3JpcHRJZCAhPT0gInVuZGVmaW5lZCIpIHsKICAgICAgICAgICAgICAgICBQ YWdlQWdlbnQucmVtb3ZlU2NyaXB0VG9FdmFsdWF0ZU9uTG9hZCh0aGlzLl9hZGRUb3VjaEV2ZW50 c1NjcmlwdElkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRXh0ZW5zaW9uQVBJLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F eHRlbnNpb25BUEkuanMKaW5kZXggM2MzMjFkMWRiM2ZhMmQwZjk4MmM2NGEyYjVmMDc2ZDBmZjk5 ODA4MS4uMmYwMmU1N2ZmMjg1Mjc4ZTBhMTU5N2IyYzk2NTI3Y2U5ZjZlNDlmNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKQEAg LTg4NSw3ICs4ODUsNyBAQCBmdW5jdGlvbiBidWlsZFBsYXRmb3JtRXh0ZW5zaW9uQVBJKGV4dGVu c2lvbkluZm8pCiAKIGZ1bmN0aW9uIGJ1aWxkRXh0ZW5zaW9uQVBJSW5qZWN0ZWRTY3JpcHQoZXh0 ZW5zaW9uSW5mbykKIHsKLSAgICByZXR1cm4gIihmdW5jdGlvbihpbmplY3RlZFNjcmlwdEhvc3Qs IGluc3BlY3RlZFdpbmRvdywgaW5qZWN0ZWRTY3JpcHRJZCl7ICIgKworICAgIHJldHVybiAiKGZ1 bmN0aW9uKGluamVjdGVkU2NyaXB0SWQpeyAiICsKICAgICAgICAgInZhciBleHRlbnNpb25TZXJ2 ZXI7IiArCiAgICAgICAgIGRlZmluZUNvbW1vbkV4dGVuc2lvblN5bWJvbHMudG9TdHJpbmcoKSAr ICI7IiArCiAgICAgICAgIGluamVjdGVkRXh0ZW5zaW9uQVBJLnRvU3RyaW5nKCkgKyAiOyIgKwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25T ZXJ2ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNl cnZlci5qcwppbmRleCBmZDMwN2ZhOTVmYzljZmMzNDVjZTc0YTMxYzBjOWI3M2FhOWZmNDNiLi4x YzI5MjE0MTk2ZmUxYmFjOTNkOGZlNmU3ZGZhZjdlYjRlMzMyMWY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAt MzEwLDExICszMTAsOCBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdmFyIG9wdGlvbnMgPSAvKiogQHR5cGUgRXh0ZW5zaW9uUmVsb2FkT3B0aW9u cyAqLyAobWVzc2FnZS5vcHRpb25zIHx8IHt9KTsKICAgICAgICAgTmV0d29ya0FnZW50LnNldFVz ZXJBZ2VudE92ZXJyaWRlKHR5cGVvZiBvcHRpb25zLnVzZXJBZ2VudCA9PT0gInN0cmluZyIgPyBv cHRpb25zLnVzZXJBZ2VudCA6ICIiKTsKICAgICAgICAgdmFyIGluamVjdGVkU2NyaXB0OwotICAg ICAgICBpZiAob3B0aW9ucy5pbmplY3RlZFNjcmlwdCkgewotICAgICAgICAgICAgLy8gV3JhcCBj bGllbnQgc2NyaXB0IGludG8gYW5vbnltb3VzIGZ1bmN0aW9uLCByZXR1cm4gYW5vdGhlciBhbm9u eW1vdXMgZnVuY3Rpb24gdGhhdAotICAgICAgICAgICAgLy8gcmV0dXJucyBlbXB0eSBvYmplY3Qg Zm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJbmplY3RlZFNjcmlwdE1hbmFnZXIgb24gdGhlIGJhY2tl bmQuCi0gICAgICAgICAgICBpbmplY3RlZFNjcmlwdCA9ICIoKGZ1bmN0aW9uKCl7IiArIG9wdGlv bnMuaW5qZWN0ZWRTY3JpcHQgKyAifSkoKSxmdW5jdGlvbigpe3JldHVybiB7fX0pIjsKLSAgICAg ICAgfQorICAgICAgICBpZiAob3B0aW9ucy5pbmplY3RlZFNjcmlwdCkKKyAgICAgICAgICAgIGlu amVjdGVkU2NyaXB0ID0gIihmdW5jdGlvbigpeyIgKyBvcHRpb25zLmluamVjdGVkU2NyaXB0ICsg In0pKCkiOwogICAgICAgICBQYWdlQWdlbnQucmVsb2FkKCEhb3B0aW9ucy5pZ25vcmVDYWNoZSwg aW5qZWN0ZWRTY3JpcHQpOwogICAgICAgICByZXR1cm4gdGhpcy5fc3RhdHVzLk9LKCk7CiAgICAg fSwK