197597 2019-05-04 22:47:37 -0700 Web Inspector: replace UIString key with comment 2022-03-26 04:15:30 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All NEW P2 Normal --- 195132 1 hi hi bburg hi inspector-bugzilla-changes mattbaker timothy oldest_to_newest 1533267 0 hi 2019-05-04 22:47:37 -0700 <https://bugs.webkit.org/show_bug.cgi?id=195132#c28> :P 1533268 1 369089 hi 2019-05-04 23:09:37 -0700 Created attachment 369089 Patch 1533269 2 369089 hi 2019-05-04 23:10:35 -0700 Comment on attachment 369089 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369089&action=review > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:81 > +localizedStrings["A context menu item to force (override) a DOM node's pseudo-classes"] = "Forced Pseudo-Classes"; The only negative I can see of this approach is that it "breaks" the alphabetization of UI strings. This could be solved by ordering based on the format string rather than the key, but I don't think it's that big of an issue either way. 1534895 3 timothy 2019-05-09 16:44:25 -0700 Have we talked to the localization folks about this? They might need to update tooling to support this. 1564491 4 hi 2019-08-23 10:21:38 -0700 (In reply to Timothy Hatcher from comment #3) > Have we talked to the localization folks about this? They might need to update tooling to support this. What would need to be updated? AFAIU, they just inject the localizedStrings.js file and replace the text inside the ` = "...";`. Previously, we'd put any "comment" as an actual JS comment on the line above, and often the key for the UIString would be almost the same string (if not identical). This patch "unifies" the comment and key into the same value. For example: ``` /* Settings tab checkbox label for whether searches should be case sensitive. */ localizedStrings["Case Sensitive @ Settings"] = "Case Sensitive"; ``` becomes ``` localizedStrings["Settings tab checkbox label for whether searches should be case sensitive"] = "Case Sensitive"; ``` 1575539 5 369089 bburg 2019-10-01 08:25:43 -0700 Comment on attachment 369089 Patch While callsites are a bit shorter, I don't think this is a good change. Whenever a comment string changes or is added, localizers would need to re-localize the key, because the comment string becomes the key. Unrelated, but I find the @ [Location] formatting to be confusing. Most localization files I've seen on macOS use the format "Search: (Settings tab)" rather than "Search: @ Settings" 1575644 6 mattbaker 2019-10-01 12:25:51 -0700 (In reply to Brian Burg from comment #5) > Comment on attachment 369089 [details] > Patch > > While callsites are a bit shorter, I don't think this is a good change. > Whenever a comment string changes or is added, localizers would need to > re-localize the key, because the comment string becomes the key. > > Unrelated, but I find the @ [Location] formatting to be confusing. Most > localization files I've seen on macOS use the format "Search: (Settings > tab)" rather than "Search: @ Settings" Agree. 369089 2019-05-04 23:09:37 -0700 2022-03-26 04:15:30 -0700 Patch bug-197597-20190505000936.patch text/plain 51445 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDMwMmQxYmViY2IxMWM3MDRiYTVmMjIzN2EyZmQ5 YzRhZDZiZjUyOGYuLmI4NTI5ZjRjYzU0ZGQzMjBmNGE2YTM5YzcwMGY3NzJmNmE2MDcwYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDE5LTA1LTA0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBy ZXBsYWNlIFVJU3RyaW5nIGtleSB3aXRoIGNvbW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzU5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9Mb2FkTG9jYWxpemVk U3RyaW5ncy5qczoKKyAgICAgICAgKFdJLlVJU3RyaW5nKToKKyAgICAgICAgKFdJLnJlcGVhdGVk VUlTdHJpbmcudGltZWxpbmVSZWNvcmRMYXlvdXQpOgorICAgICAgICAoV0kucmVwZWF0ZWRVSVN0 cmluZy50aW1lbGluZVJlY29yZFBhaW50KToKKyAgICAgICAgKFdJLnJlcGVhdGVkVUlTdHJpbmcu dGltZWxpbmVSZWNvcmRDb21wb3NpdGUpOgorICAgICAgICAoV0kucmVwZWF0ZWRVSVN0cmluZy5k b21TZWxlY3RlZEVsZW1lbnQpOiBBZGRlZC4KKyAgICAgICAgKFdJLnJlcGVhdGVkVUlTdHJpbmcu ZG9tRHJvcHBlZEVsZW1lbnQpOiBBZGRlZC4KKyAgICAgICAgKFdJLnJlcGVhdGVkVUlTdHJpbmcu ZG9tU2VsZWN0ZWROb2RlKTogQWRkZWQuCisgICAgICAgIChXSS5yZXBlYXRlZFVJU3RyaW5nLmRv bURyb3BwZWROb2RlKTogQWRkZWQuCisgICAgICAgIChXSS5yZXBlYXRlZFVJU3RyaW5nLmNzc1N0 eWxlQXR0cmlidXRlKTogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1NlYXJj aFV0aWxpdGllcy5qczoKKyAgICAgICAgKFdJLlNlYXJjaFV0aWxpdGllcy5jcmVhdGVTZXR0aW5n c0J1dHRvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2Vy LmpzOgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5cGUuaW5zcGVjdE5vZGVPYmplY3Qu bm9kZUF2YWlsYWJsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRlc3RH cm91cENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuQXVkaXRUZXN0R3JvdXBDb250ZW50Vmll dy5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgIChXSS5BdWRpdFRlc3RHcm91cENv bnRlbnRWaWV3LnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ1BVVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV0kuQ1BVVGltZWxpbmVWaWV3LnByb3Rv dHlwZS5fbGF5b3V0U291cmNlc1NlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ2hhbmdlc0RldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5DaGFuZ2VzRGV0 YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX2NyZWF0ZVJ1bGVFbGVtZW50KToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzOgorICAgICAgICAo V0kuYXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvckRPTU5vZGUpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJ LkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9idWlsZERhdGFHcmlkU2Vj dGlvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoK KyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlRHJvcCk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanM6CisgICAgICAgIChXSS5R dWlja0NvbnNvbGUucHJvdG90eXBlLl9oYW5kbGVEcm9wKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5n c1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlR2VuZXJhbFNldHRpbmdzVmlldyk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRp b25TZWN0aW9uLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5wcm90b3R5cGUuX3JlbmRlclNlbGVjdG9yKToKKwogMjAxOS0wNS0wNCAgTmlraXRh IFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBQcm92aWRlIFVJU3RyaW5nIGRlc2NyaXB0aW9ucyB0byBpbXByb3ZlIGxvY2FsaXphdGlvbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGY5N2MxODhjYjMxMTI4ZGJiZDVj YWYxZThjOGFmZDZmNDRjNGY1M2QuLmIzMTVjNjBkNTE2MDQ1YjcwNTlkNWNlNzVlM2Q1MDE3ODJh MGU1YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNzgsNiArNzgsMTcg QEAgbG9jYWxpemVkU3RyaW5nc1siKHVuaW5pdGlhbGl6ZWQpIl0gPSAiKHVuaW5pdGlhbGl6ZWQp IjsKIGxvY2FsaXplZFN0cmluZ3NbIiwgIl0gPSAiLCAiOwogbG9jYWxpemVkU3RyaW5nc1siMSBt YXRjaCJdID0gIjEgbWF0Y2giOwogbG9jYWxpemVkU3RyaW5nc1siMkQiXSA9ICIyRCI7Citsb2Nh bGl6ZWRTdHJpbmdzWyJBIGNvbnRleHQgbWVudSBpdGVtIHRvIGZvcmNlIChvdmVycmlkZSkgYSBE T00gbm9kZSdzIHBzZXVkby1jbGFzc2VzIl0gPSAiRm9yY2VkIFBzZXVkby1DbGFzc2VzIjsKK2xv Y2FsaXplZFN0cmluZ3NbIkEgY291bnQgb2YgaG93IG1hbnkgdGltZXMgYW4gZWxlbWVudCB3YXMg cGFpbnRlZCAocmVuZGVyZWQpIl0gPSAiUGFpbnRzIjsKK2xvY2FsaXplZFN0cmluZ3NbIkEgc2Vj dGlvbiBvZiBDU1MgcnVsZXMgbWF0Y2hpbmcgYW4gYW5jZXN0b3IgRE9NIG5vZGUiXSA9ICJJbmhl cml0ZWQgRnJvbSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBIHN1Ym1lbnUgaXRlbSBvZiAnQWRkJyB0 byBhZGQgRE9NIG5vZGVzIGFmdGVyIHRoZSBzZWxlY3RlZCBET00gbm9kZSJdID0gIk5leHQgU2li bGluZyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBIHN1Ym1lbnUgaXRlbSBvZiAnQWRkJyB0byBhZGQg RE9NIG5vZGVzIGJlZm9yZSB0aGUgc2VsZWN0ZWQgRE9NIG5vZGUiXSA9ICJQcmV2aW91cyBTaWJs aW5nIjsKK2xvY2FsaXplZFN0cmluZ3NbIkEgc3VibWVudSBpdGVtIG9mICdBZGQnIHRvIGFwcGVu ZCBET00gbm9kZXMgdG8gdGhlIHNlbGVjdGVkIERPTSBub2RlIl0gPSAiQ2hpbGQiOworbG9jYWxp emVkU3RyaW5nc1siQSBzdWJtZW51IGl0ZW0gb2YgJ0JyZWFrIE9uJyB0aGF0IGJyZWFrcyAocGF1 c2VzKSBiZWZvcmUgRE9NIGF0dHJpYnV0ZSBpcyBtb2RpZmllZCJdID0gIkF0dHJpYnV0ZSBNb2Rp ZmllZCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBIHN1Ym1lbnUgaXRlbSBvZiAnQnJlYWsgT24nIHRo YXQgYnJlYWtzIChwYXVzZXMpIGJlZm9yZSBET00gbm9kZSBpcyByZW1vdmVkIl0gPSAiTm9kZSBS ZW1vdmVkIjsKK2xvY2FsaXplZFN0cmluZ3NbIkEgc3VibWVudSBpdGVtIG9mICdCcmVhayBPbicg dGhhdCBicmVha3MgKHBhdXNlcykgYmVmb3JlIGNoaWxkIERPTSBub2RlIGlzIG1vZGlmaWVkIl0g PSAiU3VidHJlZSBNb2RpZmllZCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBIHN1Ym1lbnUgaXRlbSBv ZiAnQnJlYWsgb24nIHRoYXQgYnJlYWtzIChwYXVzZXMpIGJlZm9yZSBhbGwgbmV0d29yayByZXF1 ZXN0cyJdID0gIkFsbCBSZXF1ZXN0cyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBIHN1Ym1lbnUgaXRl bSBvZiAnRWRpdCcgdG8gY2hhbmdlIERPTSBlbGVtZW50J3MgdGFnIG5hbWUiXSA9ICJUYWciOwog bG9jYWxpemVkU3RyaW5nc1siQWNjZXNzaWJpbGl0eSJdID0gIkFjY2Vzc2liaWxpdHkiOwogbG9j YWxpemVkU3RyaW5nc1siQWN0aW9uIl0gPSAiQWN0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFj dGl2aXR5IFZpZXdlciJdID0gIkFjdGl2aXR5IFZpZXdlciI7CkBAIC05NywxNyArMTA4LDE0IEBA IGxvY2FsaXplZFN0cmluZ3NbIkFkZGl0aW9ucyJdID0gIkFkZGl0aW9ucyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJBZGRyZXNzIl0gPSAiQWRkcmVzcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBbGwiXSA9 ICJBbGwiOwogbG9jYWxpemVkU3RyaW5nc1siQWxsIENoYW5nZXMiXSA9ICJBbGwgQ2hhbmdlcyI7 Ci0vKiBCcmVhayAocGF1c2UpIG9uIGFsbCBleGNlcHRpb25zICovCi1sb2NhbGl6ZWRTdHJpbmdz WyJBbGwgRXhjZXB0aW9ucyJdID0gIkFsbCBFeGNlcHRpb25zIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkFsbCBMYXllcnMiXSA9ICJBbGwgTGF5ZXJzIjsKLS8qIEEgc3VibWVudSBpdGVtIG9mICdCcmVh ayBvbicgdGhhdCBicmVha3MgKHBhdXNlcykgYmVmb3JlIGFsbCBuZXR3b3JrIHJlcXVlc3RzICov Ci1sb2NhbGl6ZWRTdHJpbmdzWyJBbGwgUmVxdWVzdHMiXSA9ICJBbGwgUmVxdWVzdHMiOwogbG9j YWxpemVkU3RyaW5nc1siQWxsIFJlc291cmNlcyJdID0gIkFsbCBSZXNvdXJjZXMiOwogbG9jYWxp emVkU3RyaW5nc1siQWxsIFN0b3JhZ2UiXSA9ICJBbGwgU3RvcmFnZSI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJBbGwgaXRlbXMgaW4gXHUwMDIyJXNcdTAwMjIgbXVzdCBiZSBlcnJvciBvYmplY3RzIl0g PSAiQWxsIGl0ZW1zIGluIFx1MDAyMiVzXHUwMDIyIG11c3QgYmUgZXJyb3Igb2JqZWN0cyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJBbGwgaXRlbXMgaW4gXHUwMDIyJXNcdTAwMjIgbXVzdCBiZSBub24t ZW1wdHkgc3RyaW5ncyJdID0gIkFsbCBpdGVtcyBpbiBcdTAwMjIlc1x1MDAyMiBtdXN0IGJlIG5v bi1lbXB0eSBzdHJpbmdzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFsbCBpdGVtcyBpbiBcdTAwMjIl c1x1MDAyMiBtdXN0IGJlIHZhbGlkIERPTSBub2RlcyJdID0gIkFsbCBpdGVtcyBpbiBcdTAwMjIl c1x1MDAyMiBtdXN0IGJlIHZhbGlkIERPTSBub2RlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBbGxv dyBNZWRpYSBDYXB0dXJlIG9uIEluc2VjdXJlIFNpdGVzIl0gPSAiQWxsb3cgTWVkaWEgQ2FwdHVy ZSBvbiBJbnNlY3VyZSBTaXRlcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBbW91bnQgb2YgZGF0YSBz ZW50IG92ZXIgdGhlIG5ldHdvcmsgZm9yIGEgc2luZ2xlIHJlc291cmNlIl0gPSAiVHJhbnNmZXIg U2l6ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBbiBlcnJvciBvY2N1cnJlZCB0cnlpbmcgdG8gbG9h ZCB0aGUgcmVzb3VyY2UuIl0gPSAiQW4gZXJyb3Igb2NjdXJyZWQgdHJ5aW5nIHRvIGxvYWQgdGhl IHJlc291cmNlLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBbiBlcnJvciBvY2N1cnJlZCB0cnlpbmcg dG8gcmVhZCB0aGUgXHUyMDFDJXNcdTIwMUQgdGFibGUuIl0gPSAiQW4gZXJyb3Igb2NjdXJyZWQg dHJ5aW5nIHRvIHJlYWQgdGhlIFx1MjAxQyVzXHUyMDFEIHRhYmxlLiI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJBbiB1bmV4cGVjdGVkIGVycm9yICVzIG9jY3VycmVkLiJdID0gIkFuIHVuZXhwZWN0ZWQg ZXJyb3IgJXMgb2NjdXJyZWQuIjsKQEAgLTEyMywyMSArMTMxLDE2IEBAIGxvY2FsaXplZFN0cmlu Z3NbIkFub255bW91cyBTY3JpcHQgJWQiXSA9ICJBbm9ueW1vdXMgU2NyaXB0ICVkIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkFub255bW91cyBTY3JpcHRzIl0gPSAiQW5vbnltb3VzIFNjcmlwdHMiOwog bG9jYWxpemVkU3RyaW5nc1siQW5vbnltb3VzIFN0eWxlU2hlZXQgJWQiXSA9ICJBbm9ueW1vdXMg U3R5bGVTaGVldCAlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBcHBsaWNhdGlvbiBDYWNoZSJdID0g IkFwcGxpY2F0aW9uIENhY2hlIjsKLS8qIEFwcHJveGltYXRlIGNvdW50IG9mIGV2ZW50cyAqLwot bG9jYWxpemVkU3RyaW5nc1siQXBwcm94aW1hdGUgTnVtYmVyIl0gPSAifiVzIjsKK2xvY2FsaXpl ZFN0cmluZ3NbIkFwcHJveGltYXRlIGNvdW50IG9mIGV2ZW50cyJdID0gIn4lcyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJBcmVhIl0gPSAiQXJlYSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24i XSA9ICJBc3NlcnRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZCJdID0g IkFzc2VydGlvbiBGYWlsZWQiOwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZDog JXMiXSA9ICJBc3NlcnRpb24gRmFpbGVkOiAlcyI7Ci0vKiBCcmVhayAocGF1c2UpIHdoZW4gY29u c29sZS5hc3NlcnQoKSBmYWlscyAqLwotbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWx1 cmVzIl0gPSAiQXNzZXJ0aW9uIEZhaWx1cmVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFzc2VydGlv biB3aXRoIG1lc3NhZ2U6ICVzIl0gPSAiQXNzZXJ0aW9uIHdpdGggbWVzc2FnZTogJXMiOwogbG9j YWxpemVkU3RyaW5nc1siQXNzZXJ0aXZlIl0gPSAiQXNzZXJ0aXZlIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkFzc29jaWF0ZWQgRGF0YSJdID0gIkFzc29jaWF0ZWQgRGF0YSI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJBc3luYyBhdWRpdHMgYXJlIG5vdCBzdXBwb3J0ZWQuIl0gPSAiQXN5bmMgYXVkaXRzIGFy ZSBub3Qgc3VwcG9ydGVkLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBdHRyaWJ1dGUiXSA9ICJBdHRy aWJ1dGUiOwotLyogQSBzdWJtZW51IGl0ZW0gb2YgJ0JyZWFrIE9uJyB0aGF0IGJyZWFrcyAocGF1 c2VzKSBiZWZvcmUgRE9NIGF0dHJpYnV0ZSBpcyBtb2RpZmllZCAqLwotbG9jYWxpemVkU3RyaW5n c1siQXR0cmlidXRlIE1vZGlmaWVkIl0gPSAiQXR0cmlidXRlIE1vZGlmaWVkIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkF0dHJpYnV0ZXMiXSA9ICJBdHRyaWJ1dGVzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkF1ZGl0Il0gPSAiQXVkaXQiOwogbG9jYWxpemVkU3RyaW5nc1siQXVkaXQgRXJyb3I6ICVzIl0g PSAiQXVkaXQgRXJyb3I6ICVzIjsKQEAgLTE2Niw2ICsxNjksOSBAQCBsb2NhbGl6ZWRTdHJpbmdz WyJCbG9jayBWYXJpYWJsZXMiXSA9ICJCbG9jayBWYXJpYWJsZXMiOwogbG9jYWxpemVkU3RyaW5n c1siQm9keToiXSA9ICJCb2R5OiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJCb3VuZGFyeSJdID0gIkJv dW5kYXJ5IjsKIGxvY2FsaXplZFN0cmluZ3NbIkJveCBNb2RlbCJdID0gIkJveCBNb2RlbCI7Cits b2NhbGl6ZWRTdHJpbmdzWyJCcmVhayAocGF1c2UpIG9uIGFsbCBleGNlcHRpb25zIl0gPSAiQWxs IEV4Y2VwdGlvbnMiOworbG9jYWxpemVkU3RyaW5nc1siQnJlYWsgKHBhdXNlKSBvbiB1bmNhdWdo dCAodW5oYW5kbGVkKSBleGNlcHRpb25zIl0gPSAiVW5jYXVnaHQgRXhjZXB0aW9ucyI7Citsb2Nh bGl6ZWRTdHJpbmdzWyJCcmVhayAocGF1c2UpIHdoZW4gY29uc29sZS5hc3NlcnQoKSBmYWlscyJd ID0gIkFzc2VydGlvbiBGYWlsdXJlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJCcmVhayBvbiBldmVu dHMgd2l0aCBuYW1lOiJdID0gIkJyZWFrIG9uIGV2ZW50cyB3aXRoIG5hbWU6IjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkJyZWFrIG9uIHJlcXVlc3Qgd2l0aCBVUkw6Il0gPSAiQnJlYWsgb24gcmVxdWVz dCB3aXRoIFVSTDoiOwogbG9jYWxpemVkU3RyaW5nc1siQnJlYWsgb25cdTIwMjYiXSA9ICJCcmVh ayBvblx1MjAyNiI7CkBAIC0xODcsNiArMTkzLDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQ1NTIl0g PSAiQ1NTIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNTUyBDYW52YXMiXSA9ICJDU1MgQ2FudmFzIjsK IGxvY2FsaXplZFN0cmluZ3NbIkNTUyBDaGFuZ2VzOiJdID0gIkNTUyBDaGFuZ2VzOiI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJDU1MgY2FudmFzIFx1MjAxQyVzXHUyMDFEIl0gPSAiQ1NTIGNhbnZhcyBc dTIwMUMlc1x1MjAxRCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJDU1MgcHJvcGVydGllcyBkZWZpbmVk IHZpYSBIVE1MIHN0eWxlIGF0dHJpYnV0ZSJdID0gIlN0eWxlIEF0dHJpYnV0ZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJDYWNoZWQiXSA9ICJDYWNoZWQiOwogbG9jYWxpemVkU3RyaW5nc1siQ2FsbCBG cmFtZXMgVHJ1bmNhdGVkIl0gPSAiQ2FsbCBGcmFtZXMgVHJ1bmNhdGVkIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkNhbGwgU3RhY2siXSA9ICJDYWxsIFN0YWNrIjsKQEAgLTIwMCwxMyArMjA3LDggQEAg bG9jYWxpemVkU3RyaW5nc1siQ2FudmFzICVkIl0gPSAiQ2FudmFzICVkIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkNhbnZhcyAlcyJdID0gIkNhbnZhcyAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW52 YXMgRWxlbWVudCJdID0gIkNhbnZhcyBFbGVtZW50IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNhbnZh c2VzIl0gPSAiQ2FudmFzZXMiOwotLyogQ2FwdHVyZSBzY3JlZW5zaG90IG9mIHRoZSBzZWxlY3Rl ZCBET00gbm9kZSAqLwotbG9jYWxpemVkU3RyaW5nc1siQ2FwdHVyZSBTY3JlZW5zaG90Il0gPSAi Q2FwdHVyZSBTY3JlZW5zaG90IjsKK2xvY2FsaXplZFN0cmluZ3NbIkNhcHR1cmUgc2NyZWVuc2hv dCBvZiB0aGUgc2VsZWN0ZWQgRE9NIG5vZGUiXSA9ICJDYXB0dXJlIFNjcmVlbnNob3QiOwogbG9j YWxpemVkU3RyaW5nc1siQ2FwdHVyaW5nIl0gPSAiQ2FwdHVyaW5nIjsKLS8qIENvbnRleHQgbWVu dSBsYWJlbCBmb3Igd2hldGhlciBzZWFyY2hlcyBzaG91bGQgYmUgY2FzZSBzZW5zaXRpdmUuICov Ci1sb2NhbGl6ZWRTdHJpbmdzWyJDYXNlIFNlbnNpdGl2ZSBAIENvbnRleHQgTWVudSJdID0gIkNh c2UgU2Vuc2l0aXZlIjsKLS8qIFNldHRpbmdzIHRhYiBjaGVja2JveCBsYWJlbCBmb3Igd2hldGhl ciBzZWFyY2hlcyBzaG91bGQgYmUgY2FzZSBzZW5zaXRpdmUuICovCi1sb2NhbGl6ZWRTdHJpbmdz WyJDYXNlIFNlbnNpdGl2ZSBAIFNldHRpbmdzIl0gPSAiQ2FzZSBTZW5zaXRpdmUiOwogbG9jYWxp emVkU3RyaW5nc1siQ2F0Y2ggVmFyaWFibGVzIl0gPSAiQ2F0Y2ggVmFyaWFibGVzIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkNhdGVnb3JpZXMiXSA9ICJDYXRlZ29yaWVzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkNlcnRpZmljYXRlIl0gPSAiQ2VydGlmaWNhdGUiOwpAQCAtMjE0LDggKzIxNiw2IEBAIGxv Y2FsaXplZFN0cmluZ3NbIkNoYW5nZXMiXSA9ICJDaGFuZ2VzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkNoYXJhY3RlciBEYXRhIl0gPSAiQ2hhcmFjdGVyIERhdGEiOwogbG9jYWxpemVkU3RyaW5nc1si Q2hhcmdlIFx1MjAxQyVzXHUyMDFEIHRvIENhbGxlcnMiXSA9ICJDaGFyZ2UgXHUyMDFDJXNcdTIw MUQgdG8gQ2FsbGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDaGVja2VkIl0gPSAiQ2hlY2tlZCI7 Ci0vKiBBIHN1Ym1lbnUgaXRlbSBvZiAnQWRkJyB0byBhcHBlbmQgRE9NIG5vZGVzIHRvIHRoZSBz ZWxlY3RlZCBET00gbm9kZSAqLwotbG9jYWxpemVkU3RyaW5nc1siQ2hpbGQiXSA9ICJDaGlsZCI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJDaGlsZCBMYXllcnMiXSA9ICJDaGlsZCBMYXllcnMiOwogbG9j YWxpemVkU3RyaW5nc1siQ2hpbGQgYWRkZWQgdG8gIl0gPSAiQ2hpbGQgYWRkZWQgdG8gIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkNoaWxkcmVuIl0gPSAiQ2hpbGRyZW4iOwpAQCAtMjQ5LDggKzI0OSw3 IEBAIGxvY2FsaXplZFN0cmluZ3NbIkNvbGxlY3QgZ2FyYmFnZSJdID0gIkNvbGxlY3QgZ2FyYmFn ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb21tZW50Il0gPSAiQ29tbWVudCI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJDb21wYXJlIHNuYXBzaG90cyJdID0gIkNvbXBhcmUgc25hcHNob3RzIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkNvbXBhcmlzb24gb2YgdG90YWwgbWVtb3J5IHNpemUgYXQgdGhlIGVuZCBv ZiB0aGUgc2VsZWN0ZWQgdGltZSByYW5nZSB0byB0aGUgbWF4aW11bSBtZW1vcnkgc2l6ZSBpbiB0 aGlzIHJlY29yZGluZyJdID0gIkNvbXBhcmlzb24gb2YgdG90YWwgbWVtb3J5IHNpemUgYXQgdGhl IGVuZCBvZiB0aGUgc2VsZWN0ZWQgdGltZSByYW5nZSB0byB0aGUgbWF4aW11bSBtZW1vcnkgc2l6 ZSBpbiB0aGlzIHJlY29yZGluZyI7Ci0vKiBDb21wb3NpdGUgcGhhc2UgdGltZWxpbmUgcmVjb3Jk cywgd2hlcmUgZ3JhcGhpYyBsYXllcnMgYXJlIGNvbWJpbmVkICovCi1sb2NhbGl6ZWRTdHJpbmdz WyJDb21wb3NpdGUgQCBUaW1lbGluZSByZWNvcmQiXSA9ICJDb21wb3NpdGUiOworbG9jYWxpemVk U3RyaW5nc1siQ29tcG9zaXRlIHBoYXNlIHRpbWVsaW5lIHJlY29yZHMsIHdoZXJlIGdyYXBoaWMg bGF5ZXJzIGFyZSBjb21iaW5lZCJdID0gIkNvbXBvc2l0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJD b21wb3NpdGVkIl0gPSAiQ29tcG9zaXRlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb21wcmVzc2Vk Il0gPSAiQ29tcHJlc3NlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb21wcmVzc2lvbiJdID0gIkNv bXByZXNzaW9uIjsKQEAgLTI3NCw2ICsyNzMsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDb25zb2xl OiJdID0gIkNvbnNvbGU6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvbnRhaW5pbmciXSA9ICJDb250 YWluaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvbnRlbnQiXSA9ICJDb250ZW50IjsKIGxvY2Fs aXplZFN0cmluZ3NbIkNvbnRlbnQgU2VjdXJpdHkgUG9saWN5IHZpb2xhdGlvbiBvZiBkaXJlY3Rp dmU6ICVzIl0gPSAiQ29udGVudCBTZWN1cml0eSBQb2xpY3kgdmlvbGF0aW9uIG9mIGRpcmVjdGl2 ZTogJXMiOworbG9jYWxpemVkU3RyaW5nc1siQ29udGV4dCBtZW51IGxhYmVsIGZvciB3aGV0aGVy IHNlYXJjaGVzIHNob3VsZCBiZSBjYXNlIHNlbnNpdGl2ZS4iXSA9ICJDYXNlIFNlbnNpdGl2ZSI7 Citsb2NhbGl6ZWRTdHJpbmdzWyJDb250ZXh0IG1lbnUgbGFiZWwgZm9yIHdoZXRoZXIgc2VhcmNo ZXMgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgcmVndWxhciBleHByZXNzaW9ucy4iXSA9ICJSZWd1bGFy IEV4cHJlc3Npb24iOwogbG9jYWxpemVkU3RyaW5nc1siQ29udGludWF0aW9uIEZyYW1lIl0gPSAi Q29udGludWF0aW9uIEZyYW1lIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvbnRpbnVlIHNjcmlwdCBl eGVjdXRpb24gKCVzIG9yICVzKSJdID0gIkNvbnRpbnVlIHNjcmlwdCBleGVjdXRpb24gKCVzIG9y ICVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb250aW51ZSB0byBIZXJlIl0gPSAiQ29udGludWUg dG8gSGVyZSI7CkBAIC0zMDMsNiArMzA0LDggQEAgbG9jYWxpemVkU3RyaW5nc1siRE9NIENvbnRl bnQgTG9hZGVkIFx1MjAxNCAlcyJdID0gIkRPTSBDb250ZW50IExvYWRlZCBcdTIwMTQgJXMKIGxv Y2FsaXplZFN0cmluZ3NbIkRPTSBFdmVudCJdID0gIkRPTSBFdmVudCI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJET00gRXZlbnRzIl0gPSAiRE9NIEV2ZW50cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJET00g Tm9kZXM6Il0gPSAiRE9NIE5vZGVzOiI7Citsb2NhbGl6ZWRTdHJpbmdzWyJET00gZWxlbWVudCB0 aGF0IHdhcyBkcm9wcGVkIGFmdGVyIGJlaW5nIGRyYWdnZWQgZnJvbSB0aGUgRE9NIHRyZWUiXSA9 ICJEcm9wcGVkIEVsZW1lbnQiOworbG9jYWxpemVkU3RyaW5nc1siRE9NIG5vZGUgdGhhdCB3YXMg ZHJvcHBlZCBhZnRlciBiZWluZyBkcmFnZ2VkIGZyb20gdGhlIERPTSB0cmVlIl0gPSAiRHJvcHBl ZCBOb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRhbXBpbmciXSA9ICJEYW1waW5nIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkRhdGEiXSA9ICJEYXRhIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRhdGEgQmlu ZGluZ3MiXSA9ICJEYXRhIEJpbmRpbmdzIjsKQEAgLTM1NSw4ICszNTgsNiBAQCBsb2NhbGl6ZWRT dHJpbmdzWyJEb21haW4iXSA9ICJEb21haW4iOwogbG9jYWxpemVkU3RyaW5nc1siRG9uZSJdID0g IkRvbmUiOwogbG9jYWxpemVkU3RyaW5nc1siRG93bmxvYWQiXSA9ICJEb3dubG9hZCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJEb3dubG9hZCBXZWIgQXJjaGl2ZSJdID0gIkRvd25sb2FkIFdlYiBBcmNo aXZlIjsKLWxvY2FsaXplZFN0cmluZ3NbIkRyb3BwZWQgRWxlbWVudCJdID0gIkRyb3BwZWQgRWxl bWVudCI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJEcm9wcGVkIE5vZGUiXSA9ICJEcm9wcGVkIE5vZGUi OwogbG9jYWxpemVkU3RyaW5nc1siRHVwbGljYXRlIHByb3BlcnR5Il0gPSAiRHVwbGljYXRlIHBy b3BlcnR5IjsKIGxvY2FsaXplZFN0cmluZ3NbIkR1cmF0aW9uIl0gPSAiRHVyYXRpb24iOwogbG9j YWxpemVkU3RyaW5nc1siRHVyYXRpb246ICVzIl0gPSAiRHVyYXRpb246ICVzIjsKQEAgLTQ3MCwx MCArNDcxLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siRXh0cmEgU2NyaXB0cyJdID0gIkV4dHJhIFNj cmlwdHMiOwogbG9jYWxpemVkU3RyaW5nc1siRmFkZSB1bmV4ZWN1dGVkIGNvZGUiXSA9ICJGYWRl IHVuZXhlY3V0ZWQgY29kZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJGYWlsZWQgdG8gdXBncmFkZSJd ID0gIkZhaWxlZCB0byB1cGdyYWRlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkZhaWx1cmUgc3RhdHVz IGNvZGUiXSA9ICJGYWlsdXJlIHN0YXR1cyBjb2RlIjsKLS8qIFJlc291cmNlIGxvYWRlZCB2aWEg J2ZldGNoJyBtZXRob2QgKi8KLWxvY2FsaXplZFN0cmluZ3NbIkZldGNoIl0gPSAiRmV0Y2giOwot LyogUmVzb3VyY2VzIGxvYWRlZCB2aWEgJ2ZldGNoJyBtZXRob2QgKi8KLWxvY2FsaXplZFN0cmlu Z3NbIkZldGNoZXMiXSA9ICJGZXRjaGVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkZpbGUgb3IgUmVz b3VyY2UiXSA9ICJGaWxlIG9yIFJlc291cmNlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkZpbGVuYW1l Il0gPSAiRmlsZW5hbWUiOwogbG9jYWxpemVkU3RyaW5nc1siRmlsdGVyIl0gPSAiRmlsdGVyIjsK QEAgLTQ4OSwxMCArNDg2LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siRm9udHMiXSA9ICJGb250cyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJGb3JjZSBEYXJrIEFwcGVhcmFuY2UiXSA9ICJGb3JjZSBEYXJr IEFwcGVhcmFuY2UiOwogbG9jYWxpemVkU3RyaW5nc1siRm9yY2UgTGlnaHQgQXBwZWFyYW5jZSJd ID0gIkZvcmNlIExpZ2h0IEFwcGVhcmFuY2UiOwogbG9jYWxpemVkU3RyaW5nc1siRm9yY2UgUHJp bnQgTWVkaWEgU3R5bGVzIl0gPSAiRm9yY2UgUHJpbnQgTWVkaWEgU3R5bGVzIjsKLS8qIExheW91 dCBwaGFzZSByZWNvcmRzIHRoYXQgd2VyZSBpbXBlcmF0aXZlIChmb3JjZWQpICovCi1sb2NhbGl6 ZWRTdHJpbmdzWyJGb3JjZWQgTGF5b3V0Il0gPSAiRm9yY2VkIExheW91dCI7Ci0vKiBBIGNvbnRl eHQgbWVudSBpdGVtIHRvIGZvcmNlIChvdmVycmlkZSkgYSBET00gbm9kZSdzIHBzZXVkby1jbGFz c2VzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJGb3JjZWQgUHNldWRvLUNsYXNzZXMiXSA9ICJGb3Jj ZWQgUHNldWRvLUNsYXNzZXMiOwogbG9jYWxpemVkU3RyaW5nc1siRm9ybWF0OiBIU0wiXSA9ICJG b3JtYXQ6IEhTTCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJGb3JtYXQ6IEhTTEEiXSA9ICJGb3JtYXQ6 IEhTTEEiOwogbG9jYWxpemVkU3RyaW5nc1siRm9ybWF0OiBIZXgiXSA9ICJGb3JtYXQ6IEhleCI7 CkBAIC01ODEsOCArNTc0LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siSW5kZXggS2V5IFx1MjAxNCAl cyJdID0gIkluZGV4IEtleSBcdTIwMTQgJXMiOwogbG9jYWxpemVkU3RyaW5nc1siSW5kZXhlZCBE YXRhYmFzZXMiXSA9ICJJbmRleGVkIERhdGFiYXNlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbmZv OiAiXSA9ICJJbmZvOiAiOwogbG9jYWxpemVkU3RyaW5nc1siSW5mb3MiXSA9ICJJbmZvcyI7Ci0v KiBBIHNlY3Rpb24gb2YgQ1NTIHJ1bGVzIG1hdGNoaW5nIGFuIGFuY2VzdG9yIERPTSBub2RlICov Ci1sb2NhbGl6ZWRTdHJpbmdzWyJJbmhlcml0ZWQgRnJvbSJdID0gIkluaGVyaXRlZCBGcm9tIjsK IGxvY2FsaXplZFN0cmluZ3NbIkluaXRpYWwgU3RhdGUiXSA9ICJJbml0aWFsIFN0YXRlIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkluaXRpYWwgVmVsb2NpdHkiXSA9ICJJbml0aWFsIFZlbG9jaXR5IjsK IGxvY2FsaXplZFN0cmluZ3NbIkluaXRpYXRlZCJdID0gIkluaXRpYXRlZCI7CkBAIC02MTEsOSAr NjAyLDkgQEAgbG9jYWxpemVkU3RyaW5nc1siTGF5ZXIgSW5mbyJdID0gIkxheWVyIEluZm8iOwog bG9jYWxpemVkU3RyaW5nc1siTGF5ZXJzIl0gPSAiTGF5ZXJzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkxheWVyczoiXSA9ICJMYXllcnM6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxheW91dCAmIFJlbmRl cmluZyJdID0gIkxheW91dCAmIFJlbmRlcmluZyI7Ci0vKiBMYXlvdXQgcGhhc2UgdGltZWxpbmUg cmVjb3JkcyAqLwotbG9jYWxpemVkU3RyaW5nc1siTGF5b3V0IEAgVGltZWxpbmUgcmVjb3JkIl0g PSAiTGF5b3V0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxheW91dCBJbnZhbGlkYXRlZCJdID0gIkxh eW91dCBJbnZhbGlkYXRlZCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJMYXlvdXQgcGhhc2UgcmVjb3Jk cyB0aGF0IHdlcmUgaW1wZXJhdGl2ZSAoZm9yY2VkKSJdID0gIkZvcmNlZCBMYXlvdXQiOworbG9j YWxpemVkU3RyaW5nc1siTGF5b3V0IHBoYXNlIHRpbWVsaW5lIHJlY29yZHMiXSA9ICJMYXlvdXQi OwogbG9jYWxpemVkU3RyaW5nc1siTGluZSAlZCJdID0gIkxpbmUgJWQiOwogbG9jYWxpemVkU3Ry aW5nc1siTGluZSAlZDolZCJdID0gIkxpbmUgJWQ6JWQiOwogbG9jYWxpemVkU3RyaW5nc1siTGlu ZSBOdW1iZXIiXSA9ICJMaW5lIE51bWJlciI7CkBAIC02MjksMTQgKzYyMCwxMiBAQCBsb2NhbGl6 ZWRTdHJpbmdzWyJMb2NhbCBTdG9yYWdlIl0gPSAiTG9jYWwgU3RvcmFnZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJMb2NhbCBWYXJpYWJsZXMiXSA9ICJMb2NhbCBWYXJpYWJsZXMiOwogbG9jYWxpemVk U3RyaW5nc1siTG9jYXRlZCBhdCAlcyJdID0gIkxvY2F0ZWQgYXQgJXMiOwogbG9jYWxpemVkU3Ry aW5nc1siTG9jYXRpb24iXSA9ICJMb2NhdGlvbiI7Citsb2NhbGl6ZWRTdHJpbmdzWyJMb2cgKHBy aW50KSBET00gZWxlbWVudCB0byBDb25zb2xlIl0gPSAiTG9nIEVsZW1lbnQiOworbG9jYWxpemVk U3RyaW5nc1siTG9nIChwcmludCkgRE9NIG5vZGUgdG8gQ29uc29sZSJdID0gIkxvZyBOb2RlIjsK IGxvY2FsaXplZFN0cmluZ3NbIkxvZyBDYW52YXMgQ29udGV4dCJdID0gIkxvZyBDYW52YXMgQ29u dGV4dCI7Ci0vKiBMb2cgKHByaW50KSBET00gZWxlbWVudCB0byBDb25zb2xlICovCi1sb2NhbGl6 ZWRTdHJpbmdzWyJMb2cgRWxlbWVudCJdID0gIkxvZyBFbGVtZW50IjsKIGxvY2FsaXplZFN0cmlu Z3NbIkxvZyBGcmFtZSBUZXh0Il0gPSAiTG9nIEZyYW1lIFRleHQiOwogbG9jYWxpemVkU3RyaW5n c1siTG9nIEZyYW1lIFZhbHVlIl0gPSAiTG9nIEZyYW1lIFZhbHVlIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkxvZyBNZXNzYWdlIl0gPSAiTG9nIE1lc3NhZ2UiOwotLyogTG9nIChwcmludCkgRE9NIG5v ZGUgdG8gQ29uc29sZSAqLwotbG9jYWxpemVkU3RyaW5nc1siTG9nIE5vZGUiXSA9ICJMb2cgTm9k ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb2cgU3ltYm9sIl0gPSAiTG9nIFN5bWJvbCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJMb2cgVmFsdWUiXSA9ICJMb2cgVmFsdWUiOwogbG9jYWxpemVkU3RyaW5n c1siTG9nIFdlYlNvY2tldCJdID0gIkxvZyBXZWJTb2NrZXQiOwpAQCAtNjc5LDggKzY2OCw2IEBA IGxvY2FsaXplZFN0cmluZ3NbIk5ldHdvcmsgSXNzdWUiXSA9ICJOZXR3b3JrIElzc3VlIjsKIGxv Y2FsaXplZFN0cmluZ3NbIk5ldHdvcmsgUmVxdWVzdHMiXSA9ICJOZXR3b3JrIFJlcXVlc3RzIjsK IGxvY2FsaXplZFN0cmluZ3NbIk5ldHdvcmsgUmVxdWVzdHM6Il0gPSAiTmV0d29yayBSZXF1ZXN0 czoiOwogbG9jYWxpemVkU3RyaW5nc1siTmV3IFRhYiJdID0gIk5ldyBUYWIiOwotLyogQSBzdWJt ZW51IGl0ZW0gb2YgJ0FkZCcgdG8gYWRkIERPTSBub2RlcyBhZnRlciB0aGUgc2VsZWN0ZWQgRE9N IG5vZGUgKi8KLWxvY2FsaXplZFN0cmluZ3NbIk5leHQgU2libGluZyJdID0gIk5leHQgU2libGlu ZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyJdID0gIk5vIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5v IEFjY2Vzc2liaWxpdHkgSW5mb3JtYXRpb24iXSA9ICJObyBBY2Nlc3NpYmlsaXR5IEluZm9ybWF0 aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIEFwcGxpY2F0aW9uIENhY2hlIGluZm9ybWF0aW9u IGF2YWlsYWJsZSJdID0gIk5vIEFwcGxpY2F0aW9uIENhY2hlIGluZm9ybWF0aW9uIGF2YWlsYWJs ZSI7CkBAIC03MjAsOCArNzA3LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siTm8gcmVxdWVzdCwgc2Vy dmVkIGZyb20gdGhlIG1lbW9yeSBjYWNoZS4iXSA9ICJObyByZXF1ZXN0LCBzZXIKIGxvY2FsaXpl ZFN0cmluZ3NbIk5vIHJlc3BvbnNlIGNvb2tpZXMuIl0gPSAiTm8gcmVzcG9uc2UgY29va2llcy4i OwogbG9jYWxpemVkU3RyaW5nc1siTm8gcmVzcG9uc2UgaGVhZGVycyJdID0gIk5vIHJlc3BvbnNl IGhlYWRlcnMiOwogbG9jYWxpemVkU3RyaW5nc1siTm9kZSJdID0gIk5vZGUiOwotLyogQSBzdWJt ZW51IGl0ZW0gb2YgJ0JyZWFrIE9uJyB0aGF0IGJyZWFrcyAocGF1c2VzKSBiZWZvcmUgRE9NIG5v ZGUgaXMgcmVtb3ZlZCAqLwotbG9jYWxpemVkU3RyaW5nc1siTm9kZSBSZW1vdmVkIl0gPSAiTm9k ZSBSZW1vdmVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vZGVzIl0gPSAiTm9kZXMiOwogbG9jYWxp emVkU3RyaW5nc1siTm9uZSJdID0gIk5vbmUiOwogbG9jYWxpemVkU3RyaW5nc1siTm90IGZvdW5k Il0gPSAiTm90IGZvdW5kIjsKQEAgLTczNiw2ICs3MjEsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJP bmxpbmUiXSA9ICJPbmxpbmUiOwogbG9jYWxpemVkU3RyaW5nc1siT25seSBzaG93IHJlc291cmNl cyB3aXRoIGlzc3VlcyJdID0gIk9ubHkgc2hvdyByZXNvdXJjZXMgd2l0aCBpc3N1ZXMiOwogbG9j YWxpemVkU3RyaW5nc1siT25seSBzaG93IHZpc3VhbCBhY3Rpb25zIl0gPSAiT25seSBzaG93IHZp c3VhbCBhY3Rpb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIk9wZW4iXSA9ICJPcGVuIjsKK2xvY2Fs aXplZFN0cmluZ3NbIk9wZW4gRWxlbWVudHMgdGFiIGFuZCBzZWxlY3QgdGhpcyBub2RlIGluIERP TSB0cmVlIl0gPSAiUmV2ZWFsIGluIERPTSBUcmVlIjsKK2xvY2FsaXplZFN0cmluZ3NbIk9wZW4g TGF5ZXJzIHRhYiBhbmQgc2VsZWN0IHRoZSBsYXllciBjb3JyZXNwb25kaW5nIHRvIHRoaXMgbm9k ZSJdID0gIlJldmVhbCBpbiBMYXllcnMgVGFiIjsKIGxvY2FsaXplZFN0cmluZ3NbIk9wZW4gaW4g TmV3IFRhYiJdID0gIk9wZW4gaW4gTmV3IFRhYiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJPcHRpb24t Y2xpY2sgdG8gc2hvdyBzb3VyY2UiXSA9ICJPcHRpb24tY2xpY2sgdG8gc2hvdyBzb3VyY2UiOwog bG9jYWxpemVkU3RyaW5nc1siT3B0aW9ucyJdID0gIk9wdGlvbnMiOwpAQCAtNzYwLDExICs3NDcs OCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIl0gPSAiUGFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJQYWdlIElzc3VlIl0gPSAiUGFnZSBJc3N1ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIG5h dmlnYXRlZCBhdCAlcyJdID0gIlBhZ2UgbmF2aWdhdGVkIGF0ICVzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlBhZ2UgcmVsb2FkZWQgYXQgJXMiXSA9ICJQYWdlIHJlbG9hZGVkIGF0ICVzIjsKLS8qIFBh aW50IChyZW5kZXIpIHBoYXNlIHRpbWVsaW5lIHJlY29yZHMgKi8KLWxvY2FsaXplZFN0cmluZ3Nb IlBhaW50IEAgVGltZWxpbmUgcmVjb3JkIl0gPSAiUGFpbnQiOworbG9jYWxpemVkU3RyaW5nc1si UGFpbnQgKHJlbmRlcikgcGhhc2UgdGltZWxpbmUgcmVjb3JkcyJdID0gIlBhaW50IjsKIGxvY2Fs aXplZFN0cmluZ3NbIlBhaW50cyJdID0gIlBhaW50cyI7Ci0vKiBBIGNvdW50IG9mIGhvdyBtYW55 IHRpbWVzIGFuIGVsZW1lbnQgd2FzIHBhaW50ZWQgKHJlbmRlcmVkKSAqLwotbG9jYWxpemVkU3Ry aW5nc1siUGFpbnRzIEAgQ29sdW1uIHRpdGxlIl0gPSAiUGFpbnRzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlBhcmVudCJdID0gIlBhcmVudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYXJ0aWFsIEdhcmJh Z2UgQ29sbGVjdGlvbiJdID0gIlBhcnRpYWwgR2FyYmFnZSBDb2xsZWN0aW9uIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlBhc3NpdmUiXSA9ICJQYXNzaXZlIjsKQEAgLTc3Miw4ICs3NTYsNiBAQCBsb2Nh bGl6ZWRTdHJpbmdzWyJQYXRoIl0gPSAiUGF0aCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYXVzZSBQ cm9jZXNzaW5nIl0gPSAiUGF1c2UgUHJvY2Vzc2luZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYXVz ZSBSZWFzb24iXSA9ICJQYXVzZSBSZWFzb24iOwogbG9jYWxpemVkU3RyaW5nc1siUGF1c2Ugc2Ny aXB0IGV4ZWN1dGlvbiAoJXMgb3IgJXMpIl0gPSAiUGF1c2Ugc2NyaXB0IGV4ZWN1dGlvbiAoJXMg b3IgJXMpIjsKLS8qIFRoZSBudW1iZXIgb2YgdGVzdHMgdGhhdCBwYXNzZWQgZXhwcmVzc2VkIGFz IGEgcGVyY2VudGFnZSwgZm9sbG93ZWQgYnkgYSBsaXRlcmFsICUuICovCi1sb2NhbGl6ZWRTdHJp bmdzWyJQZXJjZW50YWdlIChvZiBhdWRpdHMpIl0gPSAiJXMlJSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJQZXJpb2RzIG9mIGhpZ2ggQ1BVIHV0aWxpemF0aW9uIHdpbGwgcmFwaWRseSBkcmFpbiBiYXR0 ZXJ5LiBTdHJpdmUgdG8ga2VlcCBpZGxlIHBhZ2VzIHVuZGVyICVzIGF2ZXJhZ2UgQ1BVIHV0aWxp emF0aW9uLiJdID0gIlBlcmlvZHMgb2YgaGlnaCBDUFUgdXRpbGl6YXRpb24gd2lsbCByYXBpZGx5 IGRyYWluIGJhdHRlcnkuIFN0cml2ZSB0byBrZWVwIGlkbGUgcGFnZXMgdW5kZXIgJXMgYXZlcmFn ZSBDUFUgdXRpbGl6YXRpb24uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBpbmciXSA9ICJQaW5nIjsK IGxvY2FsaXplZFN0cmluZ3NbIlBpbmcgRnJhbWUiXSA9ICJQaW5nIEZyYW1lIjsKQEAgLTc5NCw4 ICs3NzYsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJQcmVzcyAlcyB0byBzdG9wIGVkaXRpbmciXSA9 ICJQcmVzcyAlcyB0byBzdG9wIGVkaXRpbmciOwogbG9jYWxpemVkU3RyaW5nc1siUHJlc3NlZCJd ID0gIlByZXNzZWQiOwogbG9jYWxpemVkU3RyaW5nc1siUHJldHR5IHByaW50Il0gPSAiUHJldHR5 IHByaW50IjsKIGxvY2FsaXplZFN0cmluZ3NbIlByZXZpZXciXSA9ICJQcmV2aWV3IjsKLS8qIEEg c3VibWVudSBpdGVtIG9mICdBZGQnIHRvIGFkZCBET00gbm9kZXMgYmVmb3JlIHRoZSBzZWxlY3Rl ZCBET00gbm9kZSAqLwotbG9jYWxpemVkU3RyaW5nc1siUHJldmlvdXMgU2libGluZyJdID0gIlBy ZXZpb3VzIFNpYmxpbmciOwogbG9jYWxpemVkU3RyaW5nc1siUHJpbWFyeSBLZXkiXSA9ICJQcmlt YXJ5IEtleSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQcmltYXJ5IEtleSBcdTIwMTQgJXMiXSA9ICJQ cmltYXJ5IEtleSBcdTIwMTQgJXMiOwogbG9jYWxpemVkU3RyaW5nc1siUHJpb3JpdHkiXSA9ICJQ cmlvcml0eSI7CkBAIC04MzQsMTAgKzgxNCw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIlJlZnJlc2gg YWxsIl0gPSAiUmVmcmVzaCBhbGwiOwogbG9jYWxpemVkU3RyaW5nc1siUmVmcmVzaCB3YXRjaCBl eHByZXNzaW9ucyJdID0gIlJlZnJlc2ggd2F0Y2ggZXhwcmVzc2lvbnMiOwogbG9jYWxpemVkU3Ry aW5nc1siUmVnaW9uIGFubm91bmNlZCBpbiBpdHMgZW50aXJldHkuIl0gPSAiUmVnaW9uIGFubm91 bmNlZCBpbiBpdHMgZW50aXJldHkuIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJlZ3VsYXIgRXhwcmVz c2lvbiJdID0gIlJlZ3VsYXIgRXhwcmVzc2lvbiI7Ci0vKiBDb250ZXh0IG1lbnUgbGFiZWwgZm9y IHdoZXRoZXIgc2VhcmNoZXMgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgcmVndWxhciBleHByZXNzaW9u cy4gKi8KLWxvY2FsaXplZFN0cmluZ3NbIlJlZ3VsYXIgRXhwcmVzc2lvbiBAIENvbnRleHQgTWVu dSJdID0gIlJlZ3VsYXIgRXhwcmVzc2lvbiI7Ci0vKiBTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFi ZWwgZm9yIHdoZXRoZXIgc2VhcmNoZXMgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgcmVndWxhciBleHBy ZXNzaW9ucy4gKi8KLWxvY2FsaXplZFN0cmluZ3NbIlJlZ3VsYXIgRXhwcmVzc2lvbiBAIFNldHRp bmdzIl0gPSAiUmVndWxhciBFeHByZXNzaW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJlbG9hZCBX ZWIgSW5zcGVjdG9yIl0gPSAiUmVsb2FkIFdlYiBJbnNwZWN0b3IiOwogbG9jYWxpemVkU3RyaW5n c1siUmVsb2FkIHBhZ2UgKCVzKVxuUmVsb2FkIHBhZ2UgaWdub3JpbmcgY2FjaGUgKCVzKSJdID0g IlJlbG9hZCBwYWdlICglcylcblJlbG9hZCBwYWdlIGlnbm9yaW5nIGNhY2hlICglcykiOwogbG9j YWxpemVkU3RyaW5nc1siUmVtb3ZhbHMiXSA9ICJSZW1vdmFscyI7CkBAIC04NjIsOSArODM4LDEx IEBAIGxvY2FsaXplZFN0cmluZ3NbIlJlc291cmNlIGRvZXMgbm90IGhhdmUgdGltaW5nIGRhdGEi XSA9ICJSZXNvdXJjZSBkb2VzIG5vdCBoYXZlCiBsb2NhbGl6ZWRTdHJpbmdzWyJSZXNvdXJjZSBm YWlsZWQgdG8gbG9hZC4iXSA9ICJSZXNvdXJjZSBmYWlsZWQgdG8gbG9hZC4iOwogbG9jYWxpemVk U3RyaW5nc1siUmVzb3VyY2UgaGFzIG5vIGNvbnRlbnQiXSA9ICJSZXNvdXJjZSBoYXMgbm8gY29u dGVudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJSZXNvdXJjZSBoYXMgbm8gdGltaW5nIGRhdGEiXSA9 ICJSZXNvdXJjZSBoYXMgbm8gdGltaW5nIGRhdGEiOworbG9jYWxpemVkU3RyaW5nc1siUmVzb3Vy Y2UgbG9hZGVkIHZpYSAnZmV0Y2gnIG1ldGhvZCJdID0gIkZldGNoIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlJlc291cmNlIHdhcyBsb2FkZWQgd2l0aCB0aGUgXHUyMDFDZGF0YVx1MjAxRCBzY2hlbWUu Il0gPSAiUmVzb3VyY2Ugd2FzIGxvYWRlZCB3aXRoIHRoZSBcdTIwMUNkYXRhXHUyMDFEIHNjaGVt ZS4iOwogbG9jYWxpemVkU3RyaW5nc1siUmVzb3VyY2Ugd2FzIHNlcnZlZCBmcm9tIHRoZSBjYWNo ZS4iXSA9ICJSZXNvdXJjZSB3YXMgc2VydmVkIGZyb20gdGhlIGNhY2hlLiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJSZXNvdXJjZXMiXSA9ICJSZXNvdXJjZXMiOworbG9jYWxpemVkU3RyaW5nc1siUmVz b3VyY2VzIGxvYWRlZCB2aWEgJ2ZldGNoJyBtZXRob2QiXSA9ICJGZXRjaGVzIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlJlc3BvbnNlIl0gPSAiUmVzcG9uc2UiOwogbG9jYWxpemVkU3RyaW5nc1siUmVz cG9uc2UgQ29va2llcyJdID0gIlJlc3BvbnNlIENvb2tpZXMiOwogbG9jYWxpemVkU3RyaW5nc1si UmVzcG9uc2UgSGVhZGVycyJdID0gIlJlc3BvbnNlIEhlYWRlcnMiOwpAQCAtODgyLDEyICs4NjAs OCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJSZXR1cm4gdHlwZSBmb3IgYW5vbnltb3VzIGZ1bmN0aW9u Il0gPSAiUmV0dXJuIHR5cGUgZm9yIGFub255bQogbG9jYWxpemVkU3RyaW5nc1siUmV0dXJuIHR5 cGUgZm9yIGZ1bmN0aW9uOiAlcyJdID0gIlJldHVybiB0eXBlIGZvciBmdW5jdGlvbjogJXMiOwog bG9jYWxpemVkU3RyaW5nc1siUmV0dXJuIHZhbHVlIGlzIG5vdCBhbiBvYmplY3QsIHN0cmluZywg b3IgYm9vbGVhbiJdID0gIlJldHVybiB2YWx1ZSBpcyBub3QgYW4gb2JqZWN0LCBzdHJpbmcsIG9y IGJvb2xlYW4iOwogbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIEJyZWFrcG9pbnQiXSA9ICJSZXZl YWwgQnJlYWtwb2ludCI7Ci0vKiBPcGVuIEVsZW1lbnRzIHRhYiBhbmQgc2VsZWN0IHRoaXMgbm9k ZSBpbiBET00gdHJlZSAqLwotbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIERPTSBUcmVlIl0g PSAiUmV2ZWFsIGluIERPTSBUcmVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJldmVhbCBpbiBEZWJ1 Z2dlciBUYWIiXSA9ICJSZXZlYWwgaW4gRGVidWdnZXIgVGFiIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlJldmVhbCBpbiBFbGVtZW50cyBUYWIiXSA9ICJSZXZlYWwgaW4gRWxlbWVudHMgVGFiIjsKLS8q IE9wZW4gTGF5ZXJzIHRhYiBhbmQgc2VsZWN0IHRoZSBsYXllciBjb3JyZXNwb25kaW5nIHRvIHRo aXMgbm9kZSAqLwotbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIExheWVycyBUYWIiXSA9ICJS ZXZlYWwgaW4gTGF5ZXJzIFRhYiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJSZXZlYWwgaW4gTmV0d29y ayBUYWIiXSA9ICJSZXZlYWwgaW4gTmV0d29yayBUYWIiOwogbG9jYWxpemVkU3RyaW5nc1siUmV2 ZWFsIGluIE9yaWdpbmFsIFJlc291cmNlIl0gPSAiUmV2ZWFsIGluIE9yaWdpbmFsIFJlc291cmNl IjsKIGxvY2FsaXplZFN0cmluZ3NbIlJldmVhbCBpbiBSZXNvdXJjZXMgVGFiIl0gPSAiUmV2ZWFs IGluIFJlc291cmNlcyBUYWIiOwpAQCAtOTE1LDEzICs4ODksMTAgQEAgbG9jYWxpemVkU3RyaW5n c1siU2NyaXB0IEVsZW1lbnQgJWQiXSA9ICJTY3JpcHQgRWxlbWVudCAlZCI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTY3JpcHQgRW50cmllczoiXSA9ICJTY3JpcHQgRW50cmllczoiOwogbG9jYWxpemVk U3RyaW5nc1siU2NyaXB0IEV2YWx1YXRlZCJdID0gIlNjcmlwdCBFdmFsdWF0ZWQiOwogbG9jYWxp emVkU3RyaW5nc1siU2NyaXB0cyJdID0gIlNjcmlwdHMiOwotLyogU2Nyb2xsIHNlbGVjdGVkIERP TSBub2RlIGludG8gdmlldyBvbiB0aGUgaW5zcGVjdGVkIHdlYiBwYWdlICovCi1sb2NhbGl6ZWRT dHJpbmdzWyJTY3JvbGwgaW50byBWaWV3Il0gPSAiU2Nyb2xsIGludG8gVmlldyI7Citsb2NhbGl6 ZWRTdHJpbmdzWyJTY3JvbGwgc2VsZWN0ZWQgRE9NIG5vZGUgaW50byB2aWV3IG9uIHRoZSBpbnNw ZWN0ZWQgd2ViIHBhZ2UiXSA9ICJTY3JvbGwgaW50byBWaWV3IjsKIGxvY2FsaXplZFN0cmluZ3Nb IlNlYXJjaCJdID0gIlNlYXJjaCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWFyY2ggQWdhaW4iXSA9 ICJTZWFyY2ggQWdhaW4iOwogbG9jYWxpemVkU3RyaW5nc1siU2VhcmNoIFJlc291cmNlIENvbnRl bnQiXSA9ICJTZWFyY2ggUmVzb3VyY2UgQ29udGVudCI7Ci0vKiBTZXR0aW5ncyB0YWIgbGFiZWwg Zm9yIHNlYXJjaCByZWxhdGVkIHNldHRpbmdzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTZWFyY2g6 IEAgU2V0dGluZ3MiXSA9ICJTZWFyY2g6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJjaGluZyAl cyJdID0gIlNlYXJjaGluZyAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWN1cmUiXSA9ICJTZWN1 cmUiOwogbG9jYWxpemVkU3RyaW5nc1siU2VjdXJpdHkiXSA9ICJTZWN1cml0eSI7CkBAIC05MzEs MTMgKzkwMiwxMSBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTZWxlY3QgYmFzZWxpbmUgc25hcHNob3Qi XSA9ICJTZWxlY3QgYmFzZWxpbmUgc25hcHNob3QiOwogbG9jYWxpemVkU3RyaW5nc1siU2VsZWN0 IGNvbXBhcmlzb24gc25hcHNob3QiXSA9ICJTZWxlY3QgY29tcGFyaXNvbiBzbmFwc2hvdCI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJTZWxlY3RlZCJdID0gIlNlbGVjdGVkIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlNlbGVjdGVkIENhbnZhcyBDb250ZXh0Il0gPSAiU2VsZWN0ZWQgQ2FudmFzIENvbnRleHQi OwotLyogU2VsZWN0ZWQgRE9NIGVsZW1lbnQgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlNlbGVjdGVk IEVsZW1lbnQiXSA9ICJTZWxlY3RlZCBFbGVtZW50IjsKK2xvY2FsaXplZFN0cmluZ3NbIlNlbGVj dGVkIERPTSBlbGVtZW50Il0gPSAiU2VsZWN0ZWQgRWxlbWVudCI7Citsb2NhbGl6ZWRTdHJpbmdz WyJTZWxlY3RlZCBET00gbm9kZSJdID0gIlNlbGVjdGVkIE5vZGUiOwogbG9jYWxpemVkU3RyaW5n c1siU2VsZWN0ZWQgRnJhbWUiXSA9ICJTZWxlY3RlZCBGcmFtZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJTZWxlY3RlZCBJdGVtIl0gPSAiU2VsZWN0ZWQgSXRlbSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJT ZWxlY3RlZCBJdGVtcyJdID0gIlNlbGVjdGVkIEl0ZW1zIjsKLS8qIFNlbGVjdGVkIERPTSBub2Rl ICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTZWxlY3RlZCBOb2RlIl0gPSAiU2VsZWN0ZWQgTm9kZSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWxlY3RlZCBTeW1ib2wiXSA9ICJTZWxlY3RlZCBTeW1ib2wi OwogbG9jYWxpemVkU3RyaW5nc1siU2VsZWN0ZWQgVmFsdWUiXSA9ICJTZWxlY3RlZCBWYWx1ZSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWxlY3RlZCBXZWJTb2NrZXQiXSA9ICJTZWxlY3RlZCBXZWJT b2NrZXQiOwpAQCAtOTUzLDYgKzkyMiw5IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNlc3Npb24gU3Rv cmFnZSJdID0gIlNlc3Npb24gU3RvcmFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZXQgdG8gQXV0 b21hdGljYWxseSBDb250aW51ZSJdID0gIlNldCB0byBBdXRvbWF0aWNhbGx5IENvbnRpbnVlIjsK IGxvY2FsaXplZFN0cmluZ3NbIlNldHRlciJdID0gIlNldHRlciI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJTZXR0aW5ncyJdID0gIlNldHRpbmdzIjsKK2xvY2FsaXplZFN0cmluZ3NbIlNldHRpbmdzIHRh YiBjaGVja2JveCBsYWJlbCBmb3Igd2hldGhlciBzZWFyY2hlcyBzaG91bGQgYmUgY2FzZSBzZW5z aXRpdmUuIl0gPSAiQ2FzZSBTZW5zaXRpdmUiOworbG9jYWxpemVkU3RyaW5nc1siU2V0dGluZ3Mg dGFiIGNoZWNrYm94IGxhYmVsIGZvciB3aGV0aGVyIHNlYXJjaGVzIHNob3VsZCBiZSB0cmVhdGVk IGFzIHJlZ3VsYXIgZXhwcmVzc2lvbnMuIl0gPSAiUmVndWxhciBFeHByZXNzaW9uIjsKK2xvY2Fs aXplZFN0cmluZ3NbIlNldHRpbmdzIHRhYiBsYWJlbCBmb3Igc2VhcmNoIHJlbGF0ZWQgc2V0dGlu Z3MiXSA9ICJTZWFyY2g6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNoYWRlciJdID0gIlNoYWRlciI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaGFkZXIgUHJvZ3JhbXMiXSA9ICJTaGFkZXIgUHJvZ3JhbXMi OwogbG9jYWxpemVkU3RyaW5nc1siU2hhZG93IENvbnRlbnQiXSA9ICJTaGFkb3cgQ29udGVudCI7 CkBAIC0xMDM3LDggKzEwMDksNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wIHJlY29yZGluZyBj YW52YXMgYWN0aW9ucyJdID0gIlN0b3AgcmVjb3JkaW5nIGNhbnZhcyBhY3RpbwogbG9jYWxpemVk U3RyaW5nc1siU3RvcCByZWNvcmRpbmcgb25jZSBwYWdlIGxvYWRzIl0gPSAiU3RvcCByZWNvcmRp bmcgb25jZSBwYWdlIGxvYWRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0b3BwaW5nIHRoZSBcdTIw MUMlc1x1MjAxRCBhdWRpdCJdID0gIlN0b3BwaW5nIHRoZSBcdTIwMUMlc1x1MjAxRCBhdWRpdCI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9yYWdlIl0gPSAiU3RvcmFnZSI7Ci0vKiBDU1MgcHJvcGVy dGllcyBkZWZpbmVkIHZpYSBIVE1MIHN0eWxlIGF0dHJpYnV0ZSAqLwotbG9jYWxpemVkU3RyaW5n c1siU3R5bGUgQXR0cmlidXRlIl0gPSAiU3R5bGUgQXR0cmlidXRlIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlN0eWxlIFJlc29sdXRpb24iXSA9ICJTdHlsZSBSZXNvbHV0aW9uIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlN0eWxlIHJ1bGUiXSA9ICJTdHlsZSBydWxlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0 eWxlcyJdID0gIlN0eWxlcyI7CkBAIC0xMDUwLDE1ICsxMDIwLDExIEBAIGxvY2FsaXplZFN0cmlu Z3NbIlN0eWxlczoiXSA9ICJTdHlsZXM6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0eWxlc2hlZXQi XSA9ICJTdHlsZXNoZWV0IjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0eWxlc2hlZXRzIl0gPSAiU3R5 bGVzaGVldHMiOwogbG9jYWxpemVkU3RyaW5nc1siU3ViamVjdCJdID0gIlN1YmplY3QiOwotLyog QSBzdWJtZW51IGl0ZW0gb2YgJ0JyZWFrIE9uJyB0aGF0IGJyZWFrcyAocGF1c2VzKSBiZWZvcmUg Y2hpbGQgRE9NIG5vZGUgaXMgbW9kaWZpZWQgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlN1YnRyZWUg TW9kaWZpZWQiXSA9ICJTdWJ0cmVlIE1vZGlmaWVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN1bW1h cnkiXSA9ICJTdW1tYXJ5IjsKIGxvY2FsaXplZFN0cmluZ3NbIlRDUCJdID0gIlRDUCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJUSUZGIl0gPSAiVElGRiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUYWIgd2lk dGg6Il0gPSAiVGFiIHdpZHRoOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUYWJzIl0gPSAiVGFicyI7 Ci0vKiBBIHN1Ym1lbnUgaXRlbSBvZiAnRWRpdCcgdG8gY2hhbmdlIERPTSBlbGVtZW50J3MgdGFn IG5hbWUgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlRhZyJdID0gIlRhZyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJUYWtlIHNuYXBzaG90Il0gPSAiVGFrZSBzbmFwc2hvdCI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJUYXJnZXQiXSA9ICJUYXJnZXQiOwogbG9jYWxpemVkU3RyaW5nc1siVGVtcGxhdGUgQ29udGVu dCJdID0gIlRlbXBsYXRlIENvbnRlbnQiOwpAQCAtMTA3MSw2ICsxMDM3LDcgQEAgbG9jYWxpemVk U3RyaW5nc1siVGhlIFx1MjAxQyVzXHUyMDFEIGF1ZGl0IHBhc3NlZCJdID0gIlRoZSBcdTIwMUMl c1x1MjAxRCBhdWRpdAogbG9jYWxpemVkU3RyaW5nc1siVGhlIFx1MjAxQyVzXHUyMDFEIGF1ZGl0 IHJlc3VsdGVkIGluIGEgd2FybmluZyJdID0gIlRoZSBcdTIwMUMlc1x1MjAxRCBhdWRpdCByZXN1 bHRlZCBpbiBhIHdhcm5pbmciOwogbG9jYWxpemVkU3RyaW5nc1siVGhlIFx1MjAxQyVzXHUyMDFE IGF1ZGl0IHRocmV3IGFuIGVycm9yIl0gPSAiVGhlIFx1MjAxQyVzXHUyMDFEIGF1ZGl0IHRocmV3 IGFuIGVycm9yIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRoZSBcdTIwMUMlc1x1MjAxRFxudGFibGUg aXMgZW1wdHkuIl0gPSAiVGhlIFx1MjAxQyVzXHUyMDFEXG50YWJsZSBpcyBlbXB0eS4iOworbG9j YWxpemVkU3RyaW5nc1siVGhlIG51bWJlciBvZiB0ZXN0cyB0aGF0IHBhc3NlZCBleHByZXNzZWQg YXMgYSBwZXJjZW50YWdlLCBmb2xsb3dlZCBieSBhIGxpdGVyYWwgJS4iXSA9ICIlcyUlIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlRoZSBwYWdlJ3MgY29udGVudCBoYXMgY2hhbmdlZCJdID0gIlRoZSBw YWdlJ3MgY29udGVudCBoYXMgY2hhbmdlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaGUgcmVzb3Vy Y2Ugd2FzIHJlcXVlc3RlZCBpbnNlY3VyZWx5LiJdID0gIlRoZSByZXNvdXJjZSB3YXMgcmVxdWVz dGVkIGluc2VjdXJlbHkuIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRoZXJlIGlzIGFuIGluY3VycmVk IGVuZXJneSBwZW5hbHR5IGVhY2ggdGltZSB0aGUgcGFnZSBlbnRlcnMgc2NyaXB0LiBUaGlzIGNv bW1vbmx5IGhhcHBlbnMgd2l0aCB0aW1lcnMsIGV2ZW50IGhhbmRsZXJzLCBhbmQgb2JzZXJ2ZXJz LiJdID0gIlRoZXJlIGlzIGFuIGluY3VycmVkIGVuZXJneSBwZW5hbHR5IGVhY2ggdGltZSB0aGUg cGFnZSBlbnRlcnMgc2NyaXB0LiBUaGlzIGNvbW1vbmx5IGhhcHBlbnMgd2l0aCB0aW1lcnMsIGV2 ZW50IGhhbmRsZXJzLCBhbmQgb2JzZXJ2ZXJzLiI7CkBAIC0xMTIwLDggKzEwODcsNiBAQCBsb2Nh bGl6ZWRTdHJpbmdzWyJUb3RhbDogJXMiXSA9ICJUb3RhbDogJXMiOwogbG9jYWxpemVkU3RyaW5n c1siVG90YWxzOiJdID0gIlRvdGFsczoiOwogbG9jYWxpemVkU3RyaW5nc1siVHJhY2UiXSA9ICJU cmFjZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUcmFjZTogJXMiXSA9ICJUcmFjZTogJXMiOwotLyog QW1vdW50IG9mIGRhdGEgc2VudCBvdmVyIHRoZSBuZXR3b3JrIGZvciBhIHNpbmdsZSByZXNvdXJj ZSAqLwotbG9jYWxpemVkU3RyaW5nc1siVHJhbnNmZXIgU2l6ZSJdID0gIlRyYW5zZmVyIFNpemUi OwogbG9jYWxpemVkU3RyaW5nc1siVHJhbnNmZXJyZWQiXSA9ICJUcmFuc2ZlcnJlZCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJUcmlnZ2VyZWQgQnJlYWtwb2ludCJdID0gIlRyaWdnZXJlZCBCcmVha3Bv aW50IjsKIGxvY2FsaXplZFN0cmluZ3NbIlRyaWdnZXJlZCBVUkwgQnJlYWtwb2ludCJdID0gIlRy aWdnZXJlZCBVUkwgQnJlYWtwb2ludCI7CkBAIC0xMTM1LDggKzExMDAsNiBAQCBsb2NhbGl6ZWRT dHJpbmdzWyJVUkwgQnJlYWtwb2ludFx1MjAyNiJdID0gIlVSTCBCcmVha3BvaW50XHUyMDI2IjsK IGxvY2FsaXplZFN0cmluZ3NbIlVuYWJsZSB0byBkZXRlcm1pbmUgcGF0aCB0byBwcm9wZXJ0eSBm cm9tIHJvb3QiXSA9ICJVbmFibGUgdG8gZGV0ZXJtaW5lIHBhdGggdG8gcHJvcGVydHkgZnJvbSBy b290IjsKIGxvY2FsaXplZFN0cmluZ3NbIlVuYWJsZSB0byBwYXJzZSBhcyBKU09OOiAlcyJdID0g IlVuYWJsZSB0byBwYXJzZSBhcyBKU09OOiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJVbmFibGUg dG8gc2hvdyBjZXJ0aWZpY2F0ZSBmb3IgXHUyMDFDJXNcdTIwMUQiXSA9ICJVbmFibGUgdG8gc2hv dyBjZXJ0aWZpY2F0ZSBmb3IgXHUyMDFDJXNcdTIwMUQiOwotLyogQnJlYWsgKHBhdXNlKSBvbiB1 bmNhdWdodCAodW5oYW5kbGVkKSBleGNlcHRpb25zICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJVbmNh dWdodCBFeGNlcHRpb25zIl0gPSAiVW5jYXVnaHQgRXhjZXB0aW9ucyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJVbmRlZmluZWQgY3VzdG9tIGVsZW1lbnQiXSA9ICJVbmRlZmluZWQgY3VzdG9tIGVsZW1l bnQiOwogbG9jYWxpemVkU3RyaW5nc1siVW5pcXVlIl0gPSAiVW5pcXVlIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlVua25vd24gTG9jYXRpb24iXSA9ICJVbmtub3duIExvY2F0aW9uIjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXpl ZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0xv YWRMb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGUyMGQ1MDY4MzFiMGUxYTY2NGM0ZWJlNmFhMjgx OWIxZjBiNTM2Y2YuLjM2ODVhMTMyYmU5OGVmMzVlMzMzMDdiYzdlN2VmOTdkYTA4OTIyYzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTG9hZExv Y2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9Mb2FkTG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNDEsMzIgKzQxLDI2IEBAIFdJLnVu bG9jYWxpemVkU3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nKQogICAgIHJldHVybiBzdHJpbmc7CiB9 OwogCi1XSS5VSVN0cmluZyA9IGZ1bmN0aW9uKHN0cmluZywga2V5LCBjb21tZW50KQorV0kuVUlT dHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIGtleSkKIHsKICAgICAidXNlIHN0cmljdCI7CiAKICAg ICBpZiAoV0kuZG9udExvY2FsaXplVXNlckludGVyZmFjZSkKICAgICAgICAgcmV0dXJuIHN0cmlu ZzsKIAotICAgIC8vIFVJU3RyaW5nKHN0cmluZywgY29tbWVudCkKLSAgICBpZiAoYXJndW1lbnRz Lmxlbmd0aCA9PT0gMikgewotICAgICAgICBjb21tZW50ID0ga2V5OwotICAgICAgICBrZXkgPSB1 bmRlZmluZWQ7Ci0gICAgfQotCiAgICAga2V5ID0ga2V5IHx8IHN0cmluZzsKIAogICAgIGlmICh3 aW5kb3cubG9jYWxpemVkU3RyaW5ncyAmJiBrZXkgaW4gd2luZG93LmxvY2FsaXplZFN0cmluZ3Mp CiAgICAgICAgIHJldHVybiB3aW5kb3cubG9jYWxpemVkU3RyaW5nc1trZXldOwogCiAgICAgaWYg KCF3aW5kb3cubG9jYWxpemVkU3RyaW5ncykKLSAgICAgICAgY29uc29sZS5lcnJvcihgQXR0ZW1w dGVkIHRvIGxvYWQgbG9jYWxpemVkIHN0cmluZyAiJHtrZXl9IiBiZWZvcmUgbG9jYWxpemVkU3Ry aW5ncyB3YXMgaW5pdGlhbGl6ZWQuYCwgY29tbWVudCk7CisgICAgICAgIGNvbnNvbGUuZXJyb3Io YEF0dGVtcHRlZCB0byBsb2FkIGxvY2FsaXplZCBzdHJpbmcgIiR7a2V5fSIgYmVmb3JlIGxvY2Fs aXplZFN0cmluZ3Mgd2FzIGluaXRpYWxpemVkLmApOwogCiAgICAgaWYgKCF0aGlzLl9taXNzaW5n TG9jYWxpemVkU3RyaW5ncykKICAgICAgICAgdGhpcy5fbWlzc2luZ0xvY2FsaXplZFN0cmluZ3Mg PSB7fTsKIAogICAgIGlmICghKGtleSBpbiB0aGlzLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncykp IHsKLSAgICAgICAgY29uc29sZS5lcnJvcihgTG9jYWxpemVkIHN0cmluZyAiJHtrZXl9IiB3YXMg bm90IGZvdW5kLmAsIGNvbW1lbnQpOworICAgICAgICBjb25zb2xlLmVycm9yKGBMb2NhbGl6ZWQg c3RyaW5nICIke2tleX0iIHdhcyBub3QgZm91bmQuYCk7CiAgICAgICAgIHRoaXMuX21pc3NpbmdM b2NhbGl6ZWRTdHJpbmdzW2tleV0gPSB0cnVlOwogICAgIH0KIApAQCAtNzYsMTUgKzcwLDE1IEBA IFdJLlVJU3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nLCBrZXksIGNvbW1lbnQpCiBXSS5yZXBlYXRl ZFVJU3RyaW5nID0ge307CiAKIFdJLnJlcGVhdGVkVUlTdHJpbmcudGltZWxpbmVSZWNvcmRMYXlv dXQgPSBmdW5jdGlvbigpIHsKLSAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkxheW91dCIsICJMYXlv dXQgQCBUaW1lbGluZSByZWNvcmQiLCAiTGF5b3V0IHBoYXNlIHRpbWVsaW5lIHJlY29yZHMiKTsK KyAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkxheW91dCIsICJMYXlvdXQgcGhhc2UgdGltZWxpbmUg cmVjb3JkcyIpOwogfTsKIAogV0kucmVwZWF0ZWRVSVN0cmluZy50aW1lbGluZVJlY29yZFBhaW50 ID0gZnVuY3Rpb24oKSB7Ci0gICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJQYWludCIsICJQYWludCBA IFRpbWVsaW5lIHJlY29yZCIsICJQYWludCAocmVuZGVyKSBwaGFzZSB0aW1lbGluZSByZWNvcmRz Iik7CisgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJQYWludCIsICJQYWludCAocmVuZGVyKSBwaGFz ZSB0aW1lbGluZSByZWNvcmRzIik7CiB9OwogCiBXSS5yZXBlYXRlZFVJU3RyaW5nLnRpbWVsaW5l UmVjb3JkQ29tcG9zaXRlID0gZnVuY3Rpb24oKSB7Ci0gICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJD b21wb3NpdGUiLCAiQ29tcG9zaXRlIEAgVGltZWxpbmUgcmVjb3JkIiwgIkNvbXBvc2l0ZSBwaGFz ZSB0aW1lbGluZSByZWNvcmRzLCB3aGVyZSBncmFwaGljIGxheWVycyBhcmUgY29tYmluZWQiKTsK KyAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkNvbXBvc2l0ZSIsICJDb21wb3NpdGUgcGhhc2UgdGlt ZWxpbmUgcmVjb3Jkcywgd2hlcmUgZ3JhcGhpYyBsYXllcnMgYXJlIGNvbWJpbmVkIik7CiB9Owog CiBXSS5yZXBlYXRlZFVJU3RyaW5nLmFsbEV4Y2VwdGlvbnMgPSBmdW5jdGlvbigpIHsKQEAgLTEx MCwzICsxMDQsMjMgQEAgV0kucmVwZWF0ZWRVSVN0cmluZy5mZXRjaCA9IGZ1bmN0aW9uKCkgewog V0kucmVwZWF0ZWRVSVN0cmluZy5yZXZlYWxJbkRPTVRyZWUgPSBmdW5jdGlvbigpIHsKICAgICBy ZXR1cm4gV0kuVUlTdHJpbmcoIlJldmVhbCBpbiBET00gVHJlZSIsICJPcGVuIEVsZW1lbnRzIHRh YiBhbmQgc2VsZWN0IHRoaXMgbm9kZSBpbiBET00gdHJlZSIpOwogfTsKKworV0kucmVwZWF0ZWRV SVN0cmluZy5kb21TZWxlY3RlZEVsZW1lbnQgPSBmdW5jdGlvbigpIHsKKyAgICByZXR1cm4gV0ku VUlTdHJpbmcoIlNlbGVjdGVkIEVsZW1lbnQiLCAiU2VsZWN0ZWQgRE9NIGVsZW1lbnQiKTsKK307 CisKK1dJLnJlcGVhdGVkVUlTdHJpbmcuZG9tRHJvcHBlZEVsZW1lbnQgPSBmdW5jdGlvbigpIHsK KyAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkRyb3BwZWQgRWxlbWVudCIsICJET00gZWxlbWVudCB0 aGF0IHdhcyBkcm9wcGVkIGFmdGVyIGJlaW5nIGRyYWdnZWQgZnJvbSB0aGUgRE9NIHRyZWUiKTsK K307CisKK1dJLnJlcGVhdGVkVUlTdHJpbmcuZG9tU2VsZWN0ZWROb2RlID0gZnVuY3Rpb24oKSB7 CisgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJTZWxlY3RlZCBOb2RlIiwgIlNlbGVjdGVkIERPTSBu b2RlIik7Cit9OworCitXSS5yZXBlYXRlZFVJU3RyaW5nLmRvbURyb3BwZWROb2RlID0gZnVuY3Rp b24oKSB7CisgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJEcm9wcGVkIE5vZGUiLCAiRE9NIG5vZGUg dGhhdCB3YXMgZHJvcHBlZCBhZnRlciBiZWluZyBkcmFnZ2VkIGZyb20gdGhlIERPTSB0cmVlIik7 Cit9OworCitXSS5yZXBlYXRlZFVJU3RyaW5nLmNzc1N0eWxlQXR0cmlidXRlID0gZnVuY3Rpb24o KSB7CisgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJTdHlsZSBBdHRyaWJ1dGUiLCAiQ1NTIHByb3Bl cnRpZXMgZGVmaW5lZCB2aWEgSFRNTCBzdHlsZSBhdHRyaWJ1dGUiKTsKK307CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NlYXJjaFV0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2VhcmNoVXRp bGl0aWVzLmpzCmluZGV4IDVhNTg2NTY4NjFhNTNlOWI3OTZiZjBhOTk2MTljNjg4MTUxNmEwYTYu LmRkZmY1NDA2NzQ5NmNlZDEzNTA0YzEyYmIxODZhZTgxZDc5ZGE2YmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2VhcmNoVXRpbGl0aWVzLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2VhcmNoVXRp bGl0aWVzLmpzCkBAIC04OSwxMyArODksMTMgQEAgV0kuU2VhcmNoVXRpbGl0aWVzID0gY2xhc3Mg U2VhcmNoVXRpbGl0aWVzIHsKICAgICAgICAgICAgIH0pOwogCiAgICAgICAgICAgICBpZiAoc2V0 dGluZ3MuY2FzZVNlbnNpdGl2ZSkgewotICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZENoZWNrYm94SXRlbShXSS5VSVN0cmluZygiQ2FzZSBTZW5zaXRpdmUiLCAiQ2FzZSBTZW5zaXRp dmUgQCBDb250ZXh0IE1lbnUiLCAiQ29udGV4dCBtZW51IGxhYmVsIGZvciB3aGV0aGVyIHNlYXJj aGVzIHNob3VsZCBiZSBjYXNlIHNlbnNpdGl2ZS4iKSwgKCkgPT4geworICAgICAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXSS5VSVN0cmluZygiQ2FzZSBTZW5zaXRp dmUiLCAiQ29udGV4dCBtZW51IGxhYmVsIGZvciB3aGV0aGVyIHNlYXJjaGVzIHNob3VsZCBiZSBj YXNlIHNlbnNpdGl2ZS4iKSwgKCkgPT4gewogICAgICAgICAgICAgICAgICAgICBzZXR0aW5ncy5j YXNlU2Vuc2l0aXZlLnZhbHVlID0gIXNldHRpbmdzLmNhc2VTZW5zaXRpdmUudmFsdWU7CiAgICAg ICAgICAgICAgICAgfSwgc2V0dGluZ3MuY2FzZVNlbnNpdGl2ZS52YWx1ZSk7CiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIGlmIChzZXR0aW5ncy5yZWd1bGFyRXhwcmVzc2lvbikgewotICAg ICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXSS5VSVN0cmluZygi UmVndWxhciBFeHByZXNzaW9uIiwgIlJlZ3VsYXIgRXhwcmVzc2lvbiBAIENvbnRleHQgTWVudSIs ICJDb250ZXh0IG1lbnUgbGFiZWwgZm9yIHdoZXRoZXIgc2VhcmNoZXMgc2hvdWxkIGJlIHRyZWF0 ZWQgYXMgcmVndWxhciBleHByZXNzaW9ucy4iKSwgKCkgPT4geworICAgICAgICAgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXSS5VSVN0cmluZygiUmVndWxhciBFeHByZXNz aW9uIiwgIkNvbnRleHQgbWVudSBsYWJlbCBmb3Igd2hldGhlciBzZWFyY2hlcyBzaG91bGQgYmUg dHJlYXRlZCBhcyByZWd1bGFyIGV4cHJlc3Npb25zLiIpLCAoKSA9PiB7CiAgICAgICAgICAgICAg ICAgICAgIHNldHRpbmdzLnJlZ3VsYXJFeHByZXNzaW9uLnZhbHVlID0gIXNldHRpbmdzLnJlZ3Vs YXJFeHByZXNzaW9uLnZhbHVlOwogICAgICAgICAgICAgICAgIH0sIHNldHRpbmdzLnJlZ3VsYXJF eHByZXNzaW9uLnZhbHVlKTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpz CmluZGV4IDdhOTFiM2ZlYTM3Mzg1ZWFiMmRjMWY4MGNiMWYxMzRjZGM5MWJiODkuLmQ2ZWU4M2M0 NWJiZmFjNDM0MDM5OGU5MGU1Y2E3YjYzNzFmMWZkMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdl ci5qcwpAQCAtNDMzLDkgKzQzMywxMCBAQCBXSS5ET01NYW5hZ2VyID0gY2xhc3MgRE9NTWFuYWdl ciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgLy8gUmUtcmVzb2x2ZSB0aGUgbm9kZSBp biB0aGUgY29uc29sZSdzIG9iamVjdCBncm91cCB3aGVuIGFkZGluZyB0byB0aGUgY29uc29sZS4K ICAgICAgICAgICAgIGxldCBkb21Ob2RlID0gdGhpcy5ub2RlRm9ySWQobm9kZUlkKTsKICAgICAg ICAgICAgIFdJLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZShkb21Ob2RlLCBXSS5SdW50aW1lTWFu YWdlci5Db25zb2xlT2JqZWN0R3JvdXApLnRoZW4oKHJlbW90ZU9iamVjdCkgPT4geworICAgICAg ICAgICAgICAgIGxldCB0ZXh0ID0gZG9tTm9kZS5ub2RlVHlwZSgpID09PSBOb2RlLkVMRU1FTlRf Tk9ERSA/IFdJLnJlcGVhdGVkVUlTdHJpbmcuZG9tU2VsZWN0ZWRFbGVtZW50KCkgOiBXSS5yZXBl YXRlZFVJU3RyaW5nLmRvbVNlbGVjdGVkTm9kZSgpOwogICAgICAgICAgICAgICAgIGNvbnN0IHNw ZWNpYWxMb2dTdHlsZXMgPSB0cnVlOwogICAgICAgICAgICAgICAgIGNvbnN0IHNob3VsZFJldmVh bENvbnNvbGUgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBXSS5jb25zb2xlTG9nVmlld0NvbnRy b2xsZXIuYXBwZW5kSW1tZWRpYXRlRXhlY3V0aW9uV2l0aFJlc3VsdChXSS5VSVN0cmluZygiU2Vs ZWN0ZWQgRWxlbWVudCIpLCByZW1vdGVPYmplY3QsIHNwZWNpYWxMb2dTdHlsZXMsIHNob3VsZFJl dmVhbENvbnNvbGUpOworICAgICAgICAgICAgICAgIFdJLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxl ci5hcHBlbmRJbW1lZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwg c3BlY2lhbExvZ1N0eWxlcywgc2hvdWxkUmV2ZWFsQ29uc29sZSk7CiAgICAgICAgICAgICB9KTsK ICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9BdWRpdFRlc3RHcm91cENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUZXN0R3JvdXBDb250ZW50Vmlldy5qcwpp bmRleCBiZTJlZWJhNjJjY2I5MGMyMDA1ZGE1YWExMzk0ODQwZGMzYjgxZTY4Li4zMDI5MGQ2MzZk MmZiNjc0Mjc1NDM4MTdhYzA0ZGYzZTU1ZDIxYzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRlc3RHcm91cENvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGVz dEdyb3VwQ29udGVudFZpZXcuanMKQEAgLTY1LDcgKzY1LDcgQEAgV0kuQXVkaXRUZXN0R3JvdXBD b250ZW50VmlldyA9IGNsYXNzIEF1ZGl0VGVzdEdyb3VwQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5B dWRpdFQKIAogICAgICAgICB0aGlzLl9wZXJjZW50YWdlVGV4dEVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7CiAKLSAgICAgICAgY29uc3QgZm9ybWF0ID0gV0kuVUlTdHJp bmcoIiVzJSUiLCAiUGVyY2VudGFnZSAob2YgYXVkaXRzKSIsICJUaGUgbnVtYmVyIG9mIHRlc3Rz IHRoYXQgcGFzc2VkIGV4cHJlc3NlZCBhcyBhIHBlcmNlbnRhZ2UsIGZvbGxvd2VkIGJ5IGEgbGl0 ZXJhbCAlLiIpOworICAgICAgICBjb25zdCBmb3JtYXQgPSBXSS5VSVN0cmluZygiJXMlJSIsICJU aGUgbnVtYmVyIG9mIHRlc3RzIHRoYXQgcGFzc2VkIGV4cHJlc3NlZCBhcyBhIHBlcmNlbnRhZ2Us IGZvbGxvd2VkIGJ5IGEgbGl0ZXJhbCAlLiIpOwogICAgICAgICBTdHJpbmcuZm9ybWF0KGZvcm1h dCwgW3RoaXMuX3BlcmNlbnRhZ2VUZXh0RWxlbWVudF0sIFN0cmluZy5zdGFuZGFyZEZvcm1hdHRl cnMsIHRoaXMuX3BlcmNlbnRhZ2VDb250YWluZXIsIChhLCBiKSA9PiB7CiAgICAgICAgICAgICBh LmFwcGVuZChiKTsKICAgICAgICAgICAgIHJldHVybiBhOwpAQCAtMTI1LDExICsxMjUsMTEgQEAg V0kuQXVkaXRUZXN0R3JvdXBDb250ZW50VmlldyA9IGNsYXNzIEF1ZGl0VGVzdEdyb3VwQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS5BdWRpdFQKICAgICAgICAgICAgICAgICBzY29wZUJhckl0ZW1zLnB1 c2goc2NvcGVCYXJJdGVtKTsKICAgICAgICAgICAgIH07CiAKLSAgICAgICAgICAgIGFkZFNjb3Bl QmFySXRlbShXSS5BdWRpdFRlc3RDYXNlUmVzdWx0LkxldmVsLlBhc3MsIFdJLlVJU3RyaW5nKCIl ZCBQYXNzZWQiLCAiJWQgUGFzc2VkIChzaW5ndWxhcikiLCAiIiksIFdJLlVJU3RyaW5nKCIlZCBQ YXNzZWQiLCAiJWQgUGFzc2VkIChwbHVyYWwpIiwgIiIpKTsKKyAgICAgICAgICAgIGFkZFNjb3Bl QmFySXRlbShXSS5BdWRpdFRlc3RDYXNlUmVzdWx0LkxldmVsLlBhc3MsIFdJLlVJU3RyaW5nKCIl ZCBQYXNzZWQiLCAiJWQgUGFzc2VkIChzaW5ndWxhcikiKSwgV0kuVUlTdHJpbmcoIiVkIFBhc3Nl ZCIsICIlZCBQYXNzZWQgKHBsdXJhbCkiKSk7CiAgICAgICAgICAgICBhZGRTY29wZUJhckl0ZW0o V0kuQXVkaXRUZXN0Q2FzZVJlc3VsdC5MZXZlbC5XYXJuLCBXSS5VSVN0cmluZygiJWQgV2Fybmlu ZyIpLCBXSS5VSVN0cmluZygiJWQgV2FybmluZ3MiKSk7Ci0gICAgICAgICAgICBhZGRTY29wZUJh ckl0ZW0oV0kuQXVkaXRUZXN0Q2FzZVJlc3VsdC5MZXZlbC5GYWlsLCBXSS5VSVN0cmluZygiJWQg RmFpbGVkIiwgIiVkIEZhaWxlZCAoc2luZ3VsYXIpIiwgIiIpLCBXSS5VSVN0cmluZygiJWQgRmFp bGVkIiwgIiVkIEZhaWxlZCAocGx1cmFsKSIsICIiKSk7CisgICAgICAgICAgICBhZGRTY29wZUJh ckl0ZW0oV0kuQXVkaXRUZXN0Q2FzZVJlc3VsdC5MZXZlbC5GYWlsLCBXSS5VSVN0cmluZygiJWQg RmFpbGVkIiwgIiVkIEZhaWxlZCAoc2luZ3VsYXIpIiksIFdJLlVJU3RyaW5nKCIlZCBGYWlsZWQi LCAiJWQgRmFpbGVkIChwbHVyYWwpIikpOwogICAgICAgICAgICAgYWRkU2NvcGVCYXJJdGVtKFdJ LkF1ZGl0VGVzdENhc2VSZXN1bHQuTGV2ZWwuRXJyb3IsIFdJLlVJU3RyaW5nKCIlZCBFcnJvciIp LCBXSS5VSVN0cmluZygiJWQgRXJyb3JzIikpOwotICAgICAgICAgICAgYWRkU2NvcGVCYXJJdGVt KFdJLkF1ZGl0VGVzdENhc2VSZXN1bHQuTGV2ZWwuVW5zdXBwb3J0ZWQsIFdJLlVJU3RyaW5nKCIl ZCBVbnN1cHBvcnRlZCIsICIlZCBVbnN1cHBvcnRlZCAoc2luZ3VsYXIpIiwgIiIpLCBXSS5VSVN0 cmluZygiJWQgVW5zdXBwb3J0ZWQiLCAiJWQgVW5zdXBwb3J0ZWQgKHBsdXJhbCkiLCAiIikpOwor ICAgICAgICAgICAgYWRkU2NvcGVCYXJJdGVtKFdJLkF1ZGl0VGVzdENhc2VSZXN1bHQuTGV2ZWwu VW5zdXBwb3J0ZWQsIFdJLlVJU3RyaW5nKCIlZCBVbnN1cHBvcnRlZCIsICIlZCBVbnN1cHBvcnRl ZCAoc2luZ3VsYXIpIiksIFdJLlVJU3RyaW5nKCIlZCBVbnN1cHBvcnRlZCIsICIlZCBVbnN1cHBv cnRlZCAocGx1cmFsKSIpKTsKIAogICAgICAgICAgICAgdGhpcy5fbGV2ZWxTY29wZUJhciA9IG5l dyBXSS5TY29wZUJhcihudWxsLCBzY29wZUJhckl0ZW1zKTsKICAgICAgICAgICAgIHRoaXMuX2xl dmVsU2NvcGVCYXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5TY29wZUJhci5FdmVudC5TZWxlY3Rpb25D aGFuZ2VkLCB0aGlzLl9oYW5kbGVMZXZlbFNjb3BlQmFyU2VsZWN0aW9uQ2hhbmdlZCwgdGhpcyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D UFVUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9DUFVUaW1lbGluZVZpZXcuanMKaW5kZXggMTdhZDVhZDA1NzRlNWE0NzU1ZWFjZGJmMDky NjZjYWQ1OGM5MjY3Yi4uOTQyZjBhMTI0MGNiNWEwOGYxZmJiZDk1NTQyMWNiNWI1ZDdlOTUyNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BV VGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NQVVRpbWVsaW5lVmlldy5qcwpAQCAtMTAyNSw3ICsxMDI1LDcgQEAgV0kuQ1BVVGlt ZWxpbmVWaWV3ID0gY2xhc3MgQ1BVVGltZWxpbmVWaWV3IGV4dGVuZHMgV0kuVGltZWxpbmVWaWV3 CiAgICAgICAgICAgICBsZXQgaSA9IDA7CiAgICAgICAgICAgICBsZXQgc29ydGVkID0gc29ydE1h cEJ5RW50cnlDb3VudFByb3BlcnR5KHRpbWVyTWFwKTsKICAgICAgICAgICAgIGZvciAobGV0IFtr ZXksIGVudHJ5XSBvZiBzb3J0ZWQpIHsKLSAgICAgICAgICAgICAgICBsZXQgbnVtYmVyVmFsdWUg PSBlbnRyeS5yZXBlYXRpbmcgPyBXSS5VSVN0cmluZygifiVzIiwgIkFwcHJveGltYXRlIE51bWJl ciIsICJBcHByb3hpbWF0ZSBjb3VudCBvZiBldmVudHMiKS5mb3JtYXQoZW50cnkuY291bnQpIDog ZW50cnkuY291bnQ7CisgICAgICAgICAgICAgICAgbGV0IG51bWJlclZhbHVlID0gZW50cnkucmVw ZWF0aW5nID8gV0kuVUlTdHJpbmcoIn4lcyIsICJBcHByb3hpbWF0ZSBjb3VudCBvZiBldmVudHMi KS5mb3JtYXQoZW50cnkuY291bnQpIDogZW50cnkuY291bnQ7CiAgICAgICAgICAgICAgICAgbGV0 IHNvdXJjZUNvZGVMb2NhdGlvbiA9IGVudHJ5LmNhbGxGcmFtZSA/IGVudHJ5LmNhbGxGcmFtZS5z b3VyY2VDb2RlTG9jYXRpb24gOiBlbnRyeS5zb3VyY2VDb2RlTG9jYXRpb247CiAgICAgICAgICAg ICAgICAgbGV0IGxhYmVsVmFsdWUgPSBsYWJlbEZvckxvY2F0aW9uKGtleSwgc291cmNlQ29kZUxv Y2F0aW9uKTsKICAgICAgICAgICAgICAgICBsZXQgZm9sbG93aW5nUm93ID0gdGhpcy5fZXZlbnRI YW5kbGVyc1JvdzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NoYW5nZXNEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2hhbmdlc0RldGFpbHNTaWRlYmFyUGFuZWwuanMK aW5kZXggOGZlZjdhZmY1YTYxNjgyMzg4YWIyNjMxZWU3OTdmNmNlN2FjNzU0Yy4uNzEyZDQ5MTE0 M2I5ZDJiMjRmNTlkNWJjNDUwMzMzYzE0ZjEzMTI1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2hhbmdlc0RldGFpbHNTaWRlYmFyUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2hhbmdl c0RldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTE0Miw3ICsxNDIsNyBAQCBXSS5DaGFuZ2VzRGV0 YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIENoYW5nZXNEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVu ZHMgV0kuRE9NRAogICAgICAgICBzZWxlY3RvckVsZW1lbnQuY2xhc3NOYW1lID0gInNlbGVjdG9y IjsKIAogICAgICAgICBpZiAoc3R5bGUudHlwZSA9PT0gV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5U eXBlLklubGluZSkgewotICAgICAgICAgICAgc2VsZWN0b3JFbGVtZW50LnRleHRDb250ZW50ID0g V0kuVUlTdHJpbmcoIlN0eWxlIEF0dHJpYnV0ZSIpOworICAgICAgICAgICAgc2VsZWN0b3JFbGVt ZW50LnRleHRDb250ZW50ID0gV0kucmVwZWF0ZWRVSVN0cmluZy5jc3NTdHlsZUF0dHJpYnV0ZSgp OwogICAgICAgICAgICAgc2VsZWN0b3JFbGVtZW50LmNsYXNzTGlzdC5hZGQoInN0eWxlLWF0dHJp YnV0ZSIpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHNlbGVjdG9yRWxlbWVudC50ZXh0 Q29udGVudCA9IHN0eWxlLm93bmVyUnVsZS5zZWxlY3RvclRleHQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRN ZW51VXRpbGl0aWVzLmpzCmluZGV4IDM2NzJkNDdhNmRkNjI2NjAyODc2YThiNGFlYWYxZTJhMjEz YWY5YmQuLjQxMWYzMzZlZWE4ZGM5NzliNjAzMzFhZjMyZTBlNWYwMTM1ZTZiMjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51 VXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzCkBAIC0yMTksNyArMjE5LDcgQEAgV0kuYXBwZW5k Q29udGV4dE1lbnVJdGVtc0ZvckRPTU5vZGUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgZG9tTm9k ZSwgb3B0aW9ucyA9IHsKICAgICAgICAgbGV0IGxhYmVsID0gaXNFbGVtZW50ID8gV0kuVUlTdHJp bmcoIkxvZyBFbGVtZW50IiwgIkxvZyAocHJpbnQpIERPTSBlbGVtZW50IHRvIENvbnNvbGUiKSA6 IFdJLlVJU3RyaW5nKCJMb2cgTm9kZSIsICJMb2cgKHByaW50KSBET00gbm9kZSB0byBDb25zb2xl Iik7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0obGFiZWwsICgpID0+IHsKICAgICAg ICAgICAgIFdJLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZShkb21Ob2RlLCBXSS5SdW50aW1lTWFu YWdlci5Db25zb2xlT2JqZWN0R3JvdXApLnRoZW4oKHJlbW90ZU9iamVjdCkgPT4gewotICAgICAg ICAgICAgICAgIGxldCB0ZXh0ID0gaXNFbGVtZW50ID8gV0kuVUlTdHJpbmcoIlNlbGVjdGVkIEVs ZW1lbnQiLCAiU2VsZWN0ZWQgRE9NIGVsZW1lbnQiKSA6IFdJLlVJU3RyaW5nKCJTZWxlY3RlZCBO b2RlIiwgIlNlbGVjdGVkIERPTSBub2RlIik7CisgICAgICAgICAgICAgICAgbGV0IHRleHQgPSBp c0VsZW1lbnQgPyBXSS5yZXBlYXRlZFVJU3RyaW5nLmRvbVNlbGVjdGVkRWxlbWVudCgpIDogV0ku cmVwZWF0ZWRVSVN0cmluZy5kb21TZWxlY3RlZE5vZGUoKTsKICAgICAgICAgICAgICAgICBjb25z dCBhZGRTcGVjaWFsVXNlckxvZ0NsYXNzID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBXSS5jb25z b2xlTG9nVmlld0NvbnRyb2xsZXIuYXBwZW5kSW1tZWRpYXRlRXhlY3V0aW9uV2l0aFJlc3VsdCh0 ZXh0LCByZW1vdGVPYmplY3QsIGFkZFNwZWNpYWxVc2VyTG9nQ2xhc3MpOwogICAgICAgICAgICAg fSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRl eCBjMWFkNmZhYTRjZWIyOGYzZGQzZjY5YmMzMzRjYWFkODdlYjI1YmNkLi4wNDA5MDY2OTA5MTk3 YWFkOWY3NzdkZDlhOWEzYWQ1ZDcxMTY1Y2NiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJl ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTEzNiw3ICsxMzYsNyBAQCBXSS5MYXllclRyZWVE ZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbCBl eHRlbmRzIFdJLgogICAgICAgICBjb2x1bW5zLm5hbWUudGl0bGUgPSBXSS5VSVN0cmluZygiTm9k ZSIpOwogICAgICAgICBjb2x1bW5zLm5hbWUuc29ydGFibGUgPSBmYWxzZTsKIAotICAgICAgICBj b2x1bW5zLnBhaW50Q291bnQudGl0bGUgPSBXSS5VSVN0cmluZygiUGFpbnRzIiwgIlBhaW50cyBA IENvbHVtbiB0aXRsZSIsICJBIGNvdW50IG9mIGhvdyBtYW55IHRpbWVzIGFuIGVsZW1lbnQgd2Fz IHBhaW50ZWQgKHJlbmRlcmVkKSIpOworICAgICAgICBjb2x1bW5zLnBhaW50Q291bnQudGl0bGUg PSBXSS5VSVN0cmluZygiUGFpbnRzIiwgIkEgY291bnQgb2YgaG93IG1hbnkgdGltZXMgYW4gZWxl bWVudCB3YXMgcGFpbnRlZCAocmVuZGVyZWQpIik7CiAgICAgICAgIGNvbHVtbnMucGFpbnRDb3Vu dC5zb3J0YWJsZSA9IHRydWU7CiAgICAgICAgIGNvbHVtbnMucGFpbnRDb3VudC5hbGlnbmVkID0g InJpZ2h0IjsKICAgICAgICAgY29sdW1ucy5wYWludENvdW50LndpZHRoID0gIjcwcHgiOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29u dGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M b2dDb250ZW50Vmlldy5qcwppbmRleCAzNTkyNGFlMzg2YjA0N2VhZDUxMDExNjJmNjNlNDUxZGNh MDI4YjIyLi45NWQ4NTI1ZWMwNDEzOWI2MTM5NzZiM2ExMmYzOGIxNDg5NTAxOTYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M b2dDb250ZW50Vmlldy5qcwpAQCAtNjM3LDcgKzYzNyw3IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0g Y2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAg bGV0IGRvbU5vZGUgPSBXSS5kb21NYW5hZ2VyLm5vZGVGb3JJZChkb21Ob2RlSWQpOwogICAgICAg ICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKGRvbU5vZGUsIFdJLlJ1bnRpbWVNYW5h Z2VyLkNvbnNvbGVPYmplY3RHcm91cCkKICAgICAgICAgICAgIC50aGVuKChyZW1vdGVPYmplY3Qp ID0+IHsKLSAgICAgICAgICAgICAgICBsZXQgdGV4dCA9IGRvbU5vZGUubm9kZVR5cGUoKSA9PT0g Tm9kZS5FTEVNRU5UX05PREUgPyBXSS5VSVN0cmluZygiRHJvcHBlZCBFbGVtZW50IikgOiBXSS5V SVN0cmluZygiRHJvcHBlZCBOb2RlIik7CisgICAgICAgICAgICAgICAgbGV0IHRleHQgPSBkb21O b2RlLm5vZGVUeXBlKCkgPT09IE5vZGUuRUxFTUVOVF9OT0RFID8gV0kucmVwZWF0ZWRVSVN0cmlu Zy5kb21Ecm9wcGVkRWxlbWVudCgpIDogV0kucmVwZWF0ZWRVSVN0cmluZy5kb21Ecm9wcGVkTm9k ZSgpOwogICAgICAgICAgICAgICAgIGNvbnN0IGFkZFNwZWNpYWxVc2VyTG9nQ2xhc3MgPSB0cnVl OwogICAgICAgICAgICAgICAgIFdJLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1l ZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgYWRkU3BlY2lhbFVz ZXJMb2dDbGFzcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwppbmRleCAwMWVlYTNkODI4YjBhNjEyNDA4 MTU4ODI2YTQyMDBiNzBlMzllNTUxLi4yNWVjMDQ4ZTA3OTdmNzhkNDQwMzA0MzAzMGY0NmVmMGVh MjI3YzhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9RdWlja0NvbnNvbGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCkBAIC0xOTAsNyArMTkwLDcgQEAgV0kuUXVpY2tD b25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICAgICAg bGV0IGRvbU5vZGUgPSBXSS5kb21NYW5hZ2VyLm5vZGVGb3JJZChkb21Ob2RlSWQpOwogICAgICAg ICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKGRvbU5vZGUsIFdJLlJ1bnRpbWVNYW5h Z2VyLkNvbnNvbGVPYmplY3RHcm91cCkKICAgICAgICAgICAgIC50aGVuKChyZW1vdGVPYmplY3Qp ID0+IHsKLSAgICAgICAgICAgICAgICBsZXQgdGV4dCA9IGRvbU5vZGUubm9kZVR5cGUoKSA9PT0g Tm9kZS5FTEVNRU5UX05PREUgPyBXSS5VSVN0cmluZygiRHJvcHBlZCBFbGVtZW50IikgOiBXSS5V SVN0cmluZygiRHJvcHBlZCBOb2RlIik7CisgICAgICAgICAgICAgICAgbGV0IHRleHQgPSBkb21O b2RlLm5vZGVUeXBlKCkgPT09IE5vZGUuRUxFTUVOVF9OT0RFID8gV0kucmVwZWF0ZWRVSVN0cmlu Zy5kb21Ecm9wcGVkRWxlbWVudCgpIDogV0kucmVwZWF0ZWRVSVN0cmluZy5kb21Ecm9wcGVkTm9k ZSgpOwogICAgICAgICAgICAgICAgIGNvbnN0IGFkZFNwZWNpYWxVc2VyTG9nQ2xhc3MgPSB0cnVl OwogICAgICAgICAgICAgICAgIFdJLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1l ZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgYWRkU3BlY2lhbFVz ZXJMb2dDbGFzcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4 IDA4MDY2Y2Q0NzY2NDBjNjhjY2E5NzMwN2E2MGY5Y2EzYzE0MjEzZDkuLjBlOGY3MWE2YWJlNzJl MmVjN2VmOWY5ZjQ4MmMyZTVmODBjZTBiMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250 ZW50Vmlldy5qcwpAQCAtMjEyLDkgKzIxMiw5IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcg PSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAK ICAgICAgICAgZ2VuZXJhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIAotICAgICAgICBs ZXQgc2VhcmNoR3JvdXAgPSBnZW5lcmFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5n KCJTZWFyY2g6IiwgIlNlYXJjaDogQCBTZXR0aW5ncyIsICJTZXR0aW5ncyB0YWIgbGFiZWwgZm9y IHNlYXJjaCByZWxhdGVkIHNldHRpbmdzIikpOwotICAgICAgICBzZWFyY2hHcm91cC5hZGRTZXR0 aW5nKFdJLnNldHRpbmdzLnNlYXJjaENhc2VTZW5zaXRpdmUsIFdJLlVJU3RyaW5nKCJDYXNlIFNl bnNpdGl2ZSIsICJDYXNlIFNlbnNpdGl2ZSBAIFNldHRpbmdzIiwgIlNldHRpbmdzIHRhYiBjaGVj a2JveCBsYWJlbCBmb3Igd2hldGhlciBzZWFyY2hlcyBzaG91bGQgYmUgY2FzZSBzZW5zaXRpdmUu IikpOwotICAgICAgICBzZWFyY2hHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLnNlYXJjaFJl Z3VsYXJFeHByZXNzaW9uLCBXSS5VSVN0cmluZygiUmVndWxhciBFeHByZXNzaW9uIiwgIlJlZ3Vs YXIgRXhwcmVzc2lvbiBAIFNldHRpbmdzIiwgIlNldHRpbmdzIHRhYiBjaGVja2JveCBsYWJlbCBm b3Igd2hldGhlciBzZWFyY2hlcyBzaG91bGQgYmUgdHJlYXRlZCBhcyByZWd1bGFyIGV4cHJlc3Np b25zLiIpKTsKKyAgICAgICAgbGV0IHNlYXJjaEdyb3VwID0gZ2VuZXJhbFNldHRpbmdzVmlldy5h ZGRHcm91cChXSS5VSVN0cmluZygiU2VhcmNoOiIsICJTZXR0aW5ncyB0YWIgbGFiZWwgZm9yIHNl YXJjaCByZWxhdGVkIHNldHRpbmdzIikpOworICAgICAgICBzZWFyY2hHcm91cC5hZGRTZXR0aW5n KFdJLnNldHRpbmdzLnNlYXJjaENhc2VTZW5zaXRpdmUsIFdJLlVJU3RyaW5nKCJDYXNlIFNlbnNp dGl2ZSIsICJTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFiZWwgZm9yIHdoZXRoZXIgc2VhcmNoZXMg c2hvdWxkIGJlIGNhc2Ugc2Vuc2l0aXZlLiIpKTsKKyAgICAgICAgc2VhcmNoR3JvdXAuYWRkU2V0 dGluZyhXSS5zZXR0aW5ncy5zZWFyY2hSZWd1bGFyRXhwcmVzc2lvbiwgV0kuVUlTdHJpbmcoIlJl Z3VsYXIgRXhwcmVzc2lvbiIsICJTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFiZWwgZm9yIHdoZXRo ZXIgc2VhcmNoZXMgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgcmVndWxhciBleHByZXNzaW9ucy4iKSk7 CiAKICAgICAgICAgZ2VuZXJhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24u anMKaW5kZXggZmVjYmU2MGMyM2ZmMzI5ZDIwZmZjNGU2NzRkOTI5Y2RmZWNiY2ZmYi4uN2M2NGM5 NWIwNDQ1Yzg3NjZlN2NmMmRlNzExOGQwZGMwY2IxOTk1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCkBAIC0zMTUs NyArMzE1LDcgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9IGNs YXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblMKICAgICAgICAgICAgIGJyZWFrOwog CiAgICAgICAgIGNhc2UgV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLklubGluZToKLSAgICAg ICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJT dHlsZSBBdHRyaWJ1dGUiLCAiQ1NTIHByb3BlcnRpZXMgZGVmaW5lZCB2aWEgSFRNTCBzdHlsZSBh dHRyaWJ1dGUiKTsKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudC50ZXh0Q29udGVu dCA9IFdJLnJlcGVhdGVkVUlTdHJpbmcuY3NzU3R5bGVBdHRyaWJ1dGUoKTsKICAgICAgICAgICAg IHRoaXMuX3NlbGVjdG9yRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzdHlsZS1hdHRyaWJ1dGUiKTsK ICAgICAgICAgICAgIGJyZWFrOwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggODU4NmExNWM1YWQ4NzUxOTg4OTkxN2Y3MDZmYmViOTg1M2NlZmFl YS4uNzU1Njc0NzBmODJjMTQwOGYyZThkNzgwOGJkZjQzYzY3MmNlZWE4NiAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDE5LTA1LTA0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiByZXBsYWNlIFVJU3RyaW5nIGtleSB3aXRoIGNvbW1lbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzU5NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9leHRyYWN0 LWxvY2FsaXphYmxlLWpzLXN0cmluZ3M6CisgICAgICAgIChIYW5kbGVVSVN0cmluZyk6CisKIDIw MTktMDUtMDQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBNZXJnZSB0aGUgdGhyZWUgVUlLaXRTUEkuaCBmaWxlcyBpbnRvIGEgc2luZ2xlIG9u ZSBpbiBQQUwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1q cy1zdHJpbmdzIGIvVG9vbHMvU2NyaXB0cy9leHRyYWN0LWxvY2FsaXphYmxlLWpzLXN0cmluZ3MK aW5kZXggNjhjNzBiZGVjOTdiNzc0YjIzYTc5OWQ2YzU3MGU0ZWVjYWM4ZDEwZS4uNzFiYjI2MGUx YjEzODZmNjliMjRkYTdmZTE0OWE1N2M1MzcyNmM5YyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9leHRyYWN0LWxvY2FsaXphYmxlLWpzLXN0cmluZ3MKKysrIGIvVG9vbHMvU2NyaXB0cy9leHRy YWN0LWxvY2FsaXphYmxlLWpzLXN0cmluZ3MKQEAgLTc0LDM3ICs3NCwyOCBAQCBmb3IgbXkgJGZp bGUgKHNvcnQgQGZpbGVzKSB7CiAgICAgICAgIGNob21wOwogCiAgICAgICAgICMgSGFuZGxlIFdl Ykluc3BlY3RvciBzdHJpbmdzLiBQcmludHMgYSB3YXJuaW5nIGlmIGEgbm9uLXN0cmluZyBsaXRl cmFsIGlzIHBhc3NlZCB0byBXSS5VSVN0cmluZygpLgotICAgICAgICAjIEFsbG93OiBXSS5VSVN0 cmluZyhzdHJpbmcsIGNvbW1lbnQpCi0gICAgICAgICMgICAgICAgIFdJLlVJU3RyaW5nKHN0cmlu Zywga2V5LCBjb21tZW50KQotICAgICAgICBIYW5kbGVVSVN0cmluZygKLSAgICAgICAgICAgICQx LAotICAgICAgICAgICAgKCQzIHx8IChkZWZpbmVkICQzIGFuZCBsZW5ndGggJDMgPT0gMCkpID8g JDIgOiAkMSwKLSAgICAgICAgICAgICgkMyB8fCAoZGVmaW5lZCAkMyBhbmQgbGVuZ3RoICQzID09 IDApKSA/ICQzIDogJDIgfHwgIiIsCi0gICAgICAgICAgICAkZmlsZSwKLSAgICAgICAgICAgICQu Ci0gICAgICAgICkgd2hpbGUgcy9XSVwuVUlTdHJpbmdcKCIoW14iXSspIig/OixccyoiKFteIl0q KSIoPzosXHMqIihbXiJdKikiKT8pP1wpLy87CisgICAgICAgIEhhbmRsZVVJU3RyaW5nKCQxLCAk MiB8fCAkMSwgJGZpbGUsICQuKSB3aGlsZSBzL1dJXC5VSVN0cmluZ1woIihbXiJdKykiKD86LFxz KiIoW14iXSopIik/XCkvLzsKICAgICAgICAgcHJpbnQgIiRmaWxlOiQuOldBUk5JTkc6ICQmXG4i IHdoaWxlIHMvV0lcLlVJU3RyaW5nXCguKj9cKS8vOwogCiAgICAgICAgICMgSGFuZGxlIHN0cmlu Z3MgZm9yIG90aGVyIHByb2plY3RzIHRoYXQgYWxzbyB1c2UgdGhpcyBzY3JpcHQuCi0gICAgICAg IEhhbmRsZVVJU3RyaW5nKCQyLCAkMiwgIiIsICRmaWxlLCAkLikgd2hpbGUgcy8oXGJjbGFzcz0i W14iXSpsMTJuLXRvb2x0aXBbXiJdKiJbXj5dKil0aXRsZT0iKFteIl0rKSIvJDEvOwotICAgICAg ICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAkZmlsZSwgJC4pIHdoaWxlIHMvXGJ0aXRsZT0i KFteIl0rKSIoW14+XSpjbGFzcz0iW14iXSpsMTJuLXRvb2x0aXBbXiJdKiIpLyQyLzsKLSAgICAg ICAgSGFuZGxlVUlTdHJpbmcoJDIsICQyLCAiIiwgJGZpbGUsICQuKSB3aGlsZSBzLzwoXHcrKVte Pl0qXGJjbGFzcz0iW14iXSpsMTJuW14iXSoiW14+XSo+KFtePl0rKTxcL1wxPi8vOwotICAgICAg ICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAkZmlsZSwgJC4pIHdoaWxlIHMvSFRNTFZpZXdD b250cm9sbGVyXC5VSVN0cmluZ1woIihbXiJdKykiXCkvLzsKLSAgICAgICAgSGFuZGxlVUlTdHJp bmcoJDEsICQxLCAiIiwgJGZpbGUsICQuKSB3aGlsZSBzL1xiZ2V0TG9jYWxpemVkU3RyaW5nXCgi KFteIl0rKSJcKS8vOwotICAgICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAkZmlsZSwg JC4pIHdoaWxlIHMvXGJsb2NhbGl6ZWRTdHJpbmdzXFsiKFteIl0rKSJcXS8vOworICAgICAgICBI YW5kbGVVSVN0cmluZygkMiwgJDIsICRmaWxlLCAkLikgd2hpbGUgcy8oXGJjbGFzcz0iW14iXSps MTJuLXRvb2x0aXBbXiJdKiJbXj5dKil0aXRsZT0iKFteIl0rKSIvJDEvOworICAgICAgICBIYW5k bGVVSVN0cmluZygkMSwgJDEsICRmaWxlLCAkLikgd2hpbGUgcy9cYnRpdGxlPSIoW14iXSspIihb Xj5dKmNsYXNzPSJbXiJdKmwxMm4tdG9vbHRpcFteIl0qIikvJDIvOworICAgICAgICBIYW5kbGVV SVN0cmluZygkMiwgJDIsICRmaWxlLCAkLikgd2hpbGUgcy88KFx3KylbXj5dKlxiY2xhc3M9Ilte Il0qbDEyblteIl0qIltePl0qPihbXj5dKyk8XC9cMT4vLzsKKyAgICAgICAgSGFuZGxlVUlTdHJp bmcoJDEsICQxLCAkZmlsZSwgJC4pIHdoaWxlIHMvSFRNTFZpZXdDb250cm9sbGVyXC5VSVN0cmlu Z1woIihbXiJdKykiXCkvLzsKKyAgICAgICAgSGFuZGxlVUlTdHJpbmcoJDEsICQxLCAkZmlsZSwg JC4pIHdoaWxlIHMvXGJnZXRMb2NhbGl6ZWRTdHJpbmdcKCIoW14iXSspIlwpLy87CisgICAgICAg IEhhbmRsZVVJU3RyaW5nKCQxLCAkMSwgJGZpbGUsICQuKSB3aGlsZSBzL1xibG9jYWxpemVkU3Ry aW5nc1xbIihbXiJdKykiXF0vLzsKICAgICB9CiAKICAgICBjbG9zZSBTT1VSQ0U7CiB9CiAKIG15 ICVzdHJpbmdCeUtleTsKLW15ICVjb21tZW50QnlLZXk7CiBteSAlZmlsZUJ5S2V5OwogbXkgJWxp bmVCeUtleTsKIAogc3ViIEhhbmRsZVVJU3RyaW5nCiB7Ci0gICAgbXkgKCRzdHJpbmcsICRrZXks ICRjb21tZW50LCAkZmlsZSwgJGxpbmUpID0gQF87CisgICAgbXkgKCRzdHJpbmcsICRrZXksICRm aWxlLCAkbGluZSkgPSBAXzsKICAgICBteSAkYmFkID0gMDsKIAogICAgIGlmIChncmVwIHsgJF8g PT0gMHhGRkZEIH0gdW5wYWNrICJVKiIsICRzdHJpbmcpIHsKQEAgLTExNywxMSArMTA4LDYgQEAg c3ViIEhhbmRsZVVJU3RyaW5nCiAgICAgICAgICRiYWQgPSAxOwogICAgIH0KIAotICAgIGlmIChn cmVwIHsgJF8gPT0gMHhGRkZEIH0gdW5wYWNrICJVKiIsICRjb21tZW50KSB7Ci0gICAgICAgIHBy aW50ICIkZmlsZTokbGluZTpFUlJPUjpjb21tZW50IGZvciB0cmFuc2xhdGlvbiBoYXMgaWxsZWdh bCBVVEYtOCAtLSBtb3N0IGxpa2VseSBhIHByb2JsZW0gd2l0aCB0aGUgVGV4dCBFbmNvZGluZyBv ZiB0aGUgc291cmNlIGZpbGVcbiI7Ci0gICAgICAgICRiYWQgPSAxOwotICAgIH0KLQogICAgIGlm ICgkYmFkKSB7CiAgICAgICAgICRzYXdFcnJvciA9IDE7CiAgICAgICAgIHJldHVybjsKQEAgLTEz NCwxNyArMTIwLDkgQEAgc3ViIEhhbmRsZVVJU3RyaW5nCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICBpZiAoJGNvbW1lbnRCeUtleXska2V5fSAmJiAkY29tbWVudEJ5S2V5eyRrZXl9IG5l ICRjb21tZW50KSB7Ci0gICAgICAgIHByaW50ICIkZmlsZTokbGluZTplbmNvdW50ZXJlZCB0aGUg c2FtZSBrZXksIFwiJGtleVwiLCB0d2ljZSwgd2l0aCBkaWZmZXJlbnQgY29tbWVudHNcbiI7Ci0g ICAgICAgIHByaW50ICIkZmlsZUJ5S2V5eyRrZXl9OiRsaW5lQnlLZXl7JGtleX06cHJldmlvdXMg b2NjdXJyZW5jZVxuIjsKLSAgICAgICAgJGtleUNvbGxpc2lvbkNvdW50Kys7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0KICAgICAkZmlsZUJ5S2V5eyRrZXl9ID0gJGZpbGU7CiAgICAgJGxpbmVC eUtleXska2V5fSA9ICRsaW5lOwogICAgICRzdHJpbmdCeUtleXska2V5fSA9ICRzdHJpbmc7Ci0g ICAgJGNvbW1lbnRCeUtleXska2V5fSA9ICRjb21tZW50OwogfQogCiBwcmludCAiXG4iIGlmICRz YXdFcnJvcjsKQEAgLTE1OCw4ICsxMzYsNyBAQCBpZiAoJHNhd0Vycm9yKSB7CiAKIG15ICRsb2Nh bGl6ZWRTdHJpbmdzID0gInZhciBsb2NhbGl6ZWRTdHJpbmdzID0gbmV3IE9iamVjdDtcblxuIjsK IAotZm9yIG15ICRrZXkgKHNvcnQga2V5cyAlY29tbWVudEJ5S2V5KSB7Ci0gICAgJGxvY2FsaXpl ZFN0cmluZ3MgLj0gIi8qICRjb21tZW50QnlLZXl7JGtleX0gKi9cbiIgaWYgbGVuZ3RoICRjb21t ZW50QnlLZXl7JGtleX07Citmb3IgbXkgJGtleSAoc29ydCBrZXlzICVzdHJpbmdCeUtleSkgewog ICAgICRsb2NhbGl6ZWRTdHJpbmdzIC49ICJsb2NhbGl6ZWRTdHJpbmdzW1wiJGtleVwiXSA9IFwi JHN0cmluZ0J5S2V5eyRrZXl9XCI7XG4iOwogfQogCg==