146040 2015-06-16 18:16:24 -0700 Web Inspector: Inspector Scripts evaluated in the page should not be searchable 2015-06-16 22:12:36 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck benjamin burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1102424 0 joepeck 2015-06-16 18:16:24 -0700 * SUMMARY Inspector Scripts evaluated in the page should not be searchable. * STEPS TO REPRODUCE 1. Inspect about:blank 2. Type "[1,2].con" in the console, to show autocompletion "concat" 3. Search "1,2" or "getComple" => results in Inspector internal script evaluated on the page to get completion for [1,2] * NOTES - The frontend ignores all evaluations containing a sourceURL starting with "__WebInspector", so we should append something like that for EVERY eval the frontend runs on the inspected page. 1102425 1 webkit-bug-importer 2015-06-16 18:16:55 -0700 <rdar://problem/21413971> 1102428 2 joepeck 2015-06-16 18:24:14 -0700 Also affects DebuggerPopovers, and other one-off evaluations like "document". Basically all of these places can evaluate arbitrary code on the frontend: - RuntimeAgent.evaluate - DebuggerAgent.evaluateOnCallFrame - RuntimeAgent.callFunctionOn Both of these are wrapped by managers / models, others are called directly in code. I will just look at updating the direct call sites of each to ensure I cover each case. 1102435 3 254991 joepeck 2015-06-16 18:28:51 -0700 Created attachment 254991 [PATCH] Proposed Fix cq- for the moment because at least one part of this has yet to be tested manually by me. 1102436 4 254991 joepeck 2015-06-16 18:29:54 -0700 Comment on attachment 254991 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=254991&action=review > Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js:159 > + else if (result.type === "string" || result.type === "number" || result.type === "boolean") { > + var completionScript = "(" + getCompletions + ")(\"" + result.type + "\")"; > + WebInspector.runtimeManager.evaluateInInspectedWindow(completionScript, "completion", false, true, true, false, false, receivedPropertyNamesFromEvaluate.bind(this)); > + } else Err, this change can be reverted now that I have evaluateInInspectedWindow add the sourceURL. Let me update the patch. 1102437 5 254992 joepeck 2015-06-16 18:31:05 -0700 Created attachment 254992 [PATCH] Proposed Fix 1102475 6 254992 commit-queue 2015-06-16 22:12:30 -0700 Comment on attachment 254992 [PATCH] Proposed Fix Clearing flags on attachment: 254992 Committed r185638: <http://trac.webkit.org/changeset/185638> 1102476 7 commit-queue 2015-06-16 22:12:36 -0700 All reviewed patches have been landed. Closing bug. 254991 2015-06-16 18:28:51 -0700 2015-06-16 18:31:05 -0700 [PATCH] Proposed Fix sourceURL.patch text/plain 12016 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcxODI3ZWMuLjYyYjRhYTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTA2LTE2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVj dG9yIFNjcmlwdHMgZXZhbHVhdGVkIGluIHRoZSBwYWdlIHNob3VsZCBub3QgYmUgc2VhcmNoYWJs ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MDQw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQW55IHNj cmlwdCB3aXRoIGEgX19XZWJJbnNwZWN0b3Igc291cmNlIFVSTCB3aWxsIGJlIGhpZGRlbiBieSB0 aGUgdG9vbHMuCisgICAgICAgIFRoZXJlIHdlcmUgYSBudW1iZXIgb2Ygd2F5cyB0aGUgaW5zcGVj dG9yIGNvdWxkIGV2YWx1YXRlIHNjcmlwdCBvbiB0aGUgcGFnZQorICAgICAgICB3aXRob3V0IGdl dHRpbmcgdGhlIHNvdXJjZVVSTCBhbmQgdGhlcmVmb3JlIG5vdCBnZXR0aW5nIGhpZGRlbi4gQXVk aXQKKyAgICAgICAgYWxsIGNhc2VzIG9mIFJ1bnRpbWUuZXZhbHVhdGUsIFJ1bnRpbWUuY2FsbEZ1 bmN0aW9uT24sIGFuZAorICAgICAgICBEZWJ1Z2dlci5ldmFsdWF0ZU9uQ2FsbEZyYW1lLCB0byBl bnN1cmUgd2UgaGF2ZSBhbiBhcHByb3ByaWF0ZSBzb3VyY2UgVVJMLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qczoKKyAgICAgICAgKGFwcGVuZFdlYkluc3BlY3Rv clNvdXJjZVVSTCk6CisgICAgICAgIEhlbHBlciB0byBhcHBlbmQgYSBfX1dlYkluc3BlY3Rvcklu dGVybmFsX18gc291cmNlVVJMIHRvIGEgc3RyaW5nIHRoYXQgbWF5CisgICAgICAgIGJlIGV2YWx1 YXRlZCBkaXJlY3RseSBvbiB0aGUgaW5zcGVjdGVkIGNvbnRleHQuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVNYW5hZ2VyLmRvbU5vZGVSZXNvbHZlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5j b25zb2xlUHJvbXB0VGV4dENvbW1pdHRlZCk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0UnVudGltZUNvbXBsZXRpb25Qcm92aWRlci5qczoK KyAgICAgICAgKGdldCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFJ1bnRpbWVDb21wbGV0aW9uUHJv dmlkZXIucHJvdG90eXBlLmNvbXBsZXRpb25Db250cm9sbGVyQ29tcGxldGlvbnNOZWVkZWQuKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVNYW5hZ2VyLmpzOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NVHJlZS5wcm90b3R5cGUuX3JlcXVlc3RSb290RE9NTm9kZSk6CisgICAgICAg ICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1vdGVPYmplY3QuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0Lik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T b3VyY2VDb2RlVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2Rl VGV4dEVkaXRvci5wcm90b3R5cGUuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVySGlnaGxpZ2h0ZWRK YXZhU2NyaXB0RXhwcmVzc2lvbik6CisgICAgICAgIEVuc3VyZSBhbGwgY2FzZXMgdGhhdCBldmFs dWF0ZSBkaXJlY3RseSBvbiB0aGUgaW5zcGVjdGVkIHBhZ2UgLyBjb250ZXh0CisgICAgICAgIGhh dmUgdGhlIGludGVucmFsIHNvdXJjZSBVUkwuCisKIDIwMTUtMDYtMTYgIE1hdHQgQmFrZXIgIDxt YXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04g KHIxNzE2NDUpOiB1cC9kb3duIGtleSBuYXZpZ2F0aW9uIG9mIHRpbWVsaW5lIHNpZGViYXIgdHJl ZSBlbGVtZW50cyBpcyBicm9rZW4gd2hlbiBzY29wZSBiYXIgZmlsdGVycyBhcmUgYXBwbGllZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGls aXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxp dGllcy5qcwppbmRleCBjOGFjZGE4Li5lNjE5YTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtMTAwNyw2ICsx MDA3LDExIEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShBcnJheS5wcm90b3R5cGUsICJiaW5hcnlJ bmRleE9mIiwKICAgICB9CiB9KTsKIAorZnVuY3Rpb24gYXBwZW5kV2ViSW5zcGVjdG9yU291cmNl VVJMKHN0cmluZykKK3sKKyAgICByZXR1cm4gc3RyaW5nICsgIlxuLy8jIHNvdXJjZVVSTD1fX1dl Ykluc3BlY3RvckludGVybmFsX19cbiI7Cit9CisKIGZ1bmN0aW9uIGlzRnVuY3Rpb25TdHJpbmdO YXRpdmVDb2RlKHN0cikKIHsKICAgICByZXR1cm4gc3RyLmVuZHNXaXRoKCJ7XG4gICAgW25hdGl2 ZSBjb2RlXVxufSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qcwppbmRleCBkYTVh NmM0Li5kZmI5Y2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qcwpAQCAtNTk3 LDcgKzU5Nyw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlciA9IGNsYXNzIERPTVRyZWVN YW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgLy8gcGFzc2lu ZyB0aGUgRE9NTm9kZSBhcyB0aGUgInRoaXMiIHJlZmVyZW5jZS4KICAgICAgICAgICAgIHZhciBl dmFsUGFyYW1ldGVycyA9IHsKICAgICAgICAgICAgICAgICBvYmplY3RJZDogcmVtb3RlT2JqZWN0 Lm9iamVjdElkLAotICAgICAgICAgICAgICAgIGZ1bmN0aW9uRGVjbGFyYXRpb246IGJhY2tlbmRG dW5jdGlvbi50b1N0cmluZygpLAorICAgICAgICAgICAgICAgIGZ1bmN0aW9uRGVjbGFyYXRpb246 IGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChiYWNrZW5kRnVuY3Rpb24udG9TdHJpbmcoKSks CiAgICAgICAgICAgICAgICAgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0 cnVlLAogICAgICAgICAgICAgICAgIHJldHVybkJ5VmFsdWU6IGZhbHNlLAogICAgICAgICAgICAg ICAgIGdlbmVyYXRlUHJldmlldzogZmFsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwppbmRleCAyZmRjZjZlLi5hZmM3NjkyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9K YXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpz CkBAIC0yMzIsOCArMjMyLDYgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRMb2dWaWV3Q29udHJv bGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciBleHQKICAgICAgICAgICAg IHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlVmlldyhjb21tYW5kUmVzdWx0TWVzc2FnZVZpZXcs IHRydWUpOwogICAgICAgICB9CiAKLSAgICAgICAgdGV4dCArPSAiXG4vLyMgc291cmNlVVJMPV9f V2ViSW5zcGVjdG9yQ29uc29sZV9fXG4iOwotCiAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1l TWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KHRleHQsICJjb25zb2xlIiwgdHJ1ZSwg ZmFsc2UsIGZhbHNlLCB0cnVlLCB0cnVlLCBwcmludFJlc3VsdC5iaW5kKHRoaXMpKTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0phdmFTY3JpcHRSdW50aW1lQ29tcGxldGlvblByb3ZpZGVyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdFJ1bnRpbWVD b21wbGV0aW9uUHJvdmlkZXIuanMKaW5kZXggNGM3ODI2OS4uY2E1ZDEzMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlw dFJ1bnRpbWVDb21wbGV0aW9uUHJvdmlkZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdFJ1bnRpbWVDb21wbGV0aW9uUHJv dmlkZXIuanMKQEAgLTE1Myw5ICsxNTMsMTAgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRSdW50 aW1lQ29tcGxldGlvblByb3ZpZGVyID0gY2xhc3MgSmF2YVNjcmlwdFJ1bnRpbWVDb21wbGUKIAog ICAgICAgICAgICAgaWYgKHJlc3VsdC50eXBlID09PSAib2JqZWN0IiB8fCByZXN1bHQudHlwZSA9 PT0gImZ1bmN0aW9uIikKICAgICAgICAgICAgICAgICByZXN1bHQuY2FsbEZ1bmN0aW9uSlNPTihn ZXRDb21wbGV0aW9ucywgdW5kZWZpbmVkLCByZWNlaXZlZFByb3BlcnR5TmFtZXMuYmluZCh0aGlz KSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChyZXN1bHQudHlwZSA9PT0gInN0cmluZyIgfHwgcmVz dWx0LnR5cGUgPT09ICJudW1iZXIiIHx8IHJlc3VsdC50eXBlID09PSAiYm9vbGVhbiIpCi0gICAg ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0 ZWRXaW5kb3coIigiICsgZ2V0Q29tcGxldGlvbnMgKyAiKShcIiIgKyByZXN1bHQudHlwZSArICJc IikiLCAiY29tcGxldGlvbiIsIGZhbHNlLCB0cnVlLCB0cnVlLCBmYWxzZSwgZmFsc2UsIHJlY2Vp dmVkUHJvcGVydHlOYW1lc0Zyb21FdmFsdWF0ZS5iaW5kKHRoaXMpKTsKLSAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGVsc2UgaWYgKHJlc3VsdC50eXBlID09PSAic3RyaW5nIiB8fCByZXN1 bHQudHlwZSA9PT0gIm51bWJlciIgfHwgcmVzdWx0LnR5cGUgPT09ICJib29sZWFuIikgeworICAg ICAgICAgICAgICAgIHZhciBjb21wbGV0aW9uU2NyaXB0ID0gIigiICsgZ2V0Q29tcGxldGlvbnMg KyAiKShcIiIgKyByZXN1bHQudHlwZSArICJcIikiOworICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KGNvbXBsZXRpb25T Y3JpcHQsICJjb21wbGV0aW9uIiwgZmFsc2UsIHRydWUsIHRydWUsIGZhbHNlLCBmYWxzZSwgcmVj ZWl2ZWRQcm9wZXJ0eU5hbWVzRnJvbUV2YWx1YXRlLmJpbmQodGhpcykpOworICAgICAgICAgICAg fSBlbHNlCiAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biByZXN1bHQgdHlw ZTogIiArIHJlc3VsdC50eXBlKTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVN YW5hZ2VyLmpzCmluZGV4IDA4MjAyYTkuLjdkODhjMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVNYW5hZ2VyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRp bWVNYW5hZ2VyLmpzCkBAIC00Myw2ICs0Myw4IEBAIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdl ciA9IGNsYXNzIFJ1bnRpbWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg ICAgICAgICAgZXhwcmVzc2lvbiA9ICJ0aGlzIjsKICAgICAgICAgfQogCisgICAgICAgIGV4cHJl c3Npb24gPSBhcHBlbmRXZWJJbnNwZWN0b3JTb3VyY2VVUkwoZXhwcmVzc2lvbik7CisKICAgICAg ICAgZnVuY3Rpb24gZXZhbENhbGxiYWNrKGVycm9yLCByZXN1bHQsIHdhc1Rocm93biwgc2F2ZWRS ZXN1bHRJbmRleCkKICAgICAgICAgewogICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9M aXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLkV2ZW50LkRpZEV2YWx1YXRlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9E T01UcmVlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RP TVRyZWUuanMKaW5kZXggZThhZDQwYy4uMDY3NDYzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKQEAgLTIxMCw3ICsy MTAsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZSA9IGNsYXNzIERPTVRyZWUgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgNik6IEV4 ZWN1dGlvbiBjb250ZXh0IGlkZW50aWZpZXJzIChjb250ZXh0SWQpIGRpZCBub3QgZXhpc3QKICAg ICAgICAgICAgIC8vIGluIGlPUyA2LiBGYWxsYmFjayB0byBpbmNsdWRpbmcgdGhlIGZyYW1lIGlk ZW50aWZpZXIgKGZyYW1lSWQpLgogICAgICAgICAgICAgdmFyIGNvbnRleHRJZCA9IHRoaXMuX2Zy YW1lLnBhZ2VFeGVjdXRpb25Db250ZXh0ID8gdGhpcy5fZnJhbWUucGFnZUV4ZWN1dGlvbkNvbnRl eHQuaWQgOiB1bmRlZmluZWQ7Ci0gICAgICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUuaW52 b2tlKHtleHByZXNzaW9uOiAiZG9jdW1lbnQiLCBvYmplY3RHcm91cDogIiIsIGluY2x1ZGVDb21t YW5kTGluZUFQSTogZmFsc2UsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTog dHJ1ZSwgY29udGV4dElkLCBmcmFtZUlkOiB0aGlzLl9mcmFtZS5pZCwgcmV0dXJuQnlWYWx1ZTog ZmFsc2UsIGdlbmVyYXRlUHJldmlldzogZmFsc2V9LCByb290T2JqZWN0QXZhaWxhYmxlLmJpbmQo dGhpcykpOworICAgICAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlLmludm9rZSh7ZXhwcmVz c2lvbjogYXBwZW5kV2ViSW5zcGVjdG9yU291cmNlVVJMKCJkb2N1bWVudCIpLCBvYmplY3RHcm91 cDogIiIsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogZmFsc2UsIGRvTm90UGF1c2VPbkV4Y2VwdGlv bnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwgY29udGV4dElkLCBmcmFtZUlkOiB0aGlzLl9mcmFtZS5p ZCwgcmV0dXJuQnlWYWx1ZTogZmFsc2UsIGdlbmVyYXRlUHJldmlldzogZmFsc2V9LCByb290T2Jq ZWN0QXZhaWxhYmxlLmJpbmQodGhpcykpOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1vdGVPYmpl Y3QuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1v dGVPYmplY3QuanMKaW5kZXggYTU5MGUzOS4uMTRmZmVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1JlbW90ZU9iamVj dC5qcwpAQCAtMzA2LDcgKzMwNiw4IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QgPSBjbGFz cyBSZW1vdGVPYmplY3QKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb246dmFsdWUsIGRvTm90UGF1 c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTp0cnVlfSwgZXZhbHVhdGVkQ2FsbGJhY2suYmlu ZCh0aGlzKSk7CisgICAgICAgIC8vIEZJWE1FOiBJdCBkb2Vzbid0IGxvb2sgbGlrZSBzZXRQcm9w ZXJ0eVZhbHVlIGlzIHVzZWQgeWV0LiBUaGlzIHdpbGwgbmVlZCB0byBiZSB0ZXN0ZWQgd2hlbiBp dCBpcyBhZ2FpbiAoZWRpdGFibGUgT2JqZWN0VHJlZXMpLgorICAgICAgICBSdW50aW1lQWdlbnQu ZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOmFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTCh2 YWx1ZSksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTp0cnVlfSwgZXZhbHVh dGVkQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAKICAgICAgICAgZnVuY3Rpb24gZXZhbHVhdGVkQ2Fs bGJhY2soZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKQogICAgICAgICB7CkBAIC0zMjIsNyArMzIz LDcgQEAgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCA9IGNsYXNzIFJlbW90ZU9iamVjdAogCiAg ICAgICAgICAgICBkZWxldGUgcmVzdWx0LmRlc2NyaXB0aW9uOyAvLyBPcHRpbWl6ZSBvbiB0cmFm ZmljLgogCi0gICAgICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhpcy5fb2Jq ZWN0SWQsIHNldFByb3BlcnR5VmFsdWUudG9TdHJpbmcoKSwgW3t2YWx1ZTpuYW1lfSwgcmVzdWx0 XSwgdHJ1ZSwgdW5kZWZpbmVkLCBwcm9wZXJ0eVNldENhbGxiYWNrLmJpbmQodGhpcykpOworICAg ICAgICAgICAgUnVudGltZUFnZW50LmNhbGxGdW5jdGlvbk9uKHRoaXMuX29iamVjdElkLCBhcHBl bmRXZWJJbnNwZWN0b3JTb3VyY2VVUkwoc2V0UHJvcGVydHlWYWx1ZS50b1N0cmluZygpKSwgW3t2 YWx1ZTpuYW1lfSwgcmVzdWx0XSwgdHJ1ZSwgdW5kZWZpbmVkLCBwcm9wZXJ0eVNldENhbGxiYWNr LmJpbmQodGhpcykpOwogCiAgICAgICAgICAgICBpZiAocmVzdWx0Ll9vYmplY3RJZCkKICAgICAg ICAgICAgICAgICBSdW50aW1lQWdlbnQucmVsZWFzZU9iamVjdChyZXN1bHQuX29iamVjdElkKTsK QEAgLTQwNiw3ICs0MDcsNyBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVt b3RlT2JqZWN0CiAgICAgICAgIGlmIChhcmdzKQogICAgICAgICAgICAgYXJncyA9IGFyZ3MubWFw KFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuY3JlYXRlQ2FsbEFyZ3VtZW50KTsKIAotICAgICAg ICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhpcy5fb2JqZWN0SWQsIGZ1bmN0aW9uRGVj bGFyYXRpb24udG9TdHJpbmcoKSwgYXJncywgdHJ1ZSwgdW5kZWZpbmVkLCBnZW5lcmF0ZVByZXZp ZXcsIG15Y2FsbGJhY2spOworICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhp cy5fb2JqZWN0SWQsIGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChmdW5jdGlvbkRlY2xhcmF0 aW9uLnRvU3RyaW5nKCkpLCBhcmdzLCB0cnVlLCB1bmRlZmluZWQsIGdlbmVyYXRlUHJldmlldywg bXljYWxsYmFjayk7CiAgICAgfQogCiAgICAgY2FsbEZ1bmN0aW9uSlNPTihmdW5jdGlvbkRlY2xh cmF0aW9uLCBhcmdzLCBjYWxsYmFjaykKQEAgLTQxNiw3ICs0MTcsNyBAQCBXZWJJbnNwZWN0b3Iu UmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVtb3RlT2JqZWN0CiAgICAgICAgICAgICBjYWxsYmFjaygo ZXJyb3IgfHwgd2FzVGhyb3duKSA/IG51bGwgOiByZXN1bHQudmFsdWUpOwogICAgICAgICB9CiAK LSAgICAgICAgUnVudGltZUFnZW50LmNhbGxGdW5jdGlvbk9uKHRoaXMuX29iamVjdElkLCBmdW5j dGlvbkRlY2xhcmF0aW9uLnRvU3RyaW5nKCksIGFyZ3MsIHRydWUsIHRydWUsIG15Y2FsbGJhY2sp OworICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhpcy5fb2JqZWN0SWQsIGFw cGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChmdW5jdGlvbkRlY2xhcmF0aW9uLnRvU3RyaW5nKCkp LCBhcmdzLCB0cnVlLCB0cnVlLCBteWNhbGxiYWNrKTsKICAgICB9CiAgICAgCiAgICAgaW52b2tl R2V0dGVyKGdldHRlclJlbW90ZU9iamVjdCwgY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVU ZXh0RWRpdG9yLmpzCmluZGV4IDA3NzYxMGIuLmUyNzQyN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNv ZGVUZXh0RWRpdG9yLmpzCkBAIC0xMzg0LDEzICsxMzg0LDE1IEBAIFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlVGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVuZHMgV2Vi SW5zcGVjCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICB2YXIgZXhwcmVzc2lv biA9IGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChjYW5kaWRhdGUuZXhwcmVzc2lvbik7CisK ICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0aXZlQ2FsbEZyYW1l KSB7Ci0gICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmV2YWx1YXRlT25DYWxsRnJhbWUuaW52b2tl KHtjYWxsRnJhbWVJZDogV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hY3RpdmVDYWxsRnJh bWUuaWQsIGV4cHJlc3Npb246IGNhbmRpZGF0ZS5leHByZXNzaW9uLCBvYmplY3RHcm91cDogInBv cG92ZXIiLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IHRydWV9LCBwb3B1 bGF0ZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIERlYnVnZ2VyQWdlbnQuZXZhbHVhdGVPbkNh bGxGcmFtZS5pbnZva2Uoe2NhbGxGcmFtZUlkOiBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2Vy LmFjdGl2ZUNhbGxGcmFtZS5pZCwgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6ICJwb3BvdmVyIiwg ZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlfSwgcG9wdWxhdGUuYmlu ZCh0aGlzKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAgICAvLyBO byBjYWxsIGZyYW1lIGF2YWlsYWJsZS4gVXNlIHRoZSBtYWluIHBhZ2UncyBjb250ZXh0LgotICAg ICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOiBjYW5kaWRhdGUu ZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6ICJwb3BvdmVyIiwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9u c0FuZE11dGVDb25zb2xlOiB0cnVlfSwgcG9wdWxhdGUuYmluZCh0aGlzKSk7CisgICAgICAgIFJ1 bnRpbWVBZ2VudC5ldmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb24sIG9iamVjdEdyb3VwOiAicG9w b3ZlciIsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZX0sIHBvcHVs YXRlLmJpbmQodGhpcykpOwogICAgIH0KIAogICAgIF90b2tlblRyYWNraW5nQ29udHJvbGxlckhp Z2hsaWdodGVkSmF2YVNjcmlwdFR5cGVJbmZvcm1hdGlvbihjYW5kaWRhdGUpCg== 254992 2015-06-16 18:31:05 -0700 2015-06-16 22:12:30 -0700 [PATCH] Proposed Fix better.patch text/plain 10312 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcxODI3ZWMuLmQ5MGVmNWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE1LTA2LTE2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVj dG9yIFNjcmlwdHMgZXZhbHVhdGVkIGluIHRoZSBwYWdlIHNob3VsZCBub3QgYmUgc2VhcmNoYWJs ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MDQw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQW55IHNj cmlwdCB3aXRoIGEgX19XZWJJbnNwZWN0b3Igc291cmNlIFVSTCB3aWxsIGJlIGhpZGRlbiBieSB0 aGUgdG9vbHMuCisgICAgICAgIFRoZXJlIHdlcmUgYSBudW1iZXIgb2Ygd2F5cyB0aGUgaW5zcGVj dG9yIGNvdWxkIGV2YWx1YXRlIHNjcmlwdCBvbiB0aGUgcGFnZQorICAgICAgICB3aXRob3V0IGdl dHRpbmcgdGhlIHNvdXJjZVVSTCBhbmQgdGhlcmVmb3JlIG5vdCBnZXR0aW5nIGhpZGRlbi4gQXVk aXQKKyAgICAgICAgYWxsIGNhc2VzIG9mIFJ1bnRpbWUuZXZhbHVhdGUsIFJ1bnRpbWUuY2FsbEZ1 bmN0aW9uT24sIGFuZAorICAgICAgICBEZWJ1Z2dlci5ldmFsdWF0ZU9uQ2FsbEZyYW1lLCB0byBl bnN1cmUgd2UgaGF2ZSBhbiBhcHByb3ByaWF0ZSBzb3VyY2UgVVJMLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qczoKKyAgICAgICAgKGFwcGVuZFdlYkluc3BlY3Rv clNvdXJjZVVSTCk6CisgICAgICAgIEhlbHBlciB0byBhcHBlbmQgYSBfX1dlYkluc3BlY3Rvcklu dGVybmFsX18gc291cmNlVVJMIHRvIGEgc3RyaW5nIHRoYXQgbWF5CisgICAgICAgIGJlIGV2YWx1 YXRlZCBkaXJlY3RseSBvbiB0aGUgaW5zcGVjdGVkIGNvbnRleHQuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVNYW5hZ2VyLmRvbU5vZGVSZXNvbHZlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5j b25zb2xlUHJvbXB0VGV4dENvbW1pdHRlZCk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdlci5qczoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9ET01UcmVlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWUucHJv dG90eXBlLl9yZXF1ZXN0Um9vdERPTU5vZGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJv dG9jb2wvUmVtb3RlT2JqZWN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dC4pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3Iu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBl Ll90b2tlblRyYWNraW5nQ29udHJvbGxlckhpZ2hsaWdodGVkSmF2YVNjcmlwdEV4cHJlc3Npb24p OgorICAgICAgICBFbnN1cmUgYWxsIGNhc2VzIHRoYXQgZXZhbHVhdGUgZGlyZWN0bHkgb24gdGhl IGluc3BlY3RlZCBwYWdlIC8gY29udGV4dAorICAgICAgICBoYXZlIHRoZSBpbnRlbnJhbCBzb3Vy Y2UgVVJMLgorCiAyMDE1LTA2LTE2ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OIChyMTcxNjQ1KTogdXAvZG93biBr ZXkgbmF2aWdhdGlvbiBvZiB0aW1lbGluZSBzaWRlYmFyIHRyZWUgZWxlbWVudHMgaXMgYnJva2Vu IHdoZW4gc2NvcGUgYmFyIGZpbHRlcnMgYXJlIGFwcGxpZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKaW5kZXggYzhhY2Rh OC4uZTYxOWE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTEwMDcsNiArMTAwNywxMSBAQCBPYmplY3QuZGVm aW5lUHJvcGVydHkoQXJyYXkucHJvdG90eXBlLCAiYmluYXJ5SW5kZXhPZiIsCiAgICAgfQogfSk7 CiAKK2Z1bmN0aW9uIGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChzdHJpbmcpCit7CisgICAg cmV0dXJuIHN0cmluZyArICJcbi8vIyBzb3VyY2VVUkw9X19XZWJJbnNwZWN0b3JJbnRlcm5hbF9f XG4iOworfQorCiBmdW5jdGlvbiBpc0Z1bmN0aW9uU3RyaW5nTmF0aXZlQ29kZShzdHIpCiB7CiAg ICAgcmV0dXJuIHN0ci5lbmRzV2l0aCgie1xuICAgIFtuYXRpdmUgY29kZV1cbn0iKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RP TVRyZWVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKaW5kZXggZGE1YTZjNC4uZGZiOWNhZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9N VHJlZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKQEAgLTU5Nyw3ICs1OTcsNyBAQCBXZWJJbnNw ZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdlciBleHRlbmRzIFdlYklu c3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIC8vIHBhc3NpbmcgdGhlIERPTU5vZGUgYXMgdGhl ICJ0aGlzIiByZWZlcmVuY2UuCiAgICAgICAgICAgICB2YXIgZXZhbFBhcmFtZXRlcnMgPSB7CiAg ICAgICAgICAgICAgICAgb2JqZWN0SWQ6IHJlbW90ZU9iamVjdC5vYmplY3RJZCwKLSAgICAgICAg ICAgICAgICBmdW5jdGlvbkRlY2xhcmF0aW9uOiBiYWNrZW5kRnVuY3Rpb24udG9TdHJpbmcoKSwK KyAgICAgICAgICAgICAgICBmdW5jdGlvbkRlY2xhcmF0aW9uOiBhcHBlbmRXZWJJbnNwZWN0b3JT b3VyY2VVUkwoYmFja2VuZEZ1bmN0aW9uLnRvU3RyaW5nKCkpLAogICAgICAgICAgICAgICAgIGRv Tm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwKICAgICAgICAgICAgICAg ICByZXR1cm5CeVZhbHVlOiBmYWxzZSwKICAgICAgICAgICAgICAgICBnZW5lcmF0ZVByZXZpZXc6 IGZhbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRy b2xsZXIuanMKaW5kZXggMmZkY2Y2ZS4uYWZjNzY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250 cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwpAQCAtMjMyLDggKzIzMiw2IEBA IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgPSBjbGFzcyBKYXZhU2Ny aXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAgICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xl TWVzc2FnZVZpZXcoY29tbWFuZFJlc3VsdE1lc3NhZ2VWaWV3LCB0cnVlKTsKICAgICAgICAgfQog Ci0gICAgICAgIHRleHQgKz0gIlxuLy8jIHNvdXJjZVVSTD1fX1dlYkluc3BlY3RvckNvbnNvbGVf X1xuIjsKLQogICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbklu c3BlY3RlZFdpbmRvdyh0ZXh0LCAiY29uc29sZSIsIHRydWUsIGZhbHNlLCBmYWxzZSwgdHJ1ZSwg dHJ1ZSwgcHJpbnRSZXN1bHQuYmluZCh0aGlzKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1 bnRpbWVNYW5hZ2VyLmpzCmluZGV4IDA4MjAyYTkuLjdkODhjMjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVNYW5hZ2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L1J1bnRpbWVNYW5hZ2VyLmpzCkBAIC00Myw2ICs0Myw4IEBAIFdlYkluc3BlY3Rvci5SdW50aW1l TWFuYWdlciA9IGNsYXNzIFJ1bnRpbWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVj dAogICAgICAgICAgICAgZXhwcmVzc2lvbiA9ICJ0aGlzIjsKICAgICAgICAgfQogCisgICAgICAg IGV4cHJlc3Npb24gPSBhcHBlbmRXZWJJbnNwZWN0b3JTb3VyY2VVUkwoZXhwcmVzc2lvbik7CisK ICAgICAgICAgZnVuY3Rpb24gZXZhbENhbGxiYWNrKGVycm9yLCByZXN1bHQsIHdhc1Rocm93biwg c2F2ZWRSZXN1bHRJbmRleCkKICAgICAgICAgewogICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLkV2ZW50LkRpZEV2YWx1 YXRlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9ET01UcmVlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0RPTVRyZWUuanMKaW5kZXggZThhZDQwYy4uMDY3NDYzMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKQEAgLTIx MCw3ICsyMTAsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZSA9IGNsYXNzIERPTVRyZWUgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1Mg Nik6IEV4ZWN1dGlvbiBjb250ZXh0IGlkZW50aWZpZXJzIChjb250ZXh0SWQpIGRpZCBub3QgZXhp c3QKICAgICAgICAgICAgIC8vIGluIGlPUyA2LiBGYWxsYmFjayB0byBpbmNsdWRpbmcgdGhlIGZy YW1lIGlkZW50aWZpZXIgKGZyYW1lSWQpLgogICAgICAgICAgICAgdmFyIGNvbnRleHRJZCA9IHRo aXMuX2ZyYW1lLnBhZ2VFeGVjdXRpb25Db250ZXh0ID8gdGhpcy5fZnJhbWUucGFnZUV4ZWN1dGlv bkNvbnRleHQuaWQgOiB1bmRlZmluZWQ7Ci0gICAgICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVh dGUuaW52b2tlKHtleHByZXNzaW9uOiAiZG9jdW1lbnQiLCBvYmplY3RHcm91cDogIiIsIGluY2x1 ZGVDb21tYW5kTGluZUFQSTogZmFsc2UsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29u c29sZTogdHJ1ZSwgY29udGV4dElkLCBmcmFtZUlkOiB0aGlzLl9mcmFtZS5pZCwgcmV0dXJuQnlW YWx1ZTogZmFsc2UsIGdlbmVyYXRlUHJldmlldzogZmFsc2V9LCByb290T2JqZWN0QXZhaWxhYmxl LmJpbmQodGhpcykpOworICAgICAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlLmludm9rZSh7 ZXhwcmVzc2lvbjogYXBwZW5kV2ViSW5zcGVjdG9yU291cmNlVVJMKCJkb2N1bWVudCIpLCBvYmpl Y3RHcm91cDogIiIsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogZmFsc2UsIGRvTm90UGF1c2VPbkV4 Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwgY29udGV4dElkLCBmcmFtZUlkOiB0aGlzLl9m cmFtZS5pZCwgcmV0dXJuQnlWYWx1ZTogZmFsc2UsIGdlbmVyYXRlUHJldmlldzogZmFsc2V9LCBy b290T2JqZWN0QXZhaWxhYmxlLmJpbmQodGhpcykpOwogICAgICAgICB9CiAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1v dGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2Nv bC9SZW1vdGVPYmplY3QuanMKaW5kZXggYTU5MGUzOS4uMTRmZmVhNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1JlbW90 ZU9iamVjdC5qcwpAQCAtMzA2LDcgKzMwNiw4IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3Qg PSBjbGFzcyBSZW1vdGVPYmplY3QKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0g ICAgICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb246dmFsdWUsIGRv Tm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTp0cnVlfSwgZXZhbHVhdGVkQ2FsbGJh Y2suYmluZCh0aGlzKSk7CisgICAgICAgIC8vIEZJWE1FOiBJdCBkb2Vzbid0IGxvb2sgbGlrZSBz ZXRQcm9wZXJ0eVZhbHVlIGlzIHVzZWQgeWV0LiBUaGlzIHdpbGwgbmVlZCB0byBiZSB0ZXN0ZWQg d2hlbiBpdCBpcyBhZ2FpbiAoZWRpdGFibGUgT2JqZWN0VHJlZXMpLgorICAgICAgICBSdW50aW1l QWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOmFwcGVuZFdlYkluc3BlY3RvclNvdXJj ZVVSTCh2YWx1ZSksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTp0cnVlfSwg ZXZhbHVhdGVkQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAKICAgICAgICAgZnVuY3Rpb24gZXZhbHVh dGVkQ2FsbGJhY2soZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKQogICAgICAgICB7CkBAIC0zMjIs NyArMzIzLDcgQEAgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCA9IGNsYXNzIFJlbW90ZU9iamVj dAogCiAgICAgICAgICAgICBkZWxldGUgcmVzdWx0LmRlc2NyaXB0aW9uOyAvLyBPcHRpbWl6ZSBv biB0cmFmZmljLgogCi0gICAgICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhp cy5fb2JqZWN0SWQsIHNldFByb3BlcnR5VmFsdWUudG9TdHJpbmcoKSwgW3t2YWx1ZTpuYW1lfSwg cmVzdWx0XSwgdHJ1ZSwgdW5kZWZpbmVkLCBwcm9wZXJ0eVNldENhbGxiYWNrLmJpbmQodGhpcykp OworICAgICAgICAgICAgUnVudGltZUFnZW50LmNhbGxGdW5jdGlvbk9uKHRoaXMuX29iamVjdElk LCBhcHBlbmRXZWJJbnNwZWN0b3JTb3VyY2VVUkwoc2V0UHJvcGVydHlWYWx1ZS50b1N0cmluZygp KSwgW3t2YWx1ZTpuYW1lfSwgcmVzdWx0XSwgdHJ1ZSwgdW5kZWZpbmVkLCBwcm9wZXJ0eVNldENh bGxiYWNrLmJpbmQodGhpcykpOwogCiAgICAgICAgICAgICBpZiAocmVzdWx0Ll9vYmplY3RJZCkK ICAgICAgICAgICAgICAgICBSdW50aW1lQWdlbnQucmVsZWFzZU9iamVjdChyZXN1bHQuX29iamVj dElkKTsKQEAgLTQwNiw3ICs0MDcsNyBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0ID0gY2xh c3MgUmVtb3RlT2JqZWN0CiAgICAgICAgIGlmIChhcmdzKQogICAgICAgICAgICAgYXJncyA9IGFy Z3MubWFwKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuY3JlYXRlQ2FsbEFyZ3VtZW50KTsKIAot ICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhpcy5fb2JqZWN0SWQsIGZ1bmN0 aW9uRGVjbGFyYXRpb24udG9TdHJpbmcoKSwgYXJncywgdHJ1ZSwgdW5kZWZpbmVkLCBnZW5lcmF0 ZVByZXZpZXcsIG15Y2FsbGJhY2spOworICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9u T24odGhpcy5fb2JqZWN0SWQsIGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChmdW5jdGlvbkRl Y2xhcmF0aW9uLnRvU3RyaW5nKCkpLCBhcmdzLCB0cnVlLCB1bmRlZmluZWQsIGdlbmVyYXRlUHJl dmlldywgbXljYWxsYmFjayk7CiAgICAgfQogCiAgICAgY2FsbEZ1bmN0aW9uSlNPTihmdW5jdGlv bkRlY2xhcmF0aW9uLCBhcmdzLCBjYWxsYmFjaykKQEAgLTQxNiw3ICs0MTcsNyBAQCBXZWJJbnNw ZWN0b3IuUmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVtb3RlT2JqZWN0CiAgICAgICAgICAgICBjYWxs YmFjaygoZXJyb3IgfHwgd2FzVGhyb3duKSA/IG51bGwgOiByZXN1bHQudmFsdWUpOwogICAgICAg ICB9CiAKLSAgICAgICAgUnVudGltZUFnZW50LmNhbGxGdW5jdGlvbk9uKHRoaXMuX29iamVjdElk LCBmdW5jdGlvbkRlY2xhcmF0aW9uLnRvU3RyaW5nKCksIGFyZ3MsIHRydWUsIHRydWUsIG15Y2Fs bGJhY2spOworICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhpcy5fb2JqZWN0 SWQsIGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChmdW5jdGlvbkRlY2xhcmF0aW9uLnRvU3Ry aW5nKCkpLCBhcmdzLCB0cnVlLCB0cnVlLCBteWNhbGxiYWNrKTsKICAgICB9CiAgICAgCiAgICAg aW52b2tlR2V0dGVyKGdldHRlclJlbW90ZU9iamVjdCwgY2FsbGJhY2spCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVk aXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJj ZUNvZGVUZXh0RWRpdG9yLmpzCmluZGV4IDA3NzYxMGIuLmUyNzQyN2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRp dG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nv dXJjZUNvZGVUZXh0RWRpdG9yLmpzCkBAIC0xMzg0LDEzICsxMzg0LDE1IEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VDb2RlVGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVu ZHMgV2ViSW5zcGVjCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICB2YXIgZXhw cmVzc2lvbiA9IGFwcGVuZFdlYkluc3BlY3RvclNvdXJjZVVSTChjYW5kaWRhdGUuZXhwcmVzc2lv bik7CisKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0aXZlQ2Fs bEZyYW1lKSB7Ci0gICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmV2YWx1YXRlT25DYWxsRnJhbWUu aW52b2tlKHtjYWxsRnJhbWVJZDogV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hY3RpdmVD YWxsRnJhbWUuaWQsIGV4cHJlc3Npb246IGNhbmRpZGF0ZS5leHByZXNzaW9uLCBvYmplY3RHcm91 cDogInBvcG92ZXIiLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IHRydWV9 LCBwb3B1bGF0ZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIERlYnVnZ2VyQWdlbnQuZXZhbHVh dGVPbkNhbGxGcmFtZS5pbnZva2Uoe2NhbGxGcmFtZUlkOiBXZWJJbnNwZWN0b3IuZGVidWdnZXJN YW5hZ2VyLmFjdGl2ZUNhbGxGcmFtZS5pZCwgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6ICJwb3Bv dmVyIiwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlfSwgcG9wdWxh dGUuYmluZCh0aGlzKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAg ICAvLyBObyBjYWxsIGZyYW1lIGF2YWlsYWJsZS4gVXNlIHRoZSBtYWluIHBhZ2UncyBjb250ZXh0 LgotICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOiBjYW5k aWRhdGUuZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6ICJwb3BvdmVyIiwgZG9Ob3RQYXVzZU9uRXhj ZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlfSwgcG9wdWxhdGUuYmluZCh0aGlzKSk7CisgICAg ICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb24sIG9iamVjdEdyb3Vw OiAicG9wb3ZlciIsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZX0s IHBvcHVsYXRlLmJpbmQodGhpcykpOwogICAgIH0KIAogICAgIF90b2tlblRyYWNraW5nQ29udHJv bGxlckhpZ2hsaWdodGVkSmF2YVNjcmlwdFR5cGVJbmZvcm1hdGlvbihjYW5kaWRhdGUpCg==