159182 2016-06-27 17:12:08 -0700 Web Inspector: Uncaught Exception page never shows if exception is thrown while processing a protocol event 2016-06-29 16:06:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 bburg bburg bburg joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1205782 0 bburg 2016-06-27 17:12:08 -0700 We catch, log, and drop the assertion on the floor. We should probably only do that if !DebugUIEnabled, so that we can easily file and fix these exceptions. 1205783 1 bburg 2016-06-27 17:12:16 -0700 exception* 1206246 2 282307 bburg 2016-06-28 17:48:01 -0700 Created attachment 282307 Proposed Fix 1206255 3 282307 joepeck 2016-06-28 18:20:45 -0700 Comment on attachment 282307 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=282307&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:2456 > + } else if (optionalMessage) > + console.error(optionalMessage, error); This `optionalMessage` stuff seems stale? Right now it looks like a ReferenceError. > Source/WebInspectorUI/UserInterface/Base/Main.js:2459 > +} Style: ; > Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js:173 > + if (entry.details) { > + lines.push(""); > + lines.push("Additional Details:") > + for (let key in entry.details) { > + let value = entry.details[key]; > + lines.push(`${indent}${key} --> ${value}`); > + } > + } Seems this can be outside of the "if (entry.stack)" block. > Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js:305 > + WebInspector.reportInternalError(e, details); Style: Inlining the details would look nicer! > Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js:357 > + WebInspector.reportInternalError(e, details); Style: Inlining the details would look nicer! 1206534 4 bburg 2016-06-29 16:06:19 -0700 Committed r202657: <http://trac.webkit.org/changeset/202657> 282307 2016-06-28 17:48:01 -0700 2016-06-28 18:20:45 -0700 Proposed Fix bug-159182-20160628174744.patch text/plain 10794 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 NzVlNDk0ZTRjY2M0NjU5YTM5YzMwY2RiM2UwNTNiMDQ4ZTYxYTlkLi5lZjM4NjkxMmQxNWFlMjkx Y2Q4ZjFjZTNiMmY4NmUzOWE2NjM5MDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAxNi0wNi0yOCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBVbmNhdWdodCBFeGNlcHRpb24gcGFnZSBuZXZlciBzaG93 cyBpZiBleGNlcHRpb24gaXMgdGhyb3duIHdoaWxlIHByb2Nlc3NpbmcgYSBwcm90b2NvbCBldmVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MTgy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2Ug d2UgY2F0Y2ggZXhjZXB0aW9ucyByYWlzZWQgZHVyaW5nIHRoZSBoYW5kbGluZyBvZiBwcm90b2Nv bCByZXNwb25zZXMgYW5kIGV2ZW50cywgdGhlcmUKKyAgICAgICAgaXMgbm8gd2F5IGZvciB0aGVz ZSBleGNlcHRpb25zIHRvIHRyaWdnZXIgdGhlIGdsb2JhbCBleGNlcHRpb24gaGFuZGxlciB0aGF0 IHNob3dzIHRoZSBVbmNhdWdodAorICAgICAgICBFeGNlcHRpb24gUmVwb3J0ZXIgc2hlZXQuIFdl IHNob3VsZCBzaG93IHRoZXNlIGluIHRoZSBzaGVldCBiZWNhdXNlIGl0IG1ha2VzIHRoZW0gZ2V0 IGZpeGVkIGZhc3Rlci4KKworICAgICAgICBBZGQgYSBuZXcgZW50cnkgcG9pbnQsIFdlYkluc3Bl Y3Rvci5yZXBvcnRJbnRlcm5hbEVycm9yLCB0aGF0IHRha2VzIGFuIGVycm9yIG9yIHN0cmluZyBh bmQKKyAgICAgICAgYSBmcmVlLWZvcm0gbWFwIG9mIHN0cmluZ3MgdG8gc3RyaW5ncyBmb3Igc3Rv cmluZyBhZGRpdGlvbmFsIGluZm9ybWF0aW9uIHN1Y2ggYXMgbWVzc2FnZSBkYXRhLgorICAgICAg ICBQYXNzIHRoZSBlcnJvciBhbmQgYW55IG90aGVyIHJlbGV2YW50IGRldGFpbHMgdG8gdGhpcyBl bnRyeSBwb2ludCwgd2hpY2ggZGVjaWRlcyB3aGV0aGVyIHRvCisgICAgICAgIHNob3cgdGhlIHVu Y2F1Z2h0IGV4Y2VwdGlvbiByZXBvcnRlciBvciBxdWlldGx5IGxvZyB0aGUgZXJyb3IgdG8gSW5z cGVjdG9yXjIgY29uc29sZS4KKworICAgICAgICBJbiBmdXR1cmUgcGF0Y2hlcywgSSB3b3VsZCBs aWtlIHRvIGRvIHRoZSBmb2xsb3dpbmcgb25jZSB0aGUgY29tbW9uIGVycm9ycyBhcmUgZml4ZWQ6 CisgICAgICAgICAtIGVuYWJsZSByZXBvcnRpbmcgdmlhIFVuY2F1Z2h0IEV4Y2VwdGlvbiBSZXBv cnRlciBmb3IgYWxsIGVuZ2luZWVyaW5nIGJ1aWxkcworICAgICAgICAgLSBtb3ZlIGludGVybmFs IGNvbnNvbGUuZXJyb3IgY2FsbCBzaXRlcyB0byB1c2UgV2ViSW5zcGVjdG9yLnJlcG9ydEludGVy bmFsRXJyb3IKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOiBBZGQgcmVw b3J0SW50ZXJuYWxFcnJvciwgd2hpY2ggcmVkaXJlY3RzIHRvIHRoZSB1bmNhdWdodAorICAgICAg ICBleGNlcHRpb24gcmVwb3J0ZXIgc2hlZXQgb3IgZG9lcyBjb25zb2xlLmVycm9yLiBJdCBhbHNv IGFkZHMgYSBjb25zb2xlLmFzc2VydCB0aGF0IGNvdWxkCisgICAgICAgIGNhdXNlIHRoZSBkZWJ1 Z2dlciB0byBwYXVzZSBpZiBkZXNpcmVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9EZWJ1 Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmNzczoKKyAgICAgICAgKC5zaGVldC1jb250YWlu ZXIpOiBNYWtlIHRoZSByZXBvcnQgc2Nyb2xsYWJsZSBub3cgdGhhdCB3ZSBjb3VsZCBwb3RlbnRp YWxseSBzaG93IGEgbG90IG9mIHRleHQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0RlYnVn L1VuY2F1Z2h0RXhjZXB0aW9uUmVwb3J0ZXIuanM6CisgICAgICAgIChoYW5kbGVFcnJvcik6IEFs c28gcGFzcyBhbG9uZyB0aGUgJ2RldGFpbHMnIHBvcGVydHkuCisgICAgICAgIChmb3JtYXR0ZWRF bnRyeSk6IFJlZmFjdG9yIHRoZSBjb2RlIHNvIGl0IGFkZGl0aW9uYWxseSBwcmludHMgb3V0IHRo ZSBrZXlzIGFuZCB2YWx1ZXMgb2YKKyAgICAgICAgdGhlICdkZXRhaWxzJyBwcm9wZXJ0eS4gSXQg ZG9lcyBub3QgZG8gYW55IGNvZXJjaW9ucywgc28gY2FsbGVycyBtdXN0IGNvbnZlcnQgdmFsdWVz IHRvIHN0cmluZ3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3Rv ckJhY2tlbmQuanM6CisgICAgICAgIChJbnNwZWN0b3JCYWNrZW5kQ2xhc3MucHJvdG90eXBlLl9k aXNwYXRjaFJlc3BvbnNlKTogSW5saW5lZCBhIGZ1bmN0aW9uLgorICAgICAgICAoSW5zcGVjdG9y QmFja2VuZENsYXNzLnByb3RvdHlwZS5fZGlzcGF0Y2hSZXNwb25zZVRvQ2FsbGJhY2spOgorICAg ICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNzLnByb3RvdHlwZS5fZGlzcGF0Y2hFdmVudCk6Cisg ICAgICAgIFJlcG9ydCB1bmNhdWdodCBleGNlcHRpb25zIHZpYSBXZWJJbnNwZWN0b3IucmVwb3J0 SW50ZXJuYWxFcnJvci4KKworICAgICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNzLnByb3RvdHlw ZS5fcmVwb3J0UHJvdG9jb2xFcnJvcik6IERlbGV0ZWQsIGlubGluZWQgaW50byB0aGUgc2luZ2xl IHVzZSBzaXRlLgorCiAyMDE2LTA2LTI3ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFF1aWNrQ29uc29sZSBzaG91bGQgdXBkYXRlIGl0cyBz ZWxlY3Rpb24gd2hlbiBSdW50aW1lTWFuYWdlci5kZWZhdWx0RXhlY3V0aW9uQ29udGV4dElkZW50 aWZpZXIgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9NYWluLmpzCmluZGV4IDUyZmE1ODE0ZTM2Y2JjZDYzOTVjODQxMjVhZDQwY2QyNmJlNjUz MzEuLjJiYzViZDFhNTU5ZTg5N2NmODM2NDY0MDBlM2FjMTQ2NTU3NmExMTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTI0MzYs NiArMjQzNiwyOCBAQCBXZWJJbnNwZWN0b3IuX3NoYXJlZFdpbmRvd0tleWRvd25MaXN0ZW5lciA9 IGZ1bmN0aW9uKGV2ZW50KQogICAgIH0KIH07CiAKK1dlYkluc3BlY3Rvci5yZXBvcnRJbnRlcm5h bEVycm9yID0gZnVuY3Rpb24oZXJyb3JPclN0cmluZywgZGV0YWlscz17fSkKK3sKKyAgICAvLyBU aGUgJ2RldGFpbHMnIG9iamVjdCBpbmNsdWRlcyBhZGRpdGlvbmFsIGluZm9ybWF0aW9uIGZyb20g dGhlIGNhbGxlciBhcyBmcmVlLWZvcm0gc3RyaW5nIGtleXMgYW5kIHZhbHVlcy4KKyAgICAvLyBF YWNoIGtleSBhbmQgdmFsdWUgd2lsbCBiZSBzaG93biBpbiB0aGUgdW5jYXVnaHQgZXhjZXB0aW9u IHJlcG9ydGVyLCBjb25zb2xlIGVycm9yIG1lc3NhZ2UsIG9yIGluCisgICAgLy8gYSBwcmUtZmls bGVkIGJ1ZyByZXBvcnQgZ2VuZXJhdGVkIGZvciB0aGlzIGludGVybmFsIGVycm9yLgorCisgICAg bGV0IGVycm9yID0gKGVycm9yT3JTdHJpbmcgaW5zdGFuY2VvZiBFcnJvcikgPyBlcnJvck9yU3Ry aW5nIDogbmV3IEVycm9yKGVycm9yT3JTdHJpbmcpOworICAgIGVycm9yLmRldGFpbHMgPSBkZXRh aWxzOworCisgICAgLy8gVGhlIGVycm9yIHdpbGwgYmUgZGlzcGxheWVkIGluIHRoZSBVbmNhdWdo dCBFeGNlcHRpb24gUmVwb3J0ZXIgc2hlZXQgaWYgRGVidWdVSSBpcyBlbmFibGVkLgorICAgIGlm IChXZWJJbnNwZWN0b3Iuc2hvd0RlYnVnVUlTZXR0aW5nICYmIFdlYkluc3BlY3Rvci5zaG93RGVi dWdVSVNldHRpbmcudmFsdWUpIHsKKyAgICAgICAgLy8gVGhpcyBhc3NlcnQgYWxsb3dzIHVzIHRv IHN0b3AgdGhlIGRlYnVnZ2VyIGF0IGFuIGludGVybmFsIGV4Y2VwdGlvbi4gSXQgZG9lc24ndCBy ZS10aHJvdworICAgICAgICAvLyBleGNlcHRpb25zIGJlY2F1c2UgdGhlIG9yaWdpbmFsIGV4Y2Vw dGlvbiB3b3VsZCBiZSBsb3N0IHRocm91Z2ggd2luZG93Lm9uZXJyb3IuCisgICAgICAgIC8vIFRo aXMgd29ya2Fyb3VuZCBjYW4gYmUgcmVtb3ZlZCBvbmNlIDxodHRwczovL3dlYmtpdC5vcmcvYi8x NTgxOTI+IGlzIGZpeGVkLgorICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIkFuIGludGVy bmFsIGV4Y2VwdGlvbiB3YXMgdGhyb3duLiIsIGVycm9yKTsKKyAgICAgICAgaGFuZGxlSW50ZXJu YWxFeGNlcHRpb24oZXJyb3IpOworICAgIH0gZWxzZSBpZiAob3B0aW9uYWxNZXNzYWdlKQorICAg ICAgICBjb25zb2xlLmVycm9yKG9wdGlvbmFsTWVzc2FnZSwgZXJyb3IpOworICAgIGVsc2UKKyAg ICAgICAgY29uc29sZS5lcnJvcihlcnJvcik7Cit9CisKIC8vIE9wZW5SZXNvdXJjZURpYWxvZyBk ZWxlZ2F0ZQogCiBXZWJJbnNwZWN0b3IuZGlhbG9nV2FzRGlzbWlzc2VkID0gZnVuY3Rpb24oZGlh bG9nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGVi dWcvVW5jYXVnaHRFeGNlcHRpb25SZXBvcnRlci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmNzcwppbmRleCA2 OTAyNzRmYzdiNmM5MzgzMTljZWZkNzhiY2I0MWEwNzgwOGUyNGFkLi44YjdlMDFkZDBiYTQ1Y2Nk NDNkMGZlZWZkYTdhMmZlOTMwNWY3ZjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2Vw dGlvblJlcG9ydGVyLmNzcwpAQCAtMzEsMTMgKzMxLDEzIEBACiAgICAgYm90dG9tOiAwOwogICAg IHotaW5kZXg6IHZhcigtLXotaW5kZXgtdW5jYXVnaHQtZXhjZXB0aW9uLXNoZWV0KTsKICAgICBi YWNrZ3JvdW5kLWNvbG9yOiBoc2woMCwgMCUsIDk2JSk7CisgICAgb3ZlcmZsb3c6IHNjcm9sbDsK IH0KIAogLnVuY2F1Z2h0LWV4Y2VwdGlvbi1zaGVldCB7CiAgICAgcGFkZGluZzogNTBweCA1NXB4 IDUwcHggNjVweDsKICAgICBmb250LWZhbWlseTogJy13ZWJraXQtc3lzdGVtLWZvbnQnOwogICAg IGZvbnQtc2l6ZTogMTFwdDsKLSAgICBvdmVyZmxvdy15OiBhdXRvOwogICAgIG1pbi13aWR0aDog NDAwcHg7CiAgICAgY29sb3I6IGhzbCgwLCAwJSwgNDAlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL1VuY2F1Z2h0RXhjZXB0aW9uUmVw b3J0ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9VbmNh dWdodEV4Y2VwdGlvblJlcG9ydGVyLmpzCmluZGV4IDdhYTZhZTRmNjNjYjBmM2FlMzIyNWU2MWIx MWExODMwYWJhMjg5YTQuLjRjOTdiYzlhYzg3N2M2MzAzOTFhNjY0MGMzYWQwMWIxMTI4MDE1OTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL1Vu Y2F1Z2h0RXhjZXB0aW9uUmVwb3J0ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRGVidWcvVW5jYXVnaHRFeGNlcHRpb25SZXBvcnRlci5qcwpAQCAtNTcsNiAr NTcsNyBAQCBmdW5jdGlvbiBoYW5kbGVFcnJvcihlcnJvcikgewogICAgICAgICBsaW5lTnVtYmVy OiBlcnJvci5saW5lLAogICAgICAgICBjb2x1bW5OdW1iZXI6IGVycm9yLmNvbHVtbiwKICAgICAg ICAgc3RhY2s6IGVycm9yLnN0YWNrLAorICAgICAgICBkZXRhaWxzOiBlcnJvci5kZXRhaWxzLAog ICAgIH0pOwogfQogCkBAIC0xNTAsMjIgKzE1MSwyOSBAQCBmdW5jdGlvbiBjcmVhdGVFcnJvclNo ZWV0KCkgewogICAgIH0KIAogICAgIGZ1bmN0aW9uIGZvcm1hdHRlZEVudHJ5KGVudHJ5KSB7Ci0g ICAgICAgIGxldCBtZXNzYWdlID0gYCR7ZW50cnkubWVzc2FnZX0gKGF0ICR7ZW50cnkudXJsfTok e2VudHJ5LmxpbmVOdW1iZXJ9OiR7ZW50cnkuY29sdW1uTnVtYmVyfSlgOwotICAgICAgICBpZiAo IWVudHJ5LnN0YWNrKQotICAgICAgICAgICAgcmV0dXJuIG1lc3NhZ2U7Ci0KLSAgICAgICAgY29u c3QgaW5kZW50ID0gIiAgICAiOwotICAgICAgICBsZXQgcmVzdWx0cyA9IFtdOwotICAgICAgICBs ZXQgbGluZXMgPSBlbnRyeS5zdGFjay5zcGxpdCgvXG4vZyk7Ci0gICAgICAgIGZvciAobGV0IGxp bmUgb2YgbGluZXMpIHsKLSAgICAgICAgICAgIGxldCBhdEluZGV4ID0gbGluZS5pbmRleE9mKCJA Iik7Ci0gICAgICAgICAgICBsZXQgc2xhc2hJbmRleCA9IE1hdGgubWF4KGxpbmUubGFzdEluZGV4 T2YoIi8iKSwgYXRJbmRleCk7Ci0gICAgICAgICAgICBsZXQgZnVuY3Rpb25OYW1lID0gbGluZS5z dWJzdHJpbmcoMCwgYXRJbmRleCkgfHwgIj8iOwotICAgICAgICAgICAgbGV0IGxvY2F0aW9uID0g bGluZS5zdWJzdHJpbmcoc2xhc2hJbmRleCArIDEsIGxpbmUubGVuZ3RoKTsKLSAgICAgICAgICAg IHJlc3VsdHMucHVzaChgJHtpbmRlbnR9JHtmdW5jdGlvbk5hbWV9IEAgJHtsb2NhdGlvbn1gKTsK KyAgICAgICAgbGV0IGxpbmVzID0gW2Ake2VudHJ5Lm1lc3NhZ2V9IChhdCAke2VudHJ5LnVybH06 JHtlbnRyeS5saW5lTnVtYmVyfToke2VudHJ5LmNvbHVtbk51bWJlcn0pYF07CisgICAgICAgIGlm IChlbnRyeS5zdGFjaykgeworICAgICAgICAgICAgY29uc3QgaW5kZW50ID0gIiAgICAiOworICAg ICAgICAgICAgbGV0IHN0YWNrTGluZXMgPSBlbnRyeS5zdGFjay5zcGxpdCgvXG4vZyk7CisgICAg ICAgICAgICBmb3IgKGxldCBzdGFja0xpbmUgb2Ygc3RhY2tMaW5lcykgeworICAgICAgICAgICAg ICAgIGxldCBhdEluZGV4ID0gc3RhY2tMaW5lLmluZGV4T2YoIkAiKTsKKyAgICAgICAgICAgICAg ICBsZXQgc2xhc2hJbmRleCA9IE1hdGgubWF4KHN0YWNrTGluZS5sYXN0SW5kZXhPZigiLyIpLCBh dEluZGV4KTsKKyAgICAgICAgICAgICAgICBsZXQgZnVuY3Rpb25OYW1lID0gc3RhY2tMaW5lLnN1 YnN0cmluZygwLCBhdEluZGV4KSB8fCAiPyI7CisgICAgICAgICAgICAgICAgbGV0IGxvY2F0aW9u ID0gc3RhY2tMaW5lLnN1YnN0cmluZyhzbGFzaEluZGV4ICsgMSwgc3RhY2tMaW5lLmxlbmd0aCk7 CisgICAgICAgICAgICAgICAgbGluZXMucHVzaChgJHtpbmRlbnR9JHtmdW5jdGlvbk5hbWV9IEAg JHtsb2NhdGlvbn1gKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGVudHJ5LmRl dGFpbHMpIHsKKyAgICAgICAgICAgICAgICBsaW5lcy5wdXNoKCIiKTsKKyAgICAgICAgICAgICAg ICBsaW5lcy5wdXNoKCJBZGRpdGlvbmFsIERldGFpbHM6IikKKyAgICAgICAgICAgICAgICBmb3Ig KGxldCBrZXkgaW4gZW50cnkuZGV0YWlscykgeworICAgICAgICAgICAgICAgICAgICBsZXQgdmFs dWUgPSBlbnRyeS5kZXRhaWxzW2tleV07CisgICAgICAgICAgICAgICAgICAgIGxpbmVzLnB1c2go YCR7aW5kZW50fSR7a2V5fSAtLT4gJHt2YWx1ZX1gKTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICByZXR1cm4gbWVzc2FnZSArICJcbiIgKyBy ZXN1bHRzLmpvaW4oIlxuIik7CisgICAgICAgIHJldHVybiBsaW5lcy5qb2luKCJcbiIpOwogICAg IH0KIAogICAgIGxldCBpbnNwZWN0ZWRQYWdlVVJMID0gbnVsbDsKQEAgLTIzMiw2ICsyNDAsNiBA QCBEb2N1bWVudCBhbnkgYWRkaXRpb25hbCBpbmZvcm1hdGlvbiB0aGF0IG1pZ2h0IGJlIHVzZWZ1 bCBpbiByZXNvbHZpbmcgdGhlIHByb2JsZQogfQogCiB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigi ZXJyb3IiLCBoYW5kbGVVbmNhdWdodEV4Y2VwdGlvbik7Ci13aW5kb3cuaGFuZGxlUHJvbWlzZUV4 Y2VwdGlvbiA9IGhhbmRsZUVycm9yOword2luZG93LmhhbmRsZVByb21pc2VFeGNlcHRpb24gPSB3 aW5kb3cuaGFuZGxlSW50ZXJuYWxFeGNlcHRpb24gPSBoYW5kbGVFcnJvcjsKIAogfSkoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0lu c3BlY3RvckJhY2tlbmQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Q cm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kLmpzCmluZGV4IDBiMzMwMTEyOTFhYTY1NGM2YmM5ZWEz MDExMDNjZjc1MGYxYzY3OWEuLjE0ZmJkMDIxMWI2MWFkZWJjZjMxMTA2ZDE0NjdkZTdkMWU0OTlk ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3Rv Y29sL0luc3BlY3RvckJhY2tlbmQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yQmFja2VuZC5qcwpAQCAtMjU1LDcgKzI1NSw3IEBA IEluc3BlY3RvckJhY2tlbmRDbGFzcyA9IGNsYXNzIEluc3BlY3RvckJhY2tlbmRDbGFzcwogCiAg ICAgICAgIGlmIChtZXNzYWdlT2JqZWN0WyJlcnJvciJdKSB7CiAgICAgICAgICAgICBpZiAobWVz c2FnZU9iamVjdFsiZXJyb3IiXS5jb2RlICE9PSAtMzIwMDApCi0gICAgICAgICAgICAgICAgdGhp cy5fcmVwb3J0UHJvdG9jb2xFcnJvcihtZXNzYWdlT2JqZWN0KTsKKyAgICAgICAgICAgICAgICBj b25zb2xlLmVycm9yKCJSZXF1ZXN0IHdpdGggaWQgPSAiICsgbWVzc2FnZU9iamVjdFsiaWQiXSAr ICIgZmFpbGVkLiAiICsgSlNPTi5zdHJpbmdpZnkobWVzc2FnZU9iamVjdFsiZXJyb3IiXSkpOwog ICAgICAgICB9CiAKICAgICAgICAgbGV0IHNlcXVlbmNlSWQgPSBtZXNzYWdlT2JqZWN0WyJpZCJd OwpAQCAtMjk4LDcgKzI5OCwxMSBAQCBJbnNwZWN0b3JCYWNrZW5kQ2xhc3MgPSBjbGFzcyBJbnNw ZWN0b3JCYWNrZW5kQ2xhc3MKICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIGNhbGxiYWNrLmFw cGx5KG51bGwsIGNhbGxiYWNrQXJndW1lbnRzKTsKICAgICAgICAgfSBjYXRjaCAoZSkgewotICAg ICAgICAgICAgY29uc29sZS5lcnJvcigiVW5jYXVnaHQgZXhjZXB0aW9uIGluIGluc3BlY3RvciBw YWdlIHdoaWxlIGRpc3BhdGNoaW5nIGNhbGxiYWNrIGZvciBjb21tYW5kICIgKyBjb21tYW5kLnF1 YWxpZmllZE5hbWUsIGUpOworICAgICAgICAgICAgbGV0IGRldGFpbHMgPSB7CisgICAgICAgICAg ICAgICAgImNhdXNlIjogYEFuIHVuY2F1Z2h0IGV4Y2VwdGlvbiB3YXMgdGhyb3duIHdoaWxlIGRp c3BhdGNoaW5nIHJlc3BvbnNlIGNhbGxiYWNrIGZvciBjb21tYW5kICR7Y29tbWFuZC5xdWFsaWZp ZWROYW1lfS5gLAorICAgICAgICAgICAgICAgICJwcm90b2NvbC1tZXNzYWdlIjogSlNPTi5zdHJp bmdpZnkobWVzc2FnZU9iamVjdCksCisgICAgICAgICAgICB9OworICAgICAgICAgICAgV2ViSW5z cGVjdG9yLnJlcG9ydEludGVybmFsRXJyb3IoZSwgZGV0YWlscyk7CiAgICAgICAgIH0KICAgICB9 CiAKQEAgLTM0Myw5ICszNDcsMTQgQEAgSW5zcGVjdG9yQmFja2VuZENsYXNzID0gY2xhc3MgSW5z cGVjdG9yQmFja2VuZENsYXNzCiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICBhZ2VudC5kaXNw YXRjaEV2ZW50KGV2ZW50TmFtZSwgZXZlbnRBcmd1bWVudHMpOwogICAgICAgICB9IGNhdGNoIChl KSB7Ci0gICAgICAgICAgICBjb25zb2xlLmVycm9yKCJVbmNhdWdodCBleGNlcHRpb24gaW4gaW5z cGVjdG9yIHBhZ2Ugd2hpbGUgaGFuZGxpbmcgZXZlbnQgIiArIHF1YWxpZmllZE5hbWUsIGUpOwog ICAgICAgICAgICAgZm9yIChsZXQgdHJhY2VyIG9mIHRoaXMuYWN0aXZlVHJhY2VycykKICAgICAg ICAgICAgICAgICB0cmFjZXIubG9nRnJvbnRlbmRFeGNlcHRpb24obWVzc2FnZU9iamVjdCwgZSk7 CisKKyAgICAgICAgICAgIGxldCBkZXRhaWxzID0geworICAgICAgICAgICAgICAgICJjYXVzZSI6 IGBBbiB1bmNhdWdodCBleGNlcHRpb24gd2FzIHRocm93biB3aGlsZSBoYW5kbGluZyBldmVudDog JHtxdWFsaWZpZWROYW1lfWAsCisgICAgICAgICAgICAgICAgInByb3RvY29sLW1lc3NhZ2UiOiBK U09OLnN0cmluZ2lmeShtZXNzYWdlT2JqZWN0KSwKKyAgICAgICAgICAgIH07CisgICAgICAgICAg ICBXZWJJbnNwZWN0b3IucmVwb3J0SW50ZXJuYWxFcnJvcihlLCBkZXRhaWxzKTsKICAgICAgICAg fQogCiAgICAgICAgIGxldCBwcm9jZXNzaW5nRHVyYXRpb24gPSAodGltZXN0YW1wKCkgLSBwcm9j ZXNzaW5nU3RhcnRUaW1lc3RhbXApLnRvRml4ZWQoMyk7CkBAIC0zNTMsMTEgKzM2Miw2IEBAIElu c3BlY3RvckJhY2tlbmRDbGFzcyA9IGNsYXNzIEluc3BlY3RvckJhY2tlbmRDbGFzcwogICAgICAg ICAgICAgdHJhY2VyLmxvZ0RpZEhhbmRsZUV2ZW50KG1lc3NhZ2VPYmplY3QsIHtkaXNwYXRjaDog cHJvY2Vzc2luZ0R1cmF0aW9ufSk7CiAgICAgfQogCi0gICAgX3JlcG9ydFByb3RvY29sRXJyb3Io bWVzc2FnZU9iamVjdCkKLSAgICB7Ci0gICAgICAgIGNvbnNvbGUuZXJyb3IoIlJlcXVlc3Qgd2l0 aCBpZCA9ICIgKyBtZXNzYWdlT2JqZWN0WyJpZCJdICsgIiBmYWlsZWQuICIgKyBKU09OLnN0cmlu Z2lmeShtZXNzYWdlT2JqZWN0WyJlcnJvciJdKSk7Ci0gICAgfQotCiAgICAgX2ZsdXNoUGVuZGlu Z1NjcmlwdHMoKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fcGVuZGluZ1Jl c3BvbnNlcy5zaXplID09PSAwKTsK