205955 2020-01-08 14:13:38 -0800 Web Inspector: Sources: not all injected scripts and style sheets are from extensions 2020-01-08 18:16:20 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1604281 0 hi 2020-01-08 14:13:38 -0800 e.g. media controls JavaScript injected by WebKit should not appear in the Extension Scripts folder, and should really be in Extra Scripts 1604300 1 387142 hi 2020-01-08 14:49:32 -0800 Created attachment 387142 Patch 1604302 2 387143 hi 2020-01-08 14:53:00 -0800 Created attachment 387143 Patch Rebase 1604355 3 387143 bburg 2020-01-08 16:18:19 -0800 Comment on attachment 387143 Patch r=me 1604441 4 387143 commit-queue 2020-01-08 18:15:52 -0800 Comment on attachment 387143 Patch Clearing flags on attachment: 387143 Committed r254245: <https://trac.webkit.org/changeset/254245> 1604442 5 commit-queue 2020-01-08 18:15:54 -0800 All reviewed patches have been landed. Closing bug. 1604443 6 webkit-bug-importer 2020-01-08 18:16:20 -0800 <rdar://problem/58429523> 387142 2020-01-08 14:49:32 -0800 2020-01-08 14:52:58 -0800 Patch bug-205955-20200108154931.patch text/plain 14104 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY2ZDU5NDU0YTFlMjYyMmQ4YWNhZmNkOTU3NTRj MDAxYjQxNmIwNjguLjgxMGIxMjUwZGYyMmU1ZGE1NzVlMDA1ODY0ZGExNWIzMjFkMjZhYjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAxLTA4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBub3QgYWxsIGluamVjdGVkIHNjcmlwdHMgYW5kIHN0eWxlIHNoZWV0cyBhcmUgZnJv bSBleHRlbnNpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDU5NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgIChpc1dlYktp dEV4dGVuc2lvblNjaGVtZSk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxz L0NTU1N0eWxlU2hlZXQuanM6CisgICAgICAgIChXSS5DU1NTdHlsZVNoZWV0LnByb3RvdHlwZS5n ZXQgaW5qZWN0ZWQpOgorICAgICAgICAqIC5lc2xpbnRyYzoKKyAgICAgICAgTW92ZSB0aGUgbG9n aWMgZm9yIGRldGVjdGluZyBhbiBleHRlbnNpb24gaW5qZWN0ZWQgcmVzb3VyY2UgdG8gaXRzIG93 biBmdW5jdGlvbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmln YXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5wcm90b3R5cGUudHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdCk6CisgICAg ICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZFN0eWxl U2hlZXQpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90 eXBlLl9hZGRTY3JpcHQpOgorICAgICAgICBPbmx5IHNob3cgdGhlIEFub255bW91cyBTdHlsZSBT aGVldHMgZm9sZGVyIG9uY2UgdGhlIHVzZXIgdHJpZXMgdG8gc2hvdyBhIHN0eWxlIHNoZWV0IHRo YXQKKyAgICAgICAgd291bGQgYmUgaW4gaXQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL09wZW5SZXNvdXJjZURpYWxvZy5qczoKKyAgICAgICAgKFdJLk9wZW5SZXNvdXJjZURpYWxv Zy5wcm90b3R5cGUuZGlkUHJlc2VudERpYWxvZyk6CisgICAgICAgIChXSS5PcGVuUmVzb3VyY2VE aWFsb2cucHJvdG90eXBlLl9hZGRTY3JpcHRzRm9yVGFyZ2V0KToKKyAgICAgICAgKFdJLk9wZW5S ZXNvdXJjZURpYWxvZy5wcm90b3R5cGUuX2hhbmRsZVN0eWxlU2hlZXRBZGRlZCk6CisgICAgICAg IChXSS5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlLl9oYW5kbGVTdHlsZVNoZWV0UmVtb3Zl ZCk6CisgICAgICAgIElnbm9yZSBhbm9ueW1vdXMgc2NyaXB0cywgYW5kIGFsbG93IGluamVjdGVk IHN0eWxlIHNoZWV0cyB0byBiZSBhZGRlZCBhZnRlciBwcmVzZW50aW5nLgorCiAyMDIwLTAxLTA3 ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiB1bmFibGUgdG8gZWRpdCBvciB2aWV3IHRoZSBzb3VyY2Ugb2Ygc3R5bGUgc2hlZXRzIGlu amVjdGVkIGJ5IHNhZmFyaSBhcHAgZXh0ZW5zaW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJLy5lc2xpbnRyYyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMKaW5k ZXggZGFhNjE0ODU2OWIxNmU1Y2IxY2YxODlkMThlMzk5MGFkYjMwM2UxZS4uMzhiNzZjNTYyZmE4 NmJjMzA1OTcyNWJkYzZhZDhlNThiMzIzYzVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJLy5lc2xpbnRyYworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvLmVzbGludHJjCkBA IC0xMDEsNiArMTAxLDcgQEAKICAgICAgICAgImlzV2ViSW5zcGVjdG9yQ29uc29sZUV2YWx1YXRp b25TY3JpcHQiOiB0cnVlLAogICAgICAgICAiaXNXZWJJbnNwZWN0b3JJbnRlcm5hbFNjcmlwdCI6 IHRydWUsCiAgICAgICAgICJpc1dlYktpdEludGVybmFsU2NyaXB0IjogdHJ1ZSwKKyAgICAgICAg ImlzV2ViS2l0RXh0ZW5zaW9uU2NoZW1lIjogdHJ1ZSwKICAgICAgICAgIm11bHRpcGxpY2F0aW9u U2lnbiI6IHRydWUsCiAgICAgICAgICJwYXJzZU1JTUVUeXBlIjogdHJ1ZSwKICAgICAgICAgInJl c29sdmVEb3RzSW5QYXRoIjogdHJ1ZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKaW5kZXggMDQ1OTYyMmE1MTFjZjMxZjI4 NjIxNTMxNWQ1ZWM0NTZlMjQ4ZTZmYy4uMTliZTk5ZGJmMDFjZDAxOGZhZTAzMTIwZTlmMWIyNjU0 OTE1M2Q0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTE2NDQsNiArMTY0NCwxMSBAQCBmdW5jdGlvbiBpc1dl YktpdEludGVybmFsU2NyaXB0KHVybCkKICAgICByZXR1cm4gdXJsICYmIHVybC5zdGFydHNXaXRo KCJfX1dlYiIpICYmIHVybC5lbmRzV2l0aCgiX18iKTsKIH0KIAorZnVuY3Rpb24gaXNXZWJLaXRF eHRlbnNpb25TY2hlbWUoc2NoZW1lKQoreworICAgIHJldHVybiBzY2hlbWUgJiYgc2NoZW1lLmVu ZHNXaXRoKCJleHRlbnNpb24iKTsKK30KKwogZnVuY3Rpb24gaXNGdW5jdGlvblN0cmluZ05hdGl2 ZUNvZGUoc3RyKQogewogICAgIHJldHVybiBzdHIuZW5kc1dpdGgoIntcbiAgICBbbmF0aXZlIGNv ZGVdXG59Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvQ1NTU3R5bGVTaGVldC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0LmpzCmluZGV4IGYzNTBmZGExMWFjMTQxZGI0ZmQ3 ZjVkYzg3ZGQ0M2NkZDRhNjkwOGIuLmM5ZmQwMmU0MTEzODUwYWQyOWU2MmQxMmRkYmVjZjE1ZWRk MzdjYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9DU1NTdHlsZVNoZWV0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0LmpzCkBAIC03MCw3ICs3MCw3IEBAIFdJLkNTU1N0 eWxlU2hlZXQgPSBjbGFzcyBDU1NTdHlsZVNoZWV0IGV4dGVuZHMgV0kuU291cmNlQ29kZQogCiAg ICAgZ2V0IGluamVjdGVkKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnVybENvbXBvbmVu dHMgJiYgdGhpcy51cmxDb21wb25lbnRzLnNjaGVtZS5lbmRzV2l0aCgiZXh0ZW5zaW9uIik7Cisg ICAgICAgIHJldHVybiBpc1dlYktpdEV4dGVuc2lvblNjaGVtZSh0aGlzLnVybENvbXBvbmVudHMu c2NoZW1lKTsKICAgICB9CiAKICAgICBnZXQgYW5vbnltb3VzKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxvZy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJj ZURpYWxvZy5qcwppbmRleCBlZWE5ZGYxYmI4YTk1ZWQ2MTQzZmU1NGZjNGM2NjZhYzAzMGQ3Njg3 Li4wNjU0NTJjNmM4YWQ0MjFlYTZlZThiMDZhMTBhNGIzZGNkYjE5ZGIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PcGVuUmVzb3VyY2VEaWFs b2cuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3Bl blJlc291cmNlRGlhbG9nLmpzCkBAIC0xODksNyArMTg5LDcgQEAgV0kuT3BlblJlc291cmNlRGlh bG9nID0gY2xhc3MgT3BlblJlc291cmNlRGlhbG9nIGV4dGVuZHMgV0kuRGlhbG9nCiAgICAgICAg IH0KIAogICAgICAgICBmb3IgKGxldCBzdHlsZVNoZWV0IG9mIFdJLmNzc01hbmFnZXIuc3R5bGVT aGVldHMpIHsKLSAgICAgICAgICAgIGlmIChzdHlsZVNoZWV0Lm9yaWdpbiAhPT0gV0kuQ1NTU3R5 bGVTaGVldC5UeXBlLkF1dGhvcikKKyAgICAgICAgICAgIGlmIChzdHlsZVNoZWV0Lm9yaWdpbiAh PT0gV0kuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvciAmJiAhc3R5bGVTaGVldC5hbm9ueW1vdXMp CiAgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVzb3VyY2Uoc3R5bGVTaGVldCk7CiAgICAgICAg IH0KIApAQCAtMzcyLDkgKzM3Miw3IEBAIFdJLk9wZW5SZXNvdXJjZURpYWxvZyA9IGNsYXNzIE9w ZW5SZXNvdXJjZURpYWxvZyBleHRlbmRzIFdJLkRpYWxvZwogCiAgICAgICAgIGxldCB0YXJnZXRE YXRhID0gV0kuZGVidWdnZXJNYW5hZ2VyLmRhdGFGb3JUYXJnZXQodGFyZ2V0KTsKICAgICAgICAg Zm9yIChsZXQgc2NyaXB0IG9mIHRhcmdldERhdGEuc2NyaXB0cykgewotICAgICAgICAgICAgaWYg KHNjcmlwdC5yZXNvdXJjZSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAg IGlmIChzY3JpcHQuZHluYW1pY2FsbHlBZGRlZFNjcmlwdEVsZW1lbnQpCisgICAgICAgICAgICBp ZiAoc2NyaXB0LmFub255bW91cyB8fCBzY3JpcHQucmVzb3VyY2UgfHwgc2NyaXB0LmR5bmFtaWNh bGx5QWRkZWRTY3JpcHRFbGVtZW50KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgaWYgKCFXSS5zZXR0aW5ncy5kZWJ1Z1Nob3dDb25zb2xlRXZhbHVhdGlvbnMudmFsdWUg JiYgaXNXZWJJbnNwZWN0b3JDb25zb2xlRXZhbHVhdGlvblNjcmlwdChzY3JpcHQuc291cmNlVVJM KSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTQ0MCw3ICs0MzgsNyBAQCBXSS5PcGVu UmVzb3VyY2VEaWFsb2cgPSBjbGFzcyBPcGVuUmVzb3VyY2VEaWFsb2cgZXh0ZW5kcyBXSS5EaWFs b2cKICAgICBfaGFuZGxlU3R5bGVTaGVldEFkZGVkKGV2ZW50KQogICAgIHsKICAgICAgICAgbGV0 IHtzdHlsZVNoZWV0fSA9IGV2ZW50LmRhdGE7Ci0gICAgICAgIGlmIChzdHlsZVNoZWV0Lm9yaWdp biA9PT0gV0kuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvciB8fCBzdHlsZVNoZWV0LmluamVjdGVk IHx8IHN0eWxlU2hlZXQuYW5vbnltb3VzKQorICAgICAgICBpZiAoc3R5bGVTaGVldC5vcmlnaW4g PT09IFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5BdXRob3IgfHwgc3R5bGVTaGVldC5hbm9ueW1vdXMp CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fYWRkUmVzb3VyY2Uoc3R5bGVT aGVldCk7CkBAIC00NDksNyArNDQ3LDcgQEAgV0kuT3BlblJlc291cmNlRGlhbG9nID0gY2xhc3Mg T3BlblJlc291cmNlRGlhbG9nIGV4dGVuZHMgV0kuRGlhbG9nCiAgICAgX2hhbmRsZVN0eWxlU2hl ZXRSZW1vdmVkKGV2ZW50KQogICAgIHsKICAgICAgICAgbGV0IHtzdHlsZVNoZWV0fSA9IGV2ZW50 LmRhdGE7Ci0gICAgICAgIGlmIChzdHlsZVNoZWV0Lm9yaWdpbiA9PT0gV0kuQ1NTU3R5bGVTaGVl dC5UeXBlLkF1dGhvciB8fCBzdHlsZVNoZWV0LmluamVjdGVkIHx8IHN0eWxlU2hlZXQuYW5vbnlt b3VzKQorICAgICAgICBpZiAoc3R5bGVTaGVldC5vcmlnaW4gPT09IFdJLkNTU1N0eWxlU2hlZXQu VHlwZS5BdXRob3IgfHwgc3R5bGVTaGVldC5hbm9ueW1vdXMpCiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgdGhpcy5fcmVtb3ZlUmVzb3VyY2Uoc3R5bGVTaGVldCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IDhiNTEwZjY5Zjgy NmU0ZWQ3NzBiY2U2NTFlZWRhNjdjNDAzM2U4YmIuLmU1NmU0ZDI1MmUxZTE1NGFlMDZjZDM3YjVm NzY2Zjk4MDc3ODA5MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCkBAIC01MjIsMzUgKzUyMiw1OCBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMg VwogICAgICAgICBpZiAodHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gdHJlZUVsZW1l bnQ7CiAKLSAgICAgICAgLy8gT25seSBzcGVjaWFsIGNhc2UgU2NyaXB0IG9iamVjdHMuCi0gICAg ICAgIGlmICghKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuU2NyaXB0KSkgewotICAg ICAgICAgICAgY29uc29sZS5lcnJvcigiRGlkbid0IGZpbmQgYSBUcmVlRWxlbWVudCBmb3IgcmVw cmVzZW50ZWRPYmplY3QiLCByZXByZXNlbnRlZE9iamVjdCk7Ci0gICAgICAgICAgICByZXR1cm4g bnVsbDsKKyAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuU2NyaXB0 KSB7CisgICAgICAgICAgICAvLyBJZiB0aGUgU2NyaXB0IGhhcyBhIFVSTCB3ZSBzaG91bGQgaGF2 ZSBmb3VuZCBpdCBlYXJsaWVyLgorICAgICAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0LnVy bCkgeworICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZhbHNlLCAiRGlkbid0IGZpbmQg YSBTY3JpcHRUcmVlRWxlbWVudCBmb3IgYSBTY3JpcHQgd2l0aCBhIFVSTC4iLCByZXByZXNlbnRl ZE9iamVjdCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgICB9CisK KyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0LmFub255bW91cywg cmVwcmVzZW50ZWRPYmplY3QpOworCisgICAgICAgICAgICAvLyBTaW5jZSB0aGUgU2NyaXB0IGRv ZXMgbm90IGhhdmUgYSBVUkwgd2UgY29uc2lkZXIgaXQgYW4gJ2Fub255bW91cycgc2NyaXB0LiBU aGVzZSBzY3JpcHRzIGhhcHBlbiBmcm9tIGNhbGxzIHRvCisgICAgICAgICAgICAvLyB3aW5kb3cu ZXZhbCgpIG9yIGJyb3dzZXIgZmVhdHVyZXMgbGlrZSBBdXRvIEZpbGwgYW5kIFJlYWRlci4gVGhl eSBhcmUgbm90IG5vcm1hbGx5IGFkZGVkIHRvIHRoZSBzaWRlYmFyLCBidXQgc2luY2UKKyAgICAg ICAgICAgIC8vIHdlIGhhdmUgYSBTY3JpcHRDb250ZW50VmlldyBhc2tpbmcgZm9yIHRoZSB0cmVl IGVsZW1lbnQgd2Ugd2lsbCBtYWtlIGEgU2NyaXB0VHJlZUVsZW1lbnQgb24gZGVtYW5kIGFuZCBh ZGQgaXQuCisKKyAgICAgICAgICAgIGlmICghdGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRy ZWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJU cmVlRWxlbWVudCA9IG5ldyBXSS5Gb2xkZXJUcmVlRWxlbWVudChXSS5VSVN0cmluZygiQW5vbnlt b3VzIFNjcmlwdHMiKSwgbmV3IFdJLlNjcmlwdENvbGxlY3Rpb24pOworCisgICAgICAgICAgICBp ZiAoIXRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5wYXJlbnQpIHsKKyAg ICAgICAgICAgICAgICBsZXQgaW5kZXggPSBpbnNlcnRpb25JbmRleEZvck9iamVjdEluTGlzdFNv cnRlZEJ5RnVuY3Rpb24odGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LCB0 aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5jaGlsZHJlbiwgdGhpcy5fYm91bmRDb21wYXJlVHJl ZUVsZW1lbnRzKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5p bnNlcnRDaGlsZCh0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQsIGluZGV4 KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdGhpcy5fYW5vbnltb3VzU2NyaXB0c0Zv bGRlclRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0LmFkZChyZXByZXNlbnRlZE9iamVjdCk7 CisKKyAgICAgICAgICAgIGxldCBzY3JpcHRUcmVlRWxlbWVudCA9IG5ldyBXSS5TY3JpcHRUcmVl RWxlbWVudChyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgICAgICB0aGlzLl9hbm9ueW1vdXNT Y3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc2NyaXB0VHJlZUVsZW1lbnQpOwor ICAgICAgICAgICAgcmV0dXJuIHNjcmlwdFRyZWVFbGVtZW50OwogICAgICAgICB9CiAKLSAgICAg ICAgLy8gSWYgdGhlIFNjcmlwdCBoYXMgYSBVUkwgd2Ugc2hvdWxkIGhhdmUgZm91bmQgaXQgZWFy bGllci4KLSAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0LnVybCkgewotICAgICAgICAgICAg Y29uc29sZS5lcnJvcigiRGlkbid0IGZpbmQgYSBTY3JpcHRUcmVlRWxlbWVudCBmb3IgYSBTY3Jp cHQgd2l0aCBhIFVSTC4iKTsKLSAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICBpZiAo cmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5DU1NTdHlsZVNoZWV0KSB7CisgICAgICAg ICAgICAvLyBJZiB0aGUgQ1NTU3R5bGVTaGVldCBoYXMgYSBVUkwgd2Ugc2hvdWxkIGhhdmUgZm91 bmQgaXQgZWFybGllci4KKyAgICAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdC51cmwpIHsK KyAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIkRpZG4ndCBmaW5kIGEgQ1NT U3R5bGVTaGVldFRyZWVFbGVtZW50IGZvciBhIENTU1N0eWxlU2hlZXQgd2l0aCBhIFVSTC4iLCBy ZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0LmFu b255bW91cywgcmVwcmVzZW50ZWRPYmplY3QpOworCisgICAgICAgICAgICBpZiAoIXRoaXMuX2Fu b255bW91c1N0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQpCisgICAgICAgICAgICAgICAgdGhp cy5fYW5vbnltb3VzU3R5bGVTaGVldHNGb2xkZXJUcmVlRWxlbWVudCA9IG5ldyBXSS5Gb2xkZXJU cmVlRWxlbWVudChXSS5VSVN0cmluZygiQW5vbnltb3VzIFN0eWxlIFNoZWV0cyIpLCBuZXcgV0ku Q1NTU3R5bGVTaGVldENvbGxlY3Rpb24pOworCisgICAgICAgICAgICBpZiAoIXRoaXMuX2Fub255 bW91c1N0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQucGFyZW50KSB7CisgICAgICAgICAgICAg ICAgbGV0IGluZGV4ID0gaW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0 aW9uKHRoaXMuX2Fub255bW91c1N0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQsIHRoaXMuX3Jl c291cmNlc1RyZWVPdXRsaW5lLmNoaWxkcmVuLCB0aGlzLl9ib3VuZENvbXBhcmVUcmVlRWxlbWVu dHMpOworICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlc1RyZWVPdXRsaW5lLmluc2VydENo aWxkKHRoaXMuX2Fub255bW91c1N0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQsIGluZGV4KTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICBsZXQgY3NzU3R5bGVTaGVldFRyZWVFbGVtZW50 ID0gbmV3IFdJLkNTU1N0eWxlU2hlZXRUcmVlRWxlbWVudChyZXByZXNlbnRlZE9iamVjdCk7Cisg ICAgICAgICAgIHRoaXMuX2Fub255bW91c1N0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQuYXBw ZW5kQ2hpbGQoY3NzU3R5bGVTaGVldFRyZWVFbGVtZW50KTsKKyAgICAgICAgICAgcmV0dXJuIGNz c1N0eWxlU2hlZXRUcmVlRWxlbWVudDsKICAgICAgICAgfQogCi0gICAgICAgIC8vIFNpbmNlIHRo ZSBTY3JpcHQgZG9lcyBub3QgaGF2ZSBhIFVSTCB3ZSBjb25zaWRlciBpdCBhbiAnYW5vbnltb3Vz JyBzY3JpcHQuIFRoZXNlIHNjcmlwdHMgaGFwcGVuIGZyb20gY2FsbHMgdG8KLSAgICAgICAgLy8g d2luZG93LmV2YWwoKSBvciBicm93c2VyIGZlYXR1cmVzIGxpa2UgQXV0byBGaWxsIGFuZCBSZWFk ZXIuIFRoZXkgYXJlIG5vdCBub3JtYWxseSBhZGRlZCB0byB0aGUgc2lkZWJhciwgYnV0IHNpbmNl Ci0gICAgICAgIC8vIHdlIGhhdmUgYSBTY3JpcHRDb250ZW50VmlldyBhc2tpbmcgZm9yIHRoZSB0 cmVlIGVsZW1lbnQgd2Ugd2lsbCBtYWtlIGEgU2NyaXB0VHJlZUVsZW1lbnQgb24gZGVtYW5kIGFu ZCBhZGQgaXQuCi0KLSAgICAgICAgaWYgKCF0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJl ZUVsZW1lbnQpCi0gICAgICAgICAgICB0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVs ZW1lbnQgPSBuZXcgV0kuRm9sZGVyVHJlZUVsZW1lbnQoV0kuVUlTdHJpbmcoIkFub255bW91cyBT Y3JpcHRzIiksIG5ldyBXSS5TY3JpcHRDb2xsZWN0aW9uKTsKLQotICAgICAgICBpZiAoIXRoaXMu X2Fub255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5wYXJlbnQpIHsKLSAgICAgICAgICAg IGxldCBpbmRleCA9IGluc2VydGlvbkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlGdW5jdGlv bih0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQsIHRoaXMuX3Jlc291cmNl c1RyZWVPdXRsaW5lLmNoaWxkcmVuLCB0aGlzLl9ib3VuZENvbXBhcmVUcmVlRWxlbWVudHMpOwot ICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VzVHJlZU91dGxpbmUuaW5zZXJ0Q2hpbGQodGhpcy5f YW5vbnltb3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LCBpbmRleCk7Ci0gICAgICAgIH0KLQot ICAgICAgICB0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQucmVwcmVzZW50 ZWRPYmplY3QuYWRkKHJlcHJlc2VudGVkT2JqZWN0KTsKLQotICAgICAgICBsZXQgc2NyaXB0VHJl ZUVsZW1lbnQgPSBuZXcgV0kuU2NyaXB0VHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOwot ICAgICAgICB0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQuYXBwZW5kQ2hp bGQoc2NyaXB0VHJlZUVsZW1lbnQpOwotICAgICAgICByZXR1cm4gc2NyaXB0VHJlZUVsZW1lbnQ7 CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZhbHNlLCAiRGlkbid0IGZpbmQgYSBUcmVlRWxlbWVu dCBmb3IgcmVwcmVzZW50ZWRPYmplY3QiLCByZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIHJl dHVybiBudWxsOwogICAgIH0KIAogICAgIC8vIFByb3RlY3RlZApAQCAtOTM0LDIwICs5NTcsMjIg QEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKICAgICAgICAgY29uc29sZS5hc3NlcnQoc3R5bGVT aGVldCBpbnN0YW5jZW9mIFdJLkNTU1N0eWxlU2hlZXQpOwogICAgICAgICBjb25zb2xlLmFzc2Vy dCghc3R5bGVTaGVldC5pc0luc3BlY3RvclN0eWxlU2hlZXQoKSk7CiAKKyAgICAgICAgLy8gV2Ug ZG9uJ3QgYWRkIHN0eWxlIHNoZWV0cyB3aXRob3V0IFVSTHMgaGVyZS4gVGhvc2Ugc3R5bGUgc2hl ZXRzIGNhbiBxdWlja2x5IGNsdXR0ZXIgdGhlCisgICAgICAgIC8vIGludGVyZmFjZSBhbmQgYXJl IHVzdWFsbHkgbW9yZSB0cmFuc2llbnQuIFRoZXkgd2lsbCBnZXQgYWRkZWQgaWYvd2hlbiB0aGV5 IG5lZWQgdG8gYmUKKyAgICAgICAgLy8gc2hvd24gaW4gYSBjb250ZW50IHZpZXcuCisgICAgICAg IGlmIChzdHlsZVNoZWV0LmFub255bW91cykKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAg ICBsZXQgcGFyZW50VHJlZUVsZW1lbnQgPSBudWxsOwogCi0gICAgICAgIGlmIChzdHlsZVNoZWV0 LmluamVjdGVkKSB7CisgICAgICAgIGlmIChpc1dlYktpdEV4dGVuc2lvblNjaGVtZShzdHlsZVNo ZWV0LnVybENvbXBvbmVudHMuc2NoZW1lKSkgewogICAgICAgICAgICAgaWYgKCF0aGlzLl9leHRl bnNpb25TdHlsZVNoZWV0c0ZvbGRlclRyZWVFbGVtZW50KQogICAgICAgICAgICAgICAgIHRoaXMu X2V4dGVuc2lvblN0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV0kuRm9sZGVyVHJl ZUVsZW1lbnQoV0kuVUlTdHJpbmcoIkV4dGVuc2lvbiBTdHlsZSBTaGVldHMiKSwgbmV3IFdJLkNT U1N0eWxlU2hlZXRDb2xsZWN0aW9uKTsKICAgICAgICAgICAgIHBhcmVudFRyZWVFbGVtZW50ID0g dGhpcy5fZXh0ZW5zaW9uU3R5bGVTaGVldHNGb2xkZXJUcmVlRWxlbWVudDsKLSAgICAgICAgfSBl bHNlIGlmICghc3R5bGVTaGVldC5hbm9ueW1vdXMpIHsKKyAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgIGlmICghdGhpcy5fZXh0cmFTdHlsZVNoZWV0c0ZvbGRlclRyZWVFbGVtZW50KQogICAg ICAgICAgICAgICAgIHRoaXMuX2V4dHJhU3R5bGVTaGVldHNGb2xkZXJUcmVlRWxlbWVudCA9IG5l dyBXSS5Gb2xkZXJUcmVlRWxlbWVudChXSS5VSVN0cmluZygiRXh0cmEgU3R5bGUgU2hlZXRzIiks IG5ldyBXSS5DU1NTdHlsZVNoZWV0Q29sbGVjdGlvbik7CiAgICAgICAgICAgICBwYXJlbnRUcmVl RWxlbWVudCA9IHRoaXMuX2V4dHJhU3R5bGVTaGVldHNGb2xkZXJUcmVlRWxlbWVudDsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGlmICghdGhpcy5fYW5vbnltb3VzU3R5bGVTaGVldHNG b2xkZXJUcmVlRWxlbWVudCkKLSAgICAgICAgICAgICAgICB0aGlzLl9hbm9ueW1vdXNTdHlsZVNo ZWV0c0ZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdJLkZvbGRlclRyZWVFbGVtZW50KFdJLlVJU3Ry aW5nKCJBbm9ueW1vdXMgU3R5bGUgU2hlZXRzIiksIG5ldyBXSS5DU1NTdHlsZVNoZWV0Q29sbGVj dGlvbik7Ci0gICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2Fub255bW91c1N0 eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQ7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXBh cmVudFRyZWVFbGVtZW50LnBhcmVudCkgewpAQCAtOTYzLDkgKzk4OCwxMSBAQCBXSS5Tb3VyY2Vz TmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBh bmVsIGV4dGVuZHMgVwogCiAgICAgX2FkZFNjcmlwdChzY3JpcHQpCiAgICAgeworICAgICAgICBj b25zb2xlLmFzc2VydChzY3JpcHQgaW5zdGFuY2VvZiBXSS5TY3JpcHQpOworCiAgICAgICAgIC8v IFdlIGRvbid0IGFkZCBzY3JpcHRzIHdpdGhvdXQgVVJMcyBoZXJlLiBUaG9zZSBzY3JpcHRzIGNh biBxdWlja2x5IGNsdXR0ZXIgdGhlIGludGVyZmFjZSBhbmQKICAgICAgICAgLy8gYXJlIHVzdWFs bHkgbW9yZSB0cmFuc2llbnQuIFRoZXkgd2lsbCBnZXQgYWRkZWQgaWYvd2hlbiB0aGV5IG5lZWQg dG8gYmUgc2hvd24gaW4gYSBjb250ZW50IHZpZXcuCi0gICAgICAgIGlmICghc2NyaXB0LnVybCAm JiAhc2NyaXB0LnNvdXJjZVVSTCkKKyAgICAgICAgaWYgKHNjcmlwdC5hbm9ueW1vdXMpCiAgICAg ICAgICAgICByZXR1cm47CiAKICAgICAgICAgLy8gVGFyZ2V0IG1haW4gcmVzb3VyY2UuCkBAIC05 OTMsNyArMTAyMCw3IEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3Mg U291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICBsZXQgcGFyZW50Rm9sZGVyVHJlZUVsZW1lbnQgPSBudWxsOwogCi0gICAg ICAgICAgICBpZiAoc2NyaXB0LmluamVjdGVkKSB7CisgICAgICAgICAgICBpZiAoaXNXZWJLaXRF eHRlbnNpb25TY2hlbWUoc2NyaXB0LnVybENvbXBvbmVudHMuc2NoZW1lKSkgewogICAgICAgICAg ICAgICAgIGlmICghdGhpcy5fZXh0ZW5zaW9uU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50KSB7CiAg ICAgICAgICAgICAgICAgICAgIGxldCBjb2xsZWN0aW9uID0gbmV3IFdJLlNjcmlwdENvbGxlY3Rp b247CiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2V4dGVuc2lvblNjcmlwdHNGb2xkZXJUcmVl RWxlbWVudCA9IG5ldyBXSS5Gb2xkZXJUcmVlRWxlbWVudChXSS5VSVN0cmluZygiRXh0ZW5zaW9u IFNjcmlwdHMiKSwgY29sbGVjdGlvbik7Cg== 387143 2020-01-08 14:53:00 -0800 2020-01-08 18:15:52 -0800 Patch bug-205955-20200108155259.patch text/plain 14081 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM5MWQwOWNlMjA0MWViN2QyNGFiNTFiNzllZDVi OGY5ZDA3NWNlNDMuLjM4Y2RlYzgyZjg0YjJmZjUxNTFkNjkxMTI1NTMxZGRjOWQwODE5YmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAxLTA4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBub3QgYWxsIGluamVjdGVkIHNjcmlwdHMgYW5kIHN0eWxlIHNoZWV0cyBhcmUgZnJv bSBleHRlbnNpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDU5NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgIChpc1dlYktp dEV4dGVuc2lvblNjaGVtZSk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxz L0NTU1N0eWxlU2hlZXQuanM6CisgICAgICAgIChXSS5DU1NTdHlsZVNoZWV0LnByb3RvdHlwZS5n ZXQgaW5qZWN0ZWQpOgorICAgICAgICAqIC5lc2xpbnRyYzoKKyAgICAgICAgTW92ZSB0aGUgbG9n aWMgZm9yIGRldGVjdGluZyBhbiBleHRlbnNpb24gaW5qZWN0ZWQgcmVzb3VyY2UgdG8gaXRzIG93 biBmdW5jdGlvbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmln YXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5wcm90b3R5cGUudHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdCk6CisgICAg ICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZFN0eWxl U2hlZXQpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90 eXBlLl9hZGRTY3JpcHQpOgorICAgICAgICBPbmx5IHNob3cgdGhlIEFub255bW91cyBTdHlsZSBT aGVldHMgZm9sZGVyIG9uY2UgdGhlIHVzZXIgdHJpZXMgdG8gc2hvdyBhIHN0eWxlIHNoZWV0IHRo YXQKKyAgICAgICAgd291bGQgYmUgaW4gaXQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL09wZW5SZXNvdXJjZURpYWxvZy5qczoKKyAgICAgICAgKFdJLk9wZW5SZXNvdXJjZURpYWxv Zy5wcm90b3R5cGUuZGlkUHJlc2VudERpYWxvZyk6CisgICAgICAgIChXSS5PcGVuUmVzb3VyY2VE aWFsb2cucHJvdG90eXBlLl9hZGRTY3JpcHRzRm9yVGFyZ2V0KToKKyAgICAgICAgKFdJLk9wZW5S ZXNvdXJjZURpYWxvZy5wcm90b3R5cGUuX2hhbmRsZVN0eWxlU2hlZXRBZGRlZCk6CisgICAgICAg IChXSS5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlLl9oYW5kbGVTdHlsZVNoZWV0UmVtb3Zl ZCk6CisgICAgICAgIElnbm9yZSBhbm9ueW1vdXMgc2NyaXB0cywgYW5kIGFsbG93IGluamVjdGVk IHN0eWxlIHNoZWV0cyB0byBiZSBhZGRlZCBhZnRlciBwcmVzZW50aW5nLgorCiAyMDIwLTAxLTA4 ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O OiAocjI1NDE4NikgWyBNYWMgXSBpbnNwZWN0b3IvY3NzL2FkZC1ydWxlLmh0bWwgaXMgZmFpbGlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJLy5lc2xpbnRyYyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMKaW5kZXggZGFhNjE0ODU2OWIxNmU1Y2IxY2YxODlkMThl Mzk5MGFkYjMwM2UxZS4uMzhiNzZjNTYyZmE4NmJjMzA1OTcyNWJkYzZhZDhlNThiMzIzYzVlYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJLy5lc2xpbnRyYworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvLmVzbGludHJjCkBAIC0xMDEsNiArMTAxLDcgQEAKICAgICAgICAgImlz V2ViSW5zcGVjdG9yQ29uc29sZUV2YWx1YXRpb25TY3JpcHQiOiB0cnVlLAogICAgICAgICAiaXNX ZWJJbnNwZWN0b3JJbnRlcm5hbFNjcmlwdCI6IHRydWUsCiAgICAgICAgICJpc1dlYktpdEludGVy bmFsU2NyaXB0IjogdHJ1ZSwKKyAgICAgICAgImlzV2ViS2l0RXh0ZW5zaW9uU2NoZW1lIjogdHJ1 ZSwKICAgICAgICAgIm11bHRpcGxpY2F0aW9uU2lnbiI6IHRydWUsCiAgICAgICAgICJwYXJzZU1J TUVUeXBlIjogdHJ1ZSwKICAgICAgICAgInJlc29sdmVEb3RzSW5QYXRoIjogdHJ1ZSwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVz LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMu anMKaW5kZXggMDQ1OTYyMmE1MTFjZjMxZjI4NjIxNTMxNWQ1ZWM0NTZlMjQ4ZTZmYy4uMTliZTk5 ZGJmMDFjZDAxOGZhZTAzMTIwZTlmMWIyNjU0OTE1M2Q0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTE2NDQs NiArMTY0NCwxMSBAQCBmdW5jdGlvbiBpc1dlYktpdEludGVybmFsU2NyaXB0KHVybCkKICAgICBy ZXR1cm4gdXJsICYmIHVybC5zdGFydHNXaXRoKCJfX1dlYiIpICYmIHVybC5lbmRzV2l0aCgiX18i KTsKIH0KIAorZnVuY3Rpb24gaXNXZWJLaXRFeHRlbnNpb25TY2hlbWUoc2NoZW1lKQoreworICAg IHJldHVybiBzY2hlbWUgJiYgc2NoZW1lLmVuZHNXaXRoKCJleHRlbnNpb24iKTsKK30KKwogZnVu Y3Rpb24gaXNGdW5jdGlvblN0cmluZ05hdGl2ZUNvZGUoc3RyKQogewogICAgIHJldHVybiBzdHIu ZW5kc1dpdGgoIntcbiAgICBbbmF0aXZlIGNvZGVdXG59Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVTaGVldC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0Lmpz CmluZGV4IGMyMDA4MzU2MjE3MTAyMjZjMjgyMGRkMWIxMGIyNGMzMjM2YjkyZDMuLmM5ZmQwMmU0 MTEzODUwYWQyOWU2MmQxMmRkYmVjZjE1ZWRkMzdjYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0Lmpz CkBAIC03MCw3ICs3MCw3IEBAIFdJLkNTU1N0eWxlU2hlZXQgPSBjbGFzcyBDU1NTdHlsZVNoZWV0 IGV4dGVuZHMgV0kuU291cmNlQ29kZQogCiAgICAgZ2V0IGluamVjdGVkKCkKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLnVybENvbXBvbmVudHMuc2NoZW1lICYmIHRoaXMudXJsQ29tcG9uZW50 cy5zY2hlbWUuZW5kc1dpdGgoImV4dGVuc2lvbiIpOworICAgICAgICByZXR1cm4gaXNXZWJLaXRF eHRlbnNpb25TY2hlbWUodGhpcy51cmxDb21wb25lbnRzLnNjaGVtZSk7CiAgICAgfQogCiAgICAg Z2V0IGFub255bW91cygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9PcGVuUmVzb3VyY2VEaWFsb2cuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9PcGVuUmVzb3VyY2VEaWFsb2cuanMKaW5kZXggZWVhOWRm MWJiOGE5NWVkNjE0M2ZlNTRmYzRjNjY2YWMwMzBkNzY4Ny4uMDY1NDUyYzZjOGFkNDIxZWE2ZWU4 YjA2YTEwYTRiM2RjZGIxOWRiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvT3BlblJlc291cmNlRGlhbG9nLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxvZy5qcwpAQCAt MTg5LDcgKzE4OSw3IEBAIFdJLk9wZW5SZXNvdXJjZURpYWxvZyA9IGNsYXNzIE9wZW5SZXNvdXJj ZURpYWxvZyBleHRlbmRzIFdJLkRpYWxvZwogICAgICAgICB9CiAKICAgICAgICAgZm9yIChsZXQg c3R5bGVTaGVldCBvZiBXSS5jc3NNYW5hZ2VyLnN0eWxlU2hlZXRzKSB7Ci0gICAgICAgICAgICBp ZiAoc3R5bGVTaGVldC5vcmlnaW4gIT09IFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5BdXRob3IpCisg ICAgICAgICAgICBpZiAoc3R5bGVTaGVldC5vcmlnaW4gIT09IFdJLkNTU1N0eWxlU2hlZXQuVHlw ZS5BdXRob3IgJiYgIXN0eWxlU2hlZXQuYW5vbnltb3VzKQogICAgICAgICAgICAgICAgIHRoaXMu X2FkZFJlc291cmNlKHN0eWxlU2hlZXQpOwogICAgICAgICB9CiAKQEAgLTM3Miw5ICszNzIsNyBA QCBXSS5PcGVuUmVzb3VyY2VEaWFsb2cgPSBjbGFzcyBPcGVuUmVzb3VyY2VEaWFsb2cgZXh0ZW5k cyBXSS5EaWFsb2cKIAogICAgICAgICBsZXQgdGFyZ2V0RGF0YSA9IFdJLmRlYnVnZ2VyTWFuYWdl ci5kYXRhRm9yVGFyZ2V0KHRhcmdldCk7CiAgICAgICAgIGZvciAobGV0IHNjcmlwdCBvZiB0YXJn ZXREYXRhLnNjcmlwdHMpIHsKLSAgICAgICAgICAgIGlmIChzY3JpcHQucmVzb3VyY2UpCi0gICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBpZiAoc2NyaXB0LmR5bmFtaWNhbGx5 QWRkZWRTY3JpcHRFbGVtZW50KQorICAgICAgICAgICAgaWYgKHNjcmlwdC5hbm9ueW1vdXMgfHwg c2NyaXB0LnJlc291cmNlIHx8IHNjcmlwdC5keW5hbWljYWxseUFkZGVkU2NyaXB0RWxlbWVudCkK ICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGlmICghV0kuc2V0dGluZ3Mu ZGVidWdTaG93Q29uc29sZUV2YWx1YXRpb25zLnZhbHVlICYmIGlzV2ViSW5zcGVjdG9yQ29uc29s ZUV2YWx1YXRpb25TY3JpcHQoc2NyaXB0LnNvdXJjZVVSTCkpCiAgICAgICAgICAgICAgICAgY29u dGludWU7CkBAIC00NDAsNyArNDM4LDcgQEAgV0kuT3BlblJlc291cmNlRGlhbG9nID0gY2xhc3Mg T3BlblJlc291cmNlRGlhbG9nIGV4dGVuZHMgV0kuRGlhbG9nCiAgICAgX2hhbmRsZVN0eWxlU2hl ZXRBZGRlZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCB7c3R5bGVTaGVldH0gPSBldmVudC5k YXRhOwotICAgICAgICBpZiAoc3R5bGVTaGVldC5vcmlnaW4gPT09IFdJLkNTU1N0eWxlU2hlZXQu VHlwZS5BdXRob3IgfHwgc3R5bGVTaGVldC5pbmplY3RlZCB8fCBzdHlsZVNoZWV0LmFub255bW91 cykKKyAgICAgICAgaWYgKHN0eWxlU2hlZXQub3JpZ2luID09PSBXSS5DU1NTdHlsZVNoZWV0LlR5 cGUuQXV0aG9yIHx8IHN0eWxlU2hlZXQuYW5vbnltb3VzKQogICAgICAgICAgICAgcmV0dXJuOwog CiAgICAgICAgIHRoaXMuX2FkZFJlc291cmNlKHN0eWxlU2hlZXQpOwpAQCAtNDQ5LDcgKzQ0Nyw3 IEBAIFdJLk9wZW5SZXNvdXJjZURpYWxvZyA9IGNsYXNzIE9wZW5SZXNvdXJjZURpYWxvZyBleHRl bmRzIFdJLkRpYWxvZwogICAgIF9oYW5kbGVTdHlsZVNoZWV0UmVtb3ZlZChldmVudCkKICAgICB7 CiAgICAgICAgIGxldCB7c3R5bGVTaGVldH0gPSBldmVudC5kYXRhOwotICAgICAgICBpZiAoc3R5 bGVTaGVldC5vcmlnaW4gPT09IFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5BdXRob3IgfHwgc3R5bGVT aGVldC5pbmplY3RlZCB8fCBzdHlsZVNoZWV0LmFub255bW91cykKKyAgICAgICAgaWYgKHN0eWxl U2hlZXQub3JpZ2luID09PSBXSS5DU1NTdHlsZVNoZWV0LlR5cGUuQXV0aG9yIHx8IHN0eWxlU2hl ZXQuYW5vbnltb3VzKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX3JlbW92 ZVJlc291cmNlKHN0eWxlU2hlZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlv blNpZGViYXJQYW5lbC5qcwppbmRleCA4YjUxMGY2OWY4MjZlNGVkNzcwYmNlNjUxZWVkYTY3YzQw MzNlOGJiLi5lNTZlNGQyNTJlMWUxNTRhZTA2Y2QzN2I1Zjc2NmY5ODA3NzgwOTEzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2 aWdhdGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtNTIyLDM1 ICs1MjIsNTggQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3Vy Y2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKICAgICAgICAgaWYgKHRyZWVFbGVt ZW50KQogICAgICAgICAgICAgcmV0dXJuIHRyZWVFbGVtZW50OwogCi0gICAgICAgIC8vIE9ubHkg c3BlY2lhbCBjYXNlIFNjcmlwdCBvYmplY3RzLgotICAgICAgICBpZiAoIShyZXByZXNlbnRlZE9i amVjdCBpbnN0YW5jZW9mIFdJLlNjcmlwdCkpIHsKLSAgICAgICAgICAgIGNvbnNvbGUuZXJyb3Io IkRpZG4ndCBmaW5kIGEgVHJlZUVsZW1lbnQgZm9yIHJlcHJlc2VudGVkT2JqZWN0IiwgcmVwcmVz ZW50ZWRPYmplY3QpOwotICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIGlmIChyZXBy ZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLlNjcmlwdCkgeworICAgICAgICAgICAgLy8gSWYg dGhlIFNjcmlwdCBoYXMgYSBVUkwgd2Ugc2hvdWxkIGhhdmUgZm91bmQgaXQgZWFybGllci4KKyAg ICAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdC51cmwpIHsKKyAgICAgICAgICAgICAgICBj b25zb2xlLmFzc2VydChmYWxzZSwgIkRpZG4ndCBmaW5kIGEgU2NyaXB0VHJlZUVsZW1lbnQgZm9y IGEgU2NyaXB0IHdpdGggYSBVUkwuIiwgcmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAg ICAgIHJldHVybiBudWxsOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlLmFz c2VydChyZXByZXNlbnRlZE9iamVjdC5hbm9ueW1vdXMsIHJlcHJlc2VudGVkT2JqZWN0KTsKKwor ICAgICAgICAgICAgLy8gU2luY2UgdGhlIFNjcmlwdCBkb2VzIG5vdCBoYXZlIGEgVVJMIHdlIGNv bnNpZGVyIGl0IGFuICdhbm9ueW1vdXMnIHNjcmlwdC4gVGhlc2Ugc2NyaXB0cyBoYXBwZW4gZnJv bSBjYWxscyB0bworICAgICAgICAgICAgLy8gd2luZG93LmV2YWwoKSBvciBicm93c2VyIGZlYXR1 cmVzIGxpa2UgQXV0byBGaWxsIGFuZCBSZWFkZXIuIFRoZXkgYXJlIG5vdCBub3JtYWxseSBhZGRl ZCB0byB0aGUgc2lkZWJhciwgYnV0IHNpbmNlCisgICAgICAgICAgICAvLyB3ZSBoYXZlIGEgU2Ny aXB0Q29udGVudFZpZXcgYXNraW5nIGZvciB0aGUgdHJlZSBlbGVtZW50IHdlIHdpbGwgbWFrZSBh IFNjcmlwdFRyZWVFbGVtZW50IG9uIGRlbWFuZCBhbmQgYWRkIGl0LgorCisgICAgICAgICAgICBp ZiAoIXRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudCkKKyAgICAgICAgICAg ICAgICB0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV0kuRm9s ZGVyVHJlZUVsZW1lbnQoV0kuVUlTdHJpbmcoIkFub255bW91cyBTY3JpcHRzIiksIG5ldyBXSS5T Y3JpcHRDb2xsZWN0aW9uKTsKKworICAgICAgICAgICAgaWYgKCF0aGlzLl9hbm9ueW1vdXNTY3Jp cHRzRm9sZGVyVHJlZUVsZW1lbnQucGFyZW50KSB7CisgICAgICAgICAgICAgICAgbGV0IGluZGV4 ID0gaW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0aW9uKHRoaXMuX2Fu b255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudCwgdGhpcy5fcmVzb3VyY2VzVHJlZU91dGxp bmUuY2hpbGRyZW4sIHRoaXMuX2JvdW5kQ29tcGFyZVRyZWVFbGVtZW50cyk7CisgICAgICAgICAg ICAgICAgdGhpcy5fcmVzb3VyY2VzVHJlZU91dGxpbmUuaW5zZXJ0Q2hpbGQodGhpcy5fYW5vbnlt b3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LCBpbmRleCk7CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIHRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5yZXByZXNl bnRlZE9iamVjdC5hZGQocmVwcmVzZW50ZWRPYmplY3QpOworCisgICAgICAgICAgICBsZXQgc2Ny aXB0VHJlZUVsZW1lbnQgPSBuZXcgV0kuU2NyaXB0VHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmpl Y3QpOworICAgICAgICAgICAgdGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50 LmFwcGVuZENoaWxkKHNjcmlwdFRyZWVFbGVtZW50KTsKKyAgICAgICAgICAgIHJldHVybiBzY3Jp cHRUcmVlRWxlbWVudDsKICAgICAgICAgfQogCi0gICAgICAgIC8vIElmIHRoZSBTY3JpcHQgaGFz IGEgVVJMIHdlIHNob3VsZCBoYXZlIGZvdW5kIGl0IGVhcmxpZXIuCi0gICAgICAgIGlmIChyZXBy ZXNlbnRlZE9iamVjdC51cmwpIHsKLSAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIkRpZG4ndCBm aW5kIGEgU2NyaXB0VHJlZUVsZW1lbnQgZm9yIGEgU2NyaXB0IHdpdGggYSBVUkwuIik7Ci0gICAg ICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGluc3Rh bmNlb2YgV0kuQ1NTU3R5bGVTaGVldCkgeworICAgICAgICAgICAgLy8gSWYgdGhlIENTU1N0eWxl U2hlZXQgaGFzIGEgVVJMIHdlIHNob3VsZCBoYXZlIGZvdW5kIGl0IGVhcmxpZXIuCisgICAgICAg ICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QudXJsKSB7CisgICAgICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQoZmFsc2UsICJEaWRuJ3QgZmluZCBhIENTU1N0eWxlU2hlZXRUcmVlRWxlbWVudCBm b3IgYSBDU1NTdHlsZVNoZWV0IHdpdGggYSBVUkwuIiwgcmVwcmVzZW50ZWRPYmplY3QpOworICAg ICAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBj b25zb2xlLmFzc2VydChyZXByZXNlbnRlZE9iamVjdC5hbm9ueW1vdXMsIHJlcHJlc2VudGVkT2Jq ZWN0KTsKKworICAgICAgICAgICAgaWYgKCF0aGlzLl9hbm9ueW1vdXNTdHlsZVNoZWV0c0ZvbGRl clRyZWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHRoaXMuX2Fub255bW91c1N0eWxlU2hlZXRz Rm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV0kuRm9sZGVyVHJlZUVsZW1lbnQoV0kuVUlTdHJpbmco IkFub255bW91cyBTdHlsZSBTaGVldHMiKSwgbmV3IFdJLkNTU1N0eWxlU2hlZXRDb2xsZWN0aW9u KTsKKworICAgICAgICAgICAgaWYgKCF0aGlzLl9hbm9ueW1vdXNTdHlsZVNoZWV0c0ZvbGRlclRy ZWVFbGVtZW50LnBhcmVudCkgeworICAgICAgICAgICAgICAgIGxldCBpbmRleCA9IGluc2VydGlv bkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlGdW5jdGlvbih0aGlzLl9hbm9ueW1vdXNTdHls ZVNoZWV0c0ZvbGRlclRyZWVFbGVtZW50LCB0aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5jaGls ZHJlbiwgdGhpcy5fYm91bmRDb21wYXJlVHJlZUVsZW1lbnRzKTsKKyAgICAgICAgICAgICAgICB0 aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5pbnNlcnRDaGlsZCh0aGlzLl9hbm9ueW1vdXNTdHls ZVNoZWV0c0ZvbGRlclRyZWVFbGVtZW50LCBpbmRleCk7CisgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgbGV0IGNzc1N0eWxlU2hlZXRUcmVlRWxlbWVudCA9IG5ldyBXSS5DU1NTdHlsZVNoZWV0 VHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICB0aGlzLl9hbm9ueW1v dXNTdHlsZVNoZWV0c0ZvbGRlclRyZWVFbGVtZW50LmFwcGVuZENoaWxkKGNzc1N0eWxlU2hlZXRU cmVlRWxlbWVudCk7CisgICAgICAgICAgIHJldHVybiBjc3NTdHlsZVNoZWV0VHJlZUVsZW1lbnQ7 CiAgICAgICAgIH0KIAotICAgICAgICAvLyBTaW5jZSB0aGUgU2NyaXB0IGRvZXMgbm90IGhhdmUg YSBVUkwgd2UgY29uc2lkZXIgaXQgYW4gJ2Fub255bW91cycgc2NyaXB0LiBUaGVzZSBzY3JpcHRz IGhhcHBlbiBmcm9tIGNhbGxzIHRvCi0gICAgICAgIC8vIHdpbmRvdy5ldmFsKCkgb3IgYnJvd3Nl ciBmZWF0dXJlcyBsaWtlIEF1dG8gRmlsbCBhbmQgUmVhZGVyLiBUaGV5IGFyZSBub3Qgbm9ybWFs bHkgYWRkZWQgdG8gdGhlIHNpZGViYXIsIGJ1dCBzaW5jZQotICAgICAgICAvLyB3ZSBoYXZlIGEg U2NyaXB0Q29udGVudFZpZXcgYXNraW5nIGZvciB0aGUgdHJlZSBlbGVtZW50IHdlIHdpbGwgbWFr ZSBhIFNjcmlwdFRyZWVFbGVtZW50IG9uIGRlbWFuZCBhbmQgYWRkIGl0LgotCi0gICAgICAgIGlm ICghdGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50KQotICAgICAgICAgICAg dGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdJLkZvbGRlclRy ZWVFbGVtZW50KFdJLlVJU3RyaW5nKCJBbm9ueW1vdXMgU2NyaXB0cyIpLCBuZXcgV0kuU2NyaXB0 Q29sbGVjdGlvbik7Ci0KLSAgICAgICAgaWYgKCF0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVy VHJlZUVsZW1lbnQucGFyZW50KSB7Ci0gICAgICAgICAgICBsZXQgaW5kZXggPSBpbnNlcnRpb25J bmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24odGhpcy5fYW5vbnltb3VzU2NyaXB0 c0ZvbGRlclRyZWVFbGVtZW50LCB0aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5jaGlsZHJlbiwg dGhpcy5fYm91bmRDb21wYXJlVHJlZUVsZW1lbnRzKTsKLSAgICAgICAgICAgIHRoaXMuX3Jlc291 cmNlc1RyZWVPdXRsaW5lLmluc2VydENoaWxkKHRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJU cmVlRWxlbWVudCwgaW5kZXgpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fYW5vbnltb3Vz U2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0LmFkZChyZXByZXNlbnRl ZE9iamVjdCk7Ci0KLSAgICAgICAgbGV0IHNjcmlwdFRyZWVFbGVtZW50ID0gbmV3IFdJLlNjcmlw dFRyZWVFbGVtZW50KHJlcHJlc2VudGVkT2JqZWN0KTsKLSAgICAgICAgdGhpcy5fYW5vbnltb3Vz U2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LmFwcGVuZENoaWxkKHNjcmlwdFRyZWVFbGVtZW50KTsK LSAgICAgICAgcmV0dXJuIHNjcmlwdFRyZWVFbGVtZW50OworICAgICAgICBjb25zb2xlLmFzc2Vy dChmYWxzZSwgIkRpZG4ndCBmaW5kIGEgVHJlZUVsZW1lbnQgZm9yIHJlcHJlc2VudGVkT2JqZWN0 IiwgcmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAKICAg ICAvLyBQcm90ZWN0ZWQKQEAgLTkzNCwyMCArOTU3LDIyIEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9u U2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5k cyBXCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHN0eWxlU2hlZXQgaW5zdGFuY2VvZiBXSS5DU1NT dHlsZVNoZWV0KTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXN0eWxlU2hlZXQuaXNJbnNwZWN0 b3JTdHlsZVNoZWV0KCkpOwogCisgICAgICAgIC8vIFdlIGRvbid0IGFkZCBzdHlsZSBzaGVldHMg d2l0aG91dCBVUkxzIGhlcmUuIFRob3NlIHN0eWxlIHNoZWV0cyBjYW4gcXVpY2tseSBjbHV0dGVy IHRoZQorICAgICAgICAvLyBpbnRlcmZhY2UgYW5kIGFyZSB1c3VhbGx5IG1vcmUgdHJhbnNpZW50 LiBUaGV5IHdpbGwgZ2V0IGFkZGVkIGlmL3doZW4gdGhleSBuZWVkIHRvIGJlCisgICAgICAgIC8v IHNob3duIGluIGEgY29udGVudCB2aWV3LgorICAgICAgICBpZiAoc3R5bGVTaGVldC5hbm9ueW1v dXMpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgbGV0IHBhcmVudFRyZWVFbGVtZW50 ID0gbnVsbDsKIAotICAgICAgICBpZiAoc3R5bGVTaGVldC5pbmplY3RlZCkgeworICAgICAgICBp ZiAoaXNXZWJLaXRFeHRlbnNpb25TY2hlbWUoc3R5bGVTaGVldC51cmxDb21wb25lbnRzLnNjaGVt ZSkpIHsKICAgICAgICAgICAgIGlmICghdGhpcy5fZXh0ZW5zaW9uU3R5bGVTaGVldHNGb2xkZXJU cmVlRWxlbWVudCkKICAgICAgICAgICAgICAgICB0aGlzLl9leHRlbnNpb25TdHlsZVNoZWV0c0Zv bGRlclRyZWVFbGVtZW50ID0gbmV3IFdJLkZvbGRlclRyZWVFbGVtZW50KFdJLlVJU3RyaW5nKCJF eHRlbnNpb24gU3R5bGUgU2hlZXRzIiksIG5ldyBXSS5DU1NTdHlsZVNoZWV0Q29sbGVjdGlvbik7 CiAgICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2V4dGVuc2lvblN0eWxlU2hl ZXRzRm9sZGVyVHJlZUVsZW1lbnQ7Ci0gICAgICAgIH0gZWxzZSBpZiAoIXN0eWxlU2hlZXQuYW5v bnltb3VzKSB7CisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMuX2V4dHJh U3R5bGVTaGVldHNGb2xkZXJUcmVlRWxlbWVudCkKICAgICAgICAgICAgICAgICB0aGlzLl9leHRy YVN0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV0kuRm9sZGVyVHJlZUVsZW1lbnQo V0kuVUlTdHJpbmcoIkV4dHJhIFN0eWxlIFNoZWV0cyIpLCBuZXcgV0kuQ1NTU3R5bGVTaGVldENv bGxlY3Rpb24pOwogICAgICAgICAgICAgcGFyZW50VHJlZUVsZW1lbnQgPSB0aGlzLl9leHRyYVN0 eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQ7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICBpZiAoIXRoaXMuX2Fub255bW91c1N0eWxlU2hlZXRzRm9sZGVyVHJlZUVsZW1lbnQpCi0gICAg ICAgICAgICAgICAgdGhpcy5fYW5vbnltb3VzU3R5bGVTaGVldHNGb2xkZXJUcmVlRWxlbWVudCA9 IG5ldyBXSS5Gb2xkZXJUcmVlRWxlbWVudChXSS5VSVN0cmluZygiQW5vbnltb3VzIFN0eWxlIFNo ZWV0cyIpLCBuZXcgV0kuQ1NTU3R5bGVTaGVldENvbGxlY3Rpb24pOwotICAgICAgICAgICAgcGFy ZW50VHJlZUVsZW1lbnQgPSB0aGlzLl9hbm9ueW1vdXNTdHlsZVNoZWV0c0ZvbGRlclRyZWVFbGVt ZW50OwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFwYXJlbnRUcmVlRWxlbWVudC5wYXJlbnQp IHsKQEAgLTk2Myw5ICs5ODgsMTEgQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwg PSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKIAogICAgIF9h ZGRTY3JpcHQoc2NyaXB0KQogICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoc2NyaXB0IGlu c3RhbmNlb2YgV0kuU2NyaXB0KTsKKwogICAgICAgICAvLyBXZSBkb24ndCBhZGQgc2NyaXB0cyB3 aXRob3V0IFVSTHMgaGVyZS4gVGhvc2Ugc2NyaXB0cyBjYW4gcXVpY2tseSBjbHV0dGVyIHRoZSBp bnRlcmZhY2UgYW5kCiAgICAgICAgIC8vIGFyZSB1c3VhbGx5IG1vcmUgdHJhbnNpZW50LiBUaGV5 IHdpbGwgZ2V0IGFkZGVkIGlmL3doZW4gdGhleSBuZWVkIHRvIGJlIHNob3duIGluIGEgY29udGVu dCB2aWV3LgotICAgICAgICBpZiAoIXNjcmlwdC51cmwgJiYgIXNjcmlwdC5zb3VyY2VVUkwpCisg ICAgICAgIGlmIChzY3JpcHQuYW5vbnltb3VzKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIC8vIFRhcmdldCBtYWluIHJlc291cmNlLgpAQCAtOTkzLDcgKzEwMjAsNyBAQCBXSS5Tb3Vy Y2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJh clBhbmVsIGV4dGVuZHMgVwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbGV0IHBhcmVu dEZvbGRlclRyZWVFbGVtZW50ID0gbnVsbDsKIAotICAgICAgICAgICAgaWYgKHNjcmlwdC5pbmpl Y3RlZCkgeworICAgICAgICAgICAgaWYgKGlzV2ViS2l0RXh0ZW5zaW9uU2NoZW1lKHNjcmlwdC51 cmxDb21wb25lbnRzLnNjaGVtZSkpIHsKICAgICAgICAgICAgICAgICBpZiAoIXRoaXMuX2V4dGVu c2lvblNjcmlwdHNGb2xkZXJUcmVlRWxlbWVudCkgewogICAgICAgICAgICAgICAgICAgICBsZXQg Y29sbGVjdGlvbiA9IG5ldyBXSS5TY3JpcHRDb2xsZWN0aW9uOwogICAgICAgICAgICAgICAgICAg ICB0aGlzLl9leHRlbnNpb25TY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV0kuRm9sZGVy VHJlZUVsZW1lbnQoV0kuVUlTdHJpbmcoIkV4dGVuc2lvbiBTY3JpcHRzIiksIGNvbGxlY3Rpb24p Owo=