211598 2020-05-07 15:15:42 -0700 Web Inspector: Storage: double clicking on a cookie field doesn't start editing it 2020-05-07 16:00:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1650365 0 hi 2020-05-07 15:15:42 -0700 # STEPS TO REPRODUCE 1. inspect any page 2. add a cookie via the + in the navigation bar of the Cookies view in the Storage Tab 3. double click on any cell of the newly added cookie => nothing :( This doesn't match the editing capabilities of Local Storage or Session Storage. It's possible to edit an existing cookie via the context menu Edit, but that's not very discoverable and always defaults to showing the popover next to the Name. 1650368 1 398802 hi 2020-05-07 15:19:08 -0700 Created attachment 398802 Patch 1650371 2 398803 hi 2020-05-07 15:22:05 -0700 Created attachment 398803 Patch Default to focusing "name" when creating a brand new cookie. 1650395 3 ews-feeder 2020-05-07 15:59:13 -0700 Committed r261339: <https://trac.webkit.org/changeset/261339> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398803. 1650396 4 webkit-bug-importer 2020-05-07 16:00:15 -0700 <rdar://problem/62996950> 398802 2020-05-07 15:19:08 -0700 2020-05-07 15:22:03 -0700 Patch bug-211598-20200507161907.patch text/plain 8693 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3NmE2NTA4NjVkNTYwYTNhNTgyMjBmYjYzMTI4 MmIzMzkyMmE2ZmMuLjc2YjkwNTE1ZDdkZDNkOWE0M2MyYzVhZDdiMjAwZjIzY2M5YzlhYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dG9yYWdlOiBkb3VibGUgY2xpY2tpbmcgb24gYSBjb29raWUgZmllbGQgZG9lc24ndCBzdGFydCBl ZGl0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTE1OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkNvb2tpZVN0 b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUudGFibGVDZWxsQ29udGV4dE1lbnVDbGlja2VkKToK KyAgICAgICAgKFdJLkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUudGFibGVQb3B1 bGF0ZUNlbGwpOgorICAgICAgICAoV0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5fc2hvd0Nvb2tpZVBvcG92ZXIpOgorICAgICAgICAoV0kuQ29va2llU3RvcmFnZUNvbnRlbnRW aWV3LnByb3RvdHlwZS5faGFuZGxlU2V0Q29va2llQnV0dG9uQ2xpY2spOgorICAgICAgICBBZGQg YSBgImRibGNsaWNrImAgZXZlbnQgbGlzdGVuZXIgdG8gZWFjaCBjZWxsIHRoYXQgc2hvd3MgYSBg V0kuQ29va2llUG9wb3ZlcmAgZm9yIHRoYXQgY2VsbAorICAgICAgICBhbmQgYXV0b21hdGljYWxs eSBzZWxlY3QgdGhlIGN1cnJlbnQgdmFsdWUgb2YgdGhhdCBmaWVsZCBpbiB0aGUgYFdJLkNvb2tp ZWAuIFVuaWZ5IHRoZSBmZXcKKyAgICAgICAgZGlmZmVyZW50IHdheXMgdG8gc2hvdyBhIGBXSS5D b29raWVQb3BvdmVyYC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llUG9w b3Zlci5qczoKKyAgICAgICAgKFdJLkNvb2tpZVBvcG92ZXIucHJvdG90eXBlLnNob3cuY3JlYXRl Um93KToKKyAgICAgICAgUHJvdmlkZSBhIHdheSB0byBwcm9ncmFtbWF0aWNhbGx5IHRyaWdnZXIg dGhlIGZvY3VzaW5nIG9mIGFuIGVkaXRvciBvbmNlIHNob3duLgorCisgICAgICAgICogTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDIwLTA1LTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBM YXllcnM6IHRoZSB0ZXh0IGF0IHRoZSBib3R0b20gb2YgdGhlIGRldGFpbHMgc2lkZWJhciBjYW4g Z2V0IHNxdWlzaGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBlNmQ2NmIz ZTcxNDlkMjI3Yjg2NjllYWIxM2ZmYWRlZTkxNjllMjViLi4yOTU4YTI5MjJjZmEwZjQ2NTFiMWFm NTI5M2U3ZTc0N2VlYWE1NGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAg LTIzMCw3ICsyMzAsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDYWxsIEZyYW1lcyBUcnVuY2F0ZWQi XSA9ICJDYWxsIEZyYW1lcyBUcnVuY2F0ZWQiOwogbG9jYWxpemVkU3RyaW5nc1siQ2FsbCBTdGFj ayJdID0gIkNhbGwgU3RhY2siOwogbG9jYWxpemVkU3RyaW5nc1siQ2FsbCBTdGFjayBVbmF2YWls YWJsZSJdID0gIkNhbGwgU3RhY2sgVW5hdmFpbGFibGUiOwogbG9jYWxpemVkU3RyaW5nc1siQ2Fs bCBUcmVlcyJdID0gIkNhbGwgVHJlZXMiOwotbG9jYWxpemVkU3RyaW5nc1siQ2FsbHMiXSA9ICJD YWxscyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW5jZWwgQXV0b21hdGljIENvbnRpbnVlIl0gPSAi Q2FuY2VsIEF1dG9tYXRpYyBDb250aW51ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW5jZWwgY29t cGFyaXNvbiJdID0gIkNhbmNlbCBjb21wYXJpc29uIjsKIC8qIFRvb2x0aXAgZm9yIGEgdGltZXN0 YW1wIG1hcmtlciB0aGF0IHJlcHJlc2VudHMgd2hlbiBhIENTUyBhbmltYXRpb24vdHJhbnNpdGlv biBpcyBjYW5jZWxlZCAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29va2llUG9wb3Zlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVBvcG92ZXIuanMKaW5kZXggN2ZkOGM5ZTVkOWZhNTYw YzhiYjc3NTE5YzAxZGUxMmQzOTIyYTM4YS4uMDM1MmY5NGQwMjJiNTJlMDllY2IxYjljNWRhMWVl NTRlMmU0OGJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29va2llUG9wb3Zlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db29raWVQb3BvdmVyLmpzCkBAIC05OCw3ICs5OCw3IEBAIFdJLkNv b2tpZVBvcG92ZXIgPSBjbGFzcyBDb29raWVQb3BvdmVyIGV4dGVuZHMgV0kuUG9wb3ZlcgogICAg ICAgICByZXR1cm4gZGF0YTsKICAgICB9CiAKLSAgICBzaG93KGNvb2tpZSwgdGFyZ2V0RWxlbWVu dCwgcHJlZmVycmVkRWRnZXMpCisgICAgc2hvdyhjb29raWUsIHRhcmdldEVsZW1lbnQsIHByZWZl cnJlZEVkZ2VzLCBvcHRpb25zID0ge30pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCgh Y29va2llIHx8IGNvb2tpZSBpbnN0YW5jZW9mIFdJLkNvb2tpZSwgY29va2llKTsKICAgICAgICAg Y29uc29sZS5hc3NlcnQodGFyZ2V0RWxlbWVudCBpbnN0YW5jZW9mIEVsZW1lbnQsIHRhcmdldEVs ZW1lbnQpOwpAQCAtMTM3LDIxICsxMzcsMjggQEAgV0kuQ29va2llUG9wb3ZlciA9IGNsYXNzIENv b2tpZVBvcG92ZXIgZXh0ZW5kcyBXSS5Qb3BvdmVyCiAgICAgICAgIGxldCB0YWJsZUVsZW1lbnQg PSBwb3BvdmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgidGFibGUiKSk7CiAKICAgICAgICAgZnVuY3Rpb24gY3JlYXRlUm93KGlkLCBsYWJlbCwgZWRp dG9yRWxlbWVudCkgewotICAgICAgICAgICAgaWQgPSBgY29va2llLXBvcG92ZXItJHtpZH0tZWRp dG9yYDsKKyAgICAgICAgICAgIGxldCBkb21JZCA9IGBjb29raWUtcG9wb3Zlci0ke2lkfS1lZGl0 b3JgOwogCiAgICAgICAgICAgICBsZXQgcm93RWxlbWVudCA9IHRhYmxlRWxlbWVudC5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0ciIpKTsKIAogICAgICAgICAgICAgbGV0IGhl YWRlckVsZW1lbnQgPSByb3dFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoInRoIikpOwogCiAgICAgICAgICAgICBsZXQgbGFiZWxFbGVtZW50ID0gaGVhZGVyRWxlbWVu dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJsYWJlbCIpKTsKLSAgICAgICAg ICAgIGxhYmVsRWxlbWVudC5zZXRBdHRyaWJ1dGUoImZvciIsIGlkKTsKKyAgICAgICAgICAgIGxh YmVsRWxlbWVudC5zZXRBdHRyaWJ1dGUoImZvciIsIGRvbUlkKTsKICAgICAgICAgICAgIGxhYmVs RWxlbWVudC50ZXh0Q29udGVudCA9IGxhYmVsOwogCiAgICAgICAgICAgICBsZXQgZGF0YUVsZW1l bnQgPSByb3dFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRkIikp OwogCi0gICAgICAgICAgICBlZGl0b3JFbGVtZW50LmlkID0gaWQ7CisgICAgICAgICAgICBlZGl0 b3JFbGVtZW50LmlkID0gZG9tSWQ7CiAgICAgICAgICAgICBkYXRhRWxlbWVudC5hcHBlbmRDaGls ZChlZGl0b3JFbGVtZW50KTsKIAorICAgICAgICAgICAgaWYgKGlkID09PSBvcHRpb25zLmZvY3Vz RmllbGQpIHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAg ICAgICAgICAgZWRpdG9yRWxlbWVudC5mb2N1cygpOworICAgICAgICAgICAgICAgICAgICBlZGl0 b3JFbGVtZW50LnNlbGVjdD8uKCk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9 CisKICAgICAgICAgICAgIHJldHVybiB7cm93RWxlbWVudH07CiAgICAgICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3Rv cmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDQ2NWFiNjZhMWYwMTEyM2Uz MmFmNjJmNzliOTBhZWE1ODA4NDA3ZmMuLjE1MGE3ZTgyOGI1NmNhNGE5ZDc0ZWI4MTAwZDE2YzA2 ZmRhMzI5OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMKQEAg LTM1LDYgKzM1LDcgQEAgV0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgQ29va2ll U3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFYKICAgICAgICAgdGhpcy5fZmls dGVyZWRDb29raWVzID0gW107CiAgICAgICAgIHRoaXMuX3NvcnRDb21wYXJhdG9yID0gbnVsbDsK ICAgICAgICAgdGhpcy5fdGFibGUgPSBudWxsOworICAgICAgICB0aGlzLl9rbm93bkNlbGxzID0g bmV3IFdlYWtTZXQ7CiAKICAgICAgICAgdGhpcy5fZW1wdHlGaWx0ZXJSZXN1bHRzTWVzc2FnZUVs ZW1lbnQgPSBudWxsOwogCkBAIC0xNDYsMTMgKzE0Nyw5IEBAIFdJLkNvb2tpZVN0b3JhZ2VDb250 ZW50VmlldyA9IGNsYXNzIENvb2tpZVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWCiAKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CiAKLSAgICAgICAg aWYgKEluc3BlY3RvckJhY2tlbmQuaGFzQ29tbWFuZCgiUGFnZS5zZXRDb29raWUiKSkgewotICAg ICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiRWRpdCIpLCAoKSA9 PiB7Ci0gICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2VkaXRpbmdDb29raWUp OwotICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRpbmdDb29raWUgPSB0aGlzLl9maWx0ZXJlZENv b2tpZXNbcm93SW5kZXhdOwotCi0gICAgICAgICAgICAgICAgbGV0IHBvcG92ZXIgPSBuZXcgV0ku Q29va2llUG9wb3Zlcih0aGlzKTsKLSAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3codGhpcy5f ZWRpdGluZ0Nvb2tpZSwgdGhpcy5fdGFibGUuY2VsbEZvclJvd0FuZENvbHVtbihyb3dJbmRleCwg dGhpcy5fdGFibGUuY29sdW1uc1swXSksIFtXSS5SZWN0RWRnZS5NQVhfWSwgV0kuUmVjdEVkZ2Uu TUlOX1hdKTsKKyAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzQ29tbWFuZCgiUGFnZS5z ZXRDb29raWUiKSAmJiBjb2x1bW4uaWRlbnRpZmllciAhPT0gInNpemUiKSB7CisgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJFZGl0ICVzIikuZm9ybWF0KGNv bHVtbi5uYW1lKSwgKCkgPT4geworICAgICAgICAgICAgICAgIHRoaXMuX3Nob3dDb29raWVQb3Bv dmVyKGNlbGwsIHRoaXMuX2ZpbHRlcmVkQ29va2llc1tyb3dJbmRleF0sIGNvbHVtbi5pZGVudGlm aWVyKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAKQEAgLTIwMCw3ICsxOTcsMjIgQEAg V0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgQ29va2llU3RvcmFnZUNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFYKICAgICB0YWJsZVBvcHVsYXRlQ2VsbCh0YWJsZSwgY2Vs bCwgY29sdW1uLCByb3dJbmRleCkKICAgICB7CiAgICAgICAgIGxldCBjb29raWUgPSB0aGlzLl9m aWx0ZXJlZENvb2tpZXNbcm93SW5kZXhdOworCiAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSB0 aGlzLl9mb3JtYXRDb29raWVQcm9wZXJ0eUZvckNvbHVtbihjb29raWUsIGNvbHVtbik7CisKKyAg ICAgICAgaWYgKCF0aGlzLl9rbm93bkNlbGxzLmhhcyhjZWxsKSkgeworICAgICAgICAgICAgdGhp cy5fa25vd25DZWxscy5hZGQoY2VsbCk7CisKKyAgICAgICAgICAgIGNlbGwuYWRkRXZlbnRMaXN0 ZW5lcigiZGJsY2xpY2siLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICBpZiAoY29sdW1u LmlkZW50aWZpZXIgPT09ICJzaXplIikgeworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JG cm9udGVuZEhvc3QuYmVlcCgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgdGhpcy5fc2hvd0Nvb2tpZVBvcG92ZXIoY2Vs bCwgY29va2llLCBjb2x1bW4uaWRlbnRpZmllcik7CisgICAgICAgICAgICB9KTsKKyAgICAgICAg fQorCiAgICAgICAgIHJldHVybiBjZWxsOwogICAgIH0KIApAQCAtMzc0LDYgKzM4Niw0MyBAQCBX SS5Db29raWVTdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9yYWdlQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogICAgICAgICB0aGlzLl9zb3J0Q29tcGFyYXRvciA9IChh LCBiKSA9PiByZXZlcnNlRmFjdG9yICogY29tcGFyYXRvcihhLCBiKTsKICAgICB9CiAKKyAgICBf c2hvd0Nvb2tpZVBvcG92ZXIodGFyZ2V0RWxlbWVudCwgY29va2llLCBjb2x1bW5JZGVudGlmaWVy KSB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9lZGl0aW5nQ29va2llKTsKKyAgICAg ICAgdGhpcy5fZWRpdGluZ0Nvb2tpZSA9IGNvb2tpZTsKKworICAgICAgICBsZXQgb3B0aW9ucyA9 IHt9OworICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllcikgeworICAgICAgICAgICAgc3dpdGNo IChjb2x1bW5JZGVudGlmaWVyKSB7CisgICAgICAgICAgICBjYXNlICJuYW1lIjoKKyAgICAgICAg ICAgIGNhc2UgInZhbHVlIjoKKyAgICAgICAgICAgIGNhc2UgImRvbWFpbiI6CisgICAgICAgICAg ICBjYXNlICJwYXRoIjoKKyAgICAgICAgICAgIGNhc2UgInNlY3VyZSI6CisgICAgICAgICAgICAg ICAgb3B0aW9ucy5mb2N1c0ZpZWxkID0gY29sdW1uSWRlbnRpZmllcjsKKyAgICAgICAgICAgICAg ICBicmVhazsKKworICAgICAgICAgICAgY2FzZSAiZXhwaXJlcyI6CisgICAgICAgICAgICAgICAg b3B0aW9ucy5mb2N1c0ZpZWxkID0gdGhpcy5fZWRpdGluZ0Nvb2tpZS5zZXNzaW9uID8gInNlc3Np b24iIDogImV4cGlyZXMiOworICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBj YXNlICJodHRwT25seSI6CisgICAgICAgICAgICAgICAgb3B0aW9ucy5mb2N1c0ZpZWxkID0gImh0 dHAtb25seSI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNhc2UgInNh bWVTaXRlIjoKKyAgICAgICAgICAgICAgICBvcHRpb25zLmZvY3VzRmllbGQgPSAic2FtZS1zaXRl IjsKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydCgpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgbGV0IHBvcG92ZXIgPSBuZXcgV0kuQ29v a2llUG9wb3Zlcih0aGlzKTsKKyAgICAgICAgcG9wb3Zlci5zaG93KHRoaXMuX2VkaXRpbmdDb29r aWUsIHRhcmdldEVsZW1lbnQsIFtXSS5SZWN0RWRnZS5NQVhfWSwgV0kuUmVjdEVkZ2UuTUlOX1ks IFdJLlJlY3RFZGdlLk1JTl9YLCBXSS5SZWN0RWRnZS5NQVhfWF0sIG9wdGlvbnMpOworICAgIH0K KwogICAgIGFzeW5jIF93aWxsRGlzbWlzc0Nvb2tpZVBvcG92ZXIocG9wb3ZlcikKICAgICB7CiAg ICAgICAgIGxldCBlZGl0aW5nQ29va2llID0gdGhpcy5fZWRpdGluZ0Nvb2tpZTsKQEAgLTQxNiw4 ICs0NjUsNyBAQCBXSS5Db29raWVTdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9y YWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogCiAgICAgX2hhbmRsZVNldENvb2tp ZUJ1dHRvbkNsaWNrKGV2ZW50KQogICAgIHsKLSAgICAgICAgbGV0IHBvcG92ZXIgPSBuZXcgV0ku Q29va2llUG9wb3Zlcih0aGlzKTsKLSAgICAgICAgcG9wb3Zlci5zaG93KG51bGwsIHRoaXMuX3Nl dENvb2tpZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmVsZW1lbnQsIFtXSS5SZWN0RWRnZS5NQVhfWSwg V0kuUmVjdEVkZ2UuTUlOX1hdKTsKKyAgICAgICAgdGhpcy5fc2hvd0Nvb2tpZVBvcG92ZXIodGhp cy5fc2V0Q29va2llQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZWxlbWVudCk7CiAgICAgfQogCiAgICAg X3JlZnJlc2hCdXR0b25DbGlja2VkKGV2ZW50KQo= 398803 2020-05-07 15:22:05 -0700 2020-05-07 15:59:13 -0700 Patch bug-211598-20200507162204.patch text/plain 8707 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3NmE2NTA4NjVkNTYwYTNhNTgyMjBmYjYzMTI4 MmIzMzkyMmE2ZmMuLjc2YjkwNTE1ZDdkZDNkOWE0M2MyYzVhZDdiMjAwZjIzY2M5YzlhYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dG9yYWdlOiBkb3VibGUgY2xpY2tpbmcgb24gYSBjb29raWUgZmllbGQgZG9lc24ndCBzdGFydCBl ZGl0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTE1OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkNvb2tpZVN0 b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUudGFibGVDZWxsQ29udGV4dE1lbnVDbGlja2VkKToK KyAgICAgICAgKFdJLkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUudGFibGVQb3B1 bGF0ZUNlbGwpOgorICAgICAgICAoV0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5fc2hvd0Nvb2tpZVBvcG92ZXIpOgorICAgICAgICAoV0kuQ29va2llU3RvcmFnZUNvbnRlbnRW aWV3LnByb3RvdHlwZS5faGFuZGxlU2V0Q29va2llQnV0dG9uQ2xpY2spOgorICAgICAgICBBZGQg YSBgImRibGNsaWNrImAgZXZlbnQgbGlzdGVuZXIgdG8gZWFjaCBjZWxsIHRoYXQgc2hvd3MgYSBg V0kuQ29va2llUG9wb3ZlcmAgZm9yIHRoYXQgY2VsbAorICAgICAgICBhbmQgYXV0b21hdGljYWxs eSBzZWxlY3QgdGhlIGN1cnJlbnQgdmFsdWUgb2YgdGhhdCBmaWVsZCBpbiB0aGUgYFdJLkNvb2tp ZWAuIFVuaWZ5IHRoZSBmZXcKKyAgICAgICAgZGlmZmVyZW50IHdheXMgdG8gc2hvdyBhIGBXSS5D b29raWVQb3BvdmVyYC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llUG9w b3Zlci5qczoKKyAgICAgICAgKFdJLkNvb2tpZVBvcG92ZXIucHJvdG90eXBlLnNob3cuY3JlYXRl Um93KToKKyAgICAgICAgUHJvdmlkZSBhIHdheSB0byBwcm9ncmFtbWF0aWNhbGx5IHRyaWdnZXIg dGhlIGZvY3VzaW5nIG9mIGFuIGVkaXRvciBvbmNlIHNob3duLgorCisgICAgICAgICogTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDIwLTA1LTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBM YXllcnM6IHRoZSB0ZXh0IGF0IHRoZSBib3R0b20gb2YgdGhlIGRldGFpbHMgc2lkZWJhciBjYW4g Z2V0IHNxdWlzaGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBlNmQ2NmIz ZTcxNDlkMjI3Yjg2NjllYWIxM2ZmYWRlZTkxNjllMjViLi4yOTU4YTI5MjJjZmEwZjQ2NTFiMWFm NTI5M2U3ZTc0N2VlYWE1NGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAg LTIzMCw3ICsyMzAsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDYWxsIEZyYW1lcyBUcnVuY2F0ZWQi XSA9ICJDYWxsIEZyYW1lcyBUcnVuY2F0ZWQiOwogbG9jYWxpemVkU3RyaW5nc1siQ2FsbCBTdGFj ayJdID0gIkNhbGwgU3RhY2siOwogbG9jYWxpemVkU3RyaW5nc1siQ2FsbCBTdGFjayBVbmF2YWls YWJsZSJdID0gIkNhbGwgU3RhY2sgVW5hdmFpbGFibGUiOwogbG9jYWxpemVkU3RyaW5nc1siQ2Fs bCBUcmVlcyJdID0gIkNhbGwgVHJlZXMiOwotbG9jYWxpemVkU3RyaW5nc1siQ2FsbHMiXSA9ICJD YWxscyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW5jZWwgQXV0b21hdGljIENvbnRpbnVlIl0gPSAi Q2FuY2VsIEF1dG9tYXRpYyBDb250aW51ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW5jZWwgY29t cGFyaXNvbiJdID0gIkNhbmNlbCBjb21wYXJpc29uIjsKIC8qIFRvb2x0aXAgZm9yIGEgdGltZXN0 YW1wIG1hcmtlciB0aGF0IHJlcHJlc2VudHMgd2hlbiBhIENTUyBhbmltYXRpb24vdHJhbnNpdGlv biBpcyBjYW5jZWxlZCAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29va2llUG9wb3Zlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVBvcG92ZXIuanMKaW5kZXggN2ZkOGM5ZTVkOWZhNTYw YzhiYjc3NTE5YzAxZGUxMmQzOTIyYTM4YS4uMDM1MmY5NGQwMjJiNTJlMDllY2IxYjljNWRhMWVl NTRlMmU0OGJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29va2llUG9wb3Zlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db29raWVQb3BvdmVyLmpzCkBAIC05OCw3ICs5OCw3IEBAIFdJLkNv b2tpZVBvcG92ZXIgPSBjbGFzcyBDb29raWVQb3BvdmVyIGV4dGVuZHMgV0kuUG9wb3ZlcgogICAg ICAgICByZXR1cm4gZGF0YTsKICAgICB9CiAKLSAgICBzaG93KGNvb2tpZSwgdGFyZ2V0RWxlbWVu dCwgcHJlZmVycmVkRWRnZXMpCisgICAgc2hvdyhjb29raWUsIHRhcmdldEVsZW1lbnQsIHByZWZl cnJlZEVkZ2VzLCBvcHRpb25zID0ge30pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCgh Y29va2llIHx8IGNvb2tpZSBpbnN0YW5jZW9mIFdJLkNvb2tpZSwgY29va2llKTsKICAgICAgICAg Y29uc29sZS5hc3NlcnQodGFyZ2V0RWxlbWVudCBpbnN0YW5jZW9mIEVsZW1lbnQsIHRhcmdldEVs ZW1lbnQpOwpAQCAtMTM3LDIxICsxMzcsMjggQEAgV0kuQ29va2llUG9wb3ZlciA9IGNsYXNzIENv b2tpZVBvcG92ZXIgZXh0ZW5kcyBXSS5Qb3BvdmVyCiAgICAgICAgIGxldCB0YWJsZUVsZW1lbnQg PSBwb3BvdmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgidGFibGUiKSk7CiAKICAgICAgICAgZnVuY3Rpb24gY3JlYXRlUm93KGlkLCBsYWJlbCwgZWRp dG9yRWxlbWVudCkgewotICAgICAgICAgICAgaWQgPSBgY29va2llLXBvcG92ZXItJHtpZH0tZWRp dG9yYDsKKyAgICAgICAgICAgIGxldCBkb21JZCA9IGBjb29raWUtcG9wb3Zlci0ke2lkfS1lZGl0 b3JgOwogCiAgICAgICAgICAgICBsZXQgcm93RWxlbWVudCA9IHRhYmxlRWxlbWVudC5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0ciIpKTsKIAogICAgICAgICAgICAgbGV0IGhl YWRlckVsZW1lbnQgPSByb3dFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoInRoIikpOwogCiAgICAgICAgICAgICBsZXQgbGFiZWxFbGVtZW50ID0gaGVhZGVyRWxlbWVu dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJsYWJlbCIpKTsKLSAgICAgICAg ICAgIGxhYmVsRWxlbWVudC5zZXRBdHRyaWJ1dGUoImZvciIsIGlkKTsKKyAgICAgICAgICAgIGxh YmVsRWxlbWVudC5zZXRBdHRyaWJ1dGUoImZvciIsIGRvbUlkKTsKICAgICAgICAgICAgIGxhYmVs RWxlbWVudC50ZXh0Q29udGVudCA9IGxhYmVsOwogCiAgICAgICAgICAgICBsZXQgZGF0YUVsZW1l bnQgPSByb3dFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRkIikp OwogCi0gICAgICAgICAgICBlZGl0b3JFbGVtZW50LmlkID0gaWQ7CisgICAgICAgICAgICBlZGl0 b3JFbGVtZW50LmlkID0gZG9tSWQ7CiAgICAgICAgICAgICBkYXRhRWxlbWVudC5hcHBlbmRDaGls ZChlZGl0b3JFbGVtZW50KTsKIAorICAgICAgICAgICAgaWYgKGlkID09PSBvcHRpb25zLmZvY3Vz RmllbGQpIHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAg ICAgICAgICAgZWRpdG9yRWxlbWVudC5mb2N1cygpOworICAgICAgICAgICAgICAgICAgICBlZGl0 b3JFbGVtZW50LnNlbGVjdD8uKCk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9 CisKICAgICAgICAgICAgIHJldHVybiB7cm93RWxlbWVudH07CiAgICAgICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3Rv cmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDQ2NWFiNjZhMWYwMTEyM2Uz MmFmNjJmNzliOTBhZWE1ODA4NDA3ZmMuLmRjMjYwMjY5NWRhZjhmOGUxYzZlNGZhMmFmOTM3Yjc4 ZWUwNzRhMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMKQEAg LTM1LDYgKzM1LDcgQEAgV0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgQ29va2ll U3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFYKICAgICAgICAgdGhpcy5fZmls dGVyZWRDb29raWVzID0gW107CiAgICAgICAgIHRoaXMuX3NvcnRDb21wYXJhdG9yID0gbnVsbDsK ICAgICAgICAgdGhpcy5fdGFibGUgPSBudWxsOworICAgICAgICB0aGlzLl9rbm93bkNlbGxzID0g bmV3IFdlYWtTZXQ7CiAKICAgICAgICAgdGhpcy5fZW1wdHlGaWx0ZXJSZXN1bHRzTWVzc2FnZUVs ZW1lbnQgPSBudWxsOwogCkBAIC0xNDYsMTMgKzE0Nyw5IEBAIFdJLkNvb2tpZVN0b3JhZ2VDb250 ZW50VmlldyA9IGNsYXNzIENvb2tpZVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWCiAKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CiAKLSAgICAgICAg aWYgKEluc3BlY3RvckJhY2tlbmQuaGFzQ29tbWFuZCgiUGFnZS5zZXRDb29raWUiKSkgewotICAg ICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiRWRpdCIpLCAoKSA9 PiB7Ci0gICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2VkaXRpbmdDb29raWUp OwotICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRpbmdDb29raWUgPSB0aGlzLl9maWx0ZXJlZENv b2tpZXNbcm93SW5kZXhdOwotCi0gICAgICAgICAgICAgICAgbGV0IHBvcG92ZXIgPSBuZXcgV0ku Q29va2llUG9wb3Zlcih0aGlzKTsKLSAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3codGhpcy5f ZWRpdGluZ0Nvb2tpZSwgdGhpcy5fdGFibGUuY2VsbEZvclJvd0FuZENvbHVtbihyb3dJbmRleCwg dGhpcy5fdGFibGUuY29sdW1uc1swXSksIFtXSS5SZWN0RWRnZS5NQVhfWSwgV0kuUmVjdEVkZ2Uu TUlOX1hdKTsKKyAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzQ29tbWFuZCgiUGFnZS5z ZXRDb29raWUiKSAmJiBjb2x1bW4uaWRlbnRpZmllciAhPT0gInNpemUiKSB7CisgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJFZGl0ICVzIikuZm9ybWF0KGNv bHVtbi5uYW1lKSwgKCkgPT4geworICAgICAgICAgICAgICAgIHRoaXMuX3Nob3dDb29raWVQb3Bv dmVyKGNlbGwsIHRoaXMuX2ZpbHRlcmVkQ29va2llc1tyb3dJbmRleF0sIGNvbHVtbi5pZGVudGlm aWVyKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAKQEAgLTIwMCw3ICsxOTcsMjIgQEAg V0kuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgQ29va2llU3RvcmFnZUNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFYKICAgICB0YWJsZVBvcHVsYXRlQ2VsbCh0YWJsZSwgY2Vs bCwgY29sdW1uLCByb3dJbmRleCkKICAgICB7CiAgICAgICAgIGxldCBjb29raWUgPSB0aGlzLl9m aWx0ZXJlZENvb2tpZXNbcm93SW5kZXhdOworCiAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSB0 aGlzLl9mb3JtYXRDb29raWVQcm9wZXJ0eUZvckNvbHVtbihjb29raWUsIGNvbHVtbik7CisKKyAg ICAgICAgaWYgKCF0aGlzLl9rbm93bkNlbGxzLmhhcyhjZWxsKSkgeworICAgICAgICAgICAgdGhp cy5fa25vd25DZWxscy5hZGQoY2VsbCk7CisKKyAgICAgICAgICAgIGNlbGwuYWRkRXZlbnRMaXN0 ZW5lcigiZGJsY2xpY2siLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICBpZiAoY29sdW1u LmlkZW50aWZpZXIgPT09ICJzaXplIikgeworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JG cm9udGVuZEhvc3QuYmVlcCgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgdGhpcy5fc2hvd0Nvb2tpZVBvcG92ZXIoY2Vs bCwgY29va2llLCBjb2x1bW4uaWRlbnRpZmllcik7CisgICAgICAgICAgICB9KTsKKyAgICAgICAg fQorCiAgICAgICAgIHJldHVybiBjZWxsOwogICAgIH0KIApAQCAtMzc0LDYgKzM4Niw0MyBAQCBX SS5Db29raWVTdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9yYWdlQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogICAgICAgICB0aGlzLl9zb3J0Q29tcGFyYXRvciA9IChh LCBiKSA9PiByZXZlcnNlRmFjdG9yICogY29tcGFyYXRvcihhLCBiKTsKICAgICB9CiAKKyAgICBf c2hvd0Nvb2tpZVBvcG92ZXIodGFyZ2V0RWxlbWVudCwgY29va2llLCBjb2x1bW5JZGVudGlmaWVy KSB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9lZGl0aW5nQ29va2llKTsKKyAgICAg ICAgdGhpcy5fZWRpdGluZ0Nvb2tpZSA9IGNvb2tpZTsKKworICAgICAgICBsZXQgb3B0aW9ucyA9 IHt9OworICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllcikgeworICAgICAgICAgICAgc3dpdGNo IChjb2x1bW5JZGVudGlmaWVyKSB7CisgICAgICAgICAgICBjYXNlICJuYW1lIjoKKyAgICAgICAg ICAgIGNhc2UgInZhbHVlIjoKKyAgICAgICAgICAgIGNhc2UgImRvbWFpbiI6CisgICAgICAgICAg ICBjYXNlICJwYXRoIjoKKyAgICAgICAgICAgIGNhc2UgInNlY3VyZSI6CisgICAgICAgICAgICAg ICAgb3B0aW9ucy5mb2N1c0ZpZWxkID0gY29sdW1uSWRlbnRpZmllcjsKKyAgICAgICAgICAgICAg ICBicmVhazsKKworICAgICAgICAgICAgY2FzZSAiZXhwaXJlcyI6CisgICAgICAgICAgICAgICAg b3B0aW9ucy5mb2N1c0ZpZWxkID0gdGhpcy5fZWRpdGluZ0Nvb2tpZS5zZXNzaW9uID8gInNlc3Np b24iIDogImV4cGlyZXMiOworICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBj YXNlICJodHRwT25seSI6CisgICAgICAgICAgICAgICAgb3B0aW9ucy5mb2N1c0ZpZWxkID0gImh0 dHAtb25seSI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNhc2UgInNh bWVTaXRlIjoKKyAgICAgICAgICAgICAgICBvcHRpb25zLmZvY3VzRmllbGQgPSAic2FtZS1zaXRl IjsKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydCgpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgbGV0IHBvcG92ZXIgPSBuZXcgV0kuQ29v a2llUG9wb3Zlcih0aGlzKTsKKyAgICAgICAgcG9wb3Zlci5zaG93KHRoaXMuX2VkaXRpbmdDb29r aWUsIHRhcmdldEVsZW1lbnQsIFtXSS5SZWN0RWRnZS5NQVhfWSwgV0kuUmVjdEVkZ2UuTUlOX1ks IFdJLlJlY3RFZGdlLk1JTl9YLCBXSS5SZWN0RWRnZS5NQVhfWF0sIG9wdGlvbnMpOworICAgIH0K KwogICAgIGFzeW5jIF93aWxsRGlzbWlzc0Nvb2tpZVBvcG92ZXIocG9wb3ZlcikKICAgICB7CiAg ICAgICAgIGxldCBlZGl0aW5nQ29va2llID0gdGhpcy5fZWRpdGluZ0Nvb2tpZTsKQEAgLTQxNiw4 ICs0NjUsNyBAQCBXSS5Db29raWVTdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9y YWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogCiAgICAgX2hhbmRsZVNldENvb2tp ZUJ1dHRvbkNsaWNrKGV2ZW50KQogICAgIHsKLSAgICAgICAgbGV0IHBvcG92ZXIgPSBuZXcgV0ku Q29va2llUG9wb3Zlcih0aGlzKTsKLSAgICAgICAgcG9wb3Zlci5zaG93KG51bGwsIHRoaXMuX3Nl dENvb2tpZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmVsZW1lbnQsIFtXSS5SZWN0RWRnZS5NQVhfWSwg V0kuUmVjdEVkZ2UuTUlOX1hdKTsKKyAgICAgICAgdGhpcy5fc2hvd0Nvb2tpZVBvcG92ZXIodGhp cy5fc2V0Q29va2llQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZWxlbWVudCwgbnVsbCwgIm5hbWUiKTsK ICAgICB9CiAKICAgICBfcmVmcmVzaEJ1dHRvbkNsaWNrZWQoZXZlbnQpCg==