222810 2021-03-05 10:48:33 -0800 [Payment Request] if `requestShipping: false` then we should not show any `PaymentShippingOption` in the Apple Pay sheet 2021-03-05 15:29:08 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi aestes bdakin hi thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1736427 0 hi 2021-03-05 10:48:33 -0800 . 1736428 1 hi 2021-03-05 10:48:52 -0800 <rdar://problem/74550889> 1736433 2 422384 hi 2021-03-05 10:54:04 -0800 Created attachment 422384 Patch 1736469 3 422384 hi 2021-03-05 12:11:06 -0800 Comment on attachment 422384 Patch After talking with @Andy Estes, I think I want/need to tweak this to be more spec compatible. 1736481 4 422396 hi 2021-03-05 12:43:43 -0800 Created attachment 422396 Patch 1736519 5 422408 hi 2021-03-05 13:42:46 -0800 Created attachment 422408 Patch 1736529 6 422413 hi 2021-03-05 13:56:59 -0800 Created attachment 422413 Patch 1736598 7 ews-feeder 2021-03-05 15:29:07 -0800 Committed r274012: <https://commits.webkit.org/r274012> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422413. 422384 2021-03-05 10:54:04 -0800 2021-03-05 12:43:43 -0800 Patch 74550889-OpenSource.diff text/plain 3171 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlODVjZTU1NDk3MjUuLjVhNDY4M2M3ZTE5ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIxLTAzLTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBzaG91bGQgc3RpbGwgcGFyc2UgYGRhdGFg IG9uIGBQYXltZW50U2hpcHBpbmdPcHRpb25gIGV2ZW4gaWYgbm90IGByZXF1ZXN0U2hpcHBpbmdg CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4MTAK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc0NTUwODg5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXlt ZW50UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGVja0FuZENhbm9uaWNhbGl6ZURl dGFpbHMpOgorCiAyMDIxLTAzLTA0ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJlZmFjdG9yIENTU1Byb3BlcnR5QW5pbWF0aW9uIHRvIHNwZWNpZnkgZmV3 ZXIgd3JhcHBlcnMgYW5kIHVzZSB2YWx1ZSgpIGZ1bmN0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcAppbmRl eCAyM2JhNzJkMDgyYWEuLjc3NzFkZDcxOWE3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHAKQEAgLTIxMywx MSArMjEzLDExIEBAIHN0YXRpYyBFeGNlcHRpb25PcjxzdGQ6OnR1cGxlPFN0cmluZywgVmVjdG9y PFN0cmluZz4+PiBjaGVja0FuZENhbm9uaWNhbGl6ZURldGFpCiAgICAgfQogCiAgICAgU3RyaW5n IHNlbGVjdGVkU2hpcHBpbmdPcHRpb247Ci0gICAgaWYgKHJlcXVlc3RTaGlwcGluZykgewotICAg ICAgICBpZiAoZGV0YWlscy5zaGlwcGluZ09wdGlvbnMpIHsKLSAgICAgICAgICAgIEhhc2hTZXQ8 U3RyaW5nPiBzZWVuU2hpcHBpbmdPcHRpb25JRHM7Ci0gICAgICAgICAgICBib29sIGRpZExvZyA9 IGZhbHNlOwotICAgICAgICAgICAgZm9yIChhdXRvJiBzaGlwcGluZ09wdGlvbiA6ICpkZXRhaWxz LnNoaXBwaW5nT3B0aW9ucykgeworICAgIGlmIChkZXRhaWxzLnNoaXBwaW5nT3B0aW9ucykgewor ICAgICAgICBIYXNoU2V0PFN0cmluZz4gc2VlblNoaXBwaW5nT3B0aW9uSURzOworICAgICAgICBi b29sIGRpZExvZyA9IGZhbHNlOworICAgICAgICBmb3IgKGF1dG8mIHNoaXBwaW5nT3B0aW9uIDog KmRldGFpbHMuc2hpcHBpbmdPcHRpb25zKSB7CisgICAgICAgICAgICBpZiAocmVxdWVzdFNoaXBw aW5nKSB7CiAgICAgICAgICAgICAgICAgYXV0byBleGNlcHRpb24gPSBjaGVja0FuZENhbm9uaWNh bGl6ZUFtb3VudChzaGlwcGluZ09wdGlvbi5hbW91bnQpOwogICAgICAgICAgICAgICAgIGlmIChl eGNlcHRpb24uaGFzRXhjZXB0aW9uKCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBleGNl cHRpb24ucmVsZWFzZUV4Y2VwdGlvbigpOwpAQCAtMjMzLDE4ICsyMzMsMTggQEAgc3RhdGljIEV4 Y2VwdGlvbk9yPHN0ZDo6dHVwbGU8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPj4+IGNoZWNrQW5kQ2Fu b25pY2FsaXplRGV0YWkKICAgICAgICAgICAgICAgICAgICAgY29udGV4dC5hZGRDb25zb2xlTWVz c2FnZShKU0M6Ok1lc3NhZ2VTb3VyY2U6OlBheW1lbnRSZXF1ZXN0LCBKU0M6Ok1lc3NhZ2VMZXZl bDo6V2FybmluZywgIldlYktpdCBjdXJyZW50bHkgdXNlcyB0aGUgZmlyc3Qgc2hpcHBpbmcgb3B0 aW9uIGV2ZW4gaWYgb3RoZXIgc2hpcHBpbmcgb3B0aW9ucyBhcmUgbWFya2VkIGFzIHNlbGVjdGVk LiJfcyk7CiAgICAgICAgICAgICAgICAgICAgIGRpZExvZyA9IHRydWU7CiAgICAgICAgICAgICAg ICAgfQotCi0gICAgICAgICAgICAgICAgaWYgKHNoaXBwaW5nT3B0aW9uLmRhdGEpIHsKLSAgICAg ICAgICAgICAgICAgICAgYXV0byBkYXRhUmVzdWx0ID0gY2hlY2tBbmRDYW5vbmljYWxpemVEYXRh KGNvbnRleHQsIHNoaXBwaW5nT3B0aW9uKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGFS ZXN1bHQuaGFzRXhjZXB0aW9uKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZGF0 YVJlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCk7Ci0KLSAgICAgICAgICAgICAgICAgICAgc2hpcHBp bmdPcHRpb24uc2VyaWFsaXplZERhdGEgPSBkYXRhUmVzdWx0LnJlbGVhc2VSZXR1cm5WYWx1ZSgp OwotICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmIChp c1VwZGF0ZSA9PSBJc1VwZGF0ZTo6Tm8pCi0gICAgICAgICAgICBkZXRhaWxzLnNoaXBwaW5nT3B0 aW9ucyA9IHsgeyB9IH07Ci0gICAgfQorCisgICAgICAgICAgICBpZiAoc2hpcHBpbmdPcHRpb24u ZGF0YSkgeworICAgICAgICAgICAgICAgIGF1dG8gZGF0YVJlc3VsdCA9IGNoZWNrQW5kQ2Fub25p Y2FsaXplRGF0YShjb250ZXh0LCBzaGlwcGluZ09wdGlvbik7CisgICAgICAgICAgICAgICAgaWYg KGRhdGFSZXN1bHQuaGFzRXhjZXB0aW9uKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBk YXRhUmVzdWx0LnJlbGVhc2VFeGNlcHRpb24oKTsKKworICAgICAgICAgICAgICAgIHNoaXBwaW5n T3B0aW9uLnNlcmlhbGl6ZWREYXRhID0gZGF0YVJlc3VsdC5yZWxlYXNlUmV0dXJuVmFsdWUoKTsK KyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0gZWxzZSBpZiAocmVxdWVzdFNoaXBwaW5n ICYmIGlzVXBkYXRlID09IElzVXBkYXRlOjpObykKKyAgICAgICAgZGV0YWlscy5zaGlwcGluZ09w dGlvbnMgPSB7IHsgfSB9OwogCiAgICAgVmVjdG9yPFN0cmluZz4gc2VyaWFsaXplZE1vZGlmaWVy RGF0YTsKICAgICBpZiAoZGV0YWlscy5tb2RpZmllcnMpIHsK 422396 2021-03-05 12:43:43 -0800 2021-03-05 13:42:46 -0800 Patch 74550889-OpenSource.diff text/plain 2340 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlODVjZTU1NDk3MjUuLjVkMmI2ZGZlZDE5MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIxLTAzLTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxz ZWAgdGhlbiB3ZSBzaG91bGQgbm90IHNob3cgYW55IGBQYXltZW50U2hpcHBpbmdPcHRpb25gIGlu IHRoZSBBcHBsZSBQYXkgc2hlZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjgxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ1NTA4ODk+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQW5keSBFc3RlcyBhbmQgVGltIEhvcnRvbi4KKworICAgICAg ICBXaGVuIGNvbnN0cnVjdGluZyBhIGBQYXltZW50UmVxdWVzdGAsIHRoZSBzcGVjIGhhcyBsb2dp YyBmb3IgZW5zdXJpbmcgdGhhdCBgc2hpcHBpbmdPcHRpb25zYAorICAgICAgICBpcyBhbiBhcnJh eSBieSBvdmVycmlkaW5nIGBbW2RldGFpbHNdXS5zaGlwcGluZ09wdGlvbnNgIGlmIGByZXF1ZXN0 U2hpcHBpbmc6IHRydWVgIFsxXS4gSXQKKyAgICAgICAgYWxzbyB3b24ndCB1cGRhdGUgYFtbZGV0 YWlsc11dLnNoaXBwaW5nT3B0aW9uc2AgdW5sZXNzIGB1cGRhdGUuU2hpcHBpbmdPcHRpb25zYCBp cyBwcm92aWRlZAorICAgICAgICBhbmQgYHJlcXVlc3RTaGlwcGluZzogdHJ1ZWAgWzJdLiBDdXJy ZW50bHksIHRoaXMgbWVhbnMgdGhhdCBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxzZWAsIHdlCisg ICAgICAgIGRvbid0IHBlcmZvcm0gYW55IHZhbGlkYXRpb24gb2YgYFtbZGV0YWlsc11dLnNoaXBw aW5nT3B0aW9uc2AgYW5kIGV2ZW4gcHJvdmlkZSB0aGF0IGRhdGEgdG8KKyAgICAgICAgdGhlIEFw cGxlIFBheSBzaGVldC4gU2luY2UgdGhlcmUgaXMgbm8gd2F5IHRvIGxvb2sgYXQgdGhlIHNlbGVj dGVkIChvciBldmVuIHRoZSBsaXN0IG9mKQorICAgICAgICBzaGlwcGluZyBvcHRpb24gd2l0aG91 dCBgcmVxdWVzdFNoaXBwaW5nOiB0cnVlYCwgd2Ugbm93IGNsZWFyIGBbW2RldGFpbHNdXS5zaGlw cGluZ09wdGlvbnNgCisgICAgICAgIGlmIGByZXF1ZXN0U2hpcHBpbmc6IGZhbHNlYC4KKworICAg ICAgICBbMV06IGh0dHBzOi8vd3d3LnczLm9yZy9UUi9wYXltZW50LXJlcXVlc3QvI2NvbnN0cnVj dG9yCisgICAgICAgIFsyXTogaHR0cHM6Ly93d3cudzMub3JnL1RSL3BheW1lbnQtcmVxdWVzdC8j dXBkYXRlLWEtcGF5bWVudHJlcXVlc3Qtcy1kZXRhaWxzLWFsZ29yaXRobQorCisgICAgICAgICog TW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpjaGVja0FuZENhbm9uaWNhbGl6ZURldGFpbHMpOgorCiAyMDIxLTAzLTA0ICBBbnRvaW5l IFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJlZmFjdG9yIENTU1Byb3Bl cnR5QW5pbWF0aW9uIHRvIHNwZWNpZnkgZmV3ZXIgd3JhcHBlcnMgYW5kIHVzZSB2YWx1ZSgpIGZ1 bmN0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVz dC9QYXltZW50UmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1 ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcAppbmRleCAyM2JhNzJkMDgyYWEuLmVmODUyNmU5ZTdmMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50 UmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9Q YXltZW50UmVxdWVzdC5jcHAKQEAgLTI0NCw3ICsyNDQsOCBAQCBzdGF0aWMgRXhjZXB0aW9uT3I8 c3RkOjp0dXBsZTxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+Pj4gY2hlY2tBbmRDYW5vbmljYWxpemVE ZXRhaQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKGlzVXBkYXRlID09IElzVXBk YXRlOjpObykKICAgICAgICAgICAgIGRldGFpbHMuc2hpcHBpbmdPcHRpb25zID0geyB7IH0gfTsK LSAgICB9CisgICAgfSBlbHNlIGlmIChpc1VwZGF0ZSA9PSBJc1VwZGF0ZTo6Tm8pCisgICAgICAg IGRldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gV1RGOjpudWxsb3B0OwogCiAgICAgVmVjdG9yPFN0 cmluZz4gc2VyaWFsaXplZE1vZGlmaWVyRGF0YTsKICAgICBpZiAoZGV0YWlscy5tb2RpZmllcnMp IHsK 422408 2021-03-05 13:42:46 -0800 2021-03-05 13:56:59 -0800 Patch 74550889-OpenSource.diff text/plain 11379 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMmVhMWI5YTg4ZWQuLjQ4ZWI4MTFmZDVmOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIxLTAzLTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxz ZWAgdGhlbiB3ZSBzaG91bGQgbm90IHNob3cgYW55IGBQYXltZW50U2hpcHBpbmdPcHRpb25gIGlu IHRoZSBBcHBsZSBQYXkgc2hlZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjgxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ1NTA4ODk+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQW5keSBFc3RlcyBhbmQgVGltIEhvcnRvbi4KKworICAgICAg ICBXaGVuIGNvbnN0cnVjdGluZyBhIGBQYXltZW50UmVxdWVzdGAsIHRoZSBzcGVjIGhhcyBsb2dp YyBmb3IgZW5zdXJpbmcgdGhhdCBgc2hpcHBpbmdPcHRpb25zYAorICAgICAgICBpcyBhbiBhcnJh eSBieSBvdmVycmlkaW5nIGBbW2RldGFpbHNdXS5zaGlwcGluZ09wdGlvbnNgIGlmIGByZXF1ZXN0 U2hpcHBpbmc6IHRydWVgIFsxXS4gSXQKKyAgICAgICAgYWxzbyB3b24ndCB1cGRhdGUgYFtbZGV0 YWlsc11dLnNoaXBwaW5nT3B0aW9uc2AgdW5sZXNzIGB1cGRhdGUuU2hpcHBpbmdPcHRpb25zYCBp cyBwcm92aWRlZAorICAgICAgICBhbmQgYHJlcXVlc3RTaGlwcGluZzogdHJ1ZWAgWzJdLiBDdXJy ZW50bHksIHRoaXMgbWVhbnMgdGhhdCBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxzZWAsIHdlCisg ICAgICAgIGRvbid0IHBlcmZvcm0gYW55IHZhbGlkYXRpb24gb2YgYFtbZGV0YWlsc11dLnNoaXBw aW5nT3B0aW9uc2AgYW5kIGV2ZW4gcHJvdmlkZSB0aGF0IGRhdGEgdG8KKyAgICAgICAgdGhlIEFw cGxlIFBheSBzaGVldC4gU2luY2UgdGhlcmUgaXMgbm8gd2F5IHRvIGxvb2sgYXQgdGhlIHNlbGVj dGVkIChvciBldmVuIHRoZSBsaXN0IG9mKQorICAgICAgICBzaGlwcGluZyBvcHRpb24gd2l0aG91 dCBgcmVxdWVzdFNoaXBwaW5nOiB0cnVlYCwgd2Ugbm93IGNsZWFyIGBbW2RldGFpbHNdXS5zaGlw cGluZ09wdGlvbnNgCisgICAgICAgIGlmIGByZXF1ZXN0U2hpcHBpbmc6IGZhbHNlYC4KKworICAg ICAgICBbMV06IGh0dHBzOi8vd3d3LnczLm9yZy9UUi9wYXltZW50LXJlcXVlc3QvI2NvbnN0cnVj dG9yCisgICAgICAgIFsyXTogaHR0cHM6Ly93d3cudzMub3JnL1RSL3BheW1lbnQtcmVxdWVzdC8j dXBkYXRlLWEtcGF5bWVudHJlcXVlc3Qtcy1kZXRhaWxzLWFsZ29yaXRobQorCisgICAgICAgICog TW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpjaGVja0FuZENhbm9uaWNhbGl6ZURldGFpbHMpOgorCiAyMDIxLTAzLTA1ICBMYXVybyBN b3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIENhbnZhczogZHJhd0ltYWdlIHNo b3VsZCBub3JtYWxpemUgc3JjUmVjdCBiZWZvcmUgY2hlY2tpbmcgaWYgaXQncyBlbXB0eQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRS ZXF1ZXN0LmNwcAppbmRleCAyM2JhNzJkMDgyYWEuLmVmODUyNmU5ZTdmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVz dC5jcHAKQEAgLTI0NCw3ICsyNDQsOCBAQCBzdGF0aWMgRXhjZXB0aW9uT3I8c3RkOjp0dXBsZTxT dHJpbmcsIFZlY3RvcjxTdHJpbmc+Pj4gY2hlY2tBbmRDYW5vbmljYWxpemVEZXRhaQogICAgICAg ICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKGlzVXBkYXRlID09IElzVXBkYXRlOjpObykKICAg ICAgICAgICAgIGRldGFpbHMuc2hpcHBpbmdPcHRpb25zID0geyB7IH0gfTsKLSAgICB9CisgICAg fSBlbHNlIGlmIChpc1VwZGF0ZSA9PSBJc1VwZGF0ZTo6Tm8pCisgICAgICAgIGRldGFpbHMuc2hp cHBpbmdPcHRpb25zID0gV1RGOjpudWxsb3B0OwogCiAgICAgVmVjdG9yPFN0cmluZz4gc2VyaWFs aXplZE1vZGlmaWVyRGF0YTsKICAgICBpZiAoZGV0YWlscy5tb2RpZmllcnMpIHsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2 NTIwMGJhMWMzYWUuLjdkOWNmMjE4NjJkZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAz LTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVu dCBSZXF1ZXN0XSBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxzZWAgdGhlbiB3ZSBzaG91bGQgbm90 IHNob3cgYW55IGBQYXltZW50U2hpcHBpbmdPcHRpb25gIGluIHRoZSBBcHBsZSBQYXkgc2hlZXQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjgxMAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ1NTA4ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW5keSBFc3RlcyBhbmQgVGltIEhvcnRvbi4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVj dG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVzLmh0 dHBzLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC91cGRhdGVXaXRo LXNoaXBwaW5nT3B0aW9ucy5odHRwcy5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3NsL2Fw cGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLmh0bWw6CisKIDIwMjEtMDMtMDUgIFJvYmVydCBK ZW5uZXIgIDxqZW5uZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TL21hY09TIHdrMiBdIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3Byb3RvY29sL2NhbmRpZGF0ZS1l eGNoYW5nZS5odHRwcy5odG1sIGlzIGEgZmxha2V5IHRleHQgZmFpbHVyZQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1y ZXF1ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1w cm9wZXJ0aWVzLmh0dHBzLmh0bWwKaW5kZXggNjE2ODk5OTY4YTQ4Li40YzQ2OTQ3N2JmNWMgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0 L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVzLmh0dHBzLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1 ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0cHMuaHRtbApAQCAtNjgsNyArNjgsNyBAQCBsZXQg Y3VycmVudFJlcXVlc3QgPSBudWxsOwogZnVuY3Rpb24gY3JlYXRlUGF5bWVudFJlcXVlc3QoKSB7 CiAgICAgaWYgKGN1cnJlbnRSZXF1ZXN0KQogICAgICAgICBjdXJyZW50UmVxdWVzdC5hYm9ydCgp LmNhdGNoKCgpID0+IHt9KTsKLSAgICBjdXJyZW50UmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVz dChbbWV0aG9kXSwgc2ltcGxlRGV0YWlscyk7CisgICAgY3VycmVudFJlcXVlc3QgPSBuZXcgUGF5 bWVudFJlcXVlc3QoW21ldGhvZF0sIHNpbXBsZURldGFpbHMsIHtyZXF1ZXN0U2hpcHBpbmc6IHRy dWV9KTsKICAgICByZXR1cm4gY3VycmVudFJlcXVlc3Q7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvdXBkYXRlV2l0aC1zaGlwcGluZ09wdGlv bnMuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvdXBk YXRlV2l0aC1zaGlwcGluZ09wdGlvbnMuaHR0cHMuaHRtbAppbmRleCAzYmI4ZTYzZjJlYTIuLjVj YTA0ZDYyZGQ4MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVx dWVzdC91cGRhdGVXaXRoLXNoaXBwaW5nT3B0aW9ucy5odHRwcy5odG1sCisrKyBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvdXBkYXRlV2l0aC1zaGlwcGluZ09wdGlvbnMu aHR0cHMuaHRtbApAQCAtNjEsMTIgKzYxLDcgQEAgdXNlcl9hY3RpdmF0aW9uX3Rlc3QoYXN5bmMg KHRlc3QpID0+IHsKICAgICAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMubW9ja1BheW1lbnRD b29yZGluYXRvci5saW5lSXRlbXNbaV0ubGFiZWwsIGRldGFpbHNJbml0LmRpc3BsYXlJdGVtc1tp XS5sYWJlbCwgYGRpc3BsYXkgaXRlbSAke2l9IGxhYmVsIHNob3VsZCBub3QgY2hhbmdlYCk7CiAg ICAgICAgIGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3IubGlu ZUl0ZW1zW2ldLmFtb3VudCwgZGV0YWlsc0luaXQuZGlzcGxheUl0ZW1zW2ldLmFtb3VudC52YWx1 ZSwgYGRpc3BsYXkgaXRlbSAke2l9IHZhbHVlIHNob3VsZCBub3QgY2hhbmdlYCk7CiAgICAgfQot ICAgIGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3Iuc2hpcHBp bmdNZXRob2RzLmxlbmd0aCwgZGV0YWlsc0luaXQuc2hpcHBpbmdPcHRpb25zLmxlbmd0aCwgIm51 bWJlciBvZiBzaGlwcGluZyBvcHRpb25zIHNob3VsZCBub3QgY2hhbmdlIik7Ci0gICAgZm9yIChs ZXQgaSA9IDA7IGkgPCBkZXRhaWxzSW5pdC5zaGlwcGluZ09wdGlvbnMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMubW9ja1BheW1lbnRDb29yZGluYXRvci5z aGlwcGluZ01ldGhvZHNbaV0uaWRlbnRpZmllciwgZGV0YWlsc0luaXQuc2hpcHBpbmdPcHRpb25z W2ldLmlkLCBgc2hpcHBpbmcgb3B0aW9uICR7aX0gaWQgc2hvdWxkIG5vdCBjaGFuZ2VgKTsKLSAg ICAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMubW9ja1BheW1lbnRDb29yZGluYXRvci5zaGlw cGluZ01ldGhvZHNbaV0ubGFiZWwsIGRldGFpbHNJbml0LnNoaXBwaW5nT3B0aW9uc1tpXS5sYWJl bCwgYHNoaXBwaW5nIG9wdGlvbiAke2l9IGxhYmVsIHNob3VsZCBub3QgY2hhbmdlYCk7Ci0gICAg ICAgIGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3Iuc2hpcHBp bmdNZXRob2RzW2ldLmFtb3VudCwgZGV0YWlsc0luaXQuc2hpcHBpbmdPcHRpb25zW2ldLmFtb3Vu dC52YWx1ZSwgYHNoaXBwaW5nIG9wdGlvbiAke2l9IGFtb3VudCBzaG91bGQgbm90IGNoYW5nZWAp OwotICAgIH0KKyAgICBhc3NlcnRfZXF1YWxzKGludGVybmFscy5tb2NrUGF5bWVudENvb3JkaW5h dG9yLnNoaXBwaW5nTWV0aG9kcy5sZW5ndGgsIDAsICJudW1iZXIgb2Ygc2hpcHBpbmcgb3B0aW9u cyBzaG91bGQgbm90IGNoYW5nZSIpOwogICAgIGFzc2VydF9lcXVhbHMocmVxdWVzdC5zaGlwcGlu Z09wdGlvbiwgbnVsbCwgInNlbGVjdGVkIHNoaXBwaW5nIG9wdGlvbiBzaG91bGQgbm90IGJlIGV4 cG9zZWQgb24gdGhlIHJlcXVlc3QiKTsKICAgICBhc3NlcnRfZXF1YWxzKHJlc3BvbnNlLnNoaXBw aW5nT3B0aW9uLCBudWxsLCAic2VsZWN0ZWQgc2hpcHBpbmcgb3B0aW9uIHNob3VsZCBub3QgYmUg ZXhwb3NlZCBvbiB0aGUgcmVzcG9uc2UiKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaHR0cHMuaHRtbCBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLmh0bWwKaW5k ZXggNDgxMWUzMTljZjY4Li5mY2RmZjAwYTlhMGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaHR0cHMuaHRt bApAQCAtMjA1LDE4ICsyMDUsMTggQEAgYXN5bmMgZnVuY3Rpb24gZ28oKSB7CiAKICAgICBkZWJ1 ZygiVGVzdGluZyBQYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMiKQogICAgIGRlYnVnKCIi KTsKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBh eW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9ICcnOyIsICJu ZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMp IikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBh eW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9ICdpbnZhbGlk JzsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnRE ZXRhaWxzKSIpCi0gICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0g dmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBu dWxsOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVu dERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMg PSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9 IDc7IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50 RGV0YWlscykiKQotICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9 IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0g eyB9OyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVu dERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMg PSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9 IFt7IH1dOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5 bWVudERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFp bHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9u cyA9IFt7IGFtb3VudDogJycsIH1dOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVu dE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJv dygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxz LnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogJycsIGRldGFpbDogJycgfV07IiwgIm5ldyBQ YXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykiKQot ICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVu dERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAn JywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycgfV07IiwgIm5ldyBQYXltZW50UmVxdWVzdChb dmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykiKQotICAgIGF3YWl0IGxvZ0Fu ZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5 bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAnJywgZGV0YWlsOiAnJywg aWRlbnRpZmllcjogJycsIGxhYmVsOiAnJyB9XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxp ZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSIpCi0gICAgYXdhaXQgbG9nQW5kU2hv dWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50 RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBbeyBhbW91bnQ6ICctMScsIGRldGFpbDogJycsIGlk ZW50aWZpZXI6ICcnLCBsYWJlbDogJycgfV07IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQ YXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykiKQotICAgIGF3YWl0IGxvZ0FuZFNob3Vs ZFJlamVjdCgicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnRE ZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBjdXJyZW5jeTogJ0VVUicsIHZh bHVlOiAnMTAuMDAnIH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOyByZXF1ZXN0ID0gbmV3IFBheW1l bnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSIsICJyZXF1 ZXN0LnNob3coKSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxz ID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMg PSAnJzsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1l bnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQorICAgIGF3YWl0IGxvZ0FuZFNo b3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVu dERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gJ2ludmFsaWQnOyIsICJuZXcgUGF5bWVudFJlcXVl c3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHtyZXF1ZXN0U2hpcHBp bmc6IHRydWV9KSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxz ID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMg PSBudWxsOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5 bWVudERldGFpbHMsIHtyZXF1ZXN0U2hpcHBpbmc6IHRydWV9KSIpCisgICAgYXdhaXQgbG9nQW5k U2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXlt ZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSA3OyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3Zh bGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHtyZXF1ZXN0U2hpcHBpbmc6IHRy dWV9KSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFs aWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSB7IH07 IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0 YWlscywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIikKKyAgICBhd2FpdCBsb2dBbmRTaG91bGRU aHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRh aWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IH1dOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlk UGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHtyZXF1ZXN0U2hpcHBpbmc6IHRydWV9 KSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQ YXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBbeyBhbW91 bnQ6ICcnLCB9XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0s IHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQorICAgIGF3YWl0IGxv Z0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsg cGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAnJywgZGV0YWlsOiAn JyB9XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1l bnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQorICAgIGF3YWl0IGxvZ0FuZFNo b3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVu dERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAnJywgZGV0YWlsOiAnJywgaWRl bnRpZmllcjogJycgfV07IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9k KCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIikKKyAgICBhd2Fp dCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxz KCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogJycsIGRldGFp bDogJycsIGlkZW50aWZpZXI6ICcnLCBsYWJlbDogJycgfV07IiwgIm5ldyBQYXltZW50UmVxdWVz dChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGlu ZzogdHJ1ZX0pIikKKyAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMg PSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9 IFt7IGFtb3VudDogJy0xJywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycsIGxhYmVsOiAnJyB9 XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnRE ZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQorICAgIGF3YWl0IGxvZ0FuZFNob3Vs ZFJlamVjdCgicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnRE ZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBjdXJyZW5jeTogJ0VVUicsIHZh bHVlOiAnMTAuMDAnIH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOyByZXF1ZXN0ID0gbmV3IFBheW1l bnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVz dFNoaXBwaW5nOiB0cnVlfSkiLCAicmVxdWVzdC5zaG93KCkiKQogCiAgICAgZGVidWcoIlRlc3Rp bmcgUGF5bWVudE9wdGlvbnMiKQogICAgIGRlYnVnKCIiKTsK 422413 2021-03-05 13:56:59 -0800 2021-03-05 15:29:08 -0800 Patch 74550889-OpenSource.diff text/plain 18969 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NTIwMGJhMWMzYWUuLmVmYzQyYTg0ZWViNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDIxLTAzLTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAg ICBbUGF5bWVudCBSZXF1ZXN0XSBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxzZWAgdGhlbiB3ZSBz aG91bGQgbm90IHNob3cgYW55IGBQYXltZW50U2hpcHBpbmdPcHRpb25gIGluIHRoZSBBcHBsZSBQ YXkgc2hlZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMjgxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ1NTA4ODk+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQW5keSBFc3RlcyBhbmQgVGltIEhvcnRvbi4KKworICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9w ZXJ0aWVzLmh0dHBzLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVu dHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0cHMtZXhwZWN0 ZWQudHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvdXBkYXRlV2l0aC1z aGlwcGluZ09wdGlvbnMuaHR0cHMuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NzbC9hcHBs ZXBheS9QYXltZW50UmVxdWVzdC5odHRwcy5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3Ns L2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0wMy0w NSAgUm9iZXJ0IEplbm5lciAgPGplbm5lckBhcHBsZS5jb20+CiAKICAgICAgICAgWyBpT1MvbWFj T1Mgd2syIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvcHJvdG9jb2wv Y2FuZGlkYXRlLWV4Y2hhbmdlLmh0dHBzLmh0bWwgaXMgYSBmbGFrZXkgdGV4dCBmYWlsdXJlCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9wYXltZW50cmVxdWVz dC9wYXltZW50LXJlcXVlc3QtaW50ZXJuYWwtcHJvcGVydGllcy5odHRwcy1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9wYXltZW50cmVxdWVzdC9wYXltZW50 LXJlcXVlc3QtaW50ZXJuYWwtcHJvcGVydGllcy5odHRwcy1leHBlY3RlZC50eHQKaW5kZXggMGRh ZDZlMmExOGE3Li4xNjRiOTBjZjU4NzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9w ZXJ0aWVzLmh0dHBzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtaW50ZXJuYWwtcHJvcGVydGll cy5odHRwcy1leHBlY3RlZC50eHQKQEAgLTEsMyArMSw0IEBACitDT05TT0xFIE1FU1NBR0U6IFdl YktpdCBjdXJyZW50bHkgdXNlcyB0aGUgZmlyc3Qgc2hpcHBpbmcgb3B0aW9uIGV2ZW4gaWYgb3Ro ZXIgc2hpcHBpbmcgb3B0aW9ucyBhcmUgbWFya2VkIGFzIHNlbGVjdGVkLgogSW50ZXJuYWwgcHJv cGVydGllcyBvZiBhIFBheW1lbnRSZXF1ZXN0LgogCiAKQEAgLTc4LDcgKzc5LDcgQEAgSU5URVJO QUwgUFJPUEVSVFk6IG9wdGlvbnM6IHsKICAgInJlcXVlc3RQYXllck5hbWUiOiBmYWxzZSwKICAg InJlcXVlc3RQYXllckVtYWlsIjogZmFsc2UsCiAgICJyZXF1ZXN0UGF5ZXJQaG9uZSI6IGZhbHNl LAotICAicmVxdWVzdFNoaXBwaW5nIjogZmFsc2UsCisgICJyZXF1ZXN0U2hpcHBpbmciOiB0cnVl LAogICAic2hpcHBpbmdUeXBlIjogInNoaXBwaW5nIgogfQogCkBAIC05NCwxMyArOTUsMTQgQEAg SU5URVJOQUwgUFJPUEVSVFk6IGRldGFpbHM6IHsKICAgICB9LAogICAgICJwZW5kaW5nIjogZmFs c2UKICAgfSwKKyAgInNoaXBwaW5nT3B0aW9ucyI6IFtdLAogICAibW9kaWZpZXJzIjogW10KIH0K IElOVEVSTkFMIFBST1BFUlRZOiBvcHRpb25zOiB7CiAgICJyZXF1ZXN0UGF5ZXJOYW1lIjogZmFs c2UsCiAgICJyZXF1ZXN0UGF5ZXJFbWFpbCI6IGZhbHNlLAogICAicmVxdWVzdFBheWVyUGhvbmUi OiBmYWxzZSwKLSAgInJlcXVlc3RTaGlwcGluZyI6IGZhbHNlLAorICAicmVxdWVzdFNoaXBwaW5n IjogdHJ1ZSwKICAgInNoaXBwaW5nVHlwZSI6ICJzaGlwcGluZyIKIH0KIApAQCAtMTE2LDEzICsx MTgsMTQgQEAgSU5URVJOQUwgUFJPUEVSVFk6IGRldGFpbHM6IHsKICAgICB9LAogICAgICJwZW5k aW5nIjogZmFsc2UKICAgfSwKKyAgInNoaXBwaW5nT3B0aW9ucyI6IFtdLAogICAibW9kaWZpZXJz IjogW10KIH0KIElOVEVSTkFMIFBST1BFUlRZOiBvcHRpb25zOiB7CiAgICJyZXF1ZXN0UGF5ZXJO YW1lIjogZmFsc2UsCiAgICJyZXF1ZXN0UGF5ZXJFbWFpbCI6IGZhbHNlLAogICAicmVxdWVzdFBh eWVyUGhvbmUiOiBmYWxzZSwKLSAgInJlcXVlc3RTaGlwcGluZyI6IGZhbHNlLAorICAicmVxdWVz dFNoaXBwaW5nIjogdHJ1ZSwKICAgInNoaXBwaW5nVHlwZSI6ICJzaGlwcGluZyIKIH0KIApAQCAt MTM4LDEzICsxNDEsMTQgQEAgSU5URVJOQUwgUFJPUEVSVFk6IGRldGFpbHM6IHsKICAgICB9LAog ICAgICJwZW5kaW5nIjogZmFsc2UKICAgfSwKKyAgInNoaXBwaW5nT3B0aW9ucyI6IFtdLAogICAi bW9kaWZpZXJzIjogW10KIH0KIElOVEVSTkFMIFBST1BFUlRZOiBvcHRpb25zOiB7CiAgICJyZXF1 ZXN0UGF5ZXJOYW1lIjogZmFsc2UsCiAgICJyZXF1ZXN0UGF5ZXJFbWFpbCI6IGZhbHNlLAogICAi cmVxdWVzdFBheWVyUGhvbmUiOiBmYWxzZSwKLSAgInJlcXVlc3RTaGlwcGluZyI6IGZhbHNlLAor ICAicmVxdWVzdFNoaXBwaW5nIjogdHJ1ZSwKICAgInNoaXBwaW5nVHlwZSI6ICJzaGlwcGluZyIK IH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVu dHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0cHMuaHRtbCBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQt cmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVzLmh0dHBzLmh0bWwKaW5kZXggNjE2ODk5OTY4YTQ4 Li4yMTQ0MTVmMGZkNjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj dG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVzLmh0 dHBzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJl cXVlc3QvcGF5bWVudC1yZXF1ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0cHMuaHRtbApAQCAt NjgsMTIgKzY4LDEyIEBAIGxldCBjdXJyZW50UmVxdWVzdCA9IG51bGw7CiBmdW5jdGlvbiBjcmVh dGVQYXltZW50UmVxdWVzdCgpIHsKICAgICBpZiAoY3VycmVudFJlcXVlc3QpCiAgICAgICAgIGN1 cnJlbnRSZXF1ZXN0LmFib3J0KCkuY2F0Y2goKCkgPT4ge30pOwotICAgIGN1cnJlbnRSZXF1ZXN0 ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFttZXRob2RdLCBzaW1wbGVEZXRhaWxzKTsKKyAgICBjdXJy ZW50UmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVzdChbbWV0aG9kXSwgc2ltcGxlRGV0YWlscywg e3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pOwogICAgIHJldHVybiBjdXJyZW50UmVxdWVzdDsKIH0K IAogZnVuY3Rpb24gdHJpZ2dlckxhcmdlUGF5bWVudFJlcXVlc3QoKSB7Ci0gICAgbGV0IHJlcXVl c3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW21ldGhvZF0sIGxhcmdlRGV0YWlscyk7CisgICAgbGV0 IHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW21ldGhvZF0sIGxhcmdlRGV0YWlscywge3Jl cXVlc3RTaGlwcGluZzogdHJ1ZX0pOwogICAgIFByb21pc2UucmVzb2x2ZSgpLnRoZW4oKCkgPT4g eyBUZXN0UGFnZS5kaXNwYXRjaEV2ZW50VG9Gcm9udGVuZCgiQ29udGludWUiKTsgfSk7CiAgICAg cmV0dXJuIHJlcXVlc3Q7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Bh eW1lbnRyZXF1ZXN0L3VwZGF0ZVdpdGgtc2hpcHBpbmdPcHRpb25zLmh0dHBzLmh0bWwgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3VwZGF0ZVdpdGgtc2hpcHBpbmdPcHRp b25zLmh0dHBzLmh0bWwKaW5kZXggM2JiOGU2M2YyZWEyLi41Y2EwNGQ2MmRkODIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvdXBkYXRlV2l0aC1zaGlw cGluZ09wdGlvbnMuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1l bnRyZXF1ZXN0L3VwZGF0ZVdpdGgtc2hpcHBpbmdPcHRpb25zLmh0dHBzLmh0bWwKQEAgLTYxLDEy ICs2MSw3IEBAIHVzZXJfYWN0aXZhdGlvbl90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CiAgICAgICAg IGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3IubGluZUl0ZW1z W2ldLmxhYmVsLCBkZXRhaWxzSW5pdC5kaXNwbGF5SXRlbXNbaV0ubGFiZWwsIGBkaXNwbGF5IGl0 ZW0gJHtpfSBsYWJlbCBzaG91bGQgbm90IGNoYW5nZWApOwogICAgICAgICBhc3NlcnRfZXF1YWxz KGludGVybmFscy5tb2NrUGF5bWVudENvb3JkaW5hdG9yLmxpbmVJdGVtc1tpXS5hbW91bnQsIGRl dGFpbHNJbml0LmRpc3BsYXlJdGVtc1tpXS5hbW91bnQudmFsdWUsIGBkaXNwbGF5IGl0ZW0gJHtp fSB2YWx1ZSBzaG91bGQgbm90IGNoYW5nZWApOwogICAgIH0KLSAgICBhc3NlcnRfZXF1YWxzKGlu dGVybmFscy5tb2NrUGF5bWVudENvb3JkaW5hdG9yLnNoaXBwaW5nTWV0aG9kcy5sZW5ndGgsIGRl dGFpbHNJbml0LnNoaXBwaW5nT3B0aW9ucy5sZW5ndGgsICJudW1iZXIgb2Ygc2hpcHBpbmcgb3B0 aW9ucyBzaG91bGQgbm90IGNoYW5nZSIpOwotICAgIGZvciAobGV0IGkgPSAwOyBpIDwgZGV0YWls c0luaXQuc2hpcHBpbmdPcHRpb25zLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgIGFzc2VydF9lcXVh bHMoaW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3Iuc2hpcHBpbmdNZXRob2RzW2ldLmlk ZW50aWZpZXIsIGRldGFpbHNJbml0LnNoaXBwaW5nT3B0aW9uc1tpXS5pZCwgYHNoaXBwaW5nIG9w dGlvbiAke2l9IGlkIHNob3VsZCBub3QgY2hhbmdlYCk7Ci0gICAgICAgIGFzc2VydF9lcXVhbHMo aW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3Iuc2hpcHBpbmdNZXRob2RzW2ldLmxhYmVs LCBkZXRhaWxzSW5pdC5zaGlwcGluZ09wdGlvbnNbaV0ubGFiZWwsIGBzaGlwcGluZyBvcHRpb24g JHtpfSBsYWJlbCBzaG91bGQgbm90IGNoYW5nZWApOwotICAgICAgICBhc3NlcnRfZXF1YWxzKGlu dGVybmFscy5tb2NrUGF5bWVudENvb3JkaW5hdG9yLnNoaXBwaW5nTWV0aG9kc1tpXS5hbW91bnQs IGRldGFpbHNJbml0LnNoaXBwaW5nT3B0aW9uc1tpXS5hbW91bnQudmFsdWUsIGBzaGlwcGluZyBv cHRpb24gJHtpfSBhbW91bnQgc2hvdWxkIG5vdCBjaGFuZ2VgKTsKLSAgICB9CisgICAgYXNzZXJ0 X2VxdWFscyhpbnRlcm5hbHMubW9ja1BheW1lbnRDb29yZGluYXRvci5zaGlwcGluZ01ldGhvZHMu bGVuZ3RoLCAwLCAibnVtYmVyIG9mIHNoaXBwaW5nIG9wdGlvbnMgc2hvdWxkIG5vdCBjaGFuZ2Ui KTsKICAgICBhc3NlcnRfZXF1YWxzKHJlcXVlc3Quc2hpcHBpbmdPcHRpb24sIG51bGwsICJzZWxl Y3RlZCBzaGlwcGluZyBvcHRpb24gc2hvdWxkIG5vdCBiZSBleHBvc2VkIG9uIHRoZSByZXF1ZXN0 Iik7CiAgICAgYXNzZXJ0X2VxdWFscyhyZXNwb25zZS5zaGlwcGluZ09wdGlvbiwgbnVsbCwgInNl bGVjdGVkIHNoaXBwaW5nIG9wdGlvbiBzaG91bGQgbm90IGJlIGV4cG9zZWQgb24gdGhlIHJlc3Bv bnNlIik7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5 L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLWV4cGVjdGVkLnR4dAppbmRleCA3 MTljMGZmM2I4YTguLjdkODIwMDRiMDVmYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaHR0cHMtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBz LWV4cGVjdGVkLnR4dApAQCAtMjc2LDM5ICsyNzYsMzkgQEAgUEFTUyByZXF1ZXN0LnNob3coKSBy ZWplY3RlZCBwcm9taXNlICB3aXRoIFR5cGVFcnJvcjogIkVVUiIgZG9lcyBub3QgbWF0Y2ggdGhl IGUKIFRlc3RpbmcgUGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zCiAKIFNFVFVQOiBwYXlt ZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBp bmdPcHRpb25zID0gJyc7Ci1QQVNTIG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0 aG9kKCldLCBwYXltZW50RGV0YWlscykgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVmFsdWUg aXMgbm90IGEgc2VxdWVuY2UuCitQQVNTIG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50 TWV0aG9kKCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIHRocmV3 IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFZhbHVlIGlzIG5vdCBhIHNlcXVlbmNlLgogCiBTRVRVUDog cGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNo aXBwaW5nT3B0aW9ucyA9ICdpbnZhbGlkJzsKLVBBU1MgbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxp ZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSB0aHJldyBleGNlcHRpb24gVHlwZUVy cm9yOiBWYWx1ZSBpcyBub3QgYSBzZXF1ZW5jZS4KK1BBU1MgbmV3IFBheW1lbnRSZXF1ZXN0KFt2 YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0 cnVlfSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVmFsdWUgaXMgbm90IGEgc2VxdWVuY2Uu CiAKIFNFVFVQOiBwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVu dERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gbnVsbDsKLVBBU1MgbmV3IFBheW1lbnRSZXF1ZXN0 KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSB0aHJldyBleGNlcHRpb24g VHlwZUVycm9yOiBWYWx1ZSBpcyBub3QgYSBzZXF1ZW5jZS4KK1BBU1MgbmV3IFBheW1lbnRSZXF1 ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBw aW5nOiB0cnVlfSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVmFsdWUgaXMgbm90IGEgc2Vx dWVuY2UuCiAKIFNFVFVQOiBwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsg cGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gNzsKLVBBU1MgbmV3IFBheW1lbnRSZXF1 ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSB0aHJldyBleGNlcHRp b24gVHlwZUVycm9yOiBWYWx1ZSBpcyBub3QgYSBzZXF1ZW5jZS4KK1BBU1MgbmV3IFBheW1lbnRS ZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNo aXBwaW5nOiB0cnVlfSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVmFsdWUgaXMgbm90IGEg c2VxdWVuY2UuCiAKIFNFVFVQOiBwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMo KTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0geyB9OwotUEFTUyBuZXcgUGF5bWVu dFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIHRocmV3IGV4 Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCitQQVNTIG5ldyBQYXltZW50UmVxdWVzdChb dmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzog dHJ1ZX0pIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCiAKIFNFVFVQOiBw YXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hp cHBpbmdPcHRpb25zID0gW3sgfV07Ci1QQVNTIG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXlt ZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjog TWVtYmVyIFBheW1lbnRTaGlwcGluZ09wdGlvbi5hbW91bnQgaXMgcmVxdWlyZWQgYW5kIG11c3Qg YmUgYW4gaW5zdGFuY2Ugb2YgUGF5bWVudEN1cnJlbmN5QW1vdW50LgorUEFTUyBuZXcgUGF5bWVu dFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHtyZXF1ZXN0 U2hpcHBpbmc6IHRydWV9KSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBNZW1iZXIgUGF5bWVu dFNoaXBwaW5nT3B0aW9uLmFtb3VudCBpcyByZXF1aXJlZCBhbmQgbXVzdCBiZSBhbiBpbnN0YW5j ZSBvZiBQYXltZW50Q3VycmVuY3lBbW91bnQuCiAKIFNFVFVQOiBwYXltZW50RGV0YWlscyA9IHZh bGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sg YW1vdW50OiAnJywgfV07Ci1QQVNTIG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0 aG9kKCldLCBwYXltZW50RGV0YWlscykgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBl cnJvci4KK1BBU1MgbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBh eW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkgdGhyZXcgZXhjZXB0aW9uIFR5 cGVFcnJvcjogVHlwZSBlcnJvci4KIAogU0VUVVA6IHBheW1lbnREZXRhaWxzID0gdmFsaWRQYXlt ZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBbeyBhbW91bnQ6 ICcnLCBkZXRhaWw6ICcnIH1dOwotUEFTUyBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVu dE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5 cGUgZXJyb3IuCitQQVNTIG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCld LCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIHRocmV3IGV4Y2VwdGlv biBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCiAKIFNFVFVQOiBwYXltZW50RGV0YWlscyA9IHZhbGlk UGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1v dW50OiAnJywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycgfV07Ci1QQVNTIG5ldyBQYXltZW50 UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykgdGhyZXcgZXhj ZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KK1BBU1MgbmV3IFBheW1lbnRSZXF1ZXN0KFt2 YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0 cnVlfSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KIAogU0VUVVA6IHBh eW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlw cGluZ09wdGlvbnMgPSBbeyBhbW91bnQ6ICcnLCBkZXRhaWw6ICcnLCBpZGVudGlmaWVyOiAnJywg bGFiZWw6ICcnIH1dOwotUEFTUyBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhv ZCgpXSwgcGF5bWVudERldGFpbHMpIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJy b3IuCitQQVNTIG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXlt ZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIHRocmV3IGV4Y2VwdGlvbiBUeXBl RXJyb3I6IFR5cGUgZXJyb3IuCiAKIFNFVFVQOiBwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVu dERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAn LTEnLCBkZXRhaWw6ICcnLCBpZGVudGlmaWVyOiAnJywgbGFiZWw6ICcnIH1dOwotUEFTUyBuZXcg UGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIHRo cmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCitQQVNTIG5ldyBQYXltZW50UmVx dWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlw cGluZzogdHJ1ZX0pIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCiAKLVNF VFVQOiBwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFp bHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiB7IGN1cnJlbmN5OiAnRVVSJywgdmFsdWU6 ICcxMC4wMCcgfSwgaWQ6ICcnLCBsYWJlbDogJycgfV07IHJlcXVlc3QgPSBuZXcgUGF5bWVudFJl cXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpCitTRVRVUDogcGF5 bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBw aW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBjdXJyZW5jeTogJ0VVUicsIHZhbHVlOiAnMTAuMDAn IH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOyByZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2 YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0 cnVlfSkKIFBBU1MgcmVxdWVzdC5zaG93KCkgcmVqZWN0ZWQgcHJvbWlzZSAgd2l0aCBUeXBlRXJy b3I6ICJFVVIiIGRvZXMgbm90IG1hdGNoIHRoZSBleHBlY3RlZCBjdXJyZW5jeSBvZiAiVVNEIi4g QXBwbGUgUGF5IHJlcXVpcmVzIGFsbCBQYXltZW50Q3VycmVuY3lBbW91bnRzIHRvIHVzZSB0aGUg c2FtZSBjdXJyZW5jeSBjb2RlLi4KIFRlc3RpbmcgUGF5bWVudE9wdGlvbnMKIApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaHR0 cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1 ZXN0Lmh0dHBzLmh0bWwKaW5kZXggNDgxMWUzMTljZjY4Li5mY2RmZjAwYTlhMGYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0 dHBzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVu dFJlcXVlc3QuaHR0cHMuaHRtbApAQCAtMjA1LDE4ICsyMDUsMTggQEAgYXN5bmMgZnVuY3Rpb24g Z28oKSB7CiAKICAgICBkZWJ1ZygiVGVzdGluZyBQYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlv bnMiKQogICAgIGRlYnVnKCIiKTsKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVu dERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5n T3B0aW9ucyA9ICcnOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgp XSwgcGF5bWVudERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVu dERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5n T3B0aW9ucyA9ICdpbnZhbGlkJzsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRN ZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSIpCi0gICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3co InBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5z aGlwcGluZ09wdGlvbnMgPSBudWxsOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVu dE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJv dygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxz LnNoaXBwaW5nT3B0aW9ucyA9IDc7IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50 TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykiKQotICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93 KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMu c2hpcHBpbmdPcHRpb25zID0geyB9OyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVu dE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJv dygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxz LnNoaXBwaW5nT3B0aW9ucyA9IFt7IH1dOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5 bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRU aHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRh aWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogJycsIH1dOyIsICJuZXcgUGF5bWVudFJl cXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpIikKLSAgICBhd2Fp dCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxz KCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogJycsIGRldGFp bDogJycgfV07IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBw YXltZW50RGV0YWlscykiKQotICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0 YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRp b25zID0gW3sgYW1vdW50OiAnJywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycgfV07IiwgIm5l dyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscyki KQotICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5 bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50 OiAnJywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycsIGxhYmVsOiAnJyB9XTsiLCAibmV3IFBh eW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKSIpCi0g ICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50 RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBbeyBhbW91bnQ6ICct MScsIGRldGFpbDogJycsIGlkZW50aWZpZXI6ICcnLCBsYWJlbDogJycgfV07IiwgIm5ldyBQYXlt ZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscykiKQotICAg IGF3YWl0IGxvZ0FuZFNob3VsZFJlamVjdCgicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnRE ZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBj dXJyZW5jeTogJ0VVUicsIHZhbHVlOiAnMTAuMDAnIH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOyBy ZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1l bnREZXRhaWxzKSIsICJyZXF1ZXN0LnNob3coKSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhy b3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWls cy5zaGlwcGluZ09wdGlvbnMgPSAnJzsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1l bnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQor ICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVu dERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gJ2ludmFsaWQnOyIs ICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFp bHMsIHtyZXF1ZXN0U2hpcHBpbmc6IHRydWV9KSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhy b3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWls cy5zaGlwcGluZ09wdGlvbnMgPSBudWxsOyIsICJuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5 bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHtyZXF1ZXN0U2hpcHBpbmc6IHRydWV9KSIp CisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXlt ZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSA3OyIsICJuZXcg UGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHty ZXF1ZXN0U2hpcHBpbmc6IHRydWV9KSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBh eW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlw cGluZ09wdGlvbnMgPSB7IH07IiwgIm5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0 aG9kKCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIikKKyAgICBh d2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRh aWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IH1dOyIsICJuZXcgUGF5 bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMsIHtyZXF1 ZXN0U2hpcHBpbmc6IHRydWV9KSIpCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkVGhyb3coInBheW1l bnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGlu Z09wdGlvbnMgPSBbeyBhbW91bnQ6ICcnLCB9XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxp ZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVl fSkiKQorICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlk UGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1v dW50OiAnJywgZGV0YWlsOiAnJyB9XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1l bnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQor ICAgIGF3YWl0IGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVu dERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAn JywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycgfV07IiwgIm5ldyBQYXltZW50UmVxdWVzdChb dmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscywge3JlcXVlc3RTaGlwcGluZzog dHJ1ZX0pIikKKyAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2 YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7 IGFtb3VudDogJycsIGRldGFpbDogJycsIGlkZW50aWZpZXI6ICcnLCBsYWJlbDogJycgfV07Iiwg Im5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWls cywge3JlcXVlc3RTaGlwcGluZzogdHJ1ZX0pIikKKyAgICBhd2FpdCBsb2dBbmRTaG91bGRUaHJv dygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxz LnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogJy0xJywgZGV0YWlsOiAnJywgaWRlbnRpZmll cjogJycsIGxhYmVsOiAnJyB9XTsiLCAibmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRN ZXRob2QoKV0sIHBheW1lbnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiKQorICAg IGF3YWl0IGxvZ0FuZFNob3VsZFJlamVjdCgicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnRE ZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBj dXJyZW5jeTogJ0VVUicsIHZhbHVlOiAnMTAuMDAnIH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOyBy ZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1l bnREZXRhaWxzLCB7cmVxdWVzdFNoaXBwaW5nOiB0cnVlfSkiLCAicmVxdWVzdC5zaG93KCkiKQog CiAgICAgZGVidWcoIlRlc3RpbmcgUGF5bWVudE9wdGlvbnMiKQogICAgIGRlYnVnKCIiKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCBiMmVhMWI5YTg4ZWQuLjQ4ZWI4MTFmZDVmOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI2IEBACisyMDIxLTAzLTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K KworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxzZWAg dGhlbiB3ZSBzaG91bGQgbm90IHNob3cgYW55IGBQYXltZW50U2hpcHBpbmdPcHRpb25gIGluIHRo ZSBBcHBsZSBQYXkgc2hlZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMjgxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ1NTA4ODk+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQW5keSBFc3RlcyBhbmQgVGltIEhvcnRvbi4KKworICAgICAgICBX aGVuIGNvbnN0cnVjdGluZyBhIGBQYXltZW50UmVxdWVzdGAsIHRoZSBzcGVjIGhhcyBsb2dpYyBm b3IgZW5zdXJpbmcgdGhhdCBgc2hpcHBpbmdPcHRpb25zYAorICAgICAgICBpcyBhbiBhcnJheSBi eSBvdmVycmlkaW5nIGBbW2RldGFpbHNdXS5zaGlwcGluZ09wdGlvbnNgIGlmIGByZXF1ZXN0U2hp cHBpbmc6IHRydWVgIFsxXS4gSXQKKyAgICAgICAgYWxzbyB3b24ndCB1cGRhdGUgYFtbZGV0YWls c11dLnNoaXBwaW5nT3B0aW9uc2AgdW5sZXNzIGB1cGRhdGUuU2hpcHBpbmdPcHRpb25zYCBpcyBw cm92aWRlZAorICAgICAgICBhbmQgYHJlcXVlc3RTaGlwcGluZzogdHJ1ZWAgWzJdLiBDdXJyZW50 bHksIHRoaXMgbWVhbnMgdGhhdCBpZiBgcmVxdWVzdFNoaXBwaW5nOiBmYWxzZWAsIHdlCisgICAg ICAgIGRvbid0IHBlcmZvcm0gYW55IHZhbGlkYXRpb24gb2YgYFtbZGV0YWlsc11dLnNoaXBwaW5n T3B0aW9uc2AgYW5kIGV2ZW4gcHJvdmlkZSB0aGF0IGRhdGEgdG8KKyAgICAgICAgdGhlIEFwcGxl IFBheSBzaGVldC4gU2luY2UgdGhlcmUgaXMgbm8gd2F5IHRvIGxvb2sgYXQgdGhlIHNlbGVjdGVk IChvciBldmVuIHRoZSBsaXN0IG9mKQorICAgICAgICBzaGlwcGluZyBvcHRpb24gd2l0aG91dCBg cmVxdWVzdFNoaXBwaW5nOiB0cnVlYCwgd2Ugbm93IGNsZWFyIGBbW2RldGFpbHNdXS5zaGlwcGlu Z09wdGlvbnNgCisgICAgICAgIGlmIGByZXF1ZXN0U2hpcHBpbmc6IGZhbHNlYC4KKworICAgICAg ICBbMV06IGh0dHBzOi8vd3d3LnczLm9yZy9UUi9wYXltZW50LXJlcXVlc3QvI2NvbnN0cnVjdG9y CisgICAgICAgIFsyXTogaHR0cHM6Ly93d3cudzMub3JnL1RSL3BheW1lbnQtcmVxdWVzdC8jdXBk YXRlLWEtcGF5bWVudHJlcXVlc3Qtcy1kZXRhaWxzLWFsZ29yaXRobQorCisgICAgICAgICogTW9k dWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpjaGVja0FuZENhbm9uaWNhbGl6ZURldGFpbHMpOgorCiAyMDIxLTAzLTA1ICBMYXVybyBNb3Vy YSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIENhbnZhczogZHJhd0ltYWdlIHNob3Vs ZCBub3JtYWxpemUgc3JjUmVjdCBiZWZvcmUgY2hlY2tpbmcgaWYgaXQncyBlbXB0eQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVz dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1 ZXN0LmNwcAppbmRleCAyM2JhNzJkMDgyYWEuLmVmODUyNmU5ZTdmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5j cHAKQEAgLTI0NCw3ICsyNDQsOCBAQCBzdGF0aWMgRXhjZXB0aW9uT3I8c3RkOjp0dXBsZTxTdHJp bmcsIFZlY3RvcjxTdHJpbmc+Pj4gY2hlY2tBbmRDYW5vbmljYWxpemVEZXRhaQogICAgICAgICAg ICAgfQogICAgICAgICB9IGVsc2UgaWYgKGlzVXBkYXRlID09IElzVXBkYXRlOjpObykKICAgICAg ICAgICAgIGRldGFpbHMuc2hpcHBpbmdPcHRpb25zID0geyB7IH0gfTsKLSAgICB9CisgICAgfSBl bHNlIGlmIChpc1VwZGF0ZSA9PSBJc1VwZGF0ZTo6Tm8pCisgICAgICAgIGRldGFpbHMuc2hpcHBp bmdPcHRpb25zID0gV1RGOjpudWxsb3B0OwogCiAgICAgVmVjdG9yPFN0cmluZz4gc2VyaWFsaXpl ZE1vZGlmaWVyRGF0YTsKICAgICBpZiAoZGV0YWlscy5tb2RpZmllcnMpIHsK