233349 2021-11-18 18:25:37 -0800 Web Inspector: Console execution context can become an unexpected selection on refresh/navigation 2021-12-01 21:03:21 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1816719 0 pangle 2021-11-18 18:25:37 -0800 <rdar://68229876> Steps to (flakily) reproduce: 1. Go to https://books.apple.com/us/audiobook/winning-unabridged/id1561431722 2. Inspect the page. 3. Switch to the console tab *(explained below) 4. Confirm the console works with 1+1 or other similarly simple input. 5. Refresh the page. 6. Notice that sometime the work Auto disappears from the execution context selector, and the entire control turns blue indicating a non-Auto selection. * This is /much/ harder to reproduce on the Elements tab, for example because there is currently a very short 10ms timeout during which the current frame's execution context will be eligible for re-selection post-load. Increasing the timeout in QuickConsole.prototype._handleFrameExecutionContextsCleared to 100ms makes this much easier to reproduce. This makes for two somewhat unfortunate bugs here: 1. If the frame of the active execution context commits a provisional load, our code attempts to reselect the new context for that frame, which results in clearing the `Auto` bit for selected context, which means the context no longer will follow the selected DOM node. 2. Because of the very short timeframe for the above to take place before bailing (currently 10ms) there are many situations where other large payloads over the protocol, like a complex DOM tree, will cause the time to expire before we receive an event telling us there is a new execution context for the frame, which means we end up not following the frame anyways... which leads to... 3. Which can lead to us having a selected execution context that may no longer be valid since the failsafe in QuickConsole.prototype._handleFrameExecutionContextsCleared doesn't really fail safely, since it doesn't provide a new execution context to be active and instead seems to rely on the hope that the context will still work for future invocations, which I believe is how many users are getting into the state of a blank execution context picker (with a working dropdown menu with actual contexts that are selectable) and are unable to evaluate anything in the console. 1816720 1 444767 pangle 2021-11-18 18:34:52 -0800 Created attachment 444767 Patch v1.0 1816965 2 444767 hi 2021-11-19 12:30:50 -0800 Comment on attachment 444767 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=444767&action=review r=me, nice catch :) > Source/WebInspectorUI/UserInterface/Views/QuickConsole.js:400 > this._restoreSelectedExecutionContextForFrame = null; Style: I'd add a newline after this > Source/WebInspectorUI/UserInterface/Views/QuickConsole.js:401 > + this._useExecutionContextOfInspectedNode = InspectorBackend.hasDomain("DOM"); NIT: We should probably make a `_canUseExecutionContextOfInspectedNode()` or something since this is done so often. 1819486 3 445638 pangle 2021-12-01 17:03:21 -0800 Created attachment 445638 Patch v1.1 - Address review nits 1819561 4 ews-feeder 2021-12-01 21:03:20 -0800 Committed r286412 (244758@main): <https://commits.webkit.org/244758@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445638. 444767 2021-11-18 18:34:52 -0800 2021-12-01 17:03:19 -0800 Patch v1.0 bug-233349-20211118183451.patch text/plain 4429 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 YzE2MDlhZTkzMDlmOGM3NzZlNzM2MzA2NjVkMGZlYTgzMjRiNDdiLi40NjY2ZWVmZDM3OTYyNWFi ZTBlOGEyNmU3Njk1OTNlMWQ1NGU0ZTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMS0xMS0xOCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29uc29sZSBleGVjdXRpb24gY29udGV4dCBjYW4g YmVjb21lIGFuIHVuZXhwZWN0ZWQgc2VsZWN0aW9uIG9uIHJlZnJlc2gvbmF2aWdhdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMzQ5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHJl YWxseSB0aHJlZSBidWdzIGhlcmUsIGVhY2ggd2hpY2ggY29udHJpYnV0ZSB0byB1bmV4cGVjdGVk IGV4ZWN1dGlvbiBjb250ZXh0IHNlbGVjdGlvbnMuCisKKyAgICAgICAgMS4gSWYgdGhlIGZyYW1l IG9mIHRoZSBhY3RpdmUgZXhlY3V0aW9uIGNvbnRleHQgY29tbWl0cyBhIHByb3Zpc2lvbmFsIGxv YWQsIG91ciBjb2RlIGF0dGVtcHRzIHRvIHJlLXNlbGVjdCB0aGUKKyAgICAgICAgbmV3IGNvbnRl eHQgZm9yIHRoYXQgZnJhbWUsIHdoaWNoIHJlc3VsdHMgaW4gY2xlYXJpbmcgdGhlIGBBdXRvYCBi aXQgZm9yIHNlbGVjdGVkIGNvbnRleHQsIHdoaWNoIG1lYW5zIHRoZQorICAgICAgICBjb250ZXh0 IG5vIGxvbmdlciB3aWxsIGZvbGxvdyB0aGUgc2VsZWN0ZWQgRE9NIG5vZGUuIFRoaXMgaXMgcmVz b2x2ZWQgYnkgbm8gbG9uZ2VyIGZvbGxvd2luZyBhIGZyYW1lJ3MgZXhlY3V0aW9uCisgICAgICAg IGNvbnRleHQgb24gbmF2aWdhdGlvbiBpZiB0aGUgY3VycmVudCBzZWxlY3Rpb24gaXMgYEF1dG9g ICh0cmFja2VkIGJ5IHRoZSBgX3VzZUV4ZWN1dGlvbkNvbnRleHRPZkluc3BlY3RlZE5vZGVgCisg ICAgICAgIHZhcmlhYmxlKS4KKworICAgICAgICAyLiBCZWNhdXNlIG9mIHRoZSB2ZXJ5IHNob3J0 IHRpbWVmcmFtZSBmb3IgdGhlIGFib3ZlIHRvIHRha2UgcGxhY2UgYmVmb3JlIGJhaWxpbmcgKHBy ZXZpb3VzbHkgMTBtcykgdGhlcmUgYXJlCisgICAgICAgIG1hbnkgc2l0dWF0aW9ucyB3aGVyZSBv dGhlciBsYXJnZSBwYXlsb2FkcyBvdmVyIHRoZSBwcm90b2NvbCwgbGlrZSBhIGNvbXBsZXggRE9N IHRyZWUsIHdpbGwgY2F1c2UgdGhlIHRpbWVvdXQgdG8KKyAgICAgICAgZmlyZSBiZWZvcmUgd2Ug cmVjZWl2ZSBhbiBldmVudCB0ZWxsaW5nIHVzIHRoZXJlIGlzIGEgbmV3IGV4ZWN1dGlvbiBjb250 ZXh0IGZvciB0aGUgZnJhbWUsIHdoaWNoIG1lYW5zIHdlIGVuZCB1cAorICAgICAgICBub3QgZm9s bG93aW5nIHRoZSBmcmFtZSBhbnl3YXlzLiBUaGlzIGlzIHJlc29sdmVkIGJ5IGluY3JlYXNpbmcg dGhlIHRpbWVvdXQgdG8gYSBzdGlsbC1icmlzaywgYnV0IG1vcmUKKyAgICAgICAgcmVhc29uYWJs ZSAxMDBtcy4KKworICAgICAgICAzLiBUaGUgdGltZW91dCBpbiAoMikgY2FuIGxlYWQgdG8gdXMg aGF2aW5nIGEgc2VsZWN0ZWQgZXhlY3V0aW9uIGNvbnRleHQgdGhhdCBtYXkgbm8gbG9uZ2VyIGJl IHZhbGlkIGJlY2F1c2UgdGhlCisgICAgICAgIGZhaWwtc2FmZSBpbiBgUXVpY2tDb25zb2xlLnBy b3RvdHlwZS5faGFuZGxlRnJhbWVFeGVjdXRpb25Db250ZXh0c0NsZWFyZWRgIGRvZXNuJ3QgcmVh bGx5IGZhaWwgc2FmZWx5LCBzaW5jZSBpdAorICAgICAgICBkb2Vzbid0IHByb3ZpZGUgYSBuZXcg ZXhlY3V0aW9uIGNvbnRleHQgdG8gYmUgYWN0aXZlIGFuZCBpbnN0ZWFkIHNlZW1zIHRvIHJlbHkg b24gdGhlIGhvcGUgdGhhdCB0aGUgY29udGV4dCB3aWxsCisgICAgICAgIHN0aWxsIHdvcmsgZm9y IGZ1dHVyZSBpbnZvY2F0aW9ucywgd2hpY2ggSSBiZWxpZXZlIGlzIGhvdyBtYW55IHVzZXJzIGFy ZSBnZXR0aW5nIGludG8gdGhlIHN0YXRlIG9mIGEgYmxhbmsKKyAgICAgICAgZXhlY3V0aW9uIGNv bnRleHQgcGlja2VyICh3aXRoIGEgd29ya2luZyBkcm9wIGRvd24gbWVudSB3aXRoIGFjdHVhbCBj b250ZXh0cyB0aGF0IGFyZSBzZWxlY3RhYmxlKSBhbmQgYXJlIHVuYWJsZQorICAgICAgICB0byBl dmFsdWF0ZSBhbnl0aGluZyBpbiB0aGUgY29uc29sZSB1bnRpbCByZS1zZWxlY3RpbmcgYW4gZXhl Y3V0aW9uIGNvbnRleHQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29u c29sZS5qczoKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX2hhbmRsZUZyYW1l RXhlY3V0aW9uQ29udGV4dHNDbGVhcmVkKToKKwogMjAyMS0xMS0xNyAgTmlraXRhIFZhc2lseWV2 ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgYSBz d2F0Y2ggZm9yIGFsaWduLWNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwppbmRleCA4MmEyNGNhMDIz Y2JhMmZlNDQ3MzdkYmM3YzVhYWFjNGQ5NDA0NmFjLi5mZTM3MzgwZjdhOTRlMDNjZGE0NTJkYjZm OTNiMGZlNDMxMzgxOWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCkBAIC0zODgsMTYgKzM4OCwxOSBA QCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICAvLyBJZiB0aGlzIGZyYW1l IGlzIG5hdmlnYXRpbmcgYW5kIGl0IGlzIHNlbGVjdGVkIGluIHRoZSBVSSB3ZSB3YW50IHRvIHJl c2VsZWN0IGl0cyBuZXcgaXRlbSBhZnRlciBuYXZpZ2F0aW9uLgotICAgICAgICBpZiAoY29tbWl0 dGluZ1Byb3Zpc2lvbmFsTG9hZCAmJiAhdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29u dGV4dEZvckZyYW1lKSB7CisgICAgICAgIC8vIElmIHRoaXMgZnJhbWUgaXMgbmF2aWdhdGluZyBh bmQgaXQgaXMgc2VsZWN0ZWQgaW4gdGhlIFVJIHdlIHdhbnQgdG8gcmVzZWxlY3QgaXRzIG5ldyBp dGVtIGFmdGVyIG5hdmlnYXRpb24sCisgICAgICAgIC8vIGhvd2V2ZXIgd2hlbiBgX3VzZUV4ZWN1 dGlvbkNvbnRleHRPZkluc3BlY3RlZE5vZGVgIGlzIHRydWUsIHdlIHNob3VsZCBrZWVwIHRoZSBl eGVjdXRpb24gY29udGV4dCBzZXQgdG8gYEF1dG9gLgorICAgICAgICBpZiAoY29tbWl0dGluZ1By b3Zpc2lvbmFsTG9hZCAmJiAhdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dEZv ckZyYW1lICYmICF0aGlzLl91c2VFeGVjdXRpb25Db250ZXh0T2ZJbnNwZWN0ZWROb2RlKSB7CiAg ICAgICAgICAgICB0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJhbWUg PSBldmVudC50YXJnZXQ7CiAKICAgICAgICAgICAgIC8vIEFzIGEgZmFpbCBzYWZlLCBpZiB0aGUg ZnJhbWUgbmV2ZXIgZ2V0cyBhbiBleGVjdXRpb24gY29udGV4dCwgY2xlYXIgdGhlIHJlc3RvcmUg dmFsdWUuCiAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKLSAgICAgICAgICAgICAgICBp ZiAodGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dEZvckZyYW1lKQotICAgICAg ICAgICAgICAgICAgICB0aGlzLl91cGRhdGVBY3RpdmVFeGVjdXRpb25Db250ZXh0RGlzcGxheSgp OworICAgICAgICAgICAgICAgIGlmICghdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29u dGV4dEZvckZyYW1lKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAg ICAgdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dEZvckZyYW1lID0gbnVsbDsK LSAgICAgICAgICAgIH0sIDEwKTsKKyAgICAgICAgICAgICAgICB0aGlzLl91c2VFeGVjdXRpb25D b250ZXh0T2ZJbnNwZWN0ZWROb2RlID0gSW5zcGVjdG9yQmFja2VuZC5oYXNEb21haW4oIkRPTSIp OworICAgICAgICAgICAgICAgIHRoaXMuX3NldEFjdGl2ZUV4ZWN1dGlvbkNvbnRleHQodGhpcy5f cmVzb2x2ZURlc2lyZWRBY3RpdmVFeGVjdXRpb25Db250ZXh0KCkpOworICAgICAgICAgICAgfSwg MTAwKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCg== 445638 2021-12-01 17:03:21 -0800 2021-12-01 21:03:20 -0800 Patch v1.1 - Address review nits bug-233349-20211201170320.patch text/plain 7641 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 OGViNjc0ZmEyNDljNDA0NWQ4MzJkOTM2ZjEyMTNjMTE4MmMwOTU4Li4xN2RjMDI0Mzc0MzY4ZDAw ZTliZTE0NTk5ZWY3NmZjNjJhNzNjZGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MiBAQAorMjAyMS0xMi0wMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29uc29sZSBleGVjdXRpb24gY29udGV4dCBjYW4g YmVjb21lIGFuIHVuZXhwZWN0ZWQgc2VsZWN0aW9uIG9uIHJlZnJlc2gvbmF2aWdhdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMzQ5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgIFRoZXJlIGFyZSByZWFs bHkgdGhyZWUgYnVncyBoZXJlIGluIGBXSS5RdWlja0NvbnNvbGUucHJvdG90eXBlLl9oYW5kbGVG cmFtZUV4ZWN1dGlvbkNvbnRleHRzQ2xlYXJlZGAsIGVhY2ggb2YKKyAgICAgICAgd2hpY2ggY29u dHJpYnV0ZSB0byB1bmV4cGVjdGVkIGV4ZWN1dGlvbiBjb250ZXh0IHNlbGVjdGlvbnMuCisKKyAg ICAgICAgMS4gSWYgdGhlIGZyYW1lIG9mIHRoZSBhY3RpdmUgZXhlY3V0aW9uIGNvbnRleHQgY29t bWl0cyBhIHByb3Zpc2lvbmFsIGxvYWQsIG91ciBjb2RlIGF0dGVtcHRzIHRvIHJlLXNlbGVjdCB0 aGUKKyAgICAgICAgbmV3IGNvbnRleHQgZm9yIHRoYXQgZnJhbWUsIHdoaWNoIHJlc3VsdHMgaW4g Y2xlYXJpbmcgdGhlIGBBdXRvYCBiaXQgZm9yIHNlbGVjdGVkIGNvbnRleHQsIHdoaWNoIG1lYW5z IHRoZQorICAgICAgICBjb250ZXh0IG5vIGxvbmdlciB3aWxsIGZvbGxvdyB0aGUgc2VsZWN0ZWQg RE9NIG5vZGUuIFRoaXMgaXMgcmVzb2x2ZWQgYnkgbm8gbG9uZ2VyIGZvbGxvd2luZyBhIGZyYW1l J3MgZXhlY3V0aW9uCisgICAgICAgIGNvbnRleHQgb24gbmF2aWdhdGlvbiBpZiB0aGUgY3VycmVu dCBzZWxlY3Rpb24gaXMgYEF1dG9gICh0cmFja2VkIGJ5IHRoZSBgX3VzZUV4ZWN1dGlvbkNvbnRl eHRPZkluc3BlY3RlZE5vZGVgCisgICAgICAgIHZhcmlhYmxlKS4KKworICAgICAgICAyLiBCZWNh dXNlIG9mIHRoZSB2ZXJ5IHNob3J0IHRpbWVmcmFtZSBmb3IgdGhlIGFib3ZlIHRvIHRha2UgcGxh Y2UgYmVmb3JlIGJhaWxpbmcgKHByZXZpb3VzbHkgMTBtcykgdGhlcmUgYXJlCisgICAgICAgIG1h bnkgc2l0dWF0aW9ucyB3aGVyZSBvdGhlciBsYXJnZSBwYXlsb2FkcyBvdmVyIHRoZSBwcm90b2Nv bCwgbGlrZSBhIGNvbXBsZXggRE9NIHRyZWUsIHdpbGwgY2F1c2UgdGhlIHRpbWVvdXQgdG8KKyAg ICAgICAgZmlyZSBiZWZvcmUgd2UgcmVjZWl2ZSBhbiBldmVudCB0ZWxsaW5nIHVzIHRoZXJlIGlz IGEgbmV3IGV4ZWN1dGlvbiBjb250ZXh0IGZvciB0aGUgZnJhbWUsIHdoaWNoIG1lYW5zIHdlIGVu ZCB1cAorICAgICAgICBub3QgZm9sbG93aW5nIHRoZSBmcmFtZSBhbnl3YXlzLiBUaGlzIGlzIGlt cHJvdmVkIGJ5IGluY3JlYXNpbmcgdGhlIHRpbWVvdXQgdG8gYSBzdGlsbC1icmlzaywgYnV0IG1v cmUKKyAgICAgICAgcmVhc29uYWJsZSAxMDBtcy4KKworICAgICAgICAzLiBUaGUgdGltZW91dCBp biAoMikgY2FuIGxlYWQgdG8gdXMgaGF2aW5nIGEgc2VsZWN0ZWQgZXhlY3V0aW9uIGNvbnRleHQg dGhhdCBtYXkgbm8gbG9uZ2VyIGJlIHZhbGlkIGJlY2F1c2UgdGhlCisgICAgICAgIGZhaWwtc2Fm ZSBpbiBgUXVpY2tDb25zb2xlLnByb3RvdHlwZS5faGFuZGxlRnJhbWVFeGVjdXRpb25Db250ZXh0 c0NsZWFyZWRgIGRvZXNuJ3QgcmVhbGx5IGZhaWwgc2FmZWx5LCBzaW5jZSBpdAorICAgICAgICBk b2Vzbid0IHByb3ZpZGUgYSBuZXcgZXhlY3V0aW9uIGNvbnRleHQgdG8gYmUgYWN0aXZlIGFuZCBp bnN0ZWFkIHNlZW1zIHRvIHJlbHkgb24gdGhlIGhvcGUgdGhhdCB0aGUgY29udGV4dCB3aWxsCisg ICAgICAgIHN0aWxsIHdvcmsgZm9yIGZ1dHVyZSBpbnZvY2F0aW9ucywgd2hpY2ggSSBiZWxpZXZl IGlzIGhvdyBtYW55IHVzZXJzIGFyZSBnZXR0aW5nIGludG8gdGhlIHN0YXRlIG9mIGEgYmxhbmsK KyAgICAgICAgZXhlY3V0aW9uIGNvbnRleHQgcGlja2VyICh3aXRoIGEgd29ya2luZyBkcm9wIGRv d24gbWVudSB3aXRoIGFjdHVhbCBjb250ZXh0cyB0aGF0IGFyZSBzZWxlY3RhYmxlKSBhbmQgYXJl IHVuYWJsZQorICAgICAgICB0byBldmFsdWF0ZSBhbnl0aGluZyBpbiB0aGUgY29uc29sZSB1bnRp bCByZS1zZWxlY3RpbmcgYW4gZXhlY3V0aW9uIGNvbnRleHQuCisKKyAgICAgICAgQWRkaXRpb25h bCBkcml2ZS1ieSBjaGFuZ2UgdG8gbW92ZSB0aGUgY2hlY2tzIGZvciB3aGV0aGVyIG9yIG5vdCB3 ZSBjYW4gdXNlIHRoZSBleGVjdXRpb24gY29udGV4dCBvZiBhIHNlbGVjdGVkCisgICAgICAgIG5v ZGUgaW50byBpdHMgb3duIG1ldGhvZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv UXVpY2tDb25zb2xlLmpzOgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fcG9w dWxhdGVBY3RpdmVFeGVjdXRpb25Db250ZXh0TmF2aWdhdGlvbkl0ZW1Db250ZXh0TWVudSk6Cisg ICAgICAgIChXSS5RdWlja0NvbnNvbGUucHJvdG90eXBlLl9oYW5kbGVFbmdpbmVlcmluZ1Nob3dJ bnRlcm5hbEV4ZWN1dGlvbkNvbnRleHRzU2V0dGluZ0NoYW5nZWQpOgorICAgICAgICAoV0kuUXVp Y2tDb25zb2xlLnByb3RvdHlwZS5faGFuZGxlRnJhbWVFeGVjdXRpb25Db250ZXh0c0NsZWFyZWQp OgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5faGFuZGxlVGFyZ2V0UmVtb3Zl ZCk6CisgICAgICAgIChXSS5RdWlja0NvbnNvbGUucHJvdG90eXBlLl9jYW5Vc2VFeGVjdXRpb25D b250ZXh0T2ZJbnNwZWN0ZWROb2RlKToKKwogMjAyMS0xMS0zMCAgQkogQnVyZyAgPGJidXJnQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgRXh0ZW5zaW9uVGFiQWN0aXZh dGlvbiBkaWFnbm9zdGljIGV2ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKaW5kZXggODJhMjRjYTAyM2Ni YTJmZTQ0NzM3ZGJjN2M1YWFhYzRkOTQwNDZhYy4uNWM1MWEzYTRjMGJlZDQxNzM1MWMwYzE4OTc3 NTQ4ZGY1ZjRkYmI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwpAQCAtMzMsNyArMzMsNyBAQCBXSS5R dWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAg IHRoaXMuX3RvZ2dsZU9yRm9jdXNLZXlib2FyZFNob3J0Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0Rl ZmF1bHQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fa2V5Ym9hcmRTaG9ydGN1dERpc2FibGVkID0g ZmFsc2U7CiAKLSAgICAgICAgdGhpcy5fdXNlRXhlY3V0aW9uQ29udGV4dE9mSW5zcGVjdGVkTm9k ZSA9IEluc3BlY3RvckJhY2tlbmQuaGFzRG9tYWluKCJET00iKTsKKyAgICAgICAgdGhpcy5fdXNl RXhlY3V0aW9uQ29udGV4dE9mSW5zcGVjdGVkTm9kZSA9IHRoaXMuX2NhblVzZUV4ZWN1dGlvbkNv bnRleHRPZkluc3BlY3RlZE5vZGUoKTsKICAgICAgICAgdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhl Y3V0aW9uQ29udGV4dEZvckZyYW1lID0gbnVsbDsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xh c3NMaXN0LmFkZCgicXVpY2stY29uc29sZSIpOwpAQCAtMjQzLDcgKzI0Myw3IEBAIFdJLlF1aWNr Q29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdJLlZpZXcKIAogICAgICAgICBs ZXQgYWN0aXZlRXhlY3V0aW9uQ29udGV4dCA9IFdJLnJ1bnRpbWVNYW5hZ2VyLmFjdGl2ZUV4ZWN1 dGlvbkNvbnRleHQ7CiAKLSAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzRG9tYWluKCJE T00iKSkgeworICAgICAgICBpZiAodGhpcy5fY2FuVXNlRXhlY3V0aW9uQ29udGV4dE9mSW5zcGVj dGVkTm9kZSgpKSB7CiAgICAgICAgICAgICBsZXQgZXhlY3V0aW9uQ29udGV4dEZvckluc3BlY3Rl ZE5vZGUgPSB0aGlzLl9yZXNvbHZlRGVzaXJlZEFjdGl2ZUV4ZWN1dGlvbkNvbnRleHQodHJ1ZSk7 CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRDaGVja2JveEl0ZW0oV0kuVUlTdHJpbmco IkF1dG8gXHUyMDE0ICVzIikuZm9ybWF0KHRoaXMuX2Rpc3BsYXlOYW1lRm9yRXhlY3V0aW9uQ29u dGV4dChleGVjdXRpb25Db250ZXh0Rm9ySW5zcGVjdGVkTm9kZSwgbWF4TGVuZ3RoKSksICgpID0+ IHsKICAgICAgICAgICAgICAgICB0aGlzLl91c2VFeGVjdXRpb25Db250ZXh0T2ZJbnNwZWN0ZWRO b2RlID0gdHJ1ZTsKQEAgLTM1Niw3ICszNTYsNyBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBR dWlja0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIGlmIChXSS5ydW50aW1lTWFuYWdl ci5hY3RpdmVFeGVjdXRpb25Db250ZXh0LnR5cGUgIT09IFdJLkV4ZWN1dGlvbkNvbnRleHQuVHlw ZS5JbnRlcm5hbCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl91c2VFeGVj dXRpb25Db250ZXh0T2ZJbnNwZWN0ZWROb2RlID0gSW5zcGVjdG9yQmFja2VuZC5oYXNEb21haW4o IkRPTSIpOworICAgICAgICB0aGlzLl91c2VFeGVjdXRpb25Db250ZXh0T2ZJbnNwZWN0ZWROb2Rl ID0gdGhpcy5fY2FuVXNlRXhlY3V0aW9uQ29udGV4dE9mSW5zcGVjdGVkTm9kZSgpOwogICAgICAg ICB0aGlzLl9zZXRBY3RpdmVFeGVjdXRpb25Db250ZXh0KHRoaXMuX3Jlc29sdmVEZXNpcmVkQWN0 aXZlRXhlY3V0aW9uQ29udGV4dCgpKTsKICAgICB9CiAKQEAgLTM4OCwyMCArMzg4LDI0IEBAIFdJ LlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdJLlZpZXcKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIC8vIElmIHRoaXMgZnJhbWUgaXMg bmF2aWdhdGluZyBhbmQgaXQgaXMgc2VsZWN0ZWQgaW4gdGhlIFVJIHdlIHdhbnQgdG8gcmVzZWxl Y3QgaXRzIG5ldyBpdGVtIGFmdGVyIG5hdmlnYXRpb24uCi0gICAgICAgIGlmIChjb21taXR0aW5n UHJvdmlzaW9uYWxMb2FkICYmICF0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0 Rm9yRnJhbWUpIHsKKyAgICAgICAgLy8gSWYgdGhpcyBmcmFtZSBpcyBuYXZpZ2F0aW5nIGFuZCBp dCBpcyBzZWxlY3RlZCBpbiB0aGUgVUkgd2Ugd2FudCB0byByZXNlbGVjdCBpdHMgbmV3IGl0ZW0g YWZ0ZXIgbmF2aWdhdGlvbiwKKyAgICAgICAgLy8gaG93ZXZlciB3aGVuIGBfdXNlRXhlY3V0aW9u Q29udGV4dE9mSW5zcGVjdGVkTm9kZWAgaXMgdHJ1ZSwgd2Ugc2hvdWxkIGtlZXAgdGhlIGV4ZWN1 dGlvbiBjb250ZXh0IHNldCB0byBgQXV0b2AuCisgICAgICAgIGlmIChjb21taXR0aW5nUHJvdmlz aW9uYWxMb2FkICYmICF0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJh bWUgJiYgIXRoaXMuX3VzZUV4ZWN1dGlvbkNvbnRleHRPZkluc3BlY3RlZE5vZGUpIHsKICAgICAg ICAgICAgIHRoaXMuX3Jlc3RvcmVTZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRGb3JGcmFtZSA9IGV2 ZW50LnRhcmdldDsKIAogICAgICAgICAgICAgLy8gQXMgYSBmYWlsIHNhZmUsIGlmIHRoZSBmcmFt ZSBuZXZlciBnZXRzIGFuIGV4ZWN1dGlvbiBjb250ZXh0LCBjbGVhciB0aGUgcmVzdG9yZSB2YWx1 ZS4KICAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gewotICAgICAgICAgICAgICAgIGlmICh0 aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJhbWUpCi0gICAgICAgICAg ICAgICAgICAgIHRoaXMuX3VwZGF0ZUFjdGl2ZUV4ZWN1dGlvbkNvbnRleHREaXNwbGF5KCk7Cisg ICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0 Rm9yRnJhbWUpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB0 aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJhbWUgPSBudWxsOwotICAg ICAgICAgICAgfSwgMTApOworCisgICAgICAgICAgICAgICAgdGhpcy5fdXNlRXhlY3V0aW9uQ29u dGV4dE9mSW5zcGVjdGVkTm9kZSA9IHRoaXMuX2NhblVzZUV4ZWN1dGlvbkNvbnRleHRPZkluc3Bl Y3RlZE5vZGUoKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9zZXRBY3RpdmVFeGVjdXRpb25Db250 ZXh0KHRoaXMuX3Jlc29sdmVEZXNpcmVkQWN0aXZlRXhlY3V0aW9uQ29udGV4dCgpKTsKKyAgICAg ICAgICAgIH0sIDEwMCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAg ICB0aGlzLl91c2VFeGVjdXRpb25Db250ZXh0T2ZJbnNwZWN0ZWROb2RlID0gSW5zcGVjdG9yQmFj a2VuZC5oYXNEb21haW4oIkRPTSIpOworICAgICAgICB0aGlzLl91c2VFeGVjdXRpb25Db250ZXh0 T2ZJbnNwZWN0ZWROb2RlID0gdGhpcy5fY2FuVXNlRXhlY3V0aW9uQ29udGV4dE9mSW5zcGVjdGVk Tm9kZSgpOwogICAgICAgICB0aGlzLl9zZXRBY3RpdmVFeGVjdXRpb25Db250ZXh0KHRoaXMuX3Jl c29sdmVEZXNpcmVkQWN0aXZlRXhlY3V0aW9uQ29udGV4dCgpKTsKICAgICB9CiAKQEAgLTQyOCw3 ICs0MzIsNyBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBX SS5WaWV3CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLl91 c2VFeGVjdXRpb25Db250ZXh0T2ZJbnNwZWN0ZWROb2RlID0gSW5zcGVjdG9yQmFja2VuZC5oYXNE b21haW4oIkRPTSIpOworICAgICAgICB0aGlzLl91c2VFeGVjdXRpb25Db250ZXh0T2ZJbnNwZWN0 ZWROb2RlID0gdGhpcy5fY2FuVXNlRXhlY3V0aW9uQ29udGV4dE9mSW5zcGVjdGVkTm9kZSgpOwog ICAgICAgICB0aGlzLl9zZXRBY3RpdmVFeGVjdXRpb25Db250ZXh0KHRoaXMuX3Jlc29sdmVEZXNp cmVkQWN0aXZlRXhlY3V0aW9uQ29udGV4dCgpKTsKICAgICB9CiAKQEAgLTQ0MCw2ICs0NDQsMTEg QEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwog ICAgICAgICB0aGlzLl9zZXRBY3RpdmVFeGVjdXRpb25Db250ZXh0KHRoaXMuX3Jlc29sdmVEZXNp cmVkQWN0aXZlRXhlY3V0aW9uQ29udGV4dCgpKTsKICAgICB9CiAKKyAgICBfY2FuVXNlRXhlY3V0 aW9uQ29udGV4dE9mSW5zcGVjdGVkTm9kZSgpCisgICAgeworICAgICAgICByZXR1cm4gSW5zcGVj dG9yQmFja2VuZC5oYXNEb21haW4oIkRPTSIpOworICAgIH0KKwogICAgIF90b2dnbGVPckZvY3Vz KGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2tleWJvYXJkU2hvcnRjdXREaXNhYmxl ZCkK