176563 2017-09-07 13:43:26 -0700 Augmented Inspector: Provide a way to inspect a DOM Node (DOM.inspect) 2017-09-07 15:22:43 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck buildbot commit-queue inspector-bugzilla-changes joepeck keith_miller mark.lam mattbaker msaboff saam webkit-bug-importer oldest_to_newest 1346524 0 joepeck 2017-09-07 13:43:26 -0700 Augmented Inspector: Provide a way to inspect a DOM Node (DOM.inspect) Augmented Agents don't have access to the Inspector domain so they can't send Inspector.inspect events with a RemoteObject. They do however have access to the DOM domain and control nodeIds, so lets provide a parallel DOM.inspect(nodeId). 1346527 1 joepeck 2017-09-07 13:46:36 -0700 <rdar://problem/19639583> 1346531 2 320174 joepeck 2017-09-07 13:52:16 -0700 Created attachment 320174 [PATCH] Proposed Fix 1346535 3 joepeck 2017-09-07 13:58:58 -0700 Normally I am adamant about writing a test for all protocol changes, but interestingly this is a protocol method that WebKit doesn't implement, but an Augmented JSContext exercises via the generated ObjC API: @interface RWIProtocolDOMDomainEventDispatcher : NSObject - (void)inspectWithNodeId:(int)nodeId; ... @end I tested it manually. Maybe I can write a protocol test for this by supplying some kind of pre-canned response. 1346538 4 320174 joepeck 2017-09-07 14:04:32 -0700 Comment on attachment 320174 [PATCH] Proposed Fix Yeah, I think I can write a test! 1346551 5 320183 joepeck 2017-09-07 14:32:56 -0700 Created attachment 320183 [PATCH] Proposed Fix 1346561 6 320183 mattbaker 2017-09-07 14:46:33 -0700 Comment on attachment 320183 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=320183&action=review r=me > Source/WebInspectorUI/UserInterface/Base/Main.js:393 > + var activatedToolTip = WI.UIString("Stop element selection (%s)").format(WI._inspectModeKeyboardShortcut.displayName); let 1346567 7 320183 joepeck 2017-09-07 14:52:58 -0700 Comment on attachment 320183 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=320183&action=review >> Source/WebInspectorUI/UserInterface/Base/Main.js:393 >> + var activatedToolTip = WI.UIString("Stop element selection (%s)").format(WI._inspectModeKeyboardShortcut.displayName); > > let Due to surrounding code this might actually cause an exception. It needs a more holistic var=>let conversion. 1346583 8 320183 commit-queue 2017-09-07 15:22:41 -0700 Comment on attachment 320183 [PATCH] Proposed Fix Clearing flags on attachment: 320183 Committed r221765: <http://trac.webkit.org/changeset/221765> 1346584 9 commit-queue 2017-09-07 15:22:43 -0700 All reviewed patches have been landed. Closing bug. 320174 2017-09-07 13:52:16 -0700 2017-09-07 14:33:04 -0700 [PATCH] Proposed Fix dom-inspect-1.patch text/plain 6671 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDcyMzI3YTVmNWM3Li5iNzA4MTkxMTQ5YSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDktMDcgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBBdWdtZW50ZWQgSW5z cGVjdG9yOiBQcm92aWRlIGEgd2F5IHRvIGluc3BlY3QgYSBET00gTm9kZSAoRE9NLmluc3BlY3Qp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY1NjMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5NjM5NTgzPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29u OgorICAgICAgICBBZGQgYW4gZXZlbnQgdGhhdCBpcyB1c2VmdWwgZm9yIGF1Z21lbnRlZCBpbnNw ZWN0b3JzIHRvIGluc3BlY3QKKyAgICAgICAgYSBub2RlLiBXZWIgcGFnZXMgd2lsbCBzdGlsbCBw cmVmZXIgSW5zcGVjdG9yLmluc3BlY3QuCisKIDIwMTctMDktMDUgIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICB0ZXN0MjYyOiBDb21wbGV0aW9uIHZhbHVl cyBmb3IgY29udHJvbCBmbG93IGRvIG5vdCBtYXRjaCB0aGUgc3BlYwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbiBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KaW5kZXggNmNlMzI4YzQy NzguLjQ3NzU1YWI1YzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3Byb3RvY29sL0RPTS5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcHJvdG9jb2wvRE9NLmpzb24KQEAgLTQ4Myw2ICs0ODMsMTMgQEAKICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIDxjb2RlPkRvY3VtZW50PC9jb2RlPiBoYXMgYmVlbiB0 b3RhbGx5IHVwZGF0ZWQuIE5vZGUgaWRzIGFyZSBubyBsb25nZXIgdmFsaWQuIgogICAgICAgICB9 LAogICAgICAgICB7CisgICAgICAgICAgICAibmFtZSI6ICJpbnNwZWN0IiwKKyAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJJbnNwZWN0IGEgcGFydGljdWxhciBub2RlLiIsCisgICAgICAgICAg ICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICIk cmVmIjogIk5vZGVJZCIsICJkZXNjcmlwdGlvbiI6ICJFcXVpdmFsZW50IG9mIEluc3BlY3Rvci5p bnNwZWN0IGJ1dCB3aXRoIGEgbm9kZUlkIGluc3RlYWQgb2YgYSBSZW1vdGVPYmplY3QuIFVzZWZ1 bCBmb3IgYXVnbWVudGVkIGNvbnRleHRzLiIgfQorICAgICAgICAgICAgXQorICAgICAgICB9LAor ICAgICAgICB7CiAgICAgICAgICAgICAibmFtZSI6ICJzZXRDaGlsZE5vZGVzIiwKICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIGJhY2tlbmQgd2FudHMgdG8gcHJvdmlkZSBj bGllbnQgd2l0aCB0aGUgbWlzc2luZyBET00gc3RydWN0dXJlLiBUaGlzIGhhcHBlbnMgdXBvbiBt b3N0IG9mIHRoZSBjYWxscyByZXF1ZXN0aW5nIG5vZGUgaWRzLiIsCiAgICAgICAgICAgICAicGFy YW1ldGVycyI6IFsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDRiZTkxMWM5NmNlLi5lOGE2 OGYzOGRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTct MDktMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBB dWdtZW50ZWQgSW5zcGVjdG9yOiBQcm92aWRlIGEgd2F5IHRvIGluc3BlY3QgYSBET00gTm9kZSAo RE9NLmluc3BlY3QpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzY1NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5NjM5NTgzPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9C YXNlL01haW4uanM6CisgICAgICAgIChXSS5jb250ZW50TG9hZGVkKToKKyAgICAgICAgQWx3YXlz IGNyZWF0ZSB0aGUgZWxlbWVudCBzZWFyY2ggdG9vbGJhciBpY29uLiBPbmx5IHNob3cgaXQgaWYg dGhlIERPTSBkb21haW4KKyAgICAgICAgaXMgYXZhaWxhYmxlLiBXaXRoIGF1Z21lbnRlZCBhZ2Vu dHMgdGhlIERPTSBkb21haW4gbWF5IGJlIGFjdGl2YXRlZCBsYXRlci4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvUHJvdG9jb2wvRE9NT2JzZXJ2ZXIuanM6CisgICAgICAgIChXSS5ET01PYnNl cnZlci5wcm90b3R5cGUuaW5zcGVjdCk6CisgICAgICAgIFNlbGVjdCB0aGUgbm9kZSBpbiB0aGUg RE9NIHRyZWUgb3V0bGluZS4KKwogMjAxNy0wOS0wNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IOKMmEUgYW5kIOKMmEcgZG8g bm90IHdvcmsgaW4gbWFpbiBjb250ZW50IGFyZWEgd2hlbiBxdWljayBjb25zb2xlIGRyYXdlciBp cyBvcGVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKaW5kZXggNDg1OTg1ZjEzOTguLjQ2YWIyYzQyZTczIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0zODksMTYgKzM4OSwx NCBAQCBXSS5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2Rvd25sb2FkVG9v bGJhckJ1dHRvbiA9IG5ldyBXSS5CdXR0b25Ub29sYmFySXRlbSgiZG93bmxvYWQiLCBXSS5VSVN0 cmluZygiRG93bmxvYWQgV2ViIEFyY2hpdmUiKSwgIkltYWdlcy9Eb3dubG9hZEFycm93LnN2ZyIp OwogICAgIHRoaXMuX2Rvd25sb2FkVG9vbGJhckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLkJ1 dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2Rvd25sb2FkV2ViQXJjaGl2 ZSwgdGhpcyk7CiAKKyAgICB2YXIgdG9vbFRpcCA9IFdJLlVJU3RyaW5nKCJTdGFydCBlbGVtZW50 IHNlbGVjdGlvbiAoJXMpIikuZm9ybWF0KFdJLl9pbnNwZWN0TW9kZUtleWJvYXJkU2hvcnRjdXQu ZGlzcGxheU5hbWUpOworICAgIHZhciBhY3RpdmF0ZWRUb29sVGlwID0gV0kuVUlTdHJpbmcoIlN0 b3AgZWxlbWVudCBzZWxlY3Rpb24gKCVzKSIpLmZvcm1hdChXSS5faW5zcGVjdE1vZGVLZXlib2Fy ZFNob3J0Y3V0LmRpc3BsYXlOYW1lKTsKKyAgICB0aGlzLl9pbnNwZWN0TW9kZVRvb2xiYXJCdXR0 b24gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25Ub29sYmFySXRlbSgiaW5zcGVjdCIsIHRvb2xUaXAs IGFjdGl2YXRlZFRvb2xUaXAsICJJbWFnZXMvQ3Jvc3NoYWlyLnN2ZyIpOworICAgIHRoaXMuX2lu c3BlY3RNb2RlVG9vbGJhckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRp b25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZUluc3BlY3RNb2RlLCB0aGlzKTsKKwog ICAgIHRoaXMuX3VwZGF0ZVJlbG9hZFRvb2xiYXJCdXR0b24oKTsKICAgICB0aGlzLl91cGRhdGVE b3dubG9hZFRvb2xiYXJCdXR0b24oKTsKLQotICAgIC8vIFRoZSB0b29sYmFyIGJ1dHRvbiBmb3Ig bm9kZSBpbnNwZWN0aW9uLgotICAgIGlmICh0aGlzLmRlYnVnZ2FibGVUeXBlID09PSBXSS5EZWJ1 Z2dhYmxlVHlwZS5XZWIpIHsKLSAgICAgICAgdmFyIHRvb2xUaXAgPSBXSS5VSVN0cmluZygiU3Rh cnQgZWxlbWVudCBzZWxlY3Rpb24gKCVzKSIpLmZvcm1hdChXSS5faW5zcGVjdE1vZGVLZXlib2Fy ZFNob3J0Y3V0LmRpc3BsYXlOYW1lKTsKLSAgICAgICAgdmFyIGFjdGl2YXRlZFRvb2xUaXAgPSBX SS5VSVN0cmluZygiU3RvcCBlbGVtZW50IHNlbGVjdGlvbiAoJXMpIikuZm9ybWF0KFdJLl9pbnNw ZWN0TW9kZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwotICAgICAgICB0aGlzLl9pbnNw ZWN0TW9kZVRvb2xiYXJCdXR0b24gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25Ub29sYmFySXRlbSgi aW5zcGVjdCIsIHRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAsICJJbWFnZXMvQ3Jvc3NoYWlyLnN2 ZyIpOwotICAgICAgICB0aGlzLl9pbnNwZWN0TW9kZVRvb2xiYXJCdXR0b24uYWRkRXZlbnRMaXN0 ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90b2dnbGVJ bnNwZWN0TW9kZSwgdGhpcyk7Ci0gICAgfQorICAgIHRoaXMuX3VwZGF0ZUluc3BlY3RNb2RlVG9v bGJhckJ1dHRvbigpOwogCiAgICAgdGhpcy5fZGFzaGJvYXJkQ29udGFpbmVyID0gbmV3IFdJLkRh c2hib2FyZENvbnRhaW5lclZpZXc7CiAgICAgdGhpcy5fZGFzaGJvYXJkQ29udGFpbmVyLnNob3dE YXNoYm9hcmRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QodGhpcy5kYXNoYm9hcmRNYW5hZ2VyLmRh c2hib2FyZHMuZGVmYXVsdCk7CkBAIC00MTgsOCArNDE2LDcgQEAgV0kuY29udGVudExvYWRlZCA9 IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMudG9vbGJhci5hZGRUb29sYmFySXRlbSh0aGlzLl9kYXNo Ym9hcmRDb250YWluZXIudG9vbGJhckl0ZW0sIFdJLlRvb2xiYXIuU2VjdGlvbi5DZW50ZXIpOwog Ci0gICAgaWYgKHRoaXMuX2luc3BlY3RNb2RlVG9vbGJhckJ1dHRvbikKLSAgICAgICAgdGhpcy50 b29sYmFyLmFkZFRvb2xiYXJJdGVtKHRoaXMuX2luc3BlY3RNb2RlVG9vbGJhckJ1dHRvbiwgV0ku VG9vbGJhci5TZWN0aW9uLkNlbnRlclJpZ2h0KTsKKyAgICB0aGlzLnRvb2xiYXIuYWRkVG9vbGJh ckl0ZW0odGhpcy5faW5zcGVjdE1vZGVUb29sYmFyQnV0dG9uLCBXSS5Ub29sYmFyLlNlY3Rpb24u Q2VudGVyUmlnaHQpOwogCiAgICAgdGhpcy50b29sYmFyLmFkZFRvb2xiYXJJdGVtKHRoaXMuX3Nl YXJjaFRvb2xiYXJJdGVtLCBXSS5Ub29sYmFyLlNlY3Rpb24uUmlnaHQpOwogCkBAIC03MjEsNiAr NzE4LDggQEAgV0kuYWN0aXZhdGVFeHRyYURvbWFpbnMgPSBmdW5jdGlvbihkb21haW5zKQogCiAg ICAgdGhpcy5fdXBkYXRlUmVsb2FkVG9vbGJhckJ1dHRvbigpOwogICAgIHRoaXMuX3VwZGF0ZURv d25sb2FkVG9vbGJhckJ1dHRvbigpOworICAgIHRoaXMuX3VwZGF0ZUluc3BlY3RNb2RlVG9vbGJh ckJ1dHRvbigpOworCiAgICAgdGhpcy5fdHJ5VG9SZXN0b3JlUGVuZGluZ1RhYnMoKTsKIH07CiAK QEAgLTE4NDksNiArMTg0OCwxNiBAQCBXSS5fdXBkYXRlRG93bmxvYWRUb29sYmFyQnV0dG9uID0g ZnVuY3Rpb24oKQogICAgIHRoaXMuX2Rvd25sb2FkVG9vbGJhckJ1dHRvbi5lbmFibGVkID0gdGhp cy5jYW5BcmNoaXZlTWFpbkZyYW1lKCk7CiB9OwogCitXSS5fdXBkYXRlSW5zcGVjdE1vZGVUb29s YmFyQnV0dG9uID0gZnVuY3Rpb24oKQoreworICAgIGlmICghd2luZG93LkRPTUFnZW50IHx8ICFE T01BZ2VudC5zZXRJbnNwZWN0TW9kZUVuYWJsZWQpIHsKKyAgICAgICAgdGhpcy5faW5zcGVjdE1v ZGVUb29sYmFyQnV0dG9uLmhpZGRlbiA9IHRydWU7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK KyAgICB0aGlzLl9pbnNwZWN0TW9kZVRvb2xiYXJCdXR0b24uaGlkZGVuID0gZmFsc2U7Cit9CisK IFdJLl90b2dnbGVJbnNwZWN0TW9kZSA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHRoaXMuZG9t VHJlZU1hbmFnZXIuaW5zcGVjdE1vZGVFbmFibGVkID0gIXRoaXMuZG9tVHJlZU1hbmFnZXIuaW5z cGVjdE1vZGVFbmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvUHJvdG9jb2wvRE9NT2JzZXJ2ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qcwppbmRleCA0NTk1NjQwOTE1ZC4u NTM3OGM5NTUzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1Byb3RvY29sL0RPTU9ic2VydmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Byb3RvY29sL0RPTU9ic2VydmVyLmpzCkBAIC0zMiw2ICszMiwxMSBAQCBX SS5ET01PYnNlcnZlciA9IGNsYXNzIERPTU9ic2VydmVyCiAgICAgICAgIFdJLmRvbVRyZWVNYW5h Z2VyLl9kb2N1bWVudFVwZGF0ZWQoKTsKICAgICB9CiAKKyAgICBpbnNwZWN0KG5vZGVJZCkKKyAg ICB7CisgICAgICAgIFdJLmRvbVRyZWVNYW5hZ2VyLmluc3BlY3RFbGVtZW50KG5vZGVJZCk7Cisg ICAgfQorCiAgICAgc2V0Q2hpbGROb2RlcyhwYXJlbnRJZCwgcGF5bG9hZHMpCiAgICAgewogICAg ICAgICBXSS5kb21UcmVlTWFuYWdlci5fc2V0Q2hpbGROb2RlcyhwYXJlbnRJZCwgcGF5bG9hZHMp Owo= 320183 2017-09-07 14:32:56 -0700 2017-09-07 15:22:41 -0700 [PATCH] Proposed Fix dom-inspect-2.patch text/plain 9715 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwMmVjYzFiNTg5OC4uZjViZDUzMjEwZDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxNy0wOS0wNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIEF1Z21lbnRlZCBJbnNwZWN0b3I6IFByb3ZpZGUgYSB3YXkgdG8gaW5zcGVjdCBhIERPTSBO b2RlIChET00uaW5zcGVjdCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3NjU2MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk2Mzk1ODM+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZG9tL2luc3BlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZG9t L2luc3BlY3QuaHRtbDogQWRkZWQuCisgICAgICAgIFRlc3QgdGhlIGZyb250ZW5kIG9uIHJlY2Vp dmluZyBET00uaW5zcGVjdCBldmVudHMuCisKIDIwMTctMDktMDYgIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBGZXRjaCdzIFJlc3BvbnNlLnN0YXR1c1Rl eHQgaXMgdW5leHBlY3RlZGx5IHRoZSBmdWxsIGh0dHAgc3RhdHVzIGxpbmUgZm9yIEhUVFAvMiBy ZXNwb25zZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vaW5zcGVjdC1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZG9tL2luc3BlY3QtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi43YzBhY2FjNTM4ZQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vaW5zcGVjdC1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSwxMCBAQAorVGVzdCBmb3IgRE9NLmluc3BlY3QuCisKKworPT0g UnVubmluZyB0ZXN0IHN1aXRlOiBET00uaW5zcGVjdAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IERP TS5pbnNwZWN0LnZhbGlkCitQQVNTOiBET01Ob2RlV2FzSW5zcGVjdGVkIGV2ZW50CisKKy0tIFJ1 bm5pbmcgdGVzdCBjYXNlOiBET00uaW5zcGVjdC5pbnZhbGlkCitQQVNTOiBObyBlcnJvcgorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZG9tL2luc3BlY3QuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kb20vaW5zcGVjdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwLi4yMzczMjI1NTU0ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kb20vaW5zcGVjdC5odG1sCkBAIC0wLDAgKzEsNTUgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2lu c3BlY3Rvci9yZXNvdXJjZXMvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4K K2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGxldCBkb2N1bWVudE5vZGU7CisKKyAgICBmdW5jdGlv biBkaXNwYXRjaERPTUluc3BlY3RFdmVudChub2RlSWQpIHsKKyAgICAgICAgV0kuZGlzcGF0Y2hN ZXNzYWdlRnJvbUJhY2tlbmQoeworICAgICAgICAgICAgIm1ldGhvZCI6ICJET00uaW5zcGVjdCIs CisgICAgICAgICAgICAicGFyYW1zIjogeyJub2RlSWQiOiBub2RlSWR9LAorICAgICAgICB9KTsK KyAgICB9CisKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFzeW5jU3VpdGUo IkRPTS5pbnNwZWN0Iik7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6 ICJET00uaW5zcGVjdC52YWxpZCIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiRXZlbnQgZ2l2ZW4g YSB2YWxpZCBub2RlSWQgc2hvdWxkIHNlbGVjdCBpdC4iLAorICAgICAgICB0ZXN0KHJlc29sdmUs IHJlamVjdCkgeworICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIucXVlcnlTZWxlY3Rvcihk b2N1bWVudE5vZGUuaWQsICIjZWxlbWVudC10by1zZWxlY3QiLCAobm9kZUlkKSA9PiB7CisgICAg ICAgICAgICAgICAgZGlzcGF0Y2hET01JbnNwZWN0RXZlbnQobm9kZUlkKTsKKyAgICAgICAgICAg IH0pOworICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuYXdhaXRFdmVudChXSS5ET01UcmVl TWFuYWdlci5FdmVudC5ET01Ob2RlV2FzSW5zcGVjdGVkKS50aGVuKChldmVudCkgPT4geworICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucGFzcygiRE9NTm9kZVdhc0luc3BlY3RlZCBldmVu dCIpOworICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgIH0pOworICAgICAg ICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJE T00uaW5zcGVjdC5pbnZhbGlkIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJFdmVudCBnaXZlbiBh biBpdmFsaWQgbm9kZUlkIHNob3VsZCBub3QgY2F1c2UgYW4gZXhjZXB0aW9uLiIsCisgICAgICAg IHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBkaXNwYXRjaERPTUluc3BlY3RF dmVudCgiRE9FU19OT1RfRVhJU1QiKTsKKyAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gewor ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucGFzcygiTm8gZXJyb3IiKTsKKyAgICAgICAg ICAgICAgICByZXNvbHZlKCkKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgfSk7CisK KyAgICBXSS5kb21UcmVlTWFuYWdlci5yZXF1ZXN0RG9jdW1lbnQoKG5vZGUpID0+IHsKKyAgICAg ICAgZG9jdW1lbnROb2RlID0gbm9kZTsKKyAgICAgICAgc3VpdGUucnVuVGVzdENhc2VzQW5kRmlu aXNoKCk7CisgICAgfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVu VGVzdCgpIj4KKzxwIGlkPSJlbGVtZW50LXRvLXNlbGVjdCI+VGVzdCBmb3IgRE9NLmluc3BlY3Qu PC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNzIzMjdh NWY1YzcuLmI3MDgxOTExNDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxNy0wOS0wNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgor CisgICAgICAgIEF1Z21lbnRlZCBJbnNwZWN0b3I6IFByb3ZpZGUgYSB3YXkgdG8gaW5zcGVjdCBh IERPTSBOb2RlIChET00uaW5zcGVjdCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE3NjU2MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk2Mzk1ODM+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvcHJvdG9jb2wvRE9NLmpzb246CisgICAgICAgIEFkZCBhbiBldmVudCB0aGF0IGlzIHVz ZWZ1bCBmb3IgYXVnbWVudGVkIGluc3BlY3RvcnMgdG8gaW5zcGVjdAorICAgICAgICBhIG5vZGUu IFdlYiBwYWdlcyB3aWxsIHN0aWxsIHByZWZlciBJbnNwZWN0b3IuaW5zcGVjdC4KKwogMjAxNy0w OS0wNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIHRl c3QyNjI6IENvbXBsZXRpb24gdmFsdWVzIGZvciBjb250cm9sIGZsb3cgZG8gbm90IG1hdGNoIHRo ZSBzcGVjCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3Rv Y29sL0RPTS5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9E T00uanNvbgppbmRleCA2Y2UzMjhjNDI3OC4uNDc3NTVhYjVjMDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbgpAQCAtNDgzLDYgKzQ4 MywxMyBAQAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gPGNvZGU+RG9j dW1lbnQ8L2NvZGU+IGhhcyBiZWVuIHRvdGFsbHkgdXBkYXRlZC4gTm9kZSBpZHMgYXJlIG5vIGxv bmdlciB2YWxpZC4iCiAgICAgICAgIH0sCiAgICAgICAgIHsKKyAgICAgICAgICAgICJuYW1lIjog Imluc3BlY3QiLAorICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkluc3BlY3QgYSBwYXJ0aWN1 bGFyIG5vZGUuIiwKKyAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWworICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAibm9kZUlkIiwgIiRyZWYiOiAiTm9kZUlkIiwgImRlc2NyaXB0aW9uIjogIkVx dWl2YWxlbnQgb2YgSW5zcGVjdG9yLmluc3BlY3QgYnV0IHdpdGggYSBub2RlSWQgaW5zdGVhZCBv ZiBhIFJlbW90ZU9iamVjdC4gVXNlZnVsIGZvciBhdWdtZW50ZWQgY29udGV4dHMuIiB9CisgICAg ICAgICAgICBdCisgICAgICAgIH0sCisgICAgICAgIHsKICAgICAgICAgICAgICJuYW1lIjogInNl dENoaWxkTm9kZXMiLAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gYmFj a2VuZCB3YW50cyB0byBwcm92aWRlIGNsaWVudCB3aXRoIHRoZSBtaXNzaW5nIERPTSBzdHJ1Y3R1 cmUuIFRoaXMgaGFwcGVucyB1cG9uIG1vc3Qgb2YgdGhlIGNhbGxzIHJlcXVlc3Rpbmcgbm9kZSBp ZHMuIiwKICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK aW5kZXggNGJlOTExYzk2Y2UuLmU4YTY4ZjM4ZGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMCBAQAorMjAxNy0wOS0wNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgorCisgICAgICAgIEF1Z21lbnRlZCBJbnNwZWN0b3I6IFByb3ZpZGUgYSB3YXkg dG8gaW5zcGVjdCBhIERPTSBOb2RlIChET00uaW5zcGVjdCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjU2MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMTk2Mzk1ODM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLmNvbnRlbnRM b2FkZWQpOgorICAgICAgICBBbHdheXMgY3JlYXRlIHRoZSBlbGVtZW50IHNlYXJjaCB0b29sYmFy IGljb24uIE9ubHkgc2hvdyBpdCBpZiB0aGUgRE9NIGRvbWFpbgorICAgICAgICBpcyBhdmFpbGFi bGUuIFdpdGggYXVnbWVudGVkIGFnZW50cyB0aGUgRE9NIGRvbWFpbiBtYXkgYmUgYWN0aXZhdGVk IGxhdGVyLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5q czoKKyAgICAgICAgKFdJLkRPTU9ic2VydmVyLnByb3RvdHlwZS5pbnNwZWN0KToKKyAgICAgICAg U2VsZWN0IHRoZSBub2RlIGluIHRoZSBET00gdHJlZSBvdXRsaW5lLgorCiAyMDE3LTA5LTA2ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3Rvcjog4oyYRSBhbmQg4oyYRyBkbyBub3Qgd29yayBpbiBtYWluIGNvbnRlbnQgYXJlYSB3aGVu IHF1aWNrIGNvbnNvbGUgZHJhd2VyIGlzIG9wZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCA0ODU5ODVmMTM5OC4uNDZhYjJjNDJl NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKQEAgLTM4OSwxNiArMzg5LDE0IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigp CiAgICAgdGhpcy5fZG93bmxvYWRUb29sYmFyQnV0dG9uID0gbmV3IFdJLkJ1dHRvblRvb2xiYXJJ dGVtKCJkb3dubG9hZCIsIFdJLlVJU3RyaW5nKCJEb3dubG9hZCBXZWIgQXJjaGl2ZSIpLCAiSW1h Z2VzL0Rvd25sb2FkQXJyb3cuc3ZnIik7CiAgICAgdGhpcy5fZG93bmxvYWRUb29sYmFyQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwg dGhpcy5fZG93bmxvYWRXZWJBcmNoaXZlLCB0aGlzKTsKIAorICAgIHZhciB0b29sVGlwID0gV0ku VUlTdHJpbmcoIlN0YXJ0IGVsZW1lbnQgc2VsZWN0aW9uICglcykiKS5mb3JtYXQoV0kuX2luc3Bl Y3RNb2RlS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSk7CisgICAgdmFyIGFjdGl2YXRlZFRv b2xUaXAgPSBXSS5VSVN0cmluZygiU3RvcCBlbGVtZW50IHNlbGVjdGlvbiAoJXMpIikuZm9ybWF0 KFdJLl9pbnNwZWN0TW9kZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOworICAgIHRoaXMu X2luc3BlY3RNb2RlVG9vbGJhckJ1dHRvbiA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvblRvb2xiYXJJ dGVtKCJpbnNwZWN0IiwgdG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgIkltYWdlcy9Dcm9zc2hh aXIuc3ZnIik7CisgICAgdGhpcy5faW5zcGVjdE1vZGVUb29sYmFyQnV0dG9uLmFkZEV2ZW50TGlz dGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fdG9nZ2xl SW5zcGVjdE1vZGUsIHRoaXMpOworCiAgICAgdGhpcy5fdXBkYXRlUmVsb2FkVG9vbGJhckJ1dHRv bigpOwogICAgIHRoaXMuX3VwZGF0ZURvd25sb2FkVG9vbGJhckJ1dHRvbigpOwotCi0gICAgLy8g VGhlIHRvb2xiYXIgYnV0dG9uIGZvciBub2RlIGluc3BlY3Rpb24uCi0gICAgaWYgKHRoaXMuZGVi dWdnYWJsZVR5cGUgPT09IFdJLkRlYnVnZ2FibGVUeXBlLldlYikgewotICAgICAgICB2YXIgdG9v bFRpcCA9IFdJLlVJU3RyaW5nKCJTdGFydCBlbGVtZW50IHNlbGVjdGlvbiAoJXMpIikuZm9ybWF0 KFdJLl9pbnNwZWN0TW9kZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwotICAgICAgICB2 YXIgYWN0aXZhdGVkVG9vbFRpcCA9IFdJLlVJU3RyaW5nKCJTdG9wIGVsZW1lbnQgc2VsZWN0aW9u ICglcykiKS5mb3JtYXQoV0kuX2luc3BlY3RNb2RlS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFt ZSk7Ci0gICAgICAgIHRoaXMuX2luc3BlY3RNb2RlVG9vbGJhckJ1dHRvbiA9IG5ldyBXSS5BY3Rp dmF0ZUJ1dHRvblRvb2xiYXJJdGVtKCJpbnNwZWN0IiwgdG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRp cCwgIkltYWdlcy9Dcm9zc2hhaXIuc3ZnIik7Ci0gICAgICAgIHRoaXMuX2luc3BlY3RNb2RlVG9v bGJhckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50 LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZUluc3BlY3RNb2RlLCB0aGlzKTsKLSAgICB9CisgICAgdGhp cy5fdXBkYXRlSW5zcGVjdE1vZGVUb29sYmFyQnV0dG9uKCk7CiAKICAgICB0aGlzLl9kYXNoYm9h cmRDb250YWluZXIgPSBuZXcgV0kuRGFzaGJvYXJkQ29udGFpbmVyVmlldzsKICAgICB0aGlzLl9k YXNoYm9hcmRDb250YWluZXIuc2hvd0Rhc2hib2FyZFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdCh0 aGlzLmRhc2hib2FyZE1hbmFnZXIuZGFzaGJvYXJkcy5kZWZhdWx0KTsKQEAgLTQxOCw4ICs0MTYs NyBAQCBXSS5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy50b29sYmFyLmFk ZFRvb2xiYXJJdGVtKHRoaXMuX2Rhc2hib2FyZENvbnRhaW5lci50b29sYmFySXRlbSwgV0kuVG9v bGJhci5TZWN0aW9uLkNlbnRlcik7CiAKLSAgICBpZiAodGhpcy5faW5zcGVjdE1vZGVUb29sYmFy QnV0dG9uKQotICAgICAgICB0aGlzLnRvb2xiYXIuYWRkVG9vbGJhckl0ZW0odGhpcy5faW5zcGVj dE1vZGVUb29sYmFyQnV0dG9uLCBXSS5Ub29sYmFyLlNlY3Rpb24uQ2VudGVyUmlnaHQpOworICAg IHRoaXMudG9vbGJhci5hZGRUb29sYmFySXRlbSh0aGlzLl9pbnNwZWN0TW9kZVRvb2xiYXJCdXR0 b24sIFdJLlRvb2xiYXIuU2VjdGlvbi5DZW50ZXJSaWdodCk7CiAKICAgICB0aGlzLnRvb2xiYXIu YWRkVG9vbGJhckl0ZW0odGhpcy5fc2VhcmNoVG9vbGJhckl0ZW0sIFdJLlRvb2xiYXIuU2VjdGlv bi5SaWdodCk7CiAKQEAgLTcyMSw2ICs3MTgsOCBAQCBXSS5hY3RpdmF0ZUV4dHJhRG9tYWlucyA9 IGZ1bmN0aW9uKGRvbWFpbnMpCiAKICAgICB0aGlzLl91cGRhdGVSZWxvYWRUb29sYmFyQnV0dG9u KCk7CiAgICAgdGhpcy5fdXBkYXRlRG93bmxvYWRUb29sYmFyQnV0dG9uKCk7CisgICAgdGhpcy5f dXBkYXRlSW5zcGVjdE1vZGVUb29sYmFyQnV0dG9uKCk7CisKICAgICB0aGlzLl90cnlUb1Jlc3Rv cmVQZW5kaW5nVGFicygpOwogfTsKIApAQCAtMTg0OSw2ICsxODQ4LDE2IEBAIFdJLl91cGRhdGVE b3dubG9hZFRvb2xiYXJCdXR0b24gPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fZG93bmxvYWRUb29s YmFyQnV0dG9uLmVuYWJsZWQgPSB0aGlzLmNhbkFyY2hpdmVNYWluRnJhbWUoKTsKIH07CiAKK1dJ Ll91cGRhdGVJbnNwZWN0TW9kZVRvb2xiYXJCdXR0b24gPSBmdW5jdGlvbigpCit7CisgICAgaWYg KCF3aW5kb3cuRE9NQWdlbnQgfHwgIURPTUFnZW50LnNldEluc3BlY3RNb2RlRW5hYmxlZCkgewor ICAgICAgICB0aGlzLl9pbnNwZWN0TW9kZVRvb2xiYXJCdXR0b24uaGlkZGVuID0gdHJ1ZTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHRoaXMuX2luc3BlY3RNb2RlVG9vbGJhckJ1dHRv bi5oaWRkZW4gPSBmYWxzZTsKK30KKwogV0kuX3RvZ2dsZUluc3BlY3RNb2RlID0gZnVuY3Rpb24o ZXZlbnQpCiB7CiAgICAgdGhpcy5kb21UcmVlTWFuYWdlci5pbnNwZWN0TW9kZUVuYWJsZWQgPSAh dGhpcy5kb21UcmVlTWFuYWdlci5pbnNwZWN0TW9kZUVuYWJsZWQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0RPTU9ic2VydmVy LmpzCmluZGV4IDQ1OTU2NDA5MTVkLi41Mzc4Yzk1NTM3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvRE9NT2JzZXJ2ZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvRE9NT2JzZXJ2ZXIu anMKQEAgLTMyLDYgKzMyLDExIEBAIFdJLkRPTU9ic2VydmVyID0gY2xhc3MgRE9NT2JzZXJ2ZXIK ICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuX2RvY3VtZW50VXBkYXRlZCgpOwogICAgIH0KIAor ICAgIGluc3BlY3Qobm9kZUlkKQorICAgIHsKKyAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuaW5z cGVjdEVsZW1lbnQobm9kZUlkKTsKKyAgICB9CisKICAgICBzZXRDaGlsZE5vZGVzKHBhcmVudElk LCBwYXlsb2FkcykKICAgICB7CiAgICAgICAgIFdJLmRvbVRyZWVNYW5hZ2VyLl9zZXRDaGlsZE5v ZGVzKHBhcmVudElkLCBwYXlsb2Fkcyk7Cg==