196109 2019-03-21 13:15:48 -0700 Web Inspector: Timelines - Cannot export on about:blank - suggested filename containing a colon silently fails 2019-03-21 23:26:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck ews-watchlist hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1519867 0 joepeck 2019-03-21 13:15:48 -0700 Timelines - Cannot export on about:blank - suggested containing a colon silently fails Steps to Reproduce: 1. Inspect about:blank 2. Start and stop a timeline recording 3. Click "Export" => Nothing happens Notes: - Changing the suggested filename from "about:blank-recording.json" to "about-blank-recording.json" works 1519869 1 joepeck 2019-03-21 13:18:21 -0700 Switching from `encodeURI(filename)` to `encodeURIComponent(filename)` does get things working however "about:blank-recording.json" becomes "about/blank-recording.json" on macOS. So maybe we should sanitize this differently to be nicer. 1519969 2 365623 joepeck 2019-03-21 15:09:22 -0700 Created attachment 365623 [PATCH] Proposed Fix Not sure if `inspectorURLForFilename` is the best name, open to suggestions. 1520078 3 365623 hi 2019-03-21 18:02:28 -0700 Comment on attachment 365623 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=365623&action=review > Source/WebInspectorUI/UserInterface/Debug/ProtocolTrace.js:55 > + let url = WI.FileUtilities.inspectorURLForFilename(filename); > + return {url, content: JSON.stringify(this._entries)}; NIT: put this on separate lines. ``` return { url: WI.FileUtilities.inspectorURLForFilename(filename), content: JSON.stringify(this._entries), }; ``` > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:269 > + let url = WI.FileUtilities.inspectorURLForFilename("Console.txt"); > + return {url, content: this._formatMessagesAsData(false), forceSaveAs: true}; Ditto (>ProtocolTrace.js:54). > Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js:148 > + let url = WI.FileUtilities.inspectorURLForFilename("InspectorStyleSheet.css"); > + return {url, content: this._textEditor.string, forceSaveAs: true}; Ditto (>ProtocolTrace.js:54). 1520181 4 hi 2019-03-21 23:24:32 -0700 Committed r243355 <https://trac.webkit.org/changeset/243355>. 1520183 5 webkit-bug-importer 2019-03-21 23:26:17 -0700 <rdar://problem/49141962> 365623 2019-03-21 15:09:22 -0700 2019-03-21 19:24:56 -0700 [PATCH] Proposed Fix filename-1.patch text/plain 21721 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiODM1ZTRmMWI1MS4uN2ZlZTdmZjU3MmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAor MjAxOS0wMy0yMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lcyAtIENhbm5vdCBleHBvcnQgb24gYWJvdXQ6Ymxh bmsgLSBzdWdnZXN0ZWQgY29udGFpbmluZyBhIGNvbG9uIHNpbGVudGx5IGZhaWxzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYxMDkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci91bml0 LXRlc3RzL2ZpbGUtdXRpbGl0aWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5z cGVjdG9yL3VuaXQtdGVzdHMvZmlsZS11dGlsaXRpZXMuaHRtbDogQWRkZWQuCisgICAgICAgIFRl c3RzIGZvciBGaWxlVXRpbGl0aWVzLmpzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0 cy9vYmplY3QtdXRpbGl0aWVzLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL3VuaXQtdGVzdHMv cHJvbWlzZS11dGlsaXRpZXMuaHRtbDoKKwogMjAxOS0wMy0xOSAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXBhcmVudGluZyBkdXJpbmcgYSBtdXRhdGlvbiBl dmVudCBpbnNpZGUgYXBwZW5kQ2hpbGQgY291bGQgcmVzdWx0IGluIGEgY2lyY3VsYXIgRE9NIHRy ZWUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL2ZpbGUtdXRp bGl0aWVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL2Zp bGUtdXRpbGl0aWVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMC4uMWUwMGIxNjhlZWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvdW5pdC10ZXN0cy9maWxlLXV0aWxpdGllcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx NiBAQAorCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6IEZpbGVVdGlsaXRpZXMKKy0tIFJ1bm5pbmcg dGVzdCBjYXNlOiBGaWxlVXRpbGl0aWVzLnNhbml0aXplRmlsZW5hbWUKK1BBU1M6IEZpbGVVdGls aXRpZXMuc2FuaXRpemVGaWxlbmFtZTogIiIgPT4gIiIKK1BBU1M6IEZpbGVVdGlsaXRpZXMuc2Fu aXRpemVGaWxlbmFtZTogIndlYmtpdC5vcmctcmVjb3JkaW5nLmpzb24iID0+ICJ3ZWJraXQub3Jn LXJlY29yZGluZy5qc29uIgorUEFTUzogRmlsZVV0aWxpdGllcy5zYW5pdGl6ZUZpbGVuYW1lOiAi YWJjQUJDMDEyLV8gdGVzdC50WHQiID0+ICJhYmNBQkMwMTItXyB0ZXN0LnRYdCIKK1BBU1M6IEZp bGVVdGlsaXRpZXMuc2FuaXRpemVGaWxlbmFtZTogImFib3V0OmJsYW5rLmpzb24iID0+ICJhYm91 dC1ibGFuay5qc29uIgorUEFTUzogRmlsZVV0aWxpdGllcy5zYW5pdGl6ZUZpbGVuYW1lOiAiYTo6 OjpiIiA9PiAiYS1iIgorCistLSBSdW5uaW5nIHRlc3QgY2FzZTogRmlsZVV0aWxpdGllcy5pbnNw ZWN0b3JVUkxGb3JGaWxlbmFtZQorUEFTUzogRmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JG aWxlbmFtZTogIiIgPT4gIndlYi1pbnNwZWN0b3I6Ly8vIgorUEFTUzogRmlsZVV0aWxpdGllcy5p bnNwZWN0b3JVUkxGb3JGaWxlbmFtZTogIndlYmtpdC5vcmctcmVjb3JkaW5nLmpzb24iID0+ICJ3 ZWItaW5zcGVjdG9yOi8vL3dlYmtpdC5vcmctcmVjb3JkaW5nLmpzb24iCitQQVNTOiBGaWxlVXRp bGl0aWVzLmluc3BlY3RvclVSTEZvckZpbGVuYW1lOiAiYWJjQUJDMDEyLV90ZXN0LnRYdCIgPT4g IndlYi1pbnNwZWN0b3I6Ly8vYWJjQUJDMDEyLV90ZXN0LnRYdCIKK1BBU1M6IEZpbGVVdGlsaXRp ZXMuaW5zcGVjdG9yVVJMRm9yRmlsZW5hbWU6ICJhOmIuanNvbiIgPT4gIndlYi1pbnNwZWN0b3I6 Ly8vYS1iLmpzb24iCitQQVNTOiBGaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZpbGVuYW1l OiAiYSBiLnR4dCIgPT4gIndlYi1pbnNwZWN0b3I6Ly8vYSUyMGIudHh0IgorCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9maWxlLXV0aWxpdGllcy5odG1sIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvZmlsZS11dGlsaXRpZXMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNGE4YTkwZGVlMTQKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9maWxlLXV0aWxpdGll cy5odG1sCkBAIC0wLDAgKzEsNDggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4K KzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvaW5zcGVj dG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0aW9uIHRlc3QoKQoreworICAg IGxldCBzdWl0ZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlU3luY1N1aXRlKCJGaWxlVXRpbGl0aWVz Iik7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJGaWxlVXRpbGl0 aWVzLnNhbml0aXplRmlsZW5hbWUiLAorICAgICAgICB0ZXN0KCkgeworICAgICAgICAgICAgZnVu Y3Rpb24gdChzdHIsIGV4cGVjdGVkKSB7CisgICAgICAgICAgICAgICAgZXhwZWN0ZWQgPSBleHBl Y3RlZCB8fCBzdHI7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChX SS5GaWxlVXRpbGl0aWVzLnNhbml0aXplRmlsZW5hbWUoc3RyKSwgZXhwZWN0ZWQsIGBGaWxlVXRp bGl0aWVzLnNhbml0aXplRmlsZW5hbWU6ICR7SlNPTi5zdHJpbmdpZnkoc3RyKX0gPT4gJHtKU09O LnN0cmluZ2lmeShleHBlY3RlZCl9YCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHQo IiIpOworICAgICAgICAgICAgdCgid2Via2l0Lm9yZy1yZWNvcmRpbmcuanNvbiIpOworICAgICAg ICAgICAgdCgiYWJjQUJDMDEyLV8gdGVzdC50WHQiKTsKKyAgICAgICAgICAgIHQoImFib3V0OmJs YW5rLmpzb24iLCAiYWJvdXQtYmxhbmsuanNvbiIpOworICAgICAgICAgICAgdCgiYTo6OjpiIiwg ImEtYiIpOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7Cisg ICAgICAgIG5hbWU6ICJGaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZpbGVuYW1lIiwKKyAg ICAgICAgdGVzdCgpIHsKKyAgICAgICAgICAgIGZ1bmN0aW9uIHQoc3RyLCBleHBlY3RlZCkgewor ICAgICAgICAgICAgICAgIGV4cGVjdGVkID0gZXhwZWN0ZWQgfHwgKCJ3ZWItaW5zcGVjdG9yOi8v LyIgKyBzdHIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0ku RmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFtZShzdHIpLCBleHBlY3RlZCwgYEZp bGVVdGlsaXRpZXMuaW5zcGVjdG9yVVJMRm9yRmlsZW5hbWU6ICR7SlNPTi5zdHJpbmdpZnkoc3Ry KX0gPT4gJHtKU09OLnN0cmluZ2lmeShleHBlY3RlZCl9YCk7CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIHQoIiIpOworICAgICAgICAgICAgdCgid2Via2l0Lm9yZy1yZWNvcmRpbmcuanNv biIpOworICAgICAgICAgICAgdCgiYWJjQUJDMDEyLV90ZXN0LnRYdCIpOworICAgICAgICAgICAg dCgiYTpiLmpzb24iLCAid2ViLWluc3BlY3RvcjovLy9hLWIuanNvbiIpOworICAgICAgICAgICAg dCgiYSBiLnR4dCIsICJ3ZWItaW5zcGVjdG9yOi8vL2ElMjBiLnR4dCIpOworICAgICAgICB9Cisg ICAgfSk7CisKKyAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2goKTsKK30KKzwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHkgb25Mb2FkPSJydW5UZXN0KCkiPgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvb2JqZWN0LXV0aWxp dGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvb2JqZWN0LXV0aWxp dGllcy5odG1sCmluZGV4IDdmNDgwZjQ1ZDA1Li4zZjFjNGVkNWRhYiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvb2JqZWN0LXV0aWxpdGllcy5odG1sCisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL29iamVjdC11dGlsaXRpZXMuaHRtbApA QCAtMyw3ICszLDYgQEAKIDxoZWFkPgogPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5z cGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0Pgot CiBmdW5jdGlvbiB0ZXN0KCkKIHsKICAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0 ZVN5bmNTdWl0ZSgiT2JqZWN0VXRpbGl0aWVzIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvdW5pdC10ZXN0cy9wcm9taXNlLXV0aWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3VuaXQtdGVzdHMvcHJvbWlzZS11dGlsaXRpZXMuaHRtbAppbmRleCAyYmEyOWEy YTM3YS4uZGE5ZjQxYjFiODAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0 LXRlc3RzL3Byb21pc2UtdXRpbGl0aWVzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3VuaXQtdGVzdHMvcHJvbWlzZS11dGlsaXRpZXMuaHRtbApAQCAtMyw3ICszLDYgQEAKIDxoZWFk PgogPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNw ZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0PgotCiBmdW5jdGlvbiB0ZXN0KCkKIHsK ICAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFzeW5jU3VpdGUoIlByb21pc2Ui KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDg4MjdhNWQyM2NmLi40NWRhYzA1NmMyNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTAgQEAKKzIwMTktMDMtMjEgIEpv c2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBUaW1lbGluZXMgLSBDYW5ub3QgZXhwb3J0IG9uIGFib3V0OmJsYW5rIC0gc3VnZ2VzdGVk IGNvbnRhaW5pbmcgYSBjb2xvbiBzaWxlbnRseSBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2MTA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxp dGllcy5qczoKKyAgICAgICAgKFdJLkZpbGVVdGlsaXRpZXMuc2FuaXRpemVGaWxlbmFtZSk6Cisg ICAgICAgIChXSS5GaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZpbGVuYW1lKToKKyAgICAg ICAgTmV3IHV0aWxpdHkgZnVuY3Rpb25zLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9UZXN0 Lmh0bWw6CisgICAgICAgIEluY2x1ZGUgRmlsZVV0aWxpdGllcy4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvQXVkaXRNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuQXVkaXRNYW5hZ2VyLnByb3RvdHlwZS5l eHBvcnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRGVidWcvUHJvdG9jb2xUcmFjZS5qczoK KyAgICAgICAgKFdJLlByb3RvY29sVHJhY2UucHJvdG90eXBlLmdldCBzYXZlRGF0YSk6CisgICAg ICAgIChXSS5Qcm90b2NvbFRyYWNlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnNvbGVNZXNzYWdlVmlldy5qczoKKyAgICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlVmlldy5wcm90 b3R5cGUuX2hhbmRsZUNvbnRleHRNZW51KToKKyAgICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlVmll dyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hvdENvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV0kuSGVhcFNuYXBzaG90Q29udGVudFZpZXcucHJvdG90eXBlLl9leHBv cnRTbmFwc2hvdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgc2F2ZURhdGEp OgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVDb250ZXh0TWVu dUV2ZW50KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBl Ll9leHBvcnRIQVIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUu X2V4cG9ydFJlY29yZGluZyk6CisgICAgICAgIChXSS5SZWNvcmRpbmdDb250ZW50Vmlldy5wcm90 b3R5cGUuX2V4cG9ydFJlZHVjdGlvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T Y3JpcHRDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlNjcmlwdENvbnRlbnRWaWV3LnByb3Rv dHlwZS5nZXQgc2F2ZURhdGEpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2hhZGVy UHJvZ3JhbUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2hhZGVyUHJvZ3JhbUNvbnRlbnRW aWV3LnByb3RvdHlwZS5nZXQgc2F2ZURhdGEpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVGV4dENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuVGV4dENvbnRlbnRWaWV3LnByb3Rv dHlwZS5nZXQgc2F2ZURhdGEpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJl c291cmNlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5UZXh0UmVzb3VyY2VDb250ZW50Vmll dy5wcm90b3R5cGUuZ2V0IHNhdmVEYXRhKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5UaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fZXhwb3J0VGltZWxpbmVSZWNvcmRpbmcpOgor ICAgICAgICBVcGRhdGUgIndlYi1pbnNwZWN0b3I6Ly8vIiBVUkwgYnVpbGRpbmcgY29kZSB0byB1 c2UgdGhlIHV0aWxpdHkuCisKIDIwMTktMDMtMjAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaW1lbGluZXMgLSBFeHBvcnQg ZmFpbHMgZm9yIE1lZGlhVGltZWxpbmVSZWNvcmRzIHdpdGggb3JpZ2luYXRvciBET00gTm9kZSAt IENhbm5vdCBzZXJpYWxpemUgY3ljbGljIHN0cnVjdHVyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRpbGl0aWVzLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRpbGl0aWVzLmpzCmluZGV4 IGNjYzA2ZGQ3ZTYzLi40ODZhMTE2MDkyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxpdGllcy5qcwpAQCAtMzgsNiAr MzgsMTYgQEAgV0kuRmlsZVV0aWxpdGllcyA9IGNsYXNzIEZpbGVVdGlsaXRpZXMgewogICAgICAg ICByZXR1cm4gV0kuVUlTdHJpbmcoIlNjcmVlbiBTaG90ICVzLSVzLSVzIGF0ICVzLiVzLiVzIiku Zm9ybWF0KC4uLnZhbHVlcyk7CiAgICAgfQogCisgICAgc3RhdGljIHNhbml0aXplRmlsZW5hbWUo ZmlsZW5hbWUpCisgICAgeworICAgICAgICByZXR1cm4gZmlsZW5hbWUucmVwbGFjZSgvOisvZywg Ii0iKTsKKyAgICB9CisKKyAgICBzdGF0aWMgaW5zcGVjdG9yVVJMRm9yRmlsZW5hbWUoZmlsZW5h bWUpCisgICAgeworICAgICAgICByZXR1cm4gIndlYi1pbnNwZWN0b3I6Ly8vIiArIGVuY29kZVVS SUNvbXBvbmVudChGaWxlVXRpbGl0aWVzLnNhbml0aXplRmlsZW5hbWUoZmlsZW5hbWUpKTsKKyAg ICB9CisKICAgICBzdGF0aWMgc2F2ZShzYXZlRGF0YSwgZm9yY2VTYXZlQXMpCiAgICAgewogICAg ICAgICBjb25zb2xlLmFzc2VydChzYXZlRGF0YSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggZmNmOWEyZTY1MzkuLmFhNjdkY2Vk OGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9N YWluLmpzCkBAIC0zMDc4LDcgKzMwNzgsNyBAQCBXSS5hcmNoaXZlTWFpbkZyYW1lID0gZnVuY3Rp b24oKQogCiAgICAgICAgIGxldCBtYWluRnJhbWUgPSBXSS5uZXR3b3JrTWFuYWdlci5tYWluRnJh bWU7CiAgICAgICAgIGxldCBhcmNoaXZlTmFtZSA9IG1haW5GcmFtZS5tYWluUmVzb3VyY2UudXJs Q29tcG9uZW50cy5ob3N0IHx8IG1haW5GcmFtZS5tYWluUmVzb3VyY2UuZGlzcGxheU5hbWUgfHwg IkFyY2hpdmUiOwotICAgICAgICBsZXQgdXJsID0gIndlYi1pbnNwZWN0b3I6Ly8vIiArIGVuY29k ZVVSSShhcmNoaXZlTmFtZSkgKyAiLndlYmFyY2hpdmUiOworICAgICAgICBsZXQgdXJsID0gV0ku RmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFtZShhcmNoaXZlTmFtZSArICIud2Vi YXJjaGl2ZSIpOwogCiAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5zYXZlKHVybCwgZGF0 YSwgdHJ1ZSwgdHJ1ZSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BdWRpdE1hbmFnZXIuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BdWRpdE1hbmFnZXIuanMKaW5k ZXggYjhlOTViNjIzNmYuLmVhMzVkOTNiZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BdWRpdE1hbmFnZXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXVkaXRNYW5hZ2Vy LmpzCkBAIC0yMzIsMTAgKzIzMiw4IEBAIFdJLkF1ZGl0TWFuYWdlciA9IGNsYXNzIEF1ZGl0TWFu YWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAob2JqZWN0IGluc3RhbmNlb2YgV0ku QXVkaXRUZXN0UmVzdWx0QmFzZSkKICAgICAgICAgICAgIGZpbGVuYW1lID0gV0kuVUlTdHJpbmco IiVzIFJlc3VsdCIpLmZvcm1hdChmaWxlbmFtZSk7CiAKLSAgICAgICAgbGV0IHVybCA9ICJ3ZWIt aW5zcGVjdG9yOi8vLyIgKyBlbmNvZGVVUkkoZmlsZW5hbWUpICsgIi5qc29uIjsKLQogICAgICAg ICBXSS5GaWxlVXRpbGl0aWVzLnNhdmUoewotICAgICAgICAgICAgdXJsLAorICAgICAgICAgICAg dXJsOiBXSS5GaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZpbGVuYW1lKGZpbGVuYW1lICsg Ii5qc29uIiksCiAgICAgICAgICAgICBjb250ZW50OiBKU09OLnN0cmluZ2lmeShvYmplY3QpLAog ICAgICAgICAgICAgZm9yY2VTYXZlQXM6IHRydWUsCiAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGVidWcvUHJvdG9jb2xUcmFjZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL1Byb3RvY29sVHJh Y2UuanMKaW5kZXggNjI4YmUxMjk0ZjYuLjk3Mzg5NGJmOGNkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9Qcm90b2NvbFRyYWNlLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL1Byb3RvY29sVHJhY2Uu anMKQEAgLTUxLDYgKzUxLDcgQEAgV0kuUHJvdG9jb2xUcmFjZSA9IGNsYXNzIFByb3RvY29sVHJh Y2UKICAgICAgICAgLy8gIlByb3RvY29sIFRyYWNlIDIwMTUtMTItMzEgYXQgMTIuNDMuMDQuanNv biIuCiAgICAgICAgIC8vIFdoZW4gdGhlIEludGwgQVBJIGlzIGltcGxlbWVudGVkLCB3ZSBjYW4g ZG8gYSBiZXR0ZXIgam9iLgogICAgICAgICBsZXQgZmlsZW5hbWUgPSBXSS51bmxvY2FsaXplZFN0 cmluZyhgUHJvdG9jb2wgVHJhY2UgYXQgJHtZWVlZfS0ke01NfS0ke0REfSAke2hofS4ke21tfS4k e3NzfS5qc29uYCk7Ci0gICAgICAgIHJldHVybiB7dXJsOiAid2ViLWluc3BlY3RvcjovLy8iICsg ZW5jb2RlVVJJQ29tcG9uZW50KGZpbGVuYW1lKSwgY29udGVudDogSlNPTi5zdHJpbmdpZnkodGhp cy5fZW50cmllcyl9OworICAgICAgICBsZXQgdXJsID0gV0kuRmlsZVV0aWxpdGllcy5pbnNwZWN0 b3JVUkxGb3JGaWxlbmFtZShmaWxlbmFtZSk7CisgICAgICAgIHJldHVybiB7dXJsLCBjb250ZW50 OiBKU09OLnN0cmluZ2lmeSh0aGlzLl9lbnRyaWVzKX07CiAgICAgfQogfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbCBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbAppbmRleCA0Y2QwYTEyYmZhNi4u MGMyODRhNmUwYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1Rlc3QuaHRtbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9U ZXN0Lmh0bWwKQEAgLTU3LDYgKzU3LDcgQEAKICAgICA8c2NyaXB0IHNyYz0iQmFzZS9ET01VdGls aXRpZXMuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL0V2ZW50TGlzdGVuZXIu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL0V2ZW50TGlzdGVuZXJTZXQuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJCYXNlL0ZpbGVVdGlsaXRpZXMuanMiPjwvc2Ny aXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL0ltYWdlVXRpbGl0aWVzLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iQmFzZS9NSU1FVHlwZVV0aWxpdGllcy5qcyI+PC9zY3JpcHQ+CiAg ICAgPHNjcmlwdCBzcmM9IkJhc2UvT2JqZWN0U3RvcmUuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3Nh Z2VWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u c29sZU1lc3NhZ2VWaWV3LmpzCmluZGV4IGE2YzIzYzZmZDVkLi42ZDZkY2JiZmU3MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1l c3NhZ2VWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcwpAQCAtOTUyLDcgKzk1Miw3IEBAIFdJLkNvbnNvbGVN ZXNzYWdlVmlldyA9IGNsYXNzIENvbnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJTYXZlIEltYWdlIiks ICgpID0+IHsKICAgICAgICAgICAgIGNvbnN0IGZvcmNlU2F2ZUFzID0gdHJ1ZTsKICAgICAgICAg ICAgIFdJLkZpbGVVdGlsaXRpZXMuc2F2ZSh7Ci0gICAgICAgICAgICAgICAgdXJsOiBlbmNvZGVV UkkoIndlYi1pbnNwZWN0b3I6Ly8vIiArIGltYWdlLmdldEF0dHJpYnV0ZSgiZmlsZW5hbWUiKSks CisgICAgICAgICAgICAgICAgdXJsOiBXSS5GaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZp bGVuYW1lKGltYWdlLmdldEF0dHJpYnV0ZSgiZmlsZW5hbWUiKSksCiAgICAgICAgICAgICAgICAg Y29udGVudDogcGFyc2VEYXRhVVJMKHRoaXMuX21lc3NhZ2UubWVzc2FnZVRleHQpLmRhdGEsCiAg ICAgICAgICAgICAgICAgYmFzZTY0RW5jb2RlZDogdHJ1ZSwKICAgICAgICAgICAgIH0sIGZvcmNl U2F2ZUFzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGlsaXRpZXMuanMKaW5kZXggODQ4ZWRkMWVi NzcuLjg1NzkzY2IxYjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qcwpAQCAt MjUzLDcgKzI1Myw3IEBAIFdJLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JET01Ob2RlID0gZnVu Y3Rpb24oY29udGV4dE1lbnUsIGRvbU5vZGUsIG9wdGlvbnMgPSB7CiAgICAgICAgICAgICAgICAg fQogCiAgICAgICAgICAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5zYXZlKHsKLSAgICAgICAgICAg ICAgICAgICAgdXJsOiBlbmNvZGVVUkkoYHdlYi1pbnNwZWN0b3I6Ly8vJHtXSS5GaWxlVXRpbGl0 aWVzLnNjcmVlbnNob3RTdHJpbmcoKX0ucG5nYCksCisgICAgICAgICAgICAgICAgICAgIHVybDog V0kuRmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFtZShXSS5GaWxlVXRpbGl0aWVz LnNjcmVlbnNob3RTdHJpbmcoKSArICIucG5nIiksCiAgICAgICAgICAgICAgICAgICAgIGNvbnRl bnQ6IHBhcnNlRGF0YVVSTChkYXRhVVJMKS5kYXRhLAogICAgICAgICAgICAgICAgICAgICBiYXNl NjRFbmNvZGVkOiB0cnVlLAogICAgICAgICAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90Q29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25h cHNob3RDb250ZW50Vmlldy5qcwppbmRleCBkZGEzYWM4Yjg2YS4uNDAwOTYyNzBhZTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFw c2hvdENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0hlYXBTbmFwc2hvdENvbnRlbnRWaWV3LmpzCkBAIC0xMDMsOSArMTAzLDggQEAg V0kuSGVhcFNuYXBzaG90Q29udGVudFZpZXcgPSBjbGFzcyBIZWFwU25hcHNob3RDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgICAgIE51bWJlci56ZXJvUGFkKGRhdGUu Z2V0U2Vjb25kcygpLCAyKSwKICAgICAgICAgXTsKICAgICAgICAgbGV0IGZpbGVuYW1lID0gV0ku VUlTdHJpbmcoIkhlYXAgU25hcHNob3QgJXMtJXMtJXMgYXQgJXMuJXMuJXMiKS5mb3JtYXQoLi4u dmFsdWVzKTsKLSAgICAgICAgbGV0IHVybCA9ICJ3ZWItaW5zcGVjdG9yOi8vLyIgKyBlbmNvZGVV UkkoZmlsZW5hbWUpICsgIi5qc29uIjsKICAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5zYXZlKHsK LSAgICAgICAgICAgIHVybCwKKyAgICAgICAgICAgIHVybDogV0kuRmlsZVV0aWxpdGllcy5pbnNw ZWN0b3JVUkxGb3JGaWxlbmFtZShmaWxlbmFtZSArICIuanNvbiIpLAogICAgICAgICAgICAgY29u dGVudDogdGhpcy5yZXByZXNlbnRlZE9iamVjdC5zbmFwc2hvdFN0cmluZ0RhdGEsCiAgICAgICAg ICAgICBmb3JjZVNhdmVBczogdHJ1ZSwKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3Lmpz CmluZGV4IDE2NDVlMjhiNGU5Li4wMjEyYzY0ZmFkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMK QEAgLTI2NSw3ICsyNjUsOCBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgIGdldCBzYXZlRGF0YSgpCiAgICAgewot ICAgICAgICByZXR1cm4ge3VybDogIndlYi1pbnNwZWN0b3I6Ly8vQ29uc29sZS50eHQiLCBjb250 ZW50OiB0aGlzLl9mb3JtYXRNZXNzYWdlc0FzRGF0YShmYWxzZSksIGZvcmNlU2F2ZUFzOiB0cnVl fTsKKyAgICAgICAgbGV0IHVybCA9IFdJLkZpbGVVdGlsaXRpZXMuaW5zcGVjdG9yVVJMRm9yRmls ZW5hbWUoIkNvbnNvbGUudHh0Iik7CisgICAgICAgIHJldHVybiB7dXJsLCBjb250ZW50OiB0aGlz Ll9mb3JtYXRNZXNzYWdlc0FzRGF0YShmYWxzZSksIGZvcmNlU2F2ZUFzOiB0cnVlfTsKICAgICB9 CiAKICAgICBoYW5kbGVDb3B5RXZlbnQoZXZlbnQpCkBAIC00OTAsNyArNDkxLDcgQEAgV0kuTG9n Q29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJTYXZlIFNl bGVjdGVkIiksICgpID0+IHsKICAgICAgICAgICAgICAgICBjb25zdCBmb3JjZVNhdmVBcyA9IHRy dWU7CiAgICAgICAgICAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5zYXZlKHsKLSAgICAgICAgICAg ICAgICAgICAgdXJsOiAid2ViLWluc3BlY3RvcjovLy9Db25zb2xlLnR4dCIsCisgICAgICAgICAg ICAgICAgICAgIHVybDogV0kuRmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFtZSgi Q29uc29sZS50eHQiKSwKICAgICAgICAgICAgICAgICAgICAgY29udGVudDogdGhpcy5fZm9ybWF0 TWVzc2FnZXNBc0RhdGEodHJ1ZSksCiAgICAgICAgICAgICAgICAgfSwgZm9yY2VTYXZlQXMpOwog ICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmlu ZGV4IDFkZDY1MTBmYTU0Li44NTIzZjBlMjFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxl Q29udGVudFZpZXcuanMKQEAgLTIxMDgsOSArMjEwOCw4IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRl bnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmllCiAgICAgICAgIFdJLkhBUkJ1aWxkZXIuYnVpbGRBcmNoaXZlKHJlc291cmNlcykudGhlbigo aGFyKSA9PiB7CiAgICAgICAgICAgICBsZXQgbWFpbkZyYW1lID0gV0kubmV0d29ya01hbmFnZXIu bWFpbkZyYW1lOwogICAgICAgICAgICAgbGV0IGFyY2hpdmVOYW1lID0gbWFpbkZyYW1lLm1haW5S ZXNvdXJjZS51cmxDb21wb25lbnRzLmhvc3QgfHwgbWFpbkZyYW1lLm1haW5SZXNvdXJjZS5kaXNw bGF5TmFtZSB8fCAiQXJjaGl2ZSI7Ci0gICAgICAgICAgICBsZXQgdXJsID0gIndlYi1pbnNwZWN0 b3I6Ly8vIiArIGVuY29kZVVSSShhcmNoaXZlTmFtZSkgKyAiLmhhciI7CiAgICAgICAgICAgICBX SS5GaWxlVXRpbGl0aWVzLnNhdmUoewotICAgICAgICAgICAgICAgIHVybCwKKyAgICAgICAgICAg ICAgICB1cmw6IFdJLkZpbGVVdGlsaXRpZXMuaW5zcGVjdG9yVVJMRm9yRmlsZW5hbWUoYXJjaGl2 ZU5hbWUgKyAiLmhhciIpLAogICAgICAgICAgICAgICAgIGNvbnRlbnQ6IEpTT04uc3RyaW5naWZ5 KGhhciwgbnVsbCwgMiksCiAgICAgICAgICAgICAgICAgZm9yY2VTYXZlQXM6IHRydWUsCiAgICAg ICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMKaW5kZXggYzRhNTk4 OWJkN2QuLjg2M2I1MmIwZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qcwpA QCAtMTc2LDEwICsxNzYsOSBAQCBXSS5SZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFJlY29y ZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICBfZXhwb3J0UmVjb3Jk aW5nKCkKICAgICB7CiAgICAgICAgIGxldCBmaWxlbmFtZSA9IHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QuZGlzcGxheU5hbWU7Ci0gICAgICAgIGxldCB1cmwgPSAid2ViLWluc3BlY3RvcjovLy8iICsg ZW5jb2RlVVJJKGZpbGVuYW1lKSArICIuanNvbiI7CiAKICAgICAgICAgV0kuRmlsZVV0aWxpdGll cy5zYXZlKHsKLSAgICAgICAgICAgIHVybCwKKyAgICAgICAgICAgIHVybDogV0kuRmlsZVV0aWxp dGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFtZShmaWxlbmFtZSArICIuanNvbiIpLAogICAgICAg ICAgICAgY29udGVudDogSlNPTi5zdHJpbmdpZnkodGhpcy5yZXByZXNlbnRlZE9iamVjdC50b0pT T04oKSksCiAgICAgICAgICAgICBmb3JjZVNhdmVBczogdHJ1ZSwKICAgICAgICAgfSk7CkBAIC0x OTMsMTAgKzE5Miw5IEBAIFdJLlJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3MgUmVjb3JkaW5n Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB9CiAKICAgICAgICAg bGV0IGZpbGVuYW1lID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdC5kaXNwbGF5TmFtZTsKLSAgICAg ICAgbGV0IHVybCA9ICJ3ZWItaW5zcGVjdG9yOi8vLyIgKyBlbmNvZGVVUkkoZmlsZW5hbWUpICsg Ii5odG1sIjsKIAogICAgICAgICBXSS5GaWxlVXRpbGl0aWVzLnNhdmUoewotICAgICAgICAgICAg dXJsLAorICAgICAgICAgICAgdXJsOiBXSS5GaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZp bGVuYW1lKGZpbGVuYW1lICsgIi5odG1sIiksCiAgICAgICAgICAgICBjb250ZW50OiB0aGlzLnJl cHJlc2VudGVkT2JqZWN0LnRvSFRNTCgpLAogICAgICAgICAgICAgZm9yY2VTYXZlQXM6IHRydWUs CiAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2NyaXB0Q29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRDb250ZW50Vmlldy5qcwppbmRleCAyZWY0NGQ0ZGNl My4uNzI1ZjE5MDQ2NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCkBAIC0xNTQsNyAr MTU0LDcgQEAgV0kuU2NyaXB0Q29udGVudFZpZXcgPSBjbGFzcyBTY3JpcHRDb250ZW50VmlldyBl eHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAKICAgICBnZXQgc2F2ZURhdGEoKQogICAgIHsKLSAgICAg ICAgdmFyIHVybCA9IHRoaXMuX3NjcmlwdC51cmwgfHwgIndlYi1pbnNwZWN0b3I6Ly8vIiArIGVu Y29kZVVSSSh0aGlzLl9zY3JpcHQuZGlzcGxheU5hbWUpICsgIi5qcyI7CisgICAgICAgIGxldCB1 cmwgPSB0aGlzLl9zY3JpcHQudXJsIHx8IFdJLkZpbGVVdGlsaXRpZXMuaW5zcGVjdG9yVVJMRm9y RmlsZW5hbWUodGhpcy5fc2NyaXB0LmRpc3BsYXlOYW1lICsgIi5qcyIpOwogICAgICAgICByZXR1 cm4ge3VybCwgY29udGVudDogdGhpcy5fdGV4dEVkaXRvci5zdHJpbmd9OwogICAgIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2hhZGVy UHJvZ3JhbUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3LmpzCmluZGV4IDI4M2VjNDk5MDc3Li43 ZThkYTgyODc0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1Db250ZW50Vmlldy5qcwpA QCAtMTIxLDcgKzEyMSw3IEBAIFdJLlNoYWRlclByb2dyYW1Db250ZW50VmlldyA9IGNsYXNzIFNo YWRlclByb2dyYW1Db250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWCiAgICAgICAgICAgICBm aWxlbmFtZSA9IFdJLlVJU3RyaW5nKCJGcmFnbWVudCIpOwogCiAgICAgICAgIHJldHVybiB7Ci0g ICAgICAgICAgICB1cmw6IGB3ZWItaW5zcGVjdG9yOi8vLyR7ZmlsZW5hbWV9Lmdsc2xgLAorICAg ICAgICAgICAgdXJsOiBXSS5GaWxlVXRpbGl0aWVzLmluc3BlY3RvclVSTEZvckZpbGVuYW1lKGZp bGVuYW1lICsgIi5nbHNsIiksCiAgICAgICAgICAgICBjb250ZW50OiB0aGlzLl9sYXN0QWN0aXZl RWRpdG9yLnN0cmluZywKICAgICAgICAgICAgIGZvcmNlU2F2ZUFzOiB0cnVlLAogICAgICAgICB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGV4dENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGV4dENvbnRlbnRWaWV3LmpzCmluZGV4IDBjZTEwY2M5OGQ1Li4yNTcwOWIzMjdlOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4 dENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RleHRDb250ZW50Vmlldy5qcwpAQCAtMTA2LDcgKzEwNiw3IEBAIFdJLlRleHRDb250 ZW50VmlldyA9IGNsYXNzIFRleHRDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAK ICAgICBnZXQgc2F2ZURhdGEoKQogICAgIHsKLSAgICAgICAgdmFyIHVybCA9ICJ3ZWItaW5zcGVj dG9yOi8vLyIgKyBlbmNvZGVVUkkoV0kuVUlTdHJpbmcoIlVudGl0bGVkIikpICsgIi50eHQiOwor ICAgICAgICBsZXQgdXJsID0gV0kuRmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFt ZShXSS5VSVN0cmluZygiVW50aXRsZWQiKSArICIudHh0Iik7CiAgICAgICAgIHJldHVybiB7dXJs LCBjb250ZW50OiB0aGlzLl90ZXh0RWRpdG9yLnN0cmluZywgZm9yY2VTYXZlQXM6IHRydWV9Owog ICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCBkNGZj NDhlYmY0NS4uNDlhOWI5NWFhMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRW aWV3LmpzCkBAIC0xNDMsOCArMTQzLDEwIEBAIFdJLlRleHRSZXNvdXJjZUNvbnRlbnRWaWV3ID0g Y2xhc3MgVGV4dFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5SZXNvdXJjZUNvCiAKICAg ICBnZXQgc2F2ZURhdGEoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UgaW5zdGFu Y2VvZiBXSS5DU1NTdHlsZVNoZWV0KQotICAgICAgICAgICAgcmV0dXJuIHt1cmw6ICJ3ZWItaW5z cGVjdG9yOi8vL0luc3BlY3RvclN0eWxlU2hlZXQuY3NzIiwgY29udGVudDogdGhpcy5fdGV4dEVk aXRvci5zdHJpbmcsIGZvcmNlU2F2ZUFzOiB0cnVlfTsKKyAgICAgICAgaWYgKHRoaXMucmVzb3Vy Y2UgaW5zdGFuY2VvZiBXSS5DU1NTdHlsZVNoZWV0KSB7CisgICAgICAgICAgICBsZXQgdXJsID0g V0kuRmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JGaWxlbmFtZSgiSW5zcGVjdG9yU3R5bGVT aGVldC5jc3MiKTsKKyAgICAgICAgICAgIHJldHVybiB7dXJsLCBjb250ZW50OiB0aGlzLl90ZXh0 RWRpdG9yLnN0cmluZywgZm9yY2VTYXZlQXM6IHRydWV9OworICAgICAgICB9CiAgICAgICAgIHJl dHVybiB7dXJsOiB0aGlzLnJlc291cmNlLnVybCwgY29udGVudDogdGhpcy5fdGV4dEVkaXRvci5z dHJpbmd9OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcuanMKaW5kZXggOWNlYjdmNjRiNzYuLjQ5NWVjYmUxNDdiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0Nv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKQEAgLTYwOCw5ICs2MDgsOSBAQCBX SS5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmdD b250ZW50VmlldyBleHRlbmRzIFdJLgogICAgICAgICAgICAgZnJhbWVOYW1lID0gbWFpbkZyYW1l Lm1haW5SZXNvdXJjZS51cmxDb21wb25lbnRzLmhvc3QgfHwgbWFpbkZyYW1lLm1haW5SZXNvdXJj ZS5kaXNwbGF5TmFtZTsKIAogICAgICAgICBsZXQgZmlsZW5hbWUgPSBmcmFtZU5hbWUgPyBgJHtm cmFtZU5hbWV9LXJlY29yZGluZ2AgOiB0aGlzLl9yZWNvcmRpbmcuZGlzcGxheU5hbWU7Ci0gICAg ICAgIGxldCB1cmwgPSAid2ViLWluc3BlY3RvcjovLy8iICsgZW5jb2RlVVJJKGZpbGVuYW1lKSAr ICIuanNvbiI7CisKICAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5zYXZlKHsKLSAgICAgICAgICAg IHVybCwKKyAgICAgICAgICAgIHVybDogV0kuRmlsZVV0aWxpdGllcy5pbnNwZWN0b3JVUkxGb3JG aWxlbmFtZShmaWxlbmFtZSArICIuanNvbiIpLAogICAgICAgICAgICAgY29udGVudDogSlNPTi5z dHJpbmdpZnkoanNvbiksCiAgICAgICAgICAgICBmb3JjZVNhdmVBczogdHJ1ZSwKICAgICAgICAg fSk7Cg==