219231 2020-11-20 17:34:13 -0800 Web Inspector: implement Multimap.prototype.take() 2020-11-21 11:10:21 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1709714 0 bburg 2020-11-20 17:34:13 -0800 Splitting off from some other work. 1709715 1 414746 bburg 2020-11-20 17:36:33 -0800 Created attachment 414746 Patch 1709716 2 414746 hi 2020-11-20 17:44:55 -0800 Comment on attachment 414746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414746&action=review r=me, with some behavior changes > Source/WebInspectorUI/UserInterface/Base/Multimap.js:94 > + return new Set; this should be `undefined` to match what `get` does when the `key` is not in `_map` > Source/WebInspectorUI/UserInterface/Base/Multimap.js:101 > + let taken = valueSet.take(value); > + > + if (!valueSet.size) > + this._map.delete(key); > + > + return new Set([taken]); this should match `Set.prototype.take` ``` let result = valueSet.take(value); if (!valueSet.size) this._map.delete(key); return result; ``` 1709719 3 414746 joepeck 2020-11-20 17:50:08 -0800 Comment on attachment 414746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414746&action=review > Source/WebInspectorUI/UserInterface/Base/Utilities.js:187 > - let exists = this.has(key); > - if (exists) > + if (this.has(key)) { > this.delete(key); > - return exists; > + return key; > + } > + > + return undefined; > } We should remove `Set.prototype.take`, it serves no purpose. The way this was originally written seems to be identical to `Set.prototype.delete`. The way this is no written is weird for falsey values (E.g. `if (set.take(0)) { ... }`). Lets just remove it and use `Set.prototype.delete` as appropriate? 1709763 4 414763 bburg 2020-11-21 09:59:39 -0800 Created attachment 414763 Revised fix 1709772 5 ews-feeder 2020-11-21 11:09:14 -0800 Committed r270149: <https://trac.webkit.org/changeset/270149> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414763. 1709775 6 webkit-bug-importer 2020-11-21 11:10:21 -0800 <rdar://problem/71656735> 414746 2020-11-20 17:36:33 -0800 2020-11-21 09:59:37 -0800 Patch bug-219231-20201120173632.patch text/plain 9153 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm NzJlYWRjODI2NjFkZmEyMmUyZDAzYmE1YTI0NWQzZTQyNTZlYjQ0Li5lMWNhMDZiOGE5MjQ4OGQ5 ZWVkZGYyM2QyZWUxNDg0Y2JkZWZiYjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0xMS0yMCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBpbXBsZW1lbnQgTWFwLnByb3RvdHlwZS50YWtlKCkgYW5k IGZpeCBTZXQucHJvdG90eXBlLnRha2UoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MjMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTXVsdGltYXAuanM6CisgICAg ICAgIChNdWx0aW1hcC5wcm90b3R5cGUudGFrZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9C YXNlL1V0aWxpdGllcy5qczoKKyAgICAgICAgKHZhbHVlKToKKwogMjAyMC0xMS0xMiAgRGV2aW4g Um91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVW5j YXVnaHQgRXhjZXB0aW9uOiBUeXBlRXJyb3I6IHVuZGVmaW5lZCBpcyBub3QgYW4gb2JqZWN0IChl dmFsdWF0aW5nICd0YXJnZXQuRE9NQWdlbnQuaGlkZUhpZ2hsaWdodCcpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL011bHRpbWFwLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NdWx0aW1hcC5qcwppbmRleCAz ZDY5ZWIwMjhkNzk1YTMyYzE3MDcyODJlZGNiOWQzNjQ1ZGYwZDQwLi4wMjdjYjQ5M2I3NzAwOGRj NjNkMGJiZDU4ZTA4YWQ4MWI1ZDdlOWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL011bHRpbWFwLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTXVsdGltYXAuanMKQEAgLTgzLDYgKzgzLDI0IEBAIGNs YXNzIE11bHRpbWFwCiAgICAgICAgIHJldHVybiBkZWxldGVkOwogICAgIH0KIAorICAgIHRha2Uo a2V5LCB2YWx1ZSkKKyAgICB7CisgICAgICAgIC8vIEFsbG93IGFuIGVudGlyZSBrZXkgdG8gYmUg cmVtb3ZlZCBieSBub3QgcGFzc2luZyBhIHZhbHVlLgorICAgICAgICBpZiAoYXJndW1lbnRzLmxl bmd0aCA9PT0gMSkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9tYXAudGFrZShrZXkpOworCisg ICAgICAgIGxldCB2YWx1ZVNldCA9IHRoaXMuX21hcC5nZXQoa2V5KTsKKyAgICAgICAgaWYgKCF2 YWx1ZVNldCkKKyAgICAgICAgICAgIHJldHVybiBuZXcgU2V0OworCisgICAgICAgIGxldCB0YWtl biA9IHZhbHVlU2V0LnRha2UodmFsdWUpOworCisgICAgICAgIGlmICghdmFsdWVTZXQuc2l6ZSkK KyAgICAgICAgICAgIHRoaXMuX21hcC5kZWxldGUoa2V5KTsKKworICAgICAgICByZXR1cm4gbmV3 IFNldChbdGFrZW5dKTsKKyAgICB9CisKICAgICBjbGVhcigpCiAgICAgewogICAgICAgICB0aGlz Ll9tYXAuY2xlYXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKaW5kZXggY2MwYzkwMTExZWY4YjY4ZTJlNTEyMDhlZDA1 OGMwOGVjNjRhZWQxMC4uNDQ2OTI0NjU0NDlhMmI1MjA5M2RiNzFhNjk4MTg2N2U5ZjEzYjM2ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGls aXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9V dGlsaXRpZXMuanMKQEAgLTE3OCwxMCArMTc4LDEyIEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShT ZXQucHJvdG90eXBlLCAidGFrZSIsCiB7CiAgICAgdmFsdWUoa2V5KQogICAgIHsKLSAgICAgICAg bGV0IGV4aXN0cyA9IHRoaXMuaGFzKGtleSk7Ci0gICAgICAgIGlmIChleGlzdHMpCisgICAgICAg IGlmICh0aGlzLmhhcyhrZXkpKSB7CiAgICAgICAgICAgICB0aGlzLmRlbGV0ZShrZXkpOwotICAg ICAgICByZXR1cm4gZXhpc3RzOworICAgICAgICAgICAgcmV0dXJuIGtleTsKKyAgICAgICAgfQor CisgICAgICAgIHJldHVybiB1bmRlZmluZWQ7CiAgICAgfQogfSk7CiAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlNWExZDE0 Yjk0MTM1NzE0ZGY3YjY1OGEyNzA2ZmFlODM1MjcxZDA2Li40OTMyZTY4MjE4ODE4ZGMxOWYzOWE1 ZDNhMzhjNWVlODBlNjBkMTNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTEtMjAgIEJy aWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaW1w bGVtZW50IE1hcC5wcm90b3R5cGUudGFrZSgpIGFuZCBmaXggU2V0LnByb3RvdHlwZS50YWtlKCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTIzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVj dG9yL3VuaXQtdGVzdHMvbXVsdGltYXAtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rv ci91bml0LXRlc3RzL211bHRpbWFwLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL3VuaXQtdGVz dHMvc2V0LXV0aWxpdGllcy5odG1sOgorCiAyMDIwLTExLTE3ICBSb2IgQnVpcyAgPHJidWlzQGln YWxpYS5jb20+CiAKICAgICAgICAgTnVsbCBjaGVjayBhbmNob3JOb2RlIG9mIGVuZGluZ1NlbGVj dGlvbiBzdGFydApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMv bXVsdGltYXAtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMv bXVsdGltYXAtZXhwZWN0ZWQudHh0CmluZGV4IDlhNWMxZDliYzdjNjJkNDUxOTgyY2MyMGQ2ZjE1 ODA2ZWUxOWI1YTUuLjNhYjBmZDg2MWQzMmUxMTUxYjU2MGE5NTBlZTk0OGU5MDZlMGRkZDAgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL211bHRpbWFwLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9tdWx0aW1hcC1l eHBlY3RlZC50eHQKQEAgLTU3LDYgKzU3LDM4IEBAIFBBU1M6IE5vdGhpbmcgd2FzIHJlbW92ZWQg Zm9yIGtleSAiYmFkZ2VyIi4KIFBBU1M6IFZhbHVlcyB3ZXJlIHJlbW92ZWQgZm9yIGtleSAib3Bv c3N1bSIuCiBbWyJyYWNjb29uIiwib3Bvc3N1bSJdXQogCistLSBSdW5uaW5nIHRlc3QgY2FzZTog TXVsdGltYXAucHJvdG90eXBlLnRha2UuU2luZ2xlS2V5QW5kVmFsdWUKK1tbMCwxXSxbMiwzXSxb Miw0XV0KK3t9CitQQVNTOiBUaGUga2V5IDAgYW5kIHRoZSB2YWx1ZSAxIHdlcmUgdGFrZW4uCitQ QVNTOiBUaGUgdGFrZW4gcmVzdWx0IGNvbnRhaW5zIHRoZSB2YWx1ZSAxLgorUEFTUzogT25seSBv bmUga2V5IHNob3VsZCByZW1haW4uCitbWzIsM10sWzIsNF1dCit7fQorUEFTUzogTm90aGluZyBz aG91bGQgaGF2ZSBiZWVuIHRha2VuLgorUEFTUzogT25seSBvbmUga2V5IHNob3VsZCByZW1haW4u CitbWzIsM10sWzIsNF1dCit7fQorUEFTUzogVGhlIGtleSAyIGFuZCB0aGUgdmFsdWUgMyB3ZXJl IHRha2VuLgorUEFTUzogVGhlIHRha2VuIHJlc3VsdCBjb250YWlucyB0aGUgdmFsdWUgMy4KK1BB U1M6IE9ubHkgb25lIGtleSBzaG91bGQgcmVtYWluLgorW1syLDRdXQore30KK1BBU1M6IFRoZSBr ZXkgMiBhbmQgdGhlIHZhbHVlIDQgd2VyZSB0YWtlbi4KK1BBU1M6IFRoZSB0YWtlbiByZXN1bHQg Y29udGFpbnMgdGhlIHZhbHVlIDQuCitQQVNTOiBObyBtb3JlIGtleXMgc2hvdWxkIHJlbWFpbi4K K1tdCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBNdWx0aW1hcC5wcm90b3R5cGUudGFrZS5BbGxW YWx1ZXNGb3JLZXkKK1tbIm9wb3NzdW0iLCJiYWRnZXIiXSxbIm9wb3NzdW0iLCJyYWNjb29uIl0s WyJyYWNjb29uIiwib3Bvc3N1bSJdXQorUEFTUzogTm90aGluZyB3YXMgcmVtb3ZlZCBmb3Iga2V5 ICJiYWRnZXIiLgorW1sib3Bvc3N1bSIsImJhZGdlciJdLFsib3Bvc3N1bSIsInJhY2Nvb24iXSxb InJhY2Nvb24iLCJvcG9zc3VtIl1dCitQQVNTOiBPbmx5IG9uZSBrZXkgc2hvdWxkIHJlbWFpbi4K K1BBU1M6IFR3byB2YWx1ZXMgZnJvbSB0aGUga2V5ICJvcG9zc3VtIiBzaG91bGQgYmUgdGFrZW4u CitQQVNTOiBSZXN1bHQgc2hvdWxkIGluY2x1ZGUgImJhZGdlciIuCitQQVNTOiBSZXN1bHQgc2hv dWxkIGluY2x1ZGUgInJhY2Nvb24iLgorW1sicmFjY29vbiIsIm9wb3NzdW0iXV0KKwogLS0gUnVu bmluZyB0ZXN0IGNhc2U6IE11bHRpbWFwLnByb3RvdHlwZS5jbGVhcgogW1sib25lIiwidHdvIl0s WyJvbmUiLCJmaXZlIl0sWyJ0aHJlZSIsImZvdXIiXSxbInRocmVlIiwic2l4Il1dCiBbXQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvbXVsdGltYXAuaHRtbCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL211bHRpbWFwLmh0bWwKaW5kZXggZDQ3 M2E4MDIyMWUzNmEyZWQ5ZWNhM2NiZjdiZGRiNDFkYjY2Yzk2ZC4uZWM3ZDBkYTA3NzlhOTUwMGI3 YWZiOWZlZGVjYTZjMjQ4YzlmMTQ5OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3VuaXQtdGVzdHMvbXVsdGltYXAuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5p dC10ZXN0cy9tdWx0aW1hcC5odG1sCkBAIC0xNjQsNiArMTY0LDc1IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICB9LAogICAgIH0pOwogCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAg ICBuYW1lOiAiTXVsdGltYXAucHJvdG90eXBlLnRha2UuU2luZ2xlS2V5QW5kVmFsdWUiLAorICAg ICAgICB0ZXN0KCkgeworICAgICAgICAgICAgbGV0IG11bHRpbWFwID0gbmV3IE11bHRpbWFwOwor ICAgICAgICAgICAgbGV0IHJlc3VsdDsKKworICAgICAgICAgICAgbXVsdGltYXAuYWRkKDAsIDEp OworICAgICAgICAgICAgbXVsdGltYXAuYWRkKDIsIDMpOworICAgICAgICAgICAgbXVsdGltYXAu YWRkKDIsIDQpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhtdWx0aW1hcCk7CisK KyAgICAgICAgICAgIHJlc3VsdCA9IG11bHRpbWFwLnRha2UoMCwgMSk7CisgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmxvZyhyZXN1bHQpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RFcXVhbChyZXN1bHQuc2l6ZSwgMSwgIlRoZSBrZXkgMCBhbmQgdGhlIHZhbHVlIDEgd2VyZSB0 YWtlbi4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChyZXN1bHQuaGFz KDEpLCAiVGhlIHRha2VuIHJlc3VsdCBjb250YWlucyB0aGUgdmFsdWUgMS4iKTsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobXVsdGltYXAuc2l6ZSwgMSwgIk9ubHkgb25l IGtleSBzaG91bGQgcmVtYWluLiIpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyht dWx0aW1hcCk7CisKKyAgICAgICAgICAgIHJlc3VsdCA9IG11bHRpbWFwLnRha2UoNSwgMSk7Cisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhyZXN1bHQpOworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RFcXVhbChyZXN1bHQuc2l6ZSwgMCwgIk5vdGhpbmcgc2hvdWxkIGhhdmUg YmVlbiB0YWtlbi4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobXVs dGltYXAuc2l6ZSwgMSwgIk9ubHkgb25lIGtleSBzaG91bGQgcmVtYWluLiIpOworCisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmxvZyhtdWx0aW1hcCk7CisKKyAgICAgICAgICAgIHJlc3VsdCA9 IG11bHRpbWFwLnRha2UoMiwgMykKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKHJlc3Vs dCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHJlc3VsdC5zaXplLCAx LCAiVGhlIGtleSAyIGFuZCB0aGUgdmFsdWUgMyB3ZXJlIHRha2VuLiIpOworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHJlc3VsdC5oYXMoMyksICJUaGUgdGFrZW4gcmVzdWx0 IGNvbnRhaW5zIHRoZSB2YWx1ZSAzLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RFcXVhbChtdWx0aW1hcC5zaXplLCAxLCAiT25seSBvbmUga2V5IHNob3VsZCByZW1haW4uIik7 CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKG11bHRpbWFwKTsKKworICAgICAgICAg ICAgcmVzdWx0ID0gbXVsdGltYXAudGFrZSgyLCA0KQorICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5sb2cocmVzdWx0KTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocmVz dWx0LnNpemUsIDEsICJUaGUga2V5IDIgYW5kIHRoZSB2YWx1ZSA0IHdlcmUgdGFrZW4uIik7Cisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocmVzdWx0Lmhhcyg0KSwgIlRoZSB0 YWtlbiByZXN1bHQgY29udGFpbnMgdGhlIHZhbHVlIDQuIik7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKG11bHRpbWFwLnNpemUsIDAsICJObyBtb3JlIGtleXMgc2hvdWxk IHJlbWFpbi4iKTsKKworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2cobXVsdGltYXApOwor ICAgICAgICB9LAorICAgIH0pOworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBu YW1lOiAiTXVsdGltYXAucHJvdG90eXBlLnRha2UuQWxsVmFsdWVzRm9yS2V5IiwKKyAgICAgICAg dGVzdCgpIHsKKyAgICAgICAgICAgIGxldCBtdWx0aW1hcCA9IG5ldyBNdWx0aW1hcDsKKworICAg ICAgICAgICAgbXVsdGltYXAuYWRkKCJvcG9zc3VtIiwgImJhZGdlciIpOworICAgICAgICAgICAg bXVsdGltYXAuYWRkKCJvcG9zc3VtIiwgInJhY2Nvb24iKTsKKyAgICAgICAgICAgIG11bHRpbWFw LmFkZCgicmFjY29vbiIsICJvcG9zc3VtIik7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu bG9nKG11bHRpbWFwKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UobXVs dGltYXAudGFrZSgiYmFkZ2VyIiksIGBOb3RoaW5nIHdhcyByZW1vdmVkIGZvciBrZXkgImJhZGdl ciIuYCk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKG11bHRpbWFwKTsKKworICAg ICAgICAgICAgbGV0IHJlc3VsdCA9IG11bHRpbWFwLnRha2UoIm9wb3NzdW0iKTsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobXVsdGltYXAuc2l6ZSwgMSwgYE9ubHkgb25l IGtleSBzaG91bGQgcmVtYWluLmApOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RF cXVhbChyZXN1bHQuc2l6ZSwgMiwgYFR3byB2YWx1ZXMgZnJvbSB0aGUga2V5ICJvcG9zc3VtIiBz aG91bGQgYmUgdGFrZW4uYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQo cmVzdWx0LmhhcygiYmFkZ2VyIiksIGBSZXN1bHQgc2hvdWxkIGluY2x1ZGUgImJhZGdlciIuYCk7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocmVzdWx0LmhhcygicmFjY29v biIpLCBgUmVzdWx0IHNob3VsZCBpbmNsdWRlICJyYWNjb29uIi5gKTsKKworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5sb2cobXVsdGltYXApOworICAgICAgICB9LAorICAgIH0pOworCiAgICAg c3VpdGUuYWRkVGVzdENhc2UoewogICAgICAgICBuYW1lOiAiTXVsdGltYXAucHJvdG90eXBlLmNs ZWFyIiwKICAgICAgICAgdGVzdCgpIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci91bml0LXRlc3RzL3NldC11dGlsaXRpZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci91 bml0LXRlc3RzL3NldC11dGlsaXRpZXMuaHRtbAppbmRleCBiN2E4ZGMwZjA0ZDc4ODYyZTE4Nzc1 NTBkNTg1ZmUzZDFkNzRhMjEwLi4zN2MyNDNiMGRhZmVhNTJkMzhmZDM1YTA3ZjdlMDU0Y2MzNDhh YjBkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRp bGl0aWVzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0 aWxpdGllcy5odG1sCkBAIC0xMDYsMTAgKzEwNiwxMCBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAg ICAgICAgICAgbGV0IHNldCA9IG5ldyBTZXQ7CiAgICAgICAgICAgICBzZXQuYWRkKGtleSk7Ci0g ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRydWUoc2V0LnRha2Uoa2V5KSwgIlNldCBj YW4gdGFrZSBga2V5YC4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwo c2V0LnRha2Uoa2V5KSwga2V5LCAiU2V0IGNhbiB0YWtlIGBrZXlgLiIpOwogICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShzZXQuaGFzKGtleSksICJTZXQgbm8gbG9uZ2VyIGhh cyBga2V5YC4iKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2Uoc2V0LnRh a2Uoa2V5KSwgIlNldCBjYW4gTk9UIHRha2UgYGtleWAuIik7Ci0gICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEZhbHNlKHNldC50YWtlKCJETkUiKSwgIlNldCBjYW4gTk9UIHRha2UgYERO RWAsIGFzIGl0IGRvZXMgTk9UIGV4aXN0LiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l eHBlY3RFcXVhbChzZXQudGFrZShrZXkpLCB1bmRlZmluZWQsICJTZXQgY2FuIE5PVCB0YWtlIGBr ZXlgLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChzZXQudGFrZSgi RE5FIiksIHVuZGVmaW5lZCwgIlNldCBjYW4gTk9UIHRha2UgYERORWAsIGFzIGl0IGRvZXMgTk9U IGV4aXN0LiIpOwogICAgICAgICB9CiAgICAgfSk7CiAK 414763 2020-11-21 09:59:39 -0800 2020-11-21 11:09:14 -0800 Revised fix bug-219231-20201121095938.patch text/plain 8933 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm NzJlYWRjODI2NjFkZmEyMmUyZDAzYmE1YTI0NWQzZTQyNTZlYjQ0Li4zNDU4OTVkZmZjODAxMTM3 Zjc4MDYzMjVjNDdiMjQ0ZTQ1ODRkYmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0xMS0yMSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBpbXBsZW1lbnQgTXVsdGltYXAucHJvdG90eXBlLnRha2Uo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MjMx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9CYXNlL011bHRpbWFwLmpzOgorICAgICAgICAoTXVsdGltYXAucHJvdG90eXBlLnRh a2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAg ICh2YWx1ZSk6CisKIDIwMjAtMTEtMTIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVuY2F1Z2h0IEV4Y2VwdGlvbjogVHlwZUVycm9y OiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAndGFyZ2V0LkRPTUFnZW50 LmhpZGVIaWdobGlnaHQnKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQmFzZS9NdWx0aW1hcC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvTXVsdGltYXAuanMKaW5kZXggM2Q2OWViMDI4ZDc5NWEzMmMxNzA3MjgyZWRj YjlkMzY0NWRmMGQ0MC4uM2VlNzIxZjU2YzY1N2U1MDBhNjdiMzRlNjhkOTBjNDdiMmRjNDE5OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NdWx0 aW1hcC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL011 bHRpbWFwLmpzCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxOCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAyMCBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTgzLDYgKzgzLDIyIEBAIGNsYXNzIE11bHRpbWFwCiAgICAgICAgIHJldHVybiBk ZWxldGVkOwogICAgIH0KIAorICAgIHRha2Uoa2V5LCB2YWx1ZSkKKyAgICB7CisgICAgICAgIC8v IEFsbG93IGFuIGVudGlyZSBrZXkgdG8gYmUgcmVtb3ZlZCBieSBub3QgcGFzc2luZyBhIHZhbHVl LgorICAgICAgICBpZiAoYXJndW1lbnRzLmxlbmd0aCA9PT0gMSkKKyAgICAgICAgICAgIHJldHVy biB0aGlzLl9tYXAudGFrZShrZXkpOworCisgICAgICAgIGxldCB2YWx1ZVNldCA9IHRoaXMuX21h cC5nZXQoa2V5KTsKKyAgICAgICAgaWYgKCF2YWx1ZVNldCkKKyAgICAgICAgICAgIHJldHVybiB1 bmRlZmluZWQ7CisKKyAgICAgICAgbGV0IHJlc3VsdCA9IHZhbHVlU2V0LnRha2UodmFsdWUpOwor ICAgICAgICBpZiAoIXZhbHVlU2V0LnNpemUpCisgICAgICAgICAgICB0aGlzLl9tYXAuZGVsZXRl KGtleSk7CisgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfQorCiAgICAgY2xlYXIoKQogICAg IHsKICAgICAgICAgdGhpcy5fbWFwLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4IGNjMGM5MDExMWVm OGI2OGUyZTUxMjA4ZWQwNThjMDhlYzY0YWVkMTAuLjQ0NjkyNDY1NDQ5YTJiNTIwOTNkYjcxYTY5 ODE4NjdlOWYxM2IzNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xNzgsMTAgKzE3OCwxMiBAQCBPYmplY3Qu ZGVmaW5lUHJvcGVydHkoU2V0LnByb3RvdHlwZSwgInRha2UiLAogewogICAgIHZhbHVlKGtleSkK ICAgICB7Ci0gICAgICAgIGxldCBleGlzdHMgPSB0aGlzLmhhcyhrZXkpOwotICAgICAgICBpZiAo ZXhpc3RzKQorICAgICAgICBpZiAodGhpcy5oYXMoa2V5KSkgewogICAgICAgICAgICAgdGhpcy5k ZWxldGUoa2V5KTsKLSAgICAgICAgcmV0dXJuIGV4aXN0czsKKyAgICAgICAgICAgIHJldHVybiBr ZXk7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gdW5kZWZpbmVkOwogICAgIH0KIH0pOwog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggYjAzNDZiZDQyMGMzY2ZjZmQxYTU3ZTQ0ZWEwZjFiMDk3N2Y2MzY1Zi4uYmZiNDQ0 ZDA1ZjJjYzEyZjQ1MzVmMzJjZmQ1NWFmMzhmNTQ1Yjg5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIwLTExLTIxICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IGltcGxlbWVudCBNdWx0aW1hcC5wcm90b3R5cGUudGFrZSgpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkyMzEKKworICAgICAg ICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10 ZXN0cy9tdWx0aW1hcC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3VuaXQtdGVz dHMvbXVsdGltYXAuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRp bGl0aWVzLmh0bWw6CisKIDIwMjAtMTEtMjAgIFRydWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZlcnQgcjI3MDEyNC4gTWFkZSB0aGUgdGVzdCB3b3JzZS4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL211bHRpbWFwLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL211bHRpbWFwLWV4cGVj dGVkLnR4dAppbmRleCA5YTVjMWQ5YmM3YzYyZDQ1MTk4MmNjMjBkNmYxNTgwNmVlMTliNWE1Li45 MmM1NDY1MDgxZDkzMTNhZmExY2ZlMmNlZTBkOTA4Yzk5NjI5NzM2IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9tdWx0aW1hcC1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvbXVsdGltYXAtZXhwZWN0ZWQudHh0CkBA IC01Nyw2ICs1NywzNSBAQCBQQVNTOiBOb3RoaW5nIHdhcyByZW1vdmVkIGZvciBrZXkgImJhZGdl ciIuCiBQQVNTOiBWYWx1ZXMgd2VyZSByZW1vdmVkIGZvciBrZXkgIm9wb3NzdW0iLgogW1sicmFj Y29vbiIsIm9wb3NzdW0iXV0KIAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IE11bHRpbWFwLnByb3Rv dHlwZS50YWtlLlNpbmdsZUtleUFuZFZhbHVlCitbWzAsMV0sWzIsM10sWzIsNF1dCisxCitQQVNT OiBUaGUga2V5IDAgYW5kIHRoZSB2YWx1ZSAxIHdlcmUgdGFrZW4uCitQQVNTOiBPbmx5IG9uZSBr ZXkgc2hvdWxkIHJlbWFpbi4KK1tbMiwzXSxbMiw0XV0KK3VuZGVmaW5lZAorUEFTUzogTm90aGlu ZyBzaG91bGQgaGF2ZSBiZWVuIHRha2VuLgorUEFTUzogT25seSBvbmUga2V5IHNob3VsZCByZW1h aW4uCitbWzIsM10sWzIsNF1dCiszCitQQVNTOiBUaGUga2V5IDIgYW5kIHRoZSB2YWx1ZSAzIHdl cmUgdGFrZW4uCitQQVNTOiBPbmx5IG9uZSBrZXkgc2hvdWxkIHJlbWFpbi4KK1tbMiw0XV0KKzQK K1BBU1M6IFRoZSBrZXkgMiBhbmQgdGhlIHZhbHVlIDQgd2VyZSB0YWtlbi4KK1BBU1M6IE5vIG1v cmUga2V5cyBzaG91bGQgcmVtYWluLgorW10KKworLS0gUnVubmluZyB0ZXN0IGNhc2U6IE11bHRp bWFwLnByb3RvdHlwZS50YWtlLkFsbFZhbHVlc0ZvcktleQorW1sib3Bvc3N1bSIsImJhZGdlciJd LFsib3Bvc3N1bSIsInJhY2Nvb24iXSxbInJhY2Nvb24iLCJvcG9zc3VtIl1dCitQQVNTOiBOb3Ro aW5nIHdhcyByZW1vdmVkIGZvciBrZXkgImJhZGdlciIuCitbWyJvcG9zc3VtIiwiYmFkZ2VyIl0s WyJvcG9zc3VtIiwicmFjY29vbiJdLFsicmFjY29vbiIsIm9wb3NzdW0iXV0KK1BBU1M6IE9ubHkg b25lIGtleSBzaG91bGQgcmVtYWluLgorUEFTUzogVHdvIHZhbHVlcyBmcm9tIHRoZSBrZXkgIm9w b3NzdW0iIHNob3VsZCBiZSB0YWtlbi4KK1BBU1M6IFJlc3VsdCBzaG91bGQgaW5jbHVkZSAiYmFk Z2VyIi4KK1BBU1M6IFJlc3VsdCBzaG91bGQgaW5jbHVkZSAicmFjY29vbiIuCitbWyJyYWNjb29u Iiwib3Bvc3N1bSJdXQorCiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogTXVsdGltYXAucHJvdG90eXBl LmNsZWFyCiBbWyJvbmUiLCJ0d28iXSxbIm9uZSIsImZpdmUiXSxbInRocmVlIiwiZm91ciJdLFsi dGhyZWUiLCJzaXgiXV0KIFtdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5p dC10ZXN0cy9tdWx0aW1hcC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMv bXVsdGltYXAuaHRtbAppbmRleCBkNDczYTgwMjIxZTM2YTJlZDllY2EzY2JmN2JkZGI0MWRiNjZj OTZkLi44YWUzZWVkMzBjMDNhYjIxYmZjYWQ3MGQ3NDRjYTJkMjVkNzgxYmQ3IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9tdWx0aW1hcC5odG1sCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL211bHRpbWFwLmh0bWwKQEAgLTE2NCw2ICsx NjQsNzIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIH0sCiAgICAgfSk7CiAKKyAgICBzdWl0 ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJNdWx0aW1hcC5wcm90b3R5cGUudGFrZS5T aW5nbGVLZXlBbmRWYWx1ZSIsCisgICAgICAgIHRlc3QoKSB7CisgICAgICAgICAgICBsZXQgbXVs dGltYXAgPSBuZXcgTXVsdGltYXA7CisgICAgICAgICAgICBsZXQgcmVzdWx0OworCisgICAgICAg ICAgICBtdWx0aW1hcC5hZGQoMCwgMSk7CisgICAgICAgICAgICBtdWx0aW1hcC5hZGQoMiwgMyk7 CisgICAgICAgICAgICBtdWx0aW1hcC5hZGQoMiwgNCk7CisKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QubG9nKG11bHRpbWFwKTsKKworICAgICAgICAgICAgcmVzdWx0ID0gbXVsdGltYXAudGFr ZSgwLCAxKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKHJlc3VsdCk7CisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHJlc3VsdCwgMSwgIlRoZSBrZXkgMCBhbmQg dGhlIHZhbHVlIDEgd2VyZSB0YWtlbi4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0RXF1YWwobXVsdGltYXAuc2l6ZSwgMSwgIk9ubHkgb25lIGtleSBzaG91bGQgcmVtYWluLiIp OworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhtdWx0aW1hcCk7CisKKyAgICAgICAg ICAgIHJlc3VsdCA9IG11bHRpbWFwLnRha2UoNSwgMSk7CisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmxvZyhyZXN1bHQpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChy ZXN1bHQsIHVuZGVmaW5lZCwgIk5vdGhpbmcgc2hvdWxkIGhhdmUgYmVlbiB0YWtlbi4iKTsKKyAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobXVsdGltYXAuc2l6ZSwgMSwgIk9u bHkgb25lIGtleSBzaG91bGQgcmVtYWluLiIpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmxvZyhtdWx0aW1hcCk7CisKKyAgICAgICAgICAgIHJlc3VsdCA9IG11bHRpbWFwLnRha2UoMiwg MykKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKHJlc3VsdCk7CisgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHJlc3VsdCwgMywgIlRoZSBrZXkgMiBhbmQgdGhlIHZh bHVlIDMgd2VyZSB0YWtlbi4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1 YWwobXVsdGltYXAuc2l6ZSwgMSwgIk9ubHkgb25lIGtleSBzaG91bGQgcmVtYWluLiIpOworCisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhtdWx0aW1hcCk7CisKKyAgICAgICAgICAgIHJl c3VsdCA9IG11bHRpbWFwLnRha2UoMiwgNCkKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9n KHJlc3VsdCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHJlc3VsdCwg NCwgIlRoZSBrZXkgMiBhbmQgdGhlIHZhbHVlIDQgd2VyZSB0YWtlbi4iKTsKKyAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobXVsdGltYXAuc2l6ZSwgMCwgIk5vIG1vcmUga2V5 cyBzaG91bGQgcmVtYWluLiIpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhtdWx0 aW1hcCk7CisgICAgICAgIH0sCisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7Cisg ICAgICAgIG5hbWU6ICJNdWx0aW1hcC5wcm90b3R5cGUudGFrZS5BbGxWYWx1ZXNGb3JLZXkiLAor ICAgICAgICB0ZXN0KCkgeworICAgICAgICAgICAgbGV0IG11bHRpbWFwID0gbmV3IE11bHRpbWFw OworCisgICAgICAgICAgICBtdWx0aW1hcC5hZGQoIm9wb3NzdW0iLCAiYmFkZ2VyIik7CisgICAg ICAgICAgICBtdWx0aW1hcC5hZGQoIm9wb3NzdW0iLCAicmFjY29vbiIpOworICAgICAgICAgICAg bXVsdGltYXAuYWRkKCJyYWNjb29uIiwgIm9wb3NzdW0iKTsKKworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5sb2cobXVsdGltYXApOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RG YWxzZShtdWx0aW1hcC50YWtlKCJiYWRnZXIiKSwgYE5vdGhpbmcgd2FzIHJlbW92ZWQgZm9yIGtl eSAiYmFkZ2VyIi5gKTsKKworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2cobXVsdGltYXAp OworCisgICAgICAgICAgICBsZXQgcmVzdWx0ID0gbXVsdGltYXAudGFrZSgib3Bvc3N1bSIpOwor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChtdWx0aW1hcC5zaXplLCAxLCBg T25seSBvbmUga2V5IHNob3VsZCByZW1haW4uYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdEVxdWFsKHJlc3VsdC5zaXplLCAyLCBgVHdvIHZhbHVlcyBmcm9tIHRoZSBrZXkgIm9w b3NzdW0iIHNob3VsZCBiZSB0YWtlbi5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0VGhhdChyZXN1bHQuaGFzKCJiYWRnZXIiKSwgYFJlc3VsdCBzaG91bGQgaW5jbHVkZSAiYmFk Z2VyIi5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChyZXN1bHQuaGFz KCJyYWNjb29uIiksIGBSZXN1bHQgc2hvdWxkIGluY2x1ZGUgInJhY2Nvb24iLmApOworCisgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZyhtdWx0aW1hcCk7CisgICAgICAgIH0sCisgICAgfSk7 CisKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJNdWx0aW1hcC5wcm90 b3R5cGUuY2xlYXIiLAogICAgICAgICB0ZXN0KCkgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGllcy5odG1sCmluZGV4IGI3YThkYzBmMDRkNzg4 NjJlMTg3NzU1MGQ1ODVmZTNkMWQ3NGEyMTAuLjM3YzI0M2IwZGFmZWE1MmQzOGZkMzVhMDdmN2Uw NTRjYzM0OGFiMGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3Rz L3NldC11dGlsaXRpZXMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0 cy9zZXQtdXRpbGl0aWVzLmh0bWwKQEAgLTEwNiwxMCArMTA2LDEwIEBAIGZ1bmN0aW9uIHRlc3Qo KQogCiAgICAgICAgICAgICBsZXQgc2V0ID0gbmV3IFNldDsKICAgICAgICAgICAgIHNldC5hZGQo a2V5KTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VHJ1ZShzZXQudGFrZShrZXkp LCAiU2V0IGNhbiB0YWtlIGBrZXlgLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RFcXVhbChzZXQudGFrZShrZXkpLCBrZXksICJTZXQgY2FuIHRha2UgYGtleWAuIik7CiAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKHNldC5oYXMoa2V5KSwgIlNldCBubyBs b25nZXIgaGFzIGBrZXlgLiIpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxz ZShzZXQudGFrZShrZXkpLCAiU2V0IGNhbiBOT1QgdGFrZSBga2V5YC4iKTsKLSAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2Uoc2V0LnRha2UoIkRORSIpLCAiU2V0IGNhbiBOT1Qg dGFrZSBgRE5FYCwgYXMgaXQgZG9lcyBOT1QgZXhpc3QuIik7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKHNldC50YWtlKGtleSksIHVuZGVmaW5lZCwgIlNldCBjYW4gTk9U IHRha2UgYGtleWAuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHNl dC50YWtlKCJETkUiKSwgdW5kZWZpbmVkLCAiU2V0IGNhbiBOT1QgdGFrZSBgRE5FYCwgYXMgaXQg ZG9lcyBOT1QgZXhpc3QuIik7CiAgICAgICAgIH0KICAgICB9KTsKIAo=