128092 2014-02-02 18:52:19 -0800 Web Inspector: RuntimeManager should not use view object WebInspector.quickConsole 2016-06-27 17:23:32 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg commit-queue galpeter joepeck llango.u-szeged ossy timothy webkit-bug-importer oldest_to_newest 974885 0 bburg 2014-02-02 18:52:19 -0800 This seems to be a straightforward model/view layering violation. The "active" context identifier should live in the RuntimeManager instead. With this fixed, we will be able to use RuntimeAgent.evaluateInInspectedWindow() within inspector-protocol tests that test the model, instead of blitzing raw "RuntimeAgent.evaluate" messages. 974886 1 webkit-bug-importer 2014-02-02 18:52:33 -0800 <rdar://problem/15966526> 982703 2 224720 gbalogh.u-szeged 2014-02-19 23:31:07 -0800 Created attachment 224720 patch 982833 3 224720 timothy 2014-02-20 08:35:20 -0800 Comment on attachment 224720 patch View in context: https://bugs.webkit.org/attachment.cgi?id=224720&action=review > Source/WebInspectorUI/UserInterface/RuntimeManager.js:76 > + if (!contextId) { > + contextId = WebInspector.quickConsole.executionContextIdentifier; > + } Passing in the contextId (preferably contextIdentifier) is the right approach. The idea of this bug was to remove the use of WebInspector.quickConsole altogether, not just hide it behind an optional argument. I also don't see where anyone is passing a context to evaluateInInspectedWindow in this patch, so nothing has really changed. 982839 4 bburg 2014-02-20 09:01:59 -0800 I think the correct fix here is to store/load the last user-selected execution context on the WebInspector.Frame. The frame already stores WebInspector.ExecutionContext's and WebInspector.ExecutionContextList. 982846 5 timothy 2014-02-20 09:09:30 -0800 Yeah, that sounds good to me. 994552 6 227844 gbalogh.u-szeged 2014-03-26 05:09:42 -0700 Created attachment 227844 proposed patch I can not find any case when the value of contextID in the original version is not undefined. Maybe I miss something, but I think this is a left over from other fixes. Based on these guess I simple remove it. 994568 7 timothy 2014-03-26 07:51:15 -0700 comtextId is pickable from a popup menu in the console input area when there are Safari extensions or frames on the page. Removing this line breaks that feature. 1205769 8 282186 bburg 2016-06-27 16:39:19 -0700 Created attachment 282186 Proposed Fix 1205789 9 282186 joepeck 2016-06-27 17:22:12 -0700 Comment on attachment 282186 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=282186&action=review > LayoutTests/inspector/runtime/change-execution-context-identifier-expected.txt:16 > +Passphrase in selected frame: rosewater > +PASS: The passphrase should match the phrase defined in the subframe. Style: InspectorTest.expectThat would output PASS: ... 1205791 10 282186 commit-queue 2016-06-27 17:23:28 -0700 Comment on attachment 282186 Proposed Fix Clearing flags on attachment: 282186 Committed r202522: <http://trac.webkit.org/changeset/202522> 1205792 11 commit-queue 2016-06-27 17:23:32 -0700 All reviewed patches have been landed. Closing bug. 224720 2014-02-19 23:31:07 -0800 2014-03-26 05:09:42 -0700 patch f3131.diff text/plain 2282 gbalogh.u-szeged ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEzNjEyY2EuLmJhMmQyMTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAyLTE5ICBHZXJnbyBCYWxvZ2gg IDxnYmFsb2doLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogUnVudGltZU1hbmFnZXIgc2hvdWxkIG5vdCB1c2UgdmlldyBvYmplY3QgV2ViSW5z cGVjdG9yLnF1aWNrQ29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI4MDkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1J1bnRpbWVNYW5hZ2VyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlwZS5ldmFsdWF0ZUluSW5zcGVjdGVk V2luZG93KToKKwogMjAxNC0wMi0xNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9y Zz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDU1Mgc2VsZWN0b3JzIGNvbnRhaW5pbmcgYSBj b2xvciBuYW1lIHNob3VsZG4ndCBiZSBjb25zaWRlcmVkIGZvciBjb2xvciBlZGl0aW5nCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9SdW50aW1lTWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1J1bnRpbWVNYW5hZ2Vy LmpzCmluZGV4IGY5NTYyZDguLjVmODk0YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1J1bnRpbWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1J1bnRpbWVNYW5hZ2VyLmpzCkBAIC00MSw3ICs0MSw3IEBA IFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAgICAvLyBQdWJs aWMKIAotICAgIGV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3c6IGZ1bmN0aW9uKGV4cHJlc3Npb24s IG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlv bnNBbmRNdXRlQ29uc29sZSwgcmV0dXJuQnlWYWx1ZSwgY2FsbGJhY2spCisgICAgZXZhbHVhdGVJ bkluc3BlY3RlZFdpbmRvdzogZnVuY3Rpb24oZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1 ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlLCBy ZXR1cm5CeVZhbHVlLCBjYWxsYmFjaywgY29udGV4dElkKQogICAgIHsKICAgICAgICAgaWYgKCFl eHByZXNzaW9uKSB7CiAgICAgICAgICAgICAvLyBUaGVyZSBpcyBubyBleHByZXNzaW9uLCBzbyB0 aGUgY29tcGxldGlvbiBzaG91bGQgaGFwcGVuIGFnYWluc3QgZ2xvYmFsIHByb3BlcnRpZXMuCkBA IC03MSw3ICs3MSw5IEBAIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDYpOiBFeGVjdXRpb24gY29udGV4dCBp ZGVudGlmaWVycyAoY29udGV4dElkKSBkaWQgbm90IGV4aXN0CiAgICAgICAgIC8vIGluIGlPUyA2 LiBGYWxsYmFjayB0byBpbmNsdWRpbmcgdGhlIGZyYW1lIGlkZW50aWZpZXIgKGZyYW1lSWQpLgot ICAgICAgICB2YXIgY29udGV4dElkID0gV2ViSW5zcGVjdG9yLnF1aWNrQ29uc29sZS5leGVjdXRp b25Db250ZXh0SWRlbnRpZmllcjsKKyAgICAgICAgaWYgKCFjb250ZXh0SWQpIHsKKyAgICAgICAg ICAgIGNvbnRleHRJZCA9IFdlYkluc3BlY3Rvci5xdWlja0NvbnNvbGUuZXhlY3V0aW9uQ29udGV4 dElkZW50aWZpZXI7CisgICAgICAgIH0KICAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlLmlu dm9rZSh7ZXhwcmVzc2lvbjogZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6IG9iamVjdEdyb3VwLCBp bmNsdWRlQ29tbWFuZExpbmVBUEk6IGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9u RXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNv bnNvbGUsIGNvbnRleHRJZDogY29udGV4dElkLCBmcmFtZUlkOiBjb250ZXh0SWQsIHJldHVybkJ5 VmFsdWU6IHJldHVybkJ5VmFsdWV9LCBldmFsQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAgfSwK IAo= 227844 2014-03-26 05:09:42 -0700 2016-06-27 16:39:16 -0700 proposed patch 3131.diff text/plain 1722 gbalogh.u-szeged ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA5ZTFhNTguLjE3MjQ2ZDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAzLTI2ICBHZXJnbyBCYWxvZ2gg IDxnYmFsb2doLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogUnVudGltZU1hbmFnZXIgc2hvdWxkIG5vdCB1c2UgdmlldyBvYmplY3QgV2ViSW5z cGVjdG9yLnF1aWNrQ29uc29sZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyODA5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUuZXZhbHVh dGVJbkluc3BlY3RlZFdpbmRvdyk6CisKIDIwMTQtMDMtMjUgIEphbWVzIENyYWlnICA8amNyYWln QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBWEk6IGFkZCBzdXBwb3J0IGZv ciBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQgYW5kIHJlY29uY2lsZSBVSS90ZXN0aW5nIHdpdGggcGFy ZW50Tm9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvUnVudGltZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qcwppbmRleCBmOTU2MmQ4Li4w OWQwOWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qcwpAQCAtNzEsNyArNzEs NyBAQCBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgICAg IC8vIENPTVBBVElCSUxJVFkgKGlPUyA2KTogRXhlY3V0aW9uIGNvbnRleHQgaWRlbnRpZmllcnMg KGNvbnRleHRJZCkgZGlkIG5vdCBleGlzdAogICAgICAgICAvLyBpbiBpT1MgNi4gRmFsbGJhY2sg dG8gaW5jbHVkaW5nIHRoZSBmcmFtZSBpZGVudGlmaWVyIChmcmFtZUlkKS4KLSAgICAgICAgdmFy IGNvbnRleHRJZCA9IFdlYkluc3BlY3Rvci5xdWlja0NvbnNvbGUuZXhlY3V0aW9uQ29udGV4dElk ZW50aWZpZXI7CisgICAgICAgIHZhciBjb250ZXh0SWQ7CiAgICAgICAgIFJ1bnRpbWVBZ2VudC5l dmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb246IGV4cHJlc3Npb24sIG9iamVjdEdyb3VwOiBvYmpl Y3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJOiBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGRv Tm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogZG9Ob3RQYXVzZU9uRXhjZXB0aW9u c0FuZE11dGVDb25zb2xlLCBjb250ZXh0SWQ6IGNvbnRleHRJZCwgZnJhbWVJZDogY29udGV4dElk LCByZXR1cm5CeVZhbHVlOiByZXR1cm5CeVZhbHVlfSwgZXZhbENhbGxiYWNrLmJpbmQodGhpcykp OwogICAgIH0sCiAK 282186 2016-06-27 16:39:19 -0700 2016-06-27 17:23:28 -0700 Proposed Fix bug-128092-20160627163904.patch text/plain 16041 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 YjRhMzI5YTNiMmUyOGYzZmFmMWNmNTA1NDdhMDdiNGJmZTdkNzliLi42NzQ2ZDVkNmVjOTFkNzEz M2E0ZmE4ZDA3ZWM4NGE2NGJlMzM0ZjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAxNi0wNi0yNyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSdW50aW1lTWFuYWdlciBzaG91bGQgbm90IHVzZSB2aWV3 IG9iamVjdCBXZWJJbnNwZWN0b3IucXVpY2tDb25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwOTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzE1OTY2NTI2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgaXMgYSBsYXllcmluZyB2aW9sYXRpb24gd2hpY2ggbWFrZXMgaXQgaGFyZGVyIHRv IHVzZSBSdW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93CisgICAgICAgIGZy b20gYSB0ZXN0aW5nIGNvbnRleHQgd2hlcmUgdGhlIFF1aWNrQ29uc29sZSB2aWV3IGRvZXMgbm90 IGV4aXN0LgorCisgICAgICAgIFN0b3JlIHRoZSBzZWxlY3RlZCBleGVjdXRpb24gY29udGV4dCBp ZGVudGlmaWVyIG9uIFJ1bnRpbWVNYW5hZ2VyIGFuZCB1c2UgaXQKKyAgICAgICAgd2hlbiBkb2lu ZyBzdWJzZXF1ZW50IGV2YWx1YXRpb25zIHRoYXQgYWN0IG9uIHRoZSBjdXJyZW50bHkgc2VsZWN0 ZWQgZnJhbWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVN YW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlw ZS5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SdW50 aW1lTWFuYWdlci5wcm90b3R5cGUuc2F2ZVJlc3VsdCk6CisgICAgICAgIFVzZSBsb2NhbCBzdGF0 ZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlwZS5nZXQg ZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUuc2V0IGRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRl bnRpZmllcik6CisgICAgICAgIEFkZGVkLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuUnVudGlt ZU1hbmFnZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0V4ZWN1dGlvbkNvbnRl eHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXhlY3V0aW9uQ29udGV4dCk6CisgICAgICAg IE1vdmUgdGhlIHN5bWJvbGljIG5hbWUgZm9yIHRoZSB0b3AgbGV2ZWwgZXhlY3V0aW9uIGNvbnRl eHQgdG8gUnVudGltZU1hbmFnZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Rlc3QvVGVz dC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5sb2FkZWQpOiBObyBuZWVkIHRvIHN0dWIgb3V0 IFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUgYW55IG1vcmUuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5RdWlj a0NvbnNvbGUucHJvdG90eXBlLl9mcmFtZVBhZ2VFeGVjdXRpb25Db250ZXh0c0NoYW5nZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX3JlbW92ZUV4ZWN1 dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX3VwZGF0ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9u ZW50Rm9yRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5 cGUuX3BhdGhDb21wb25lbnRTZWxlY3RlZCk6CisgICAgICAgIEZvciBub3csIHNldCBSdW50aW1l TWFuYWdlcidzIHNlbGVjdGVkIGV4ZWN1dGlvbiBjb250ZXh0IHdoZW5ldmVyIHdlIHNldCB0aGUK KyAgICAgICAgc2VsZWN0ZWQgcGF0aCBjb21wb25lbnQuIEluIGEgZnV0dXJlIHBhdGNoLCB3ZSBz aG91bGQgaW52ZXJ0IHRoZSBkZXBlbmRlbmN5IGFuZCBoYXZlCisgICAgICAgIHRoZSBzZWxlY3Rl ZCBjb21wb25lbnQgY2hhbmdlIHdoZW5ldmVyIFJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRp b25Db250ZXh0IGNoYW5nZXMuCisKIDIwMTYtMDYtMjMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXJzdCBoZWFwIHNuYXBz aG90IHRha2VuIHdoZW4gYSBwYWdlIGlzIHJlbG9hZGVkIGhhcHBlbnMgYmVmb3JlIHRoZSByZWxv YWQgbmF2aWdhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qcwppbmRleCA1MDA1 YmIyZGM3MDgxODBlZTIxMjU2ODViMWI0MmNmMGU1OTBkMjEwLi5hZTg0YzBlYjk2YTgwZWRiMmFm ZWEzOTQ4ZWI4YWEwYzI3ZTQwZTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5q cwpAQCAtODIsNyArODIsNyBAQCBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIgPSBjbGFzcyBS dW50aW1lTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgfQogCiAg ICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyA4KTogInNhdmVSZXN1bHQiIGRpZCBub3QgZXhp c3QuCi0gICAgICAgIHZhciBjb250ZXh0SWQgPSBXZWJJbnNwZWN0b3IucXVpY2tDb25zb2xlLmV4 ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyOworICAgICAgICBsZXQgY29udGV4dElkID0gdGhpcy5k ZWZhdWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI7CiAgICAgICAgIFJ1bnRpbWVBZ2VudC5l dmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExp bmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZSwgY29udGV4dElkLCBy ZXR1cm5CeVZhbHVlLCBnZW5lcmF0ZVByZXZpZXcsIHNhdmVSZXN1bHR9LCBldmFsQ2FsbGJhY2su YmluZCh0aGlzKSk7CiAgICAgfQogCkBAIC0xMDQsNyArMTA0LDcgQEAgV2ViSW5zcGVjdG9yLlJ1 bnRpbWVNYW5hZ2VyID0gY2xhc3MgUnVudGltZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAgICAgICAgIGlmIChyZW1vdGVPYmplY3Qub2JqZWN0SWQpCiAgICAgICAgICAgICBS dW50aW1lQWdlbnQuc2F2ZVJlc3VsdChyZW1vdGVPYmplY3QuYXNDYWxsQXJndW1lbnQoKSwgbXlj YWxsYmFjayk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIFJ1bnRpbWVBZ2VudC5zYXZlUmVz dWx0KHJlbW90ZU9iamVjdC5hc0NhbGxBcmd1bWVudCgpLCBXZWJJbnNwZWN0b3IucXVpY2tDb25z b2xlLmV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyLCBteWNhbGxiYWNrKTsKKyAgICAgICAgICAg IFJ1bnRpbWVBZ2VudC5zYXZlUmVzdWx0KHJlbW90ZU9iamVjdC5hc0NhbGxBcmd1bWVudCgpLCB0 aGlzLmRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciwgbXljYWxsYmFjayk7CiAgICAg fQogCiAgICAgZ2V0UHJvcGVydGllc0ZvclJlbW90ZU9iamVjdChvYmplY3RJZCwgY2FsbGJhY2sp CkBAIC0xMjIsOCArMTIyLDEzIEBAIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlciA9IGNsYXNz IFJ1bnRpbWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAg Y2FsbGJhY2sobnVsbCwgcHJvcGVydGllcyk7CiAgICAgICAgIH0pOwogICAgIH0KKworICAgIGdl dCBkZWZhdWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIoKSB7IHJldHVybiB0aGlzLl9kZWZh dWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI7IH0KKyAgICBzZXQgZGVmYXVsdEV4ZWN1dGlv bkNvbnRleHRJZGVudGlmaWVyKHZhbHVlKSB7IHRoaXMuX2RlZmF1bHRFeGVjdXRpb25Db250ZXh0 SWRlbnRpZmllciA9IHZhbHVlOyB9CiB9OwogCitXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIu VG9wTGV2ZWxFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciA9IHVuZGVmaW5lZDsKKwogV2ViSW5z cGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLkV2ZW50ID0gewogICAgIERpZEV2YWx1YXRlOiAicnVudGlt ZS1tYW5hZ2VyLWRpZC1ldmFsdWF0ZSIKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRXhlY3V0aW9uQ29udGV4dC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9FeGVjdXRpb25Db250ZXh0LmpzCmlu ZGV4IDgwZjIwMjNjMGVkZTlhZTFiYWIzMDBiYWJkZjY5Y2FjMWIzODlkNGMuLmMwYTQyYmUyYTEw ZjAxYTBlNzdiNjhjN2RiMWYzN2RkMWI3YTA1OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9FeGVjdXRpb25Db250ZXh0LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9FeGVjdXRpb25Db250ZXh0 LmpzCkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3BlY3Rvci5FeGVjdXRpb25Db250ZXh0ID0gY2xh c3MgRXhlY3V0aW9uQ29udGV4dCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgewogICAg ICAgICBzdXBlcigpOwogCi0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGVvZiBpZCA9PT0gIm51 bWJlciIgfHwgaWQgPT09IFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUuTWFpbkZyYW1lQ29udGV4 dEV4ZWN1dGlvbklkZW50aWZpZXIpOworICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlb2YgaWQg PT09ICJudW1iZXIiIHx8IGlkID09PSBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuVG9wTGV2 ZWxFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllcik7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5 cGVvZiBuYW1lID09PSAic3RyaW5nIik7CiAKICAgICAgICAgdGhpcy5faWQgPSBpZDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcwppbmRleCBi ZGY1NzBiMzlmNzkzN2EyZDRmODRhNGFlZTY3N2YxMWFjNGExMTQ2Li41MGJjYTU3ZmY5NTg1OGQx NWRjODIyOTdkMGNkNDYwYTE2YzE0NmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzCkBAIC02Miw5ICs2Miw2IEBAIFdlYkluc3BlY3Rv ci5sb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5wcm9iZU1hbmFnZXIgPSBuZXcgV2ViSW5z cGVjdG9yLlByb2JlTWFuYWdlcjsKICAgICB0aGlzLnJlcGxheU1hbmFnZXIgPSBuZXcgV2ViSW5z cGVjdG9yLlJlcGxheU1hbmFnZXI7CiAKLSAgICAvLyBHbG9iYWwgY29udHJvbGxlcnMuCi0gICAg dGhpcy5xdWlja0NvbnNvbGUgPSB7ZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI6IHVuZGVmaW5l ZH07Ci0KICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJET01Db250ZW50TG9hZGVkIiwg dGhpcy5jb250ZW50TG9hZGVkKTsKIAogICAgIC8vIEVuYWJsZSBhZ2VudHMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNv bGUuanMKaW5kZXggYzQ4YTBkODE1ZTRhYzZiYzczZjFiOTY0Nzk3ODgzNTFiZGVkMmYzNS4uNWU0 ZjkyNjFlNDViODBiYTIwODI5NDZhMDU4M2Q3ZDEyOTEwNDI4NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5q cwpAQCAtMTQ5LDYgKzE0OSw3IEBAIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUgPSBjbGFzcyBR dWlja0NvbnNvbGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICBpZiAoc2hvdWxk QXV0b21hdGljYWxseVNlbGVjdCkgewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3Jlc3RvcmVT ZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRGb3JGcmFtZTsKICAgICAgICAgICAgIHRoaXMuX3NlbGVj dGVkRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQgPSBuZXdFeGVjdXRpb25Db250ZXh0UGF0 aENvbXBvbmVudDsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5kZWZh dWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgPSB0aGlzLmV4ZWN1dGlvbkNvbnRleHRJZGVu dGlmaWVyOwogICAgICAgICAgICAgdGhpcy5fcmVidWlsZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50cygpOwogICAgICAgICB9CiAgICAgfQpAQCAtMjYwLDggKzI2MSwxMCBAQCBXZWJJbnNw ZWN0b3IuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV2ViSW5zcGVj dG9yLlZpZXcKICAgICAgICAgaWYgKG5leHQpCiAgICAgICAgICAgICBuZXh0LnByZXZpb3VzU2li bGluZyA9IHByZXY7CiAKLSAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkRXhlY3V0aW9uQ29udGV4 dFBhdGhDb21wb25lbnQgPT09IGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KQorICAgICAg ICBpZiAodGhpcy5fc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9PT0gZXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQpIHsKICAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVk RXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQgPSB0aGlzLl9tYWluRnJhbWVFeGVjdXRpb25D b250ZXh0UGF0aENvbXBvbmVudDsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFu YWdlci5kZWZhdWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgPSB0aGlzLmV4ZWN1dGlvbkNv bnRleHRJZGVudGlmaWVyOworICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fb3RoZXJFeGVjdXRp b25Db250ZXh0UGF0aENvbXBvbmVudHMucmVtb3ZlKGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9u ZW50LCB0cnVlKTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2ZyYW1lSWRlbnRpZmllclRvRXhlY3V0 aW9uQ29udGV4dFBhdGhDb21wb25lbnRNYXBbZnJhbWUuaWRdOwpAQCAtMjg0LDggKzI4NywxMCBA QCBXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMg V2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5fcmVtb3ZlRXhlY3V0aW9uQ29udGV4dFBh dGhDb21wb25lbnRGb3JGcmFtZShmcmFtZSwgdHJ1ZSk7CiAgICAgICAgIHZhciBuZXdFeGVjdXRp b25Db250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMuX2luc2VydEV4ZWN1dGlvbkNvbnRleHRQYXRo Q29tcG9uZW50Rm9yRnJhbWUoZnJhbWUsIHRydWUpOwogCi0gICAgICAgIGlmICh3YXNTZWxlY3Rl ZCkKKyAgICAgICAgaWYgKHdhc1NlbGVjdGVkKSB7CiAgICAgICAgICAgICB0aGlzLl9zZWxlY3Rl ZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ID0gbmV3RXhlY3V0aW9uQ29udGV4dFBhdGhD b21wb25lbnQ7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZGVmYXVs dEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyID0gdGhpcy5leGVjdXRpb25Db250ZXh0SWRlbnRp ZmllcjsKKyAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3JlYnVpbGRFeGVjdXRpb25Db250ZXh0 UGF0aENvbXBvbmVudHMoKTsKICAgICB9CkBAIC0yOTYsNiArMzAxLDcgQEAgV2ViSW5zcGVjdG9y LlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdlYkluc3BlY3Rvci5W aWV3CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRFeGVjdXRp b25Db250ZXh0UGF0aENvbXBvbmVudCA9IGV2ZW50LmRhdGEucGF0aENvbXBvbmVudDsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRl bnRpZmllciA9IHRoaXMuZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI7CiAKICAgICAgICAgdGhp cy5fcmVidWlsZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50cygpOwogICAgIH0KQEAgLTMy NSw4ICszMzEsNiBAQCBXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLlRvb2xiYXJTaW5nbGVMaW5l SGVpZ2h0ID0gMjE7CiBXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLlRvb2xiYXJQcm9tcHRQYWRk aW5nID0gNDsKIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUuVG9vbGJhclRvcEJvcmRlciA9IDE7 CiAKLVdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUuTWFpbkZyYW1lQ29udGV4dEV4ZWN1dGlvbklk ZW50aWZpZXIgPSB1bmRlZmluZWQ7Ci0KIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUuRXZlbnQg PSB7CiAgICAgRGlkUmVzaXplOiAicXVpY2stY29uc29sZS1kaWQtcmVzaXplIgogfTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBiZmZiNjllZDM3MjJmZjlhNTU1MGY1MjM2Mzc2ZmFhNDIwYTUxMjVlLi5hZDY1MWU2ZGUzYmIx N2QyMDIyZDIxYTNhNDkwNmY5MGMyMjE5NmUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTYt MDYtMjcgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogUnVudGltZU1hbmFnZXIgc2hvdWxkIG5vdCB1c2UgdmlldyBvYmplY3QgV2ViSW5zcGVj dG9yLnF1aWNrQ29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI4MDkyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTk2NjUyNj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc29tZSByZWFs bHkgYmFzaWMgY292ZXJhZ2UgZm9yIFJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRpb25Db250 ZXh0SWRlbnRpZmllcgorICAgICAgICBhbmQgdXNpbmcgaXQgaW4gUnVudGltZU1hbmFnZXIuZXZh bHVhdGVJbkluc3BlY3RlZFdpbmRvdy4KKworICAgICAgICAqIGluc3BlY3Rvci9ydW50aW1lL2No YW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogaW5zcGVjdG9yL3J1bnRpbWUvY2hhbmdlLWV4ZWN1dGlvbi1jb250ZXh0LWlkZW50 aWZpZXIuaHRtbDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL3J1bnRpbWUvcmVzb3VyY2Vz L2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLXN1YmZyYW1lLmh0bWw6IEFkZGVk LgorCiAyMDE2LTA2LTI3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTjogV2ViIEluc3BlY3RvcjogVGV4dCBzZWFyY2ggYnJva2VuIGlu IHJlc291cmNlcyB3aXRoIDxDUj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9y dW50aW1lL2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1p ZGVudGlmaWVyLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMGUxZmQxNjUzMjIxMGI1ZTFlYWRh ZGM3NmM1MDExZTJiMjliZThjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3J1bnRpbWUvY2hhbmdlLWV4ZWN1dGlvbi1jb250ZXh0LWlkZW50aWZpZXItZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMjEgQEAKKworVGVzdCB0aGF0IFJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRl SW5JbnNwZWN0ZWRXaW5kb3cgcmVzcGVjdHMgdGhlIHNlbGVjdGVkIGV4ZWN1dGlvbiBjb250ZXh0 LgorCisKKz09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogUnVudGltZU1hbmFnZXIuZGVmYXVsdEV4ZWN1 dGlvbkNvbnRleHRJZGVudGlmaWVyCistLSBSdW5uaW5nIHRlc3QgY2FzZTogSW5pdGlhbFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQKK1BBU1M6IFRoZSBkZWZhdWx0IGV4ZWN1dGlvbiBjb250ZXh0IHNo b3VsZCBiZSB0aGUgdG9wIGxldmVsIGV4ZWN1dGlvbiBjb250ZXh0IGluaXRpYWxseS4KKworLS0g UnVubmluZyB0ZXN0IGNhc2U6IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRNYWluRnJhbWUKK1Bhc3Nw aHJhc2UgaW4gc2VsZWN0ZWQgZnJhbWU6IGNvbGR3YXRlcgorUEFTUzogVGhlIHBhc3NwaHJhc2Ug c2hvdWxkIG1hdGNoIHRoZSBwaHJhc2UgZGVmaW5lZCBpbiB0aGUgbWFpbiBmcmFtZS4KKworLS0g UnVubmluZyB0ZXN0IGNhc2U6IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRTdWJGcmFtZQorUEFTUzog VGhlIHRlc3QgcGFnZSBzaG91bGQgb25seSBoYXZlIG9uZSBzdWItZnJhbWUuCitQYXNzcGhyYXNl IGluIHNlbGVjdGVkIGZyYW1lOiByb3Nld2F0ZXIKK1BBU1M6IFRoZSBwYXNzcGhyYXNlIHNob3Vs ZCBtYXRjaCB0aGUgcGhyYXNlIGRlZmluZWQgaW4gdGhlIHN1YmZyYW1lLgorCistLSBSdW5uaW5n IHRlc3QgY2FzZTogU2NyaXB0RXhlY3V0aW9uQ29udGV4dE1haW5GcmFtZUFnYWluCitQYXNzcGhy YXNlIGluIHNlbGVjdGVkIGZyYW1lOiBjb2xkd2F0ZXIKK1BBU1M6IFRoZSBwYXNzcGhyYXNlIHNo b3VsZCBtYXRjaCB0aGUgcGhyYXNlIGRlZmluZWQgaW4gdGhlIG1haW4gZnJhbWUuCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL2NoYW5nZS1leGVjdXRpb24tY29u dGV4dC1pZGVudGlmaWVyLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9jaGFu Z2UtZXhlY3V0aW9uLWNvbnRleHQtaWRlbnRpZmllci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRjZjVmMTE4 ODYxODc5NzViOTFiN2JlNTUyNzVjY2Y4NDQ3YTAxYzMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9jaGFuZ2UtZXhlY3V0aW9uLWNvbnRleHQtaWRlbnRp Zmllci5odG1sCkBAIC0wLDAgKzEsNzQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh ZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvaW5z cGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKwordmFyIHBhc3NwaHJhc2UgPSAi Y29sZHdhdGVyIjsKKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgbGV0IHN1aXRlID0gSW5zcGVj dG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJSdW50aW1lTWFuYWdlci5kZWZhdWx0RXhlY3V0aW9u Q29udGV4dElkZW50aWZpZXIiKTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAg bmFtZTogIkluaXRpYWxTY3JpcHRFeGVjdXRpb25Db250ZXh0IiwKKyAgICAgICAgZGVzY3JpcHRp b246ICJUZXN0IHRoYXQgdGhlIGluaXRpYWwgdmFsdWUgb2YgZGVmYXVsdEV4ZWN1dGlvbkNvbnRl eHRJZGVudGlmaWVyIGlzIHRoZSB0b3AtbGV2ZWwgY29udGV4dC4iLAorICAgICAgICB0ZXN0OiAo cmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRo YXQoV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRl bnRpZmllciA9PT0gV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLlRvcExldmVsRXhlY3V0aW9u Q29udGV4dElkZW50aWZpZXIsICJUaGUgZGVmYXVsdCBleGVjdXRpb24gY29udGV4dCBzaG91bGQg YmUgdGhlIHRvcCBsZXZlbCBleGVjdXRpb24gY29udGV4dCBpbml0aWFsbHkuIik7CisgICAgICAg ICAgICByZXNvbHZlKCk7CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRlLmFkZFRlc3RD YXNlKHsKKyAgICAgICAgbmFtZTogIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHRNYWluRnJhbWUiLAor ICAgICAgICBkZXNjcmlwdGlvbjogIlRlc3QgdGhhdCBldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93 IHdvcmtzIHdoZW4gZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyIGlzIHRoZSB0b3Ag bGV2ZWwgY29udGV4dC4iLAorICAgICAgICB0ZXN0OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7Cisg ICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3Rl ZFdpbmRvdygicGFzc3BocmFzZSIsIHtvYmplY3RHcm91cDogInRlc3QifSwgKHJlbW90ZU9iamVj dCwgd2FzVGhyb3duLCBzYXZlZFJlc3VsdEluZGV4KSA9PiB7CisgICAgICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5sb2coIlBhc3NwaHJhc2UgaW4gc2VsZWN0ZWQgZnJhbWU6ICIgKyByZW1vdGVP YmplY3QudmFsdWUpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChy ZW1vdGVPYmplY3QudmFsdWUgPT09ICJjb2xkd2F0ZXIiLCAiVGhlIHBhc3NwaHJhc2Ugc2hvdWxk IG1hdGNoIHRoZSBwaHJhc2UgZGVmaW5lZCBpbiB0aGUgbWFpbiBmcmFtZS4iKTsKKyAgICAgICAg ICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0pOwor CisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiU2NyaXB0RXhlY3V0aW9u Q29udGV4dFN1YkZyYW1lIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJUZXN0IHRoYXQgZXZhbHVh dGVJbkluc3BlY3RlZFdpbmRvdyB3b3JrcyB3aGVuIGRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRl bnRpZmllciBpcyBhIHN1YmZyYW1lIGNvbnRleHQuIiwKKyAgICAgICAgdGVzdDogKHJlc29sdmUs IHJlamVjdCkgPT4geworICAgICAgICAgICAgbGV0IG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5m cmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7CisgICAgICAgICAgICBsZXQgc3ViZnJhbWVz ID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmZyYW1lcy5maWx0ZXIoKGZyYW1l KSA9PiBmcmFtZSAhPSBtYWluRnJhbWUpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RUaGF0KHN1YmZyYW1lcy5sZW5ndGggPT09IDEsICJUaGUgdGVzdCBwYWdlIHNob3VsZCBvbmx5 IGhhdmUgb25lIHN1Yi1mcmFtZS4iKTsKKworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRp bWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciA9IHN1YmZyYW1lc1sw XS5wYWdlRXhlY3V0aW9uQ29udGV4dC5pZDsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50 aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCJwYXNzcGhyYXNlIiwge29iamVj dEdyb3VwOiAidGVzdCJ9LCAocmVtb3RlT2JqZWN0LCB3YXNUaHJvd24sIHNhdmVkUmVzdWx0SW5k ZXgpID0+IHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiUGFzc3BocmFzZSBp biBzZWxlY3RlZCBmcmFtZTogIiArIHJlbW90ZU9iamVjdC52YWx1ZSk7CisgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHJlbW90ZU9iamVjdC52YWx1ZSA9PT0gInJvc2V3 YXRlciIsICJUaGUgcGFzc3BocmFzZSBzaG91bGQgbWF0Y2ggdGhlIHBocmFzZSBkZWZpbmVkIGlu IHRoZSBzdWJmcmFtZS4iKTsKKyAgICAgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAg ICB9KTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAg ICAgICBuYW1lOiAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dE1haW5GcmFtZUFnYWluIiwKKyAgICAg ICAgZGVzY3JpcHRpb246ICJUZXN0IHRoYXQgZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyB3b3Jr cyB3aGVuIGRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciBzd2l0Y2hlcyBiYWNrIHRv IHRoZSBtYWluIGZyYW1lIGV4ZWN1dGlvbiBjb250ZXh0LiIsCisgICAgICAgIHRlc3Q6IChyZXNv bHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgICAgIGxldCBtYWluRnJhbWUgPSBXZWJJbnNwZWN0 b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lOworCisgICAgICAgICAgICBXZWJJbnNw ZWN0b3IucnVudGltZU1hbmFnZXIuZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyID0g bWFpbkZyYW1lLnBhZ2VFeGVjdXRpb25Db250ZXh0LmlkOworICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coInBhc3NwaHJhc2Ui LCB7b2JqZWN0R3JvdXA6ICJ0ZXN0In0sIChyZW1vdGVPYmplY3QsIHdhc1Rocm93biwgc2F2ZWRS ZXN1bHRJbmRleCkgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJQYXNz cGhyYXNlIGluIHNlbGVjdGVkIGZyYW1lOiAiICsgcmVtb3RlT2JqZWN0LnZhbHVlKTsKKyAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocmVtb3RlT2JqZWN0LnZhbHVlID09 PSAiY29sZHdhdGVyIiwgIlRoZSBwYXNzcGhyYXNlIHNob3VsZCBtYXRjaCB0aGUgcGhyYXNlIGRl ZmluZWQgaW4gdGhlIG1haW4gZnJhbWUuIik7CisgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwor ICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRlLnJ1blRlc3RD YXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxpZnJhbWUg c3JjPSJyZXNvdXJjZXMvY2hhbmdlLWV4ZWN1dGlvbi1jb250ZXh0LWlkZW50aWZpZXItc3ViZnJh bWUuaHRtbCIgb25sb2FkPSJydW5UZXN0KCkiPjwvaWZyYW1lPgorPHA+VGVzdCB0aGF0IFJ1bnRp bWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3cgcmVzcGVjdHMgdGhlIHNlbGVjdGVk IGV4ZWN1dGlvbiBjb250ZXh0LjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL3Jlc291cmNlcy9jaGFuZ2UtZXhlY3V0aW9uLWNv bnRleHQtaWRlbnRpZmllci1zdWJmcmFtZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1 bnRpbWUvcmVzb3VyY2VzL2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLXN1YmZy YW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uOGFjMmFkZjRiNmVmM2NmMWM3YjhiMTA2MzRiOGQxZGIzNjc1 ZjQ5NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL3Jl c291cmNlcy9jaGFuZ2UtZXhlY3V0aW9uLWNvbnRleHQtaWRlbnRpZmllci1zdWJmcmFtZS5odG1s CkBAIC0wLDAgKzEsMTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3Jp cHQ+Cit2YXIgcGFzc3BocmFzZSA9ICJyb3Nld2F0ZXIiOworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keT4KKzwvYm9keT4KKzwvaHRtbD4K