61358 2011-05-24 04:35:04 -0700 Web Inspector: keyboard shortcuts for debugging are hard to discover. 2011-05-24 10:37:19 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 408773 0 podivilov 2011-05-24 04:35:04 -0700 Web Inspector: keyboard shortcuts for debugging are hard to discover. Shift + ? shortcut is not widely known. Let's display keyboard shortcuts in scripts panel sidebar buttons tooltip text. 408774 1 94594 podivilov 2011-05-24 04:35:36 -0700 Created attachment 94594 Patch. 408833 2 94594 yurys 2011-05-24 07:25:47 -0700 Comment on attachment 94594 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=94594&action=review > Source/WebCore/inspector/front-end/Panel.js:444 > + this._shortcuts[key] = handler; This will fail if registerShortcuts has not been called yet. 408980 3 podivilov 2011-05-24 10:37:19 -0700 Committed r87166: <http://trac.webkit.org/changeset/87166> 94594 2011-05-24 04:35:36 -0700 2011-05-24 07:25:47 -0700 Patch. patch text/plain 14532 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOTkwYTEwLi5lYmQ0OWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMjQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogZGlzcGxheSBrZXlib2FyZCBzaG9ydGN1dHMgaW4gc2NyaXB0cyBwYW5lbCBzaWRl YmFyIGJ1dHRvbnMgdG9vbHRpcCB0ZXh0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjEzNTgKKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5l LnByb3RvdHlwZS5fc2VsZWN0ZWRQbGFjYXJkQnlJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlLnJlZ2lzdGVyU2hvcnRjdXRzKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlBhbmVsLnByb3RvdHlwZS5yZWdpc3RlclNob3J0Y3V0KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUu X2NyZWF0ZVNpZGViYXJCdXR0b25zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlLl9jcmVhdGVTaWRlYmFyQnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHMpOgor CiAyMDExLTA1LTIwICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA0ZjI1N2JkLi44ZGVjZjQ1IDEw MDY0NApCaW5hcnkgZmlsZXMgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMgYW5kIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanMKaW5kZXggOGQ1NDUzZi4uZTU5NjMx NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3Rh Y2tTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NhbGxTdGFja1NpZGViYXJQYW5lLmpzCkBAIC0xMDMsOCArMTAzLDcgQEAgV2ViSW5zcGVjdG9y LkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmIChp bmRleCA8IDAgfHwgaW5kZXggPj0gdGhpcy5wbGFjYXJkcy5sZW5ndGgpCiAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIHZhciBwbGFjYXJkID0gdGhpcy5wbGFjYXJkc1tpbmRleF07Ci0gICAg ICAgIHRoaXMuc2VsZWN0ZWRDYWxsRnJhbWUgPSBwbGFjYXJkLmNhbGxGcmFtZQorICAgICAgICB0 aGlzLl9wbGFjYXJkU2VsZWN0ZWQodGhpcy5wbGFjYXJkc1tpbmRleF0pCiAgICAgfSwKIAogICAg IF9zZWxlY3RlZENhbGxGcmFtZUluZGV4OiBmdW5jdGlvbigpCkBAIC0xNDIsMTUgKzE0MSwxNSBA QCBXZWJJbnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAg ICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQodGV4dCk7CiAgICAgfSwKIAotICAgIHJl Z2lzdGVyU2hvcnRjdXRzOiBmdW5jdGlvbihzZWN0aW9uLCBzaG9ydGN1dHMpCisgICAgcmVnaXN0 ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKHNlY3Rpb24sIHJlZ2lzdGVyU2hvcnRjdXREZWxlZ2F0ZSkK ICAgICB7CiAgICAgICAgIHZhciBuZXh0Q2FsbEZyYW1lID0gV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5 cy5QZXJpb2QsCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2Rp ZmllcnMuQ3RybCk7Ci0gICAgICAgIHNob3J0Y3V0c1tuZXh0Q2FsbEZyYW1lLmtleV0gPSB0aGlz Ll9zZWxlY3ROZXh0Q2FsbEZyYW1lT25TdGFjay5iaW5kKHRoaXMpOworICAgICAgICByZWdpc3Rl clNob3J0Y3V0RGVsZWdhdGUobmV4dENhbGxGcmFtZS5rZXksIHRoaXMuX3NlbGVjdE5leHRDYWxs RnJhbWVPblN0YWNrLmJpbmQodGhpcykpOwogCiAgICAgICAgIHZhciBwcmV2Q2FsbEZyYW1lID0g V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuS2V5cy5Db21tYSwKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsKTsKLSAgICAgICAgc2hvcnRjdXRzW3ByZXZD YWxsRnJhbWUua2V5XSA9IHRoaXMuX3NlbGVjdFByZXZpb3VzQ2FsbEZyYW1lT25TdGFjay5iaW5k KHRoaXMpOworICAgICAgICByZWdpc3RlclNob3J0Y3V0RGVsZWdhdGUocHJldkNhbGxGcmFtZS5r ZXksIHRoaXMuX3NlbGVjdFByZXZpb3VzQ2FsbEZyYW1lT25TdGFjay5iaW5kKHRoaXMpKTsKIAog ICAgICAgICBzZWN0aW9uLmFkZFJlbGF0ZWRLZXlzKFsgbmV4dENhbGxGcmFtZS5uYW1lLCBwcmV2 Q2FsbEZyYW1lLm5hbWUgXSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOZXh0L3ByZXZpb3VzIGNh bGwgZnJhbWUiKSk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1BhbmVsLmpzCmluZGV4IGExYzNkOTUuLmM1M2IwNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpAQCAtNDM5LDYgKzQzOSwxMSBAQCBXZWJJbnNwZWN0 b3IuUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zaG9ydGN1dHNbZ29Ub0xpbmVT aG9ydGN1dC5rZXldID0gdGhpcy5fc2hvd0dvVG9MaW5lRGlhbG9nLmJpbmQodGhpcyk7CiAgICAg fSwKIAorICAgIHJlZ2lzdGVyU2hvcnRjdXQ6IGZ1bmN0aW9uKGtleSwgaGFuZGxlcikKKyAgICB7 CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0c1trZXldID0gaGFuZGxlcjsKKyAgICB9LAorCiAgICAg X3Nob3dHb1RvTGluZURpYWxvZzogZnVuY3Rpb24oZSkKICAgICB7CiAgICAgICAgICB2YXIgdmll dyA9IHRoaXMudmlzaWJsZVZpZXc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGVmZmNlMjguLjNhZTI1NDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBA IC0zMCw2ICszMCw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigpCiAK ICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbCgpOwogCisgICAgdGhpcy5yZWdpc3RlclNob3J0Y3V0cygpOworCiAg ICAgdGhpcy50b3BTdGF0dXNCYXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAg ICB0aGlzLnRvcFN0YXR1c0Jhci5jbGFzc05hbWUgPSAic3RhdHVzLWJhciI7CiAgICAgdGhpcy50 b3BTdGF0dXNCYXIuaWQgPSAic2NyaXB0cy1zdGF0dXMtYmFyIjsKQEAgLTY3LDQ1ICs2OSw3IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgLy8gRklYTUU6IGFw cGVuZCB0aGUgZnVuY3Rpb25zIHNlbGVjdCBlbGVtZW50IHRvIHRoZSB0b3Agc3RhdHVzIGJhciB3 aGVuIGl0IGlzIGltcGxlbWVudGVkLgogICAgIC8vIHRoaXMudG9wU3RhdHVzQmFyLmFwcGVuZENo aWxkKHRoaXMuZnVuY3Rpb25zU2VsZWN0RWxlbWVudCk7CiAKLSAgICB0aGlzLnNpZGViYXJCdXR0 b25zRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuc2lk ZWJhckJ1dHRvbnNFbGVtZW50LmlkID0gInNjcmlwdHMtc2lkZWJhci1idXR0b25zIjsKLSAgICB0 aGlzLnRvcFN0YXR1c0Jhci5hcHBlbmRDaGlsZCh0aGlzLnNpZGViYXJCdXR0b25zRWxlbWVudCk7 Ci0KLSAgICB0aGlzLnBhdXNlQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9u Iik7Ci0gICAgdGhpcy5wYXVzZUJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsK LSAgICB0aGlzLnBhdXNlQnV0dG9uLmlkID0gInNjcmlwdHMtcGF1c2UiOwotICAgIHRoaXMucGF1 c2VCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlIHNjcmlwdCBleGVj dXRpb24uIik7Ci0gICAgdGhpcy5wYXVzZUJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7Ci0gICAgdGhp cy5wYXVzZUJ1dHRvbi5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKSk7 Ci0gICAgdGhpcy5wYXVzZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3Rv Z2dsZVBhdXNlLmJpbmQodGhpcyksIGZhbHNlKTsKLSAgICB0aGlzLnNpZGViYXJCdXR0b25zRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLnBhdXNlQnV0dG9uKTsKLQotICAgIHRoaXMuc3RlcE92ZXJC dXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKLSAgICB0aGlzLnN0ZXBP dmVyQnV0dG9uLmNsYXNzTmFtZSA9ICJzdGF0dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMuc3RlcE92 ZXJCdXR0b24uaWQgPSAic2NyaXB0cy1zdGVwLW92ZXIiOwotICAgIHRoaXMuc3RlcE92ZXJCdXR0 b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3ZlciBuZXh0IGZ1bmN0aW9u IGNhbGwuIik7Ci0gICAgdGhpcy5zdGVwT3ZlckJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7Ci0gICAg dGhpcy5zdGVwT3ZlckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3N0ZXBP dmVyQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0gICAgdGhpcy5zdGVwT3ZlckJ1dHRvbi5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKSk7Ci0gICAgdGhpcy5zaWRl YmFyQnV0dG9uc0VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zdGVwT3ZlckJ1dHRvbik7Ci0KLSAg ICB0aGlzLnN0ZXBJbnRvQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7 Ci0gICAgdGhpcy5zdGVwSW50b0J1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsK LSAgICB0aGlzLnN0ZXBJbnRvQnV0dG9uLmlkID0gInNjcmlwdHMtc3RlcC1pbnRvIjsKLSAgICB0 aGlzLnN0ZXBJbnRvQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIGlu dG8gbmV4dCBmdW5jdGlvbiBjYWxsLiIpOwotICAgIHRoaXMuc3RlcEludG9CdXR0b24uZGlzYWJs ZWQgPSB0cnVlOwotICAgIHRoaXMuc3RlcEludG9CdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xp Y2siLCB0aGlzLl9zdGVwSW50b0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwotICAgIHRoaXMu c3RlcEludG9CdXR0b24uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIikp OwotICAgIHRoaXMuc2lkZWJhckJ1dHRvbnNFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc3RlcElu dG9CdXR0b24pOwotCi0gICAgdGhpcy5zdGVwT3V0QnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5zdGVwT3V0QnV0dG9uLmNsYXNzTmFtZSA9ICJzdGF0 dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMuc3RlcE91dEJ1dHRvbi5pZCA9ICJzY3JpcHRzLXN0ZXAt b3V0IjsKLSAgICB0aGlzLnN0ZXBPdXRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlN0ZXAgb3V0IG9mIGN1cnJlbnQgZnVuY3Rpb24uIik7Ci0gICAgdGhpcy5zdGVwT3V0QnV0 dG9uLmRpc2FibGVkID0gdHJ1ZTsKLSAgICB0aGlzLnN0ZXBPdXRCdXR0b24uYWRkRXZlbnRMaXN0 ZW5lcigiY2xpY2siLCB0aGlzLl9zdGVwT3V0Q2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0g ICAgdGhpcy5zdGVwT3V0QnV0dG9uLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImltZyIpKTsKLSAgICB0aGlzLnNpZGViYXJCdXR0b25zRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz LnN0ZXBPdXRCdXR0b24pOworICAgIHRoaXMuX2NyZWF0ZVNpZGViYXJCdXR0b25zKCk7CiAKICAg ICB0aGlzLnRvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNC YXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWFjdGl2YXRlIGFsbCBicmVha3BvaW50 cy4iKSwgInRvZ2dsZS1icmVha3BvaW50cyIpOwogICAgIHRoaXMudG9nZ2xlQnJlYWtwb2ludHNC dXR0b24udG9nZ2xlZCA9IHRydWU7CkBAIC0xNTEsNiArMTE1LDkgQEAgV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuc2lkZWJhclBhbmVzLnNjb3BlY2hh aW4uZXhwYW5kZWQgPSB0cnVlOwogICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMu ZXhwYW5kZWQgPSB0cnVlOworICAgIAorICAgIHZhciBoZWxwU2VjdGlvbiA9IFdlYkluc3BlY3Rv ci5zaG9ydGN1dHNIZWxwLnNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHRzIFBh bmVsIikpOworICAgIHRoaXMuc2lkZWJhclBhbmVzLmNhbGxzdGFjay5yZWdpc3RlclNob3J0Y3V0 cyhoZWxwU2VjdGlvbiwgdGhpcy5yZWdpc3RlclNob3J0Y3V0LmJpbmQodGhpcykpOyAgIAogCiAg ICAgdmFyIHBhbmVsRW5hYmxlckhlYWRpbmcgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIllvdSBu ZWVkIHRvIGVuYWJsZSBkZWJ1Z2dpbmcgYmVmb3JlIHlvdSBjYW4gdXNlIHRoZSBTY3JpcHRzIHBh bmVsLiIpOwogICAgIHZhciBwYW5lbEVuYWJsZXJEaXNjbGFpbWVyID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJFbmFibGluZyBkZWJ1Z2dpbmcgd2lsbCBtYWtlIHNjcmlwdHMgcnVuIHNsb3dlci4i KTsKQEAgLTE3Niw4ICsxNDMsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rp b24oKQogICAgIHRoaXMuX3RvZ2dsZUZvcm1hdFNvdXJjZUZpbGVzQnV0dG9uLnRvZ2dsZWQgPSBm YWxzZTsKICAgICB0aGlzLl90b2dnbGVGb3JtYXRTb3VyY2VGaWxlc0J1dHRvbi5hZGRFdmVudExp c3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUZvcm1hdFNvdXJjZUZpbGVzLmJpbmQodGhpcyks IGZhbHNlKTsKIAotICAgIHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7Ci0KICAgICB0aGlzLl9k ZWJ1Z2dlckVuYWJsZWQgPSBQcmVmZXJlbmNlcy5kZWJ1Z2dlckFsd2F5c0VuYWJsZWQ7CiAKICAg ICB0aGlzLnJlc2V0KCk7CkBAIC05MzAsNDggKzg5NSw2OCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIFsgdGhpcy5zaWRlYmFyRWxlbWVu dCBdOwogICAgIH0sCiAKLSAgICBfcmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKCkKKyAgICBf Y3JlYXRlU2lkZWJhckJ1dHRvbnM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciBzZWN0 aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0Y3V0c0hlbHAuc2VjdGlvbihXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNjcmlwdHMgUGFuZWwiKSk7Ci0gICAgICAgIHZhciBoYW5kbGVyLCBzaG9ydGN1dDEs IHNob3J0Y3V0MjsKLSAgICAgICAgdmFyIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllciA9IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhOworICAgICAgICB0 aGlzLnNpZGViYXJCdXR0b25zRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OworICAgICAgICB0aGlzLnNpZGViYXJCdXR0b25zRWxlbWVudC5pZCA9ICJzY3JpcHRzLXNpZGVi YXItYnV0dG9ucyI7CisgICAgICAgIHRoaXMudG9wU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMu c2lkZWJhckJ1dHRvbnNFbGVtZW50KTsKIAotICAgICAgICB2YXIgc2hvcnRjdXRzID0ge307Cisg ICAgICAgIHZhciB0aXRsZSwgaGFuZGxlciwgc2hvcnRjdXRzOworICAgICAgICB2YXIgcGxhdGZv cm1TcGVjaWZpY01vZGlmaWVyID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZp ZXJzLkN0cmxPck1ldGE7CiAKICAgICAgICAgLy8gQ29udGludWUuCi0gICAgICAgIGhhbmRsZXIg PSB0aGlzLnBhdXNlQnV0dG9uLmNsaWNrLmJpbmQodGhpcy5wYXVzZUJ1dHRvbik7Ci0gICAgICAg IHNob3J0Y3V0MSA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9y KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRjgpOwotICAgICAgICBzaG9ydGN1 dHNbc2hvcnRjdXQxLmtleV0gPSBoYW5kbGVyOwotICAgICAgICBzaG9ydGN1dDIgPSBXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5LZXlzLlNsYXNoLCBwbGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIpOwotICAgICAg ICBzaG9ydGN1dHNbc2hvcnRjdXQyLmtleV0gPSBoYW5kbGVyOwotICAgICAgICBzZWN0aW9uLmFk ZEFsdGVybmF0ZUtleXMoWyBzaG9ydGN1dDEubmFtZSwgc2hvcnRjdXQyLm5hbWUgXSwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJQYXVzZS9Db250aW51ZSIpKTsKKyAgICAgICAgdGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlIHNjcmlwdCBleGVjdXRpb24gKCVzKS4iKTsKKyAgICAg ICAgaGFuZGxlciA9IHRoaXMuX3RvZ2dsZVBhdXNlLmJpbmQodGhpcyk7CisgICAgICAgIHNob3J0 Y3V0cyA9IFtdOworICAgICAgICBzaG9ydGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlz LkY4KSk7CisgICAgICAgIHNob3J0Y3V0cy5wdXNoKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuU2xh c2gsIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcikpOworICAgICAgICB0aGlzLnBhdXNlQnV0dG9u ID0gdGhpcy5fY3JlYXRlU2lkZWJhckJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKCJzY3JpcHRz LXBhdXNlIiwgdGl0bGUsIGhhbmRsZXIsIHNob3J0Y3V0cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJQYXVzZS9Db250aW51ZSIpKTsKIAogICAgICAgICAvLyBTdGVwIG92ZXIuCi0gICAgICAgIGhh bmRsZXIgPSB0aGlzLnN0ZXBPdmVyQnV0dG9uLmNsaWNrLmJpbmQodGhpcy5zdGVwT3ZlckJ1dHRv bik7Ci0gICAgICAgIHNob3J0Y3V0MSA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1h a2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRjEwKTsKLSAg ICAgICAgc2hvcnRjdXRzW3Nob3J0Y3V0MS5rZXldID0gaGFuZGxlcjsKLSAgICAgICAgc2hvcnRj dXQyID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5TaW5nbGVRdW90ZSwgcGxhdGZvcm1TcGVjaWZp Y01vZGlmaWVyKTsKLSAgICAgICAgc2hvcnRjdXRzW3Nob3J0Y3V0Mi5rZXldID0gaGFuZGxlcjsK LSAgICAgICAgc2VjdGlvbi5hZGRBbHRlcm5hdGVLZXlzKFsgc2hvcnRjdXQxLm5hbWUsIHNob3J0 Y3V0Mi5uYW1lIF0sIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdmVyIikpOworICAgICAg ICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdmVyIG5leHQgZnVuY3Rpb24g Y2FsbCAoJXMpLiIpOworICAgICAgICBoYW5kbGVyID0gdGhpcy5fc3RlcE92ZXJDbGlja2VkLmJp bmQodGhpcyk7CisgICAgICAgIHNob3J0Y3V0cyA9IFtdOworICAgICAgICBzaG9ydGN1dHMucHVz aChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkYxMCkpOworICAgICAgICBzaG9ydGN1dHMucHVzaChX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNpbmdsZVF1b3RlLCBwbGF0Zm9ybVNwZWNpZmljTW9kaWZp ZXIpKTsKKyAgICAgICAgdGhpcy5zdGVwT3ZlckJ1dHRvbiA9IHRoaXMuX2NyZWF0ZVNpZGViYXJC dXR0b25BbmRSZWdpc3RlclNob3J0Y3V0cygic2NyaXB0cy1zdGVwLW92ZXIiLCB0aXRsZSwgaGFu ZGxlciwgc2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3ZlciIpKTsKIAog ICAgICAgICAvLyBTdGVwIGludG8uCi0gICAgICAgIGhhbmRsZXIgPSB0aGlzLnN0ZXBJbnRvQnV0 dG9uLmNsaWNrLmJpbmQodGhpcy5zdGVwSW50b0J1dHRvbik7Ci0gICAgICAgIHNob3J0Y3V0MSA9 IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleXMuRjExKTsKLSAgICAgICAgc2hvcnRjdXRzW3Nob3J0Y3V0 MS5rZXldID0gaGFuZGxlcjsKLSAgICAgICAgc2hvcnRjdXQyID0gV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu S2V5cy5TZW1pY29sb24sIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcik7Ci0gICAgICAgIHNob3J0 Y3V0c1tzaG9ydGN1dDIua2V5XSA9IGhhbmRsZXI7Ci0gICAgICAgIHNlY3Rpb24uYWRkQWx0ZXJu YXRlS2V5cyhbIHNob3J0Y3V0MS5uYW1lLCBzaG9ydGN1dDIubmFtZSBdLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlN0ZXAgaW50byIpKTsKKyAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlN0ZXAgaW50byBuZXh0IGZ1bmN0aW9uIGNhbGwgKCVzKS4iKTsKKyAgICAgICAgaGFu ZGxlciA9IHRoaXMuX3N0ZXBJbnRvQ2xpY2tlZC5iaW5kKHRoaXMpOworICAgICAgICBzaG9ydGN1 dHMgPSBbXTsKKyAgICAgICAgc2hvcnRjdXRzLnB1c2goV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5G MTEpKTsKKyAgICAgICAgc2hvcnRjdXRzLnB1c2goV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRj dXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5TZW1p Y29sb24sIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcikpOworICAgICAgICB0aGlzLnN0ZXBJbnRv QnV0dG9uID0gdGhpcy5fY3JlYXRlU2lkZWJhckJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKCJz Y3JpcHRzLXN0ZXAtaW50byIsIHRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiU3RlcCBpbnRvIikpOwogCiAgICAgICAgIC8vIFN0ZXAgb3V0LgotICAgICAg ICBoYW5kbGVyID0gdGhpcy5zdGVwT3V0QnV0dG9uLmNsaWNrLmJpbmQodGhpcy5zdGVwT3V0QnV0 dG9uKTsKLSAgICAgICAgc2hvcnRjdXQxID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu bWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5GMTEsIFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5TaGlmdCk7Ci0gICAgICAgIHNo b3J0Y3V0c1tzaG9ydGN1dDEua2V5XSA9IGhhbmRsZXI7Ci0gICAgICAgIHNob3J0Y3V0MiA9IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LktleXMuU2VtaWNvbG9uLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5Nb2RpZmllcnMuU2hpZnQsIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcik7Ci0gICAgICAg IHNob3J0Y3V0c1tzaG9ydGN1dDIua2V5XSA9IGhhbmRsZXI7Ci0gICAgICAgIHNlY3Rpb24uYWRk QWx0ZXJuYXRlS2V5cyhbIHNob3J0Y3V0MS5uYW1lLCBzaG9ydGN1dDIubmFtZSBdLCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3V0IikpOwotCi0gICAgICAgIHRoaXMuc2lkZWJhclBhbmVz LmNhbGxzdGFjay5yZWdpc3RlclNob3J0Y3V0cyhzZWN0aW9uLCBzaG9ydGN1dHMpOwotICAgICAg ICB0aGlzLnJlZ2lzdGVyU2hvcnRjdXRzKHNob3J0Y3V0cyk7CisgICAgICAgIHRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIG91dCBvZiBjdXJyZW50IGZ1bmN0aW9uICglcykuIik7 CisgICAgICAgIGhhbmRsZXIgPSB0aGlzLl9zdGVwT3V0Q2xpY2tlZC5iaW5kKHRoaXMpOworICAg ICAgICBzaG9ydGN1dHMgPSBbXTsKKyAgICAgICAgc2hvcnRjdXRzLnB1c2goV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5cy5GMTEsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5T aGlmdCkpOworICAgICAgICBzaG9ydGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNl bWljb2xvbiwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLlNoaWZ0LCBw bGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIpKTsKKyAgICAgICAgdGhpcy5zdGVwT3V0QnV0dG9uID0g dGhpcy5fY3JlYXRlU2lkZWJhckJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKCJzY3JpcHRzLXN0 ZXAtb3V0IiwgdGl0bGUsIGhhbmRsZXIsIHNob3J0Y3V0cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJTdGVwIG91dCIpKTsKKyAgICB9LAorCisgICAgX2NyZWF0ZVNpZGViYXJCdXR0b25BbmRSZWdp c3RlclNob3J0Y3V0czogZnVuY3Rpb24oYnV0dG9uSWQsIGJ1dHRvblRpdGxlLCBoYW5kbGVyLCBz aG9ydGN1dHMsIHNob3J0Y3V0RGVzY3JpcHRpb24pCisgICAgeworICAgICAgICB2YXIgYnV0dG9u ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CisgICAgICAgIGJ1dHRvbi5jbGFz c05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKKyAgICAgICAgYnV0dG9uLmlkID0gYnV0dG9uSWQ7 CisgICAgICAgIGJ1dHRvbi50aXRsZSA9IFN0cmluZy52c3ByaW50ZihidXR0b25UaXRsZSwgW3No b3J0Y3V0c1swXS5uYW1lXSk7CisgICAgICAgIGJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7CisgICAg ICAgIGJ1dHRvbi5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKSk7Cisg ICAgICAgIGJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGhhbmRsZXIsIGZhbHNlKTsK KyAgICAgICAgdGhpcy5zaWRlYmFyQnV0dG9uc0VsZW1lbnQuYXBwZW5kQ2hpbGQoYnV0dG9uKTsK KworICAgICAgICB2YXIgc2hvcnRjdXROYW1lcyA9IFtdOworICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IHNob3J0Y3V0cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdGhpcy5yZWdpc3Rl clNob3J0Y3V0KHNob3J0Y3V0c1tpXS5rZXksIGhhbmRsZXIpOworICAgICAgICAgICAgc2hvcnRj dXROYW1lcy5wdXNoKHNob3J0Y3V0c1tpXS5uYW1lKTsKKyAgICAgICAgfQorICAgICAgICB2YXIg c2VjdGlvbiA9IFdlYkluc3BlY3Rvci5zaG9ydGN1dHNIZWxwLnNlY3Rpb24oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTY3JpcHRzIFBhbmVsIikpOworICAgICAgICBzZWN0aW9uLmFkZEFsdGVybmF0 ZUtleXMoc2hvcnRjdXROYW1lcywgc2hvcnRjdXREZXNjcmlwdGlvbik7CisKKyAgICAgICAgcmV0 dXJuIGJ1dHRvbjsKICAgICB9LAogCiAgICAgc2VhcmNoQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkK