196231 2019-03-25 16:58:00 -0700 Web Inspector: DOMDebugger: move breakpoint storage to use `WI.ObjectStore` 2019-04-15 12:17:20 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=192719 InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1521123 0 hi 2019-03-25 16:58:00 -0700 Rather than having to `JSON.stringify` and `JSON.parse` each breakpoint in a giant list on `localStorage`, we can leverage IndexedDB to store breakpoints in a more "friendly" way. Additionally, this would allow us to not have to re-serialize all breakpoints when saving an update to a single breakpoint. 1521127 1 webkit-bug-importer 2019-03-25 17:03:32 -0700 <rdar://problem/49236864> 1521132 2 365924 hi 2019-03-25 17:22:29 -0700 Created attachment 365924 Patch 1527285 3 365924 joepeck 2019-04-15 11:35:44 -0700 Comment on attachment 365924 Patch r=me, nice! 1527318 4 365924 commit-queue 2019-04-15 12:17:19 -0700 Comment on attachment 365924 Patch Clearing flags on attachment: 365924 Committed r244279: <https://trac.webkit.org/changeset/244279> 1527319 5 commit-queue 2019-04-15 12:17:20 -0700 All reviewed patches have been landed. Closing bug. 365924 2019-03-25 17:22:29 -0700 2019-04-15 12:17:19 -0700 Patch bug-196231-20190325172228.patch text/plain 16991 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlhOGIyYWU4NWU0ZjNhMTFhNmVlYzQwNjA0ZGQw YWI2NmI2NzBiYzUuLjE4NzZkNzg3Mjc0ZjFhZGNlNTgyN2JiZDFmN2Q1MDA1MDk3ODgyNTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDE5LTAzLTI1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T01EZWJ1Z2dlcjogbW92ZSBicmVha3BvaW50IHN0b3JhZ2UgdG8gdXNlIGBXSS5PYmplY3RTdG9y ZWAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjIz MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDkyMzY4NjQ+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0RPTURlYnVnZ2VyTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlcik6 CisgICAgICAgIChXSS5ET01EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLmFkZERPTUJyZWFrcG9p bnQpOgorICAgICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5yZW1vdmVET01C cmVha3BvaW50KToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUucmVt b3ZlRE9NQnJlYWtwb2ludHNGb3JOb2RlKToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdl ci5wcm90b3R5cGUuYWRkRXZlbnRCcmVha3BvaW50KToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2Vy TWFuYWdlci5wcm90b3R5cGUucmVtb3ZlRXZlbnRCcmVha3BvaW50KToKKyAgICAgICAgKFdJLkRP TURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuYWRkVVJMQnJlYWtwb2ludCk6CisgICAgICAgIChX SS5ET01EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLnJlbW92ZVVSTEJyZWFrcG9pbnQpOgorICAg ICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5faGFuZGxlRE9NQnJlYWtwb2lu dERpc2FibGVkU3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5w cm90b3R5cGUuX2hhbmRsZUV2ZW50QnJlYWtwb2ludERpc2FibGVkU3RhdGVDaGFuZ2VkKToKKyAg ICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX2hhbmRsZVVSTEJyZWFrcG9p bnREaXNhYmxlZFN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXSS5ET01EZWJ1Z2dlck1hbmFnZXIu cHJvdG90eXBlLl9zYXZlRE9NQnJlYWtwb2ludHMpOiBEZWxldGVkLgorICAgICAgICAoV0kuRE9N RGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fc2F2ZUV2ZW50QnJlYWtwb2ludHMpOiBEZWxldGVk LgorICAgICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fc2F2ZVVSTEJyZWFr cG9pbnRzKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTUJy ZWFrcG9pbnQuanM6CisgICAgICAgIChXSS5ET01CcmVha3BvaW50LnByb3RvdHlwZS5zYXZlSWRl bnRpdHlUb0Nvb2tpZSk6CisgICAgICAgIChXSS5ET01CcmVha3BvaW50LnByb3RvdHlwZS50b0pT T04pOiBBZGRlZC4KKyAgICAgICAgKFdJLkRPTUJyZWFrcG9pbnQucHJvdG90eXBlLmdldCBzZXJp YWxpemFibGVJbmZvKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9F dmVudEJyZWFrcG9pbnQuanM6CisgICAgICAgIChXSS5FdmVudEJyZWFrcG9pbnQucHJvdG90eXBl LnNhdmVJZGVudGl0eVRvQ29va2llKToKKyAgICAgICAgKFdJLkV2ZW50QnJlYWtwb2ludC5wcm90 b3R5cGUudG9KU09OKTogQWRkZWQuCisgICAgICAgIChXSS5FdmVudEJyZWFrcG9pbnQucHJvdG90 eXBlLmdldCBzZXJpYWxpemFibGVJbmZvKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9VUkxCcmVha3BvaW50LmpzOgorICAgICAgICAoV0kuVVJMQnJlYWtwb2ludC5w cm90b3R5cGUuc2F2ZUlkZW50aXR5VG9Db29raWUpOgorICAgICAgICAoV0kuVVJMQnJlYWtwb2lu dC5wcm90b3R5cGUudG9KU09OKTogQWRkZWQuCisgICAgICAgIChXSS5VUkxCcmVha3BvaW50LnBy b3RvdHlwZS5nZXQgc2VyaWFsaXphYmxlSW5mbyk6IERlbGV0ZWQuCisgICAgICAgIFJlcGxhY2Ug YGdldCBzZXJpYWxpemFibGVJbmZvYCB3aXRoIGB0b0pTT05gIGFzIHJlcXVpcmVkIGJ5IGBXSS5P YmplY3RTdG9yZWAuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvT2JqZWN0U3RvcmUu anM6CisgICAgICAgIChXSS5PYmplY3RTdG9yZS5fb3Blbik6CisgICAgICAgIEluY3JlbWVudCB2 ZXJzaW9uLgorCiAyMDE5LTAzLTI0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYW52YXM6IFdlYkdMIGFjdGlvbiBpY29uIHNob3Vs ZG4ndCBpbnZlcnQgd2hlbiBzZWxlY3RlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9PYmplY3RTdG9yZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvT2JqZWN0U3RvcmUuanMKaW5kZXggY2VlNDRiYjUzMzM5 ODk1M2I3NzZhZDBmMDgyMzk5NWVlMTIyN2RhNS4uM2Y0ZTk0NDU0MzI0ZDIzNTYwMDAyZWM0Y2Fm NGY3MjM0OTMwMDZiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9PYmplY3RTdG9yZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL09iamVjdFN0b3JlLmpzCkBAIC02Nyw3ICs2Nyw3IEBAIFdJLk9iamVj dFN0b3JlID0gY2xhc3MgT2JqZWN0U3RvcmUKIAogICAgICAgICBXSS5PYmplY3RTdG9yZS5fZGF0 YWJhc2VDYWxsYmFja3MgPSBbY2FsbGJhY2tdOwogCi0gICAgICAgIGNvbnN0IHZlcnNpb24gPSAy OyAvLyBJbmNyZW1lbnQgdGhpcyBmb3IgZXZlcnkgZWRpdCB0byBgV0kub2JqZWN0U3RvcmVzYC4K KyAgICAgICAgY29uc3QgdmVyc2lvbiA9IDM7IC8vIEluY3JlbWVudCB0aGlzIGZvciBldmVyeSBl ZGl0IHRvIGBXSS5vYmplY3RTdG9yZXNgLgogCiAgICAgICAgIGxldCBkYXRhYmFzZVJlcXVlc3Qg PSB3aW5kb3cuaW5kZXhlZERCLm9wZW4oV0kuT2JqZWN0U3RvcmUuX2RhdGFiYXNlTmFtZSwgdmVy c2lvbik7CiAgICAgICAgIGRhdGFiYXNlUmVxdWVzdC5hZGRFdmVudExpc3RlbmVyKCJ1cGdyYWRl bmVlZGVkIiwgKGV2ZW50KSA9PiB7CkBAIC0yNDIsNCArMjQyLDcgQEAgV0kuT2JqZWN0U3RvcmUu dG9KU09OU3ltYm9sID0gU3ltYm9sKCJPYmplY3RTdG9yZS10b0pTT04iKTsKIFdJLm9iamVjdFN0 b3JlcyA9IHsKICAgICBhdWRpdHM6IG5ldyBXSS5PYmplY3RTdG9yZSgiYXVkaXQtbWFuYWdlci10 ZXN0cyIsIHtrZXlQYXRoOiAiX19pZCIsIGF1dG9JbmNyZW1lbnQ6IHRydWV9KSwKICAgICBicmVh a3BvaW50czogbmV3IFdJLk9iamVjdFN0b3JlKCJkZWJ1Z2dlci1icmVha3BvaW50cyIsIHtrZXlQ YXRoOiAiX19pZCJ9KSwKKyAgICBkb21CcmVha3BvaW50czogbmV3IFdJLk9iamVjdFN0b3JlKCJk b20tZGVidWdnZXItZG9tLWJyZWFrcG9pbnRzIiwge2tleVBhdGg6ICJfX2lkIn0pLAorICAgIGV2 ZW50QnJlYWtwb2ludHM6IG5ldyBXSS5PYmplY3RTdG9yZSgiZG9tLWRlYnVnZ2VyLWV2ZW50LWJy ZWFrcG9pbnRzIiwge2tleVBhdGg6ICJfX2lkIn0pLAorICAgIHVybEJyZWFrcG9pbnRzOiBuZXcg V0kuT2JqZWN0U3RvcmUoImRvbS1kZWJ1Z2dlci11cmwtYnJlYWtwb2ludHMiLCB7a2V5UGF0aDog Il9faWQifSksCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzCmlu ZGV4IGU3MWQyMmM2NDQwOTNmMDBlMjAzZTQ0NGI1YWVjOTU2ZjJjYTM4ODguLjZkYTIwNWE0NDVi YmI3ZGI3NTZjNDMzZjY1ODYyMjUyMTYzYjhiNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01E ZWJ1Z2dlck1hbmFnZXIuanMKQEAgLTI5LDE0ICsyOSwxMSBAQCBXSS5ET01EZWJ1Z2dlck1hbmFn ZXIgPSBjbGFzcyBET01EZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICB7CiAg ICAgICAgIHN1cGVyKCk7CiAKLSAgICAgICAgdGhpcy5fZG9tQnJlYWtwb2ludHNTZXR0aW5nID0g bmV3IFdJLlNldHRpbmcoImRvbS1icmVha3BvaW50cyIsIFtdKTsKICAgICAgICAgdGhpcy5fZG9t QnJlYWtwb2ludFVSTE1hcCA9IG5ldyBNdWx0aW1hcDsKICAgICAgICAgdGhpcy5fZG9tQnJlYWtw b2ludEZyYW1lSWRlbnRpZmllck1hcCA9IG5ldyBNYXA7CiAKLSAgICAgICAgdGhpcy5fZXZlbnRC cmVha3BvaW50U2V0dGluZyA9IG5ldyBXSS5TZXR0aW5nKCJldmVudC1icmVha3BvaW50cyIsIFtd KTsKICAgICAgICAgdGhpcy5fZXZlbnRCcmVha3BvaW50cyA9IFtdOwogCi0gICAgICAgIHRoaXMu X3VybEJyZWFrcG9pbnRzU2V0dGluZyA9IG5ldyBXSS5TZXR0aW5nKCJ1cmwtYnJlYWtwb2ludHMi LCBXSS5TZXR0aW5nLm1pZ3JhdGVWYWx1ZSgieGhyLWJyZWFrcG9pbnRzIikgfHwgW10pOwogICAg ICAgICB0aGlzLl91cmxCcmVha3BvaW50cyA9IFtdOwogICAgICAgICB0aGlzLl9hbGxSZXF1ZXN0 c0JyZWFrcG9pbnRFbmFibGVkU2V0dGluZyA9IG5ldyBXSS5TZXR0aW5nKCJicmVhay1vbi1hbGwt cmVxdWVzdHMiLCBmYWxzZSk7CiAKQEAgLTU2LDE5ICs1Myw0MSBAQCBXSS5ET01EZWJ1Z2dlck1h bmFnZXIgPSBjbGFzcyBET01EZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAg ICAgV0kuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5DaGlsZEZyYW1lV2Fz UmVtb3ZlZCwgdGhpcy5fY2hpbGRGcmFtZVdhc1JlbW92ZWQsIHRoaXMpOwogICAgICAgICBXSS5G cmFtZS5hZGRFdmVudExpc3RlbmVyKFdJLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJjZURpZENoYW5n ZSwgdGhpcy5fbWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKIAotICAgICAgICBpZiAodGhp cy5zdXBwb3J0ZWQpIHsKKyAgICAgICAgbGV0IGxvYWRCcmVha3BvaW50cyA9IGFzeW5jIChjb25z dHJ1Y3Rvciwgb2JqZWN0U3RvcmUsIG9sZFNldHRpbmdzLCBjYWxsYmFjaykgPT4geworICAgICAg ICAgICAgZm9yIChsZXQga2V5IG9mIG9sZFNldHRpbmdzKSB7CisgICAgICAgICAgICAgICAgbGV0 IGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnRzID0gV0kuU2V0dGluZy5taWdyYXRlVmFsdWUo a2V5KTsKKyAgICAgICAgICAgICAgICBpZiAoZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2ludHMp IHsKKyAgICAgICAgICAgICAgICAgICAgZm9yIChsZXQgZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtw b2ludCBvZiBleGlzdGluZ1NlcmlhbGl6ZWRCcmVha3BvaW50cykKKyAgICAgICAgICAgICAgICAg ICAgICAgIGF3YWl0IG9iamVjdFN0b3JlLnB1dE9iamVjdChjb25zdHJ1Y3Rvci5kZXNlcmlhbGl6 ZShleGlzdGluZ1NlcmlhbGl6ZWRCcmVha3BvaW50KSk7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBsZXQgc2VyaWFsaXplZEJyZWFrcG9pbnRzID0gYXdh aXQgb2JqZWN0U3RvcmUuZ2V0QWxsKCk7CisKICAgICAgICAgICAgIHRoaXMuX3Jlc3RvcmluZ0Jy ZWFrcG9pbnRzID0gdHJ1ZTsKKyAgICAgICAgICAgIGZvciAobGV0IHNlcmlhbGl6ZWRCcmVha3Bv aW50IG9mIHNlcmlhbGl6ZWRCcmVha3BvaW50cykgeworICAgICAgICAgICAgICAgIGxldCBicmVh a3BvaW50ID0gY29uc3RydWN0b3IuZGVzZXJpYWxpemUoc2VyaWFsaXplZEJyZWFrcG9pbnQpOwog Ci0gICAgICAgICAgICBmb3IgKGxldCBzZXJpYWxpemVkSW5mbyBvZiB0aGlzLl9kb21CcmVha3Bv aW50c1NldHRpbmcudmFsdWUpCi0gICAgICAgICAgICAgICAgdGhpcy5hZGRET01CcmVha3BvaW50 KFdJLkRPTUJyZWFrcG9pbnQuZGVzZXJpYWxpemUoc2VyaWFsaXplZEluZm8pKTsKLQotICAgICAg ICAgICAgZm9yIChsZXQgc2VyaWFsaXplZEluZm8gb2YgdGhpcy5fZXZlbnRCcmVha3BvaW50U2V0 dGluZy52YWx1ZSkKLSAgICAgICAgICAgICAgICB0aGlzLmFkZEV2ZW50QnJlYWtwb2ludChXSS5F dmVudEJyZWFrcG9pbnQuZGVzZXJpYWxpemUoc2VyaWFsaXplZEluZm8pKTsKLQotICAgICAgICAg ICAgZm9yIChsZXQgc2VyaWFsaXplZEluZm8gb2YgdGhpcy5fdXJsQnJlYWtwb2ludHNTZXR0aW5n LnZhbHVlKQotICAgICAgICAgICAgICAgIHRoaXMuYWRkVVJMQnJlYWtwb2ludChXSS5VUkxCcmVh a3BvaW50LmRlc2VyaWFsaXplKHNlcmlhbGl6ZWRJbmZvKSk7CisgICAgICAgICAgICAgICAgY29u c3Qga2V5ID0gbnVsbDsKKyAgICAgICAgICAgICAgICBvYmplY3RTdG9yZS5hc3NvY2lhdGVPYmpl Y3QoYnJlYWtwb2ludCwga2V5LCBzZXJpYWxpemVkQnJlYWtwb2ludCk7CiAKKyAgICAgICAgICAg ICAgICBjYWxsYmFjayhicmVha3BvaW50KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRo aXMuX3Jlc3RvcmluZ0JyZWFrcG9pbnRzID0gZmFsc2U7CisgICAgICAgIH07CisKKyAgICAgICAg aWYgKHRoaXMuc3VwcG9ydGVkKSB7CisgICAgICAgICAgICBsb2FkQnJlYWtwb2ludHMoV0kuRE9N QnJlYWtwb2ludCwgV0kub2JqZWN0U3RvcmVzLmRvbUJyZWFrcG9pbnRzLCBbImRvbS1icmVha3Bv aW50cyJdLCAoYnJlYWtwb2ludCkgPT4geworICAgICAgICAgICAgICAgIHRoaXMuYWRkRE9NQnJl YWtwb2ludChicmVha3BvaW50KTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICBsb2Fk QnJlYWtwb2ludHMoV0kuRXZlbnRCcmVha3BvaW50LCBXSS5vYmplY3RTdG9yZXMuZXZlbnRCcmVh a3BvaW50cywgWyJldmVudC1icmVha3BvaW50cyJdLCAoYnJlYWtwb2ludCkgPT4geworICAgICAg ICAgICAgICAgIHRoaXMuYWRkRXZlbnRCcmVha3BvaW50KGJyZWFrcG9pbnQpOworICAgICAgICAg ICAgfSk7CisKKyAgICAgICAgICAgIGxvYWRCcmVha3BvaW50cyhXSS5VUkxCcmVha3BvaW50LCBX SS5vYmplY3RTdG9yZXMudXJsQnJlYWtwb2ludHMsIFsieGhyLWJyZWFrcG9pbnRzIiwgInVybC1i cmVha3BvaW50cyJdLCAoYnJlYWtwb2ludCkgPT4geworICAgICAgICAgICAgICAgIHRoaXMuYWRk VVJMQnJlYWtwb2ludChicmVha3BvaW50KTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAg ICAgfQogCkBAIC0xODAsNyArMTk5LDggQEAgV0kuRE9NRGVidWdnZXJNYW5hZ2VyID0gY2xhc3Mg RE9NRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLkV2ZW50LkRPTUJyZWFr cG9pbnRBZGRlZCwge2JyZWFrcG9pbnR9KTsKIAotICAgICAgICB0aGlzLl9zYXZlRE9NQnJlYWtw b2ludHMoKTsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cykKKyAgICAg ICAgICAgIFdJLm9iamVjdFN0b3Jlcy5kb21CcmVha3BvaW50cy5wdXRPYmplY3QoYnJlYWtwb2lu dCk7CiAgICAgfQogCiAgICAgcmVtb3ZlRE9NQnJlYWtwb2ludChicmVha3BvaW50KQpAQCAtMjE0 LDE3ICsyMzQsMTMgQEAgV0kuRE9NRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdnZXJN YW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgYnJlYWtwb2ludC5kb21Ob2RlSWRl bnRpZmllciA9IG51bGw7CiAKLSAgICAgICAgdGhpcy5fc2F2ZURPTUJyZWFrcG9pbnRzKCk7Cisg ICAgICAgIGlmICghdGhpcy5fcmVzdG9yaW5nQnJlYWtwb2ludHMpCisgICAgICAgICAgICBXSS5v YmplY3RTdG9yZXMuZG9tQnJlYWtwb2ludHMuZGVsZXRlT2JqZWN0KGJyZWFrcG9pbnQpOwogICAg IH0KIAogICAgIHJlbW92ZURPTUJyZWFrcG9pbnRzRm9yTm9kZShub2RlKQogICAgIHsKLSAgICAg ICAgdGhpcy5fcmVzdG9yaW5nQnJlYWtwb2ludHMgPSB0cnVlOwotCiAgICAgICAgIHRoaXMuZG9t QnJlYWtwb2ludHNGb3JOb2RlKG5vZGUpLmZvckVhY2godGhpcy5yZW1vdmVET01CcmVha3BvaW50 LCB0aGlzKTsKLQotICAgICAgICB0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cyA9IGZhbHNlOwot ICAgICAgICB0aGlzLl9zYXZlRE9NQnJlYWtwb2ludHMoKTsKICAgICB9CiAKICAgICBldmVudEJy ZWFrcG9pbnRGb3JUeXBlQW5kRXZlbnROYW1lKHR5cGUsIGV2ZW50TmFtZSkKQEAgLTI1Nyw3ICsy NzMsOCBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBET01EZWJ1Z2dlck1hbmFnZXIg ZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHRo aXMuX3NhdmVFdmVudEJyZWFrcG9pbnRzKCk7CisgICAgICAgIGlmICghdGhpcy5fcmVzdG9yaW5n QnJlYWtwb2ludHMpCisgICAgICAgICAgICBXSS5vYmplY3RTdG9yZXMuZXZlbnRCcmVha3BvaW50 cy5wdXRPYmplY3QoYnJlYWtwb2ludCk7CiAgICAgfQogCiAgICAgcmVtb3ZlRXZlbnRCcmVha3Bv aW50KGJyZWFrcG9pbnQpCkBAIC0yNzcsNyArMjk0LDkgQEAgV0kuRE9NRGVidWdnZXJNYW5hZ2Vy ID0gY2xhc3MgRE9NRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAg dGhpcy5fZXZlbnRCcmVha3BvaW50cy5yZW1vdmUoYnJlYWtwb2ludCk7CiAKLSAgICAgICAgdGhp cy5fc2F2ZUV2ZW50QnJlYWtwb2ludHMoKTsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdC cmVha3BvaW50cykKKyAgICAgICAgICAgIFdJLm9iamVjdFN0b3Jlcy5ldmVudEJyZWFrcG9pbnRz LmRlbGV0ZU9iamVjdChicmVha3BvaW50KTsKKwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXSS5ET01EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuRXZlbnRCcmVha3BvaW50UmVt b3ZlZCwge2JyZWFrcG9pbnR9KTsKIAogICAgICAgICBpZiAoYnJlYWtwb2ludC5kaXNhYmxlZCkK QEAgLTMzMSw3ICszNTAsOCBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBET01EZWJ1 Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIH0KICAgICAgICAgfQog Ci0gICAgICAgIHRoaXMuX3NhdmVVUkxCcmVha3BvaW50cygpOworICAgICAgICBpZiAoIXRoaXMu X3Jlc3RvcmluZ0JyZWFrcG9pbnRzKQorICAgICAgICAgICAgV0kub2JqZWN0U3RvcmVzLnVybEJy ZWFrcG9pbnRzLnB1dE9iamVjdChicmVha3BvaW50KTsKICAgICB9CiAKICAgICByZW1vdmVVUkxC cmVha3BvaW50KGJyZWFrcG9pbnQpCkBAIC0zNTEsNyArMzcxLDkgQEAgV0kuRE9NRGVidWdnZXJN YW5hZ2VyID0gY2xhc3MgRE9NRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAg ICAgICAgdGhpcy5fdXJsQnJlYWtwb2ludHMucmVtb3ZlKGJyZWFrcG9pbnQsIHRydWUpOwogCi0g ICAgICAgIHRoaXMuX3NhdmVVUkxCcmVha3BvaW50cygpOworICAgICAgICBpZiAoIXRoaXMuX3Jl c3RvcmluZ0JyZWFrcG9pbnRzKQorICAgICAgICAgICAgV0kub2JqZWN0U3RvcmVzLnVybEJyZWFr cG9pbnRzLmRlbGV0ZU9iamVjdChicmVha3BvaW50KTsKKwogICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXSS5ET01EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuVVJMQnJlYWtwb2lu dFJlbW92ZWQsIHticmVha3BvaW50fSk7CiAKICAgICAgICAgaWYgKGJyZWFrcG9pbnQuZGlzYWJs ZWQpCkBAIC01MTcsMzAgKzUzOSw2IEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERP TURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9CiAgICAgfQogCi0g ICAgX3NhdmVET01CcmVha3BvaW50cygpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fcmVzdG9y aW5nQnJlYWtwb2ludHMpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5fZG9t QnJlYWtwb2ludHNTZXR0aW5nLnZhbHVlID0gQXJyYXkuZnJvbSh0aGlzLl9kb21CcmVha3BvaW50 VVJMTWFwLnZhbHVlcygpKS5tYXAoKGJyZWFrcG9pbnQpID0+IGJyZWFrcG9pbnQuc2VyaWFsaXph YmxlSW5mbyk7Ci0gICAgfQotCi0gICAgX3NhdmVFdmVudEJyZWFrcG9pbnRzKCkKLSAgICB7Ci0g ICAgICAgIGlmICh0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cykKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICB0aGlzLl9ldmVudEJyZWFrcG9pbnRTZXR0aW5nLnZhbHVlID0gdGhpcy5f ZXZlbnRCcmVha3BvaW50cy5tYXAoKGJyZWFrcG9pbnQpID0+IGJyZWFrcG9pbnQuc2VyaWFsaXph YmxlSW5mbyk7Ci0gICAgfQotCi0gICAgX3NhdmVVUkxCcmVha3BvaW50cygpCi0gICAgewotICAg ICAgICBpZiAodGhpcy5fcmVzdG9yaW5nQnJlYWtwb2ludHMpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgdGhpcy5fdXJsQnJlYWtwb2ludHNTZXR0aW5nLnZhbHVlID0gdGhpcy5fdXJs QnJlYWtwb2ludHMubWFwKChicmVha3BvaW50KSA9PiBicmVha3BvaW50LnNlcmlhbGl6YWJsZUlu Zm8pOwotICAgIH0KLQogICAgIF9oYW5kbGVET01CcmVha3BvaW50RGlzYWJsZWRTdGF0ZUNoYW5n ZWQoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgYnJlYWtwb2ludCA9IGV2ZW50LnRhcmdldDsK QEAgLTU0OCw3ICs1NDYsOCBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBET01EZWJ1 Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKHRhcmdldCAmJiB0YXJn ZXQuRE9NRGVidWdnZXJBZ2VudCkKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZURPTUJyZWFrcG9p bnQoYnJlYWtwb2ludCwgdGFyZ2V0KTsKIAotICAgICAgICB0aGlzLl9zYXZlRE9NQnJlYWtwb2lu dHMoKTsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cykKKyAgICAgICAg ICAgIFdJLm9iamVjdFN0b3Jlcy5kb21CcmVha3BvaW50cy5wdXRPYmplY3QoYnJlYWtwb2ludCk7 CiAgICAgfQogCiAgICAgX2hhbmRsZUV2ZW50QnJlYWtwb2ludERpc2FibGVkU3RhdGVDaGFuZ2Vk KGV2ZW50KQpAQCAtNTU4LDcgKzU1Nyw5IEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNz IERPTURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgaWYgKHRh cmdldC5ET01EZWJ1Z2dlckFnZW50KQogICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUV2ZW50 QnJlYWtwb2ludChicmVha3BvaW50LCB0YXJnZXQpOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMu X3NhdmVFdmVudEJyZWFrcG9pbnRzKCk7CisKKyAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdC cmVha3BvaW50cykKKyAgICAgICAgICAgIFdJLm9iamVjdFN0b3Jlcy5ldmVudEJyZWFrcG9pbnRz LnB1dE9iamVjdChicmVha3BvaW50KTsKICAgICB9CiAKICAgICBfaGFuZGxlVVJMQnJlYWtwb2lu dERpc2FibGVkU3RhdGVDaGFuZ2VkKGV2ZW50KQpAQCAtNTcyLDcgKzU3Myw5IEBAIFdJLkRPTURl YnVnZ2VyTWFuYWdlciA9IGNsYXNzIERPTURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVj dAogICAgICAgICAgICAgaWYgKHRhcmdldC5ET01EZWJ1Z2dlckFnZW50KQogICAgICAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZVVSTEJyZWFrcG9pbnQoYnJlYWtwb2ludCwgdGFyZ2V0KTsKICAgICAg ICAgfQotICAgICAgICB0aGlzLl9zYXZlVVJMQnJlYWtwb2ludHMoKTsKKworICAgICAgICBpZiAo IXRoaXMuX3Jlc3RvcmluZ0JyZWFrcG9pbnRzKQorICAgICAgICAgICAgV0kub2JqZWN0U3RvcmVz LnVybEJyZWFrcG9pbnRzLnB1dE9iamVjdChicmVha3BvaW50KTsKICAgICB9CiAKICAgICBfY2hp bGRGcmFtZVdhc1JlbW92ZWQoZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NQnJlYWtwb2ludC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01CcmVha3BvaW50LmpzCmluZGV4IGRlMjQx OTIzNTExMzExZjAyMDEyMjM0MGU3ZjNmMDYxZDc0ZjUwYjQuLjc5OTQ1OWI3YjY0MWZjNmZkYmEw NzVmYjI4NzkzZjk3ZDgwNzdmNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9ET01CcmVha3BvaW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01CcmVha3BvaW50LmpzCkBAIC05NiwyNyAr OTYsMjggQEAgV0kuRE9NQnJlYWtwb2ludCA9IGNsYXNzIERPTUJyZWFrcG9pbnQgZXh0ZW5kcyBX SS5PYmplY3QKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuRE9NQnJl YWtwb2ludC5FdmVudC5ET01Ob2RlQ2hhbmdlZCwgZGF0YSk7CiAgICAgfQogCi0gICAgZ2V0IHNl cmlhbGl6YWJsZUluZm8oKQotICAgIHsKLSAgICAgICAgbGV0IGluZm8gPSB7dXJsOiB0aGlzLl91 cmwsIHBhdGg6IHRoaXMuX3BhdGgsIHR5cGU6IHRoaXMuX3R5cGV9OwotICAgICAgICBpZiAodGhp cy5fZGlzYWJsZWQpCi0gICAgICAgICAgICBpbmZvLmRpc2FibGVkID0gdHJ1ZTsKLQotICAgICAg ICByZXR1cm4gaW5mbzsKLSAgICB9Ci0KICAgICBzYXZlSWRlbnRpdHlUb0Nvb2tpZShjb29raWUp CiAgICAgewotICAgICAgICBjb29raWVbV0kuRE9NQnJlYWtwb2ludC5Eb2N1bWVudFVSTENvb2tp ZUtleV0gPSB0aGlzLnVybDsKLSAgICAgICAgY29va2llW1dJLkRPTUJyZWFrcG9pbnQuTm9kZVBh dGhDb29raWVLZXldID0gdGhpcy5wYXRoOwotICAgICAgICBjb29raWVbV0kuRE9NQnJlYWtwb2lu dC5UeXBlQ29va2llS2V5XSA9IHRoaXMudHlwZTsKKyAgICAgICAgY29va2llWyJkb20tYnJlYWtw b2ludC11cmwiXSA9IHRoaXMuX3VybDsKKyAgICAgICAgY29va2llWyJkb20tYnJlYWtwb2ludC1w YXRoIl0gPSB0aGlzLl9wYXRoOworICAgICAgICBjb29raWVbImRvbS1icmVha3BvaW50LXR5cGUi XSA9IHRoaXMuX3R5cGU7CisgICAgfQorCisgICAgdG9KU09OKGtleSkKKyAgICB7CisgICAgICAg IGxldCBqc29uID0geworICAgICAgICAgICAgdXJsOiB0aGlzLl91cmwsCisgICAgICAgICAgICBw YXRoOiB0aGlzLl9wYXRoLAorICAgICAgICAgICAgdHlwZTogdGhpcy5fdHlwZSwKKyAgICAgICAg fTsKKyAgICAgICAgaWYgKHRoaXMuX2Rpc2FibGVkKQorICAgICAgICAgICAganNvbi5kaXNhYmxl ZCA9IHRydWU7CisgICAgICAgIGlmIChrZXkgPT09IFdJLk9iamVjdFN0b3JlLnRvSlNPTlN5bWJv bCkKKyAgICAgICAgICAgIGpzb25bV0kub2JqZWN0U3RvcmVzLmRvbUJyZWFrcG9pbnRzLmtleVBh dGhdID0gdGhpcy5fdXJsICsgIjoiICsgdGhpcy5fcGF0aCArICI6IiArIHRoaXMuX3R5cGU7Cisg ICAgICAgIHJldHVybiBqc29uOwogICAgIH0KIH07CiAKLVdJLkRPTUJyZWFrcG9pbnQuRG9jdW1l bnRVUkxDb29raWVLZXkgPSAiZG9tLWJyZWFrcG9pbnQtZG9jdW1lbnQtdXJsIjsKLVdJLkRPTUJy ZWFrcG9pbnQuTm9kZVBhdGhDb29raWVLZXkgPSAiZG9tLWJyZWFrcG9pbnQtbm9kZS1wYXRoIjsK LVdJLkRPTUJyZWFrcG9pbnQuVHlwZUNvb2tpZUtleSA9ICJkb20tYnJlYWtwb2ludC10eXBlIjsK LQogV0kuRE9NQnJlYWtwb2ludC5UeXBlID0gewogICAgIFN1YnRyZWVNb2RpZmllZDogInN1YnRy ZWUtbW9kaWZpZWQiLAogICAgIEF0dHJpYnV0ZU1vZGlmaWVkOiAiYXR0cmlidXRlLW1vZGlmaWVk IiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9FdmVudEJyZWFrcG9pbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvRXZlbnRCcmVha3BvaW50LmpzCmluZGV4IDA4YmI5MTUyMjljZWE5ZGRmNTRiY2U4 MjVmNjIyOWJkNGE3NmZmZWMuLjMwOTBkZTljMDVmMjEwZmEyYjI2MTZhMTQzNTM0ZjJjNTUzZGFi MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9FdmVudEJyZWFrcG9pbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0V2ZW50QnJlYWtwb2ludC5qcwpAQCAtNjgsMjIgKzY4LDIzIEBAIFdJLkV2 ZW50QnJlYWtwb2ludCA9IGNsYXNzIEV2ZW50QnJlYWtwb2ludCBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5FdmVudEJyZWFrcG9pbnQu RXZlbnQuRGlzYWJsZWRTdGF0ZUNoYW5nZWQpOwogICAgIH0KIAotICAgIGdldCBzZXJpYWxpemFi bGVJbmZvKCkKKyAgICBzYXZlSWRlbnRpdHlUb0Nvb2tpZShjb29raWUpCiAgICAgewotICAgICAg ICBsZXQgaW5mbyA9IHsKKyAgICAgICAgY29va2llWyJldmVudC1icmVha3BvaW50LXR5cGUiXSA9 IHRoaXMuX3R5cGU7CisgICAgICAgIGNvb2tpZVsiZXZlbnQtYnJlYWtwb2ludC1ldmVudC1uYW1l Il0gPSB0aGlzLl9ldmVudE5hbWU7CisgICAgfQorCisgICAgdG9KU09OKGtleSkKKyAgICB7Cisg ICAgICAgIGxldCBqc29uID0gewogICAgICAgICAgICAgdHlwZTogdGhpcy5fdHlwZSwKICAgICAg ICAgICAgIGV2ZW50TmFtZTogdGhpcy5fZXZlbnROYW1lLAogICAgICAgICB9OwogICAgICAgICBp ZiAodGhpcy5fZGlzYWJsZWQpCi0gICAgICAgICAgICBpbmZvLmRpc2FibGVkID0gdHJ1ZTsKLQot ICAgICAgICByZXR1cm4gaW5mbzsKLSAgICB9Ci0KLSAgICBzYXZlSWRlbnRpdHlUb0Nvb2tpZShj b29raWUpCi0gICAgewotICAgICAgICBjb29raWVbV0kuRXZlbnRCcmVha3BvaW50LlR5cGVDb29r aWVLZXldID0gdGhpcy5fdHlwZTsKLSAgICAgICAgY29va2llW1dJLkV2ZW50QnJlYWtwb2ludC5F dmVudE5hbWVDb29raWVLZXldID0gdGhpcy5fZXZlbnROYW1lOworICAgICAgICAgICAganNvbi5k aXNhYmxlZCA9IHRydWU7CisgICAgICAgIGlmIChrZXkgPT09IFdJLk9iamVjdFN0b3JlLnRvSlNP TlN5bWJvbCkKKyAgICAgICAgICAgIGpzb25bV0kub2JqZWN0U3RvcmVzLmV2ZW50QnJlYWtwb2lu dHMua2V5UGF0aF0gPSB0aGlzLl90eXBlICsgIjoiICsgdGhpcy5fZXZlbnROYW1lOworICAgICAg ICByZXR1cm4ganNvbjsKICAgICB9CiB9OwogCkBAIC05Myw5ICs5NCw2IEBAIFdJLkV2ZW50QnJl YWtwb2ludC5UeXBlID0gewogICAgIFRpbWVyOiAidGltZXIiLAogfTsKIAotV0kuRXZlbnRCcmVh a3BvaW50LlR5cGVDb29raWVLZXkgPSAiZXZlbnQtYnJlYWtwb2ludC10eXBlIjsKLVdJLkV2ZW50 QnJlYWtwb2ludC5FdmVudE5hbWVDb29raWVLZXkgPSAiZXZlbnQtYnJlYWtwb2ludC1ldmVudC1u YW1lIjsKLQogV0kuRXZlbnRCcmVha3BvaW50LkV2ZW50ID0gewogICAgIERpc2FibGVkU3RhdGVD aGFuZ2VkOiAiZXZlbnQtYnJlYWtwb2ludC1kaXNhYmxlZC1zdGF0ZS1jaGFuZ2VkIiwKIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVVJM QnJlYWtwb2ludC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9VUkxCcmVha3BvaW50LmpzCmluZGV4IGU1ZTBiZTZhNWZlMDgyMTM5ZmM1ZDgxNmFiZjI3ODU0 MTRmNmJkNDYuLjQ3ZWVmNjRlM2RjZGYxNjc0Mjk4OTYxMmNhNWY4ZDdmYmQ4NTY5YjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9VUkxCcmVh a3BvaW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9VUkxCcmVha3BvaW50LmpzCkBAIC02NiwxOSArNjYsMjQgQEAgV0kuVVJMQnJlYWtwb2ludCA9 IGNsYXNzIFVSTEJyZWFrcG9pbnQgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuVVJMQnJlYWtwb2ludC5FdmVudC5EaXNhYmxlZFN0YXRl Q2hhbmdlZCk7CiAgICAgfQogCi0gICAgZ2V0IHNlcmlhbGl6YWJsZUluZm8oKQotICAgIHsKLSAg ICAgICAgbGV0IGluZm8gPSB7dHlwZTogdGhpcy5fdHlwZSwgdXJsOiB0aGlzLl91cmx9OwotICAg ICAgICBpZiAodGhpcy5fZGlzYWJsZWQpCi0gICAgICAgICAgICBpbmZvLmRpc2FibGVkID0gdHJ1 ZTsKLQotICAgICAgICByZXR1cm4gaW5mbzsKLSAgICB9Ci0KICAgICBzYXZlSWRlbnRpdHlUb0Nv b2tpZShjb29raWUpCiAgICAgeworICAgICAgICBjb29raWVbInVybC1icmVha3BvaW50LXR5cGUi XSA9IHRoaXMuX3R5cGU7CiAgICAgICAgIGNvb2tpZVsidXJsLWJyZWFrcG9pbnQtdXJsIl0gPSB0 aGlzLl91cmw7CiAgICAgfQorCisgICAgdG9KU09OKGtleSkKKyAgICB7CisgICAgICAgIGxldCBq c29uID0geworICAgICAgICAgICAgdHlwZTogdGhpcy5fdHlwZSwKKyAgICAgICAgICAgIHVybDog dGhpcy5fdXJsLAorICAgICAgICB9OworICAgICAgICBpZiAodGhpcy5fZGlzYWJsZWQpCisgICAg ICAgICAgICBqc29uLmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgaWYgKGtleSA9PT0gV0kuT2Jq ZWN0U3RvcmUudG9KU09OU3ltYm9sKQorICAgICAgICAgICAganNvbltXSS5vYmplY3RTdG9yZXMu dXJsQnJlYWtwb2ludHMua2V5UGF0aF0gPSB0aGlzLl90eXBlICsgIjoiICsgdGhpcy5fdXJsOwor ICAgICAgICByZXR1cm4ganNvbjsKKyAgICB9CiB9OwogCiBXSS5VUkxCcmVha3BvaW50LkV2ZW50 ID0gewo=