178150 2017-10-10 17:55:25 -0700 [Payment Request] Validate that all PaymentCurrencyAmounts use the same currency code when using Apple Pay 2017-10-11 09:12:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174796 1 aestes aestes achristensen beidson buildbot cdumez commit-queue dbates esprehn+autocc kondapallykalyan ryanhaddad sam thorton webkit-bug-importer youennf oldest_to_newest 1358990 0 aestes 2017-10-10 17:55:25 -0700 [Payment Request] Validate that all PaymentCurrencyAmounts use the same currency code when using Apple Pay 1358992 1 323366 aestes 2017-10-10 17:59:42 -0700 Created attachment 323366 Patch 1359016 2 323366 commit-queue 2017-10-10 19:57:16 -0700 Comment on attachment 323366 Patch Clearing flags on attachment: 323366 Committed r223163: <http://trac.webkit.org/changeset/223163> 1359017 3 commit-queue 2017-10-10 19:57:17 -0700 All reviewed patches have been landed. Closing bug. 1359018 4 webkit-bug-importer 2017-10-10 19:58:35 -0700 <rdar://problem/34925906> 1359195 5 ryanhaddad 2017-10-11 08:54:56 -0700 This change broke the Sierra build: (view as text) /Volumes/Data/slave/sierra-release/build/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:87:12: error: no viable conversion from returned value of type 'ApplePaySessionPaymentRequest::LineItem' to function return type 'ExceptionOr<ApplePaySessionPaymentRequest::LineItem>' /Volumes/Data/slave/sierra-release/build/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:100:12: error: no viable conversion from returned value of type 'Vector<ApplePaySessionPaymentRequest::LineItem>' to function return type 'ExceptionOr<Vector<ApplePaySessionPaymentRequest::LineItem> >' /Volumes/Data/slave/sierra-release/build/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:138:12: error: no viable conversion from returned value of type 'ApplePaySessionPaymentRequest::ShippingMethod' to function return type 'ExceptionOr<ApplePaySessionPaymentRequest::ShippingMethod>' https://build.webkit.org/builders/Apple%20Sierra%20Release%20%28Build%29/builds/5606 1359210 6 aestes 2017-10-11 09:12:45 -0700 (In reply to Ryan Haddad from comment #5) > This change broke the Sierra build: > > (view as text) > /Volumes/Data/slave/sierra-release/build/Source/WebCore/Modules/applepay/ > paymentrequest/ApplePayPaymentHandler.cpp:87:12: error: no viable conversion > from returned value of type 'ApplePaySessionPaymentRequest::LineItem' to > function return type 'ExceptionOr<ApplePaySessionPaymentRequest::LineItem>' > /Volumes/Data/slave/sierra-release/build/Source/WebCore/Modules/applepay/ > paymentrequest/ApplePayPaymentHandler.cpp:100:12: error: no viable > conversion from returned value of type > 'Vector<ApplePaySessionPaymentRequest::LineItem>' to function return type > 'ExceptionOr<Vector<ApplePaySessionPaymentRequest::LineItem> >' > /Volumes/Data/slave/sierra-release/build/Source/WebCore/Modules/applepay/ > paymentrequest/ApplePayPaymentHandler.cpp:138:12: error: no viable > conversion from returned value of type > 'ApplePaySessionPaymentRequest::ShippingMethod' to function return type > 'ExceptionOr<ApplePaySessionPaymentRequest::ShippingMethod>' > > https://build.webkit.org/builders/Apple%20Sierra%20Release%20%28Build%29/ > builds/5606 Tried to fix in r223188: <https://trac.webkit.org/changeset/223188> 323366 2017-10-10 17:59:42 -0700 2017-10-10 19:57:16 -0700 Patch bug-178150-20171010175941.patch text/plain 25050 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlhZmZlNWU4NzViZWZl MWIzNWQxMjU1MGQwODlkMTE5Yzc1MTEwZS4uZDg0ZGY0MWRhYTEzOWJkOTg4NmQ2YTlkMTQ3NzA1 ZTZlNDBiYzRmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE3LTEwLTEwICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBW YWxpZGF0ZSB0aGF0IGFsbCBQYXltZW50Q3VycmVuY3lBbW91bnRzIHVzZSB0aGUgc2FtZSBjdXJy ZW5jeSBjb2RlIHdoZW4gdXNpbmcgQXBwbGUgUGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgxNTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBcHBsZSBQYXkgcmVxdWlyZXMgYSBzaW5nbGUgY3VycmVu Y3kgY29kZSwgYnV0IHRoZSBQYXltZW50IFJlcXVlc3QgQVBJIGFsbG93cyB0aGUgY2xpZW50IHRv CisgICAgICAgIHNwZWNpZnkgYSBjdXJyZW5jeSBjb2RlIGZvciBlYWNoIFBheW1lbnRDdXJyZW5j eUFtb3VudC4KKworICAgICAgICBJbnN0ZWFkIG9mIGhhdmluZyBhIHJlcXVpcmVkIGN1cnJlbmN5 Q29kZSBwcm9wZXJ0eSBvbiBBcHBsZVBheVJlcXVlc3QgYW5kIGlnbm9yaW5nIHRoZQorICAgICAg ICBjdXJyZW5jeSBwcm9wZXJ0eSBvbiBQYXltZW50Q3VycmVuY3lBbW91bnQsIHZhbGlkYXRlIHRo YXQgYWxsIFBheW1lbnRDdXJyZW5jeUFtb3VudHMgdXNlIHRoZQorICAgICAgICBzYW1lIGN1cnJl bmN5IGNvZGUgYW5kIHVzZSB0aGF0IGFzIEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0J3Mg Y3VycmVuY3lDb2RlLgorCisgICAgICAgIEFkZGVkIHRlc3QgY2FzZXMgdG8gaHR0cC90ZXN0cy9z c2wvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaHR0cHMuaHRtbC4KKworICAgICAgICAqIE1vZHVs ZXMvYXBwbGVwYXkvQXBwbGVQYXlQYXltZW50UmVxdWVzdC5oOgorICAgICAgICAqIE1vZHVsZXMv YXBwbGVwYXkvQXBwbGVQYXlQYXltZW50UmVxdWVzdC5pZGw6CisgICAgICAgICogTW9kdWxlcy9h cHBsZXBheS9BcHBsZVBheVJlcXVlc3RCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZl cnRBbmRWYWxpZGF0ZSk6CisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVJlcXVl c3RCYXNlLmg6CisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVJlcXVlc3RCYXNl LmlkbDoKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpjb252ZXJ0QW5kVmFsaWRhdGUpOgorICAgICAgICAqIE1vZHVsZXMv YXBwbGVwYXkvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlQYXltZW50SGFuZGxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjp2YWxpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0QW5kVmFs aWRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGVQYXlQYXltZW50SGFuZGxlcjo6c2hvdyk6 CisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVzdC9BcHBsZVBheVJlcXVl c3QuaWRsOgorCiAyMDE3LTEwLTEwICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAog ICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBJbXBsZW1lbnQgUGF5bWVudFJlcXVlc3QuY2FuTWFr ZVBheW1lbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9B cHBsZVBheVBheW1lbnRSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5 L0FwcGxlUGF5UGF5bWVudFJlcXVlc3QuaAppbmRleCBkY2M5YzE3MmZhYWY3MmFkNjM0NjlmODQ3 NzhmZjViOTdkMjBjYjkzLi40ZWVlMzQ3ZWUzMTRhNTkzMjE3Nzc2YWJkZGM0NjZiZmUxYzYwN2U2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5UGF5 bWVudFJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxl UGF5UGF5bWVudFJlcXVlc3QuaApAQCAtMjksMTUgKzI5LDE3IEBACiAKICNpbmNsdWRlICJBcHBs ZVBheUxpbmVJdGVtLmgiCiAjaW5jbHVkZSAiQXBwbGVQYXlQYXltZW50Q29udGFjdC5oIgotI2lu Y2x1ZGUgIkFwcGxlUGF5UmVxdWVzdC5oIgorI2luY2x1ZGUgIkFwcGxlUGF5UmVxdWVzdEJhc2Uu aCIKICNpbmNsdWRlICJBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdC5oIgogI2luY2x1ZGUg IkFwcGxlUGF5U2hpcHBpbmdNZXRob2QuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdHJ1 Y3QgQXBwbGVQYXlQYXltZW50UmVxdWVzdCA6IEFwcGxlUGF5UmVxdWVzdCB7CitzdHJ1Y3QgQXBw bGVQYXlQYXltZW50UmVxdWVzdCA6IEFwcGxlUGF5UmVxdWVzdEJhc2UgewogICAgIHVzaW5nIFNo aXBwaW5nVHlwZSA9IEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpTaGlwcGluZ1R5cGU7 CiAKKyAgICBTdHJpbmcgY3VycmVuY3lDb2RlOworCiAgICAgc3RkOjpvcHRpb25hbDxWZWN0b3I8 QXBwbGVQYXlDb250YWN0RmllbGQ+PiByZXF1aXJlZFNoaXBwaW5nQ29udGFjdEZpZWxkczsKICAg ICBzdGQ6Om9wdGlvbmFsPEFwcGxlUGF5UGF5bWVudENvbnRhY3Q+IHNoaXBwaW5nQ29udGFjdDsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVBh eW1lbnRSZXF1ZXN0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQ YXlQYXltZW50UmVxdWVzdC5pZGwKaW5kZXggMmZmMjkwNTQxM2Q1MDVhNzVjYmMwMjZjY2I0MzE3 M2Y3N2E3NWMyNy4uYjE0NjFjNGZmZjE4NDQ4OGMwMmFlN2RmN2M4NTg5ZmM1ZDdkOTU4MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVBheW1lbnRS ZXF1ZXN0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5 UGF5bWVudFJlcXVlc3QuaWRsCkBAIC0zOCw2ICszOCw4IEBACiAgICAgcmVxdWlyZWQgQXBwbGVQ YXlMaW5lSXRlbSB0b3RhbDsKICAgICBzZXF1ZW5jZTxBcHBsZVBheUxpbmVJdGVtPiBsaW5lSXRl bXM7CiAKKyAgICByZXF1aXJlZCBET01TdHJpbmcgY3VycmVuY3lDb2RlOworCiAgICAgc2VxdWVu Y2U8QXBwbGVQYXlDb250YWN0RmllbGQ+IHJlcXVpcmVkU2hpcHBpbmdDb250YWN0RmllbGRzOwog ICAgIEFwcGxlUGF5UGF5bWVudENvbnRhY3Qgc2hpcHBpbmdDb250YWN0OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5UmVxdWVzdEJhc2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVJlcXVlc3RCYXNlLmNw cAppbmRleCAxMjI2ZDYzOTQwMWFiOGM2MjU3ODFhMzc4ZWVhM2U5OWI3NWE1NzkwLi5jN2JiNzBk ODQzNWIwNDAyOWNiZjA0MGJlNGVlZmI2NmE3YTMyY2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5UmVxdWVzdEJhc2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlSZXF1ZXN0QmFzZS5jcHAKQEAgLTQ2 LDkgKzQ2LDcgQEAgc3RhdGljIEV4Y2VwdGlvbk9yPHZvaWQ+IHZhbGlkYXRlKHVuc2lnbmVkIHZl cnNpb24sIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzdXBwb3IKIEV4Y2VwdGlvbk9yPEFwcGxlUGF5 U2Vzc2lvblBheW1lbnRSZXF1ZXN0PiBjb252ZXJ0QW5kVmFsaWRhdGUodW5zaWduZWQgdmVyc2lv biwgQXBwbGVQYXlSZXF1ZXN0QmFzZSYgcmVxdWVzdCkKIHsKICAgICBBcHBsZVBheVNlc3Npb25Q YXltZW50UmVxdWVzdCByZXN1bHQ7Ci0KICAgICByZXN1bHQuc2V0Q291bnRyeUNvZGUocmVxdWVz dC5jb3VudHJ5Q29kZSk7Ci0gICAgcmVzdWx0LnNldEN1cnJlbmN5Q29kZShyZXF1ZXN0LmN1cnJl bmN5Q29kZSk7CiAKICAgICBhdXRvIG1lcmNoYW50Q2FwYWJpbGl0aWVzID0gY29udmVydEFuZFZh bGlkYXRlKHJlcXVlc3QubWVyY2hhbnRDYXBhYmlsaXRpZXMpOwogICAgIGlmIChtZXJjaGFudENh cGFiaWxpdGllcy5oYXNFeGNlcHRpb24oKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlSZXF1ZXN0QmFzZS5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9hcHBsZXBheS9BcHBsZVBheVJlcXVlc3RCYXNlLmgKaW5kZXggMTgzMWM3MDY1YTlmODM1 NjhkMGE0YjY4MjFlMzA3YmZlMDBlYWRmNy4uZDE2NDQ4MmY3NDdiMzQyMDZkZGY5ZjY5NzFlZGMx NDJkMzIwODZjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9B cHBsZVBheVJlcXVlc3RCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBh eS9BcHBsZVBheVJlcXVlc3RCYXNlLmgKQEAgLTM3LDcgKzM3LDYgQEAgc3RydWN0IEFwcGxlUGF5 UmVxdWVzdEJhc2UgewogICAgIFZlY3RvcjxBcHBsZVBheU1lcmNoYW50Q2FwYWJpbGl0eT4gbWVy Y2hhbnRDYXBhYmlsaXRpZXM7CiAgICAgVmVjdG9yPFN0cmluZz4gc3VwcG9ydGVkTmV0d29ya3M7 CiAgICAgU3RyaW5nIGNvdW50cnlDb2RlOwotICAgIFN0cmluZyBjdXJyZW5jeUNvZGU7CiAKICAg ICBzdGQ6Om9wdGlvbmFsPFZlY3RvcjxBcHBsZVBheUNvbnRhY3RGaWVsZD4+IHJlcXVpcmVkQmls bGluZ0NvbnRhY3RGaWVsZHM7CiAgICAgc3RkOjpvcHRpb25hbDxBcHBsZVBheVBheW1lbnRDb250 YWN0PiBiaWxsaW5nQ29udGFjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv YXBwbGVwYXkvQXBwbGVQYXlSZXF1ZXN0QmFzZS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2FwcGxlcGF5L0FwcGxlUGF5UmVxdWVzdEJhc2UuaWRsCmluZGV4IDQzMzQxOThjYTQxNDVlOWE0 YTYyODE3OTFlN2YyMGVmNDg4Y2U1ZTQuLjM5NzQ3YmQ1MDc4NGRiZmMyZGFjMGQzZmZkMjM1NTgw YmQ5ZWMxNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBw bGVQYXlSZXF1ZXN0QmFzZS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBh eS9BcHBsZVBheVJlcXVlc3RCYXNlLmlkbApAQCAtMjksNyArMjksNiBAQAogICAgIHJlcXVpcmVk IHNlcXVlbmNlPEFwcGxlUGF5TWVyY2hhbnRDYXBhYmlsaXR5PiBtZXJjaGFudENhcGFiaWxpdGll czsKICAgICByZXF1aXJlZCBzZXF1ZW5jZTxET01TdHJpbmc+IHN1cHBvcnRlZE5ldHdvcmtzOyAv LyBGSVhNRTogU2hvdWxkIHRoaXMgYmUgYW4gc2VxdWVuY2Ugb2YgZW51bXM/CiAgICAgcmVxdWly ZWQgRE9NU3RyaW5nIGNvdW50cnlDb2RlOwotICAgIHJlcXVpcmVkIERPTVN0cmluZyBjdXJyZW5j eUNvZGU7CiAKICAgICBzZXF1ZW5jZTxBcHBsZVBheUNvbnRhY3RGaWVsZD4gcmVxdWlyZWRCaWxs aW5nQ29udGFjdEZpZWxkczsKICAgICBBcHBsZVBheVBheW1lbnRDb250YWN0IGJpbGxpbmdDb250 YWN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBh eVNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNl c3Npb24uY3BwCmluZGV4IGYxYmUxNDU5YjI3Yzg0YWQwZjBmZTBmZjMwOTAzNWEzYTcwNmEzZTUu LjFmMTViOTU5NDliMWIwZjAzY2VhOThiYzk0Yzc4MjFhODQ0NTc1ZjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTZXNzaW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHAKQEAgLTIx Myw2ICsyMTMsNyBAQCBzdGF0aWMgRXhjZXB0aW9uT3I8QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3Q+IGNvbnZlcnRBbmRWYWxpZGF0ZSh1bnNpZ25lZCB2ZQogICAgICAgICByZXR1cm4gY29u dmVydGVkUmVxdWVzdC5yZWxlYXNlRXhjZXB0aW9uKCk7CiAKICAgICBhdXRvIHJlc3VsdCA9IGNv bnZlcnRlZFJlcXVlc3QucmVsZWFzZVJldHVyblZhbHVlKCk7CisgICAgcmVzdWx0LnNldEN1cnJl bmN5Q29kZShwYXltZW50UmVxdWVzdC5jdXJyZW5jeUNvZGUpOwogCiAgICAgYXV0byB0b3RhbCA9 IGNvbnZlcnRBbmRWYWxpZGF0ZVRvdGFsKFdURk1vdmUocGF5bWVudFJlcXVlc3QudG90YWwpKTsK ICAgICBpZiAodG90YWwuaGFzRXhjZXB0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5UGF5bWVudEhhbmRsZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVzdC9BcHBs ZVBheVBheW1lbnRIYW5kbGVyLmNwcAppbmRleCA3ZTljMjliMDUwYTlkZTIzOTFlZGNkYmZmYWQx ZjZlNjI0YzdjMGQ3Li4yODUwYjlkNzIwMjI5ZTFmOWNlNmM3OTIyZmJhZjJhNDc0ZDQyZjRiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0 L0FwcGxlUGF5UGF5bWVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv YXBwbGVwYXkvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlQYXltZW50SGFuZGxlci5jcHAKQEAgLTY3 LDggKzY3LDE5IEBAIEFwcGxlUGF5UGF5bWVudEhhbmRsZXI6OkFwcGxlUGF5UGF5bWVudEhhbmRs ZXIoUGF5bWVudFJlcXVlc3QmIHBheW1lbnRSZXF1ZXN0KQogewogfQogCi1zdGF0aWMgQXBwbGVQ YXlTZXNzaW9uUGF5bWVudFJlcXVlc3Q6OkxpbmVJdGVtIGNvbnZlcnQoY29uc3QgUGF5bWVudEl0 ZW0mIGl0ZW0pCitzdGF0aWMgRXhjZXB0aW9uT3I8dm9pZD4gdmFsaWRhdGUoY29uc3QgUGF5bWVu dEN1cnJlbmN5QW1vdW50JiBhbW91bnQsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRDdXJyZW5jeSkK IHsKKyAgICBpZiAoYW1vdW50LmN1cnJlbmN5ICE9IGV4cGVjdGVkQ3VycmVuY3kpCisgICAgICAg IHJldHVybiBFeGNlcHRpb24geyBUeXBlRXJyb3IsIG1ha2VTdHJpbmcoIlwiIiwgYW1vdW50LmN1 cnJlbmN5LCAiXCIgZG9lcyBub3QgbWF0Y2ggdGhlIGV4cGVjdGVkIGN1cnJlbmN5IG9mIFwiIiwg ZXhwZWN0ZWRDdXJyZW5jeSwgIlwiLiBBcHBsZSBQYXkgcmVxdWlyZXMgYWxsIFBheW1lbnRDdXJy ZW5jeUFtb3VudHMgdG8gdXNlIHRoZSBzYW1lIGN1cnJlbmN5IGNvZGUuIikgfTsKKyAgICByZXR1 cm4geyB9OworfQorCitzdGF0aWMgRXhjZXB0aW9uT3I8QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3Q6OkxpbmVJdGVtPiBjb252ZXJ0QW5kVmFsaWRhdGUoY29uc3QgUGF5bWVudEl0ZW0mIGl0 ZW0sIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRDdXJyZW5jeSkKK3sKKyAgICBhdXRvIGV4Y2VwdGlv biA9IHZhbGlkYXRlKGl0ZW0uYW1vdW50LCBleHBlY3RlZEN1cnJlbmN5KTsKKyAgICBpZiAoZXhj ZXB0aW9uLmhhc0V4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4gZXhjZXB0aW9uLnJlbGVhc2VF eGNlcHRpb24oKTsKKwogICAgIEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpMaW5lSXRl bSBsaW5lSXRlbTsKICAgICBsaW5lSXRlbS5hbW91bnQgPSBpdGVtLmFtb3VudC52YWx1ZTsKICAg ICBsaW5lSXRlbS50eXBlID0gaXRlbS5wZW5kaW5nID8gQXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3Q6OkxpbmVJdGVtOjpUeXBlOjpQZW5kaW5nIDogQXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3Q6OkxpbmVJdGVtOjpUeXBlOjpGaW5hbDsKQEAgLTc2LDEyICs4NywxNiBAQCBzdGF0aWMg QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVlc3Q6OkxpbmVJdGVtIGNvbnZlcnQoY29uc3QgUGF5 bWVudEl0ZW0mIGl0ZW0pCiAgICAgcmV0dXJuIGxpbmVJdGVtOwogfQogCi1zdGF0aWMgVmVjdG9y PEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpMaW5lSXRlbT4gY29udmVydChjb25zdCBW ZWN0b3I8UGF5bWVudEl0ZW0+JiBsaW5lSXRlbXMpCitzdGF0aWMgRXhjZXB0aW9uT3I8VmVjdG9y PEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpMaW5lSXRlbT4+IGNvbnZlcnRBbmRWYWxp ZGF0ZShjb25zdCBWZWN0b3I8UGF5bWVudEl0ZW0+JiBsaW5lSXRlbXMsIGNvbnN0IFN0cmluZyYg ZXhwZWN0ZWRDdXJyZW5jeSkKIHsKICAgICBWZWN0b3I8QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3Q6OkxpbmVJdGVtPiByZXN1bHQ7CiAgICAgcmVzdWx0LnJlc2VydmVJbml0aWFsQ2FwYWNp dHkobGluZUl0ZW1zLnNpemUoKSk7Ci0gICAgZm9yIChhdXRvJiBsaW5lSXRlbSA6IGxpbmVJdGVt cykKLSAgICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChjb252ZXJ0KGxpbmVJdGVtKSk7Cisg ICAgZm9yIChhdXRvJiBsaW5lSXRlbSA6IGxpbmVJdGVtcykgeworICAgICAgICBhdXRvIGNvbnZl cnRlZExpbmVJdGVtID0gY29udmVydEFuZFZhbGlkYXRlKGxpbmVJdGVtLCBleHBlY3RlZEN1cnJl bmN5KTsKKyAgICAgICAgaWYgKGNvbnZlcnRlZExpbmVJdGVtLmhhc0V4Y2VwdGlvbigpKQorICAg ICAgICAgICAgcmV0dXJuIGNvbnZlcnRlZExpbmVJdGVtLnJlbGVhc2VFeGNlcHRpb24oKTsKKyAg ICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChjb252ZXJ0ZWRMaW5lSXRlbS5yZWxlYXNlUmV0 dXJuVmFsdWUoKSk7CisgICAgfQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTExMCw4ICsx MjUsMTIgQEAgc3RhdGljIEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpTaGlwcGluZ1R5 cGUgY29udmVydChQYXltZW50U2hpcHBpbmdUeXBlIHQKICAgICByZXR1cm4gQXBwbGVQYXlTZXNz aW9uUGF5bWVudFJlcXVlc3Q6OlNoaXBwaW5nVHlwZTo6U2hpcHBpbmc7CiB9CiAKLXN0YXRpYyBB cHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdDo6U2hpcHBpbmdNZXRob2QgY29udmVydChjb25z dCBQYXltZW50U2hpcHBpbmdPcHRpb24mIHNoaXBwaW5nT3B0aW9uKQorc3RhdGljIEV4Y2VwdGlv bk9yPEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpTaGlwcGluZ01ldGhvZD4gY29udmVy dEFuZFZhbGlkYXRlKGNvbnN0IFBheW1lbnRTaGlwcGluZ09wdGlvbiYgc2hpcHBpbmdPcHRpb24s IGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRDdXJyZW5jeSkKIHsKKyAgICBhdXRvIGV4Y2VwdGlvbiA9 IHZhbGlkYXRlKHNoaXBwaW5nT3B0aW9uLmFtb3VudCwgZXhwZWN0ZWRDdXJyZW5jeSk7CisgICAg aWYgKGV4Y2VwdGlvbi5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAgcmV0dXJuIGV4Y2VwdGlvbi5y ZWxlYXNlRXhjZXB0aW9uKCk7CisKICAgICBBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdDo6 U2hpcHBpbmdNZXRob2QgcmVzdWx0OwogICAgIHJlc3VsdC5hbW91bnQgPSBzaGlwcGluZ09wdGlv bi5hbW91bnQudmFsdWU7CiAgICAgcmVzdWx0LmxhYmVsID0gc2hpcHBpbmdPcHRpb24ubGFiZWw7 CkBAIC0xMzcsMTMgKzE1NiwyOSBAQCBFeGNlcHRpb25Pcjx2b2lkPiBBcHBsZVBheVBheW1lbnRI YW5kbGVyOjpzaG93KERvY3VtZW50JiBkb2N1bWVudCkKICAgICAgICAgcmV0dXJuIHZhbGlkYXRl ZFJlcXVlc3QucmVsZWFzZUV4Y2VwdGlvbigpOwogCiAgICAgQXBwbGVQYXlTZXNzaW9uUGF5bWVu dFJlcXVlc3QgcmVxdWVzdCA9IHZhbGlkYXRlZFJlcXVlc3QucmVsZWFzZVJldHVyblZhbHVlKCk7 Ci0gICAgcmVxdWVzdC5zZXRUb3RhbChjb252ZXJ0KG1fcGF5bWVudFJlcXVlc3QtPnBheW1lbnRE ZXRhaWxzKCkudG90YWwpKTsKIAotICAgIGF1dG8gbGluZUl0ZW1zID0gY29udmVydChtX3BheW1l bnRSZXF1ZXN0LT5wYXltZW50RGV0YWlscygpLmRpc3BsYXlJdGVtcyk7CisgICAgU3RyaW5nIGV4 cGVjdGVkQ3VycmVuY3kgPSBtX3BheW1lbnRSZXF1ZXN0LT5wYXltZW50RGV0YWlscygpLnRvdGFs LmFtb3VudC5jdXJyZW5jeTsKKyAgICByZXF1ZXN0LnNldEN1cnJlbmN5Q29kZShleHBlY3RlZEN1 cnJlbmN5KTsKKworICAgIGF1dG8gdG90YWwgPSBjb252ZXJ0QW5kVmFsaWRhdGUobV9wYXltZW50 UmVxdWVzdC0+cGF5bWVudERldGFpbHMoKS50b3RhbCwgZXhwZWN0ZWRDdXJyZW5jeSk7CisgICAg QVNTRVJUKCF0b3RhbC5oYXNFeGNlcHRpb24oKSk7CisgICAgcmVxdWVzdC5zZXRUb3RhbCh0b3Rh bC5yZWxlYXNlUmV0dXJuVmFsdWUoKSk7CisKKyAgICBhdXRvIGNvbnZlcnRlZExpbmVJdGVtcyA9 IGNvbnZlcnRBbmRWYWxpZGF0ZShtX3BheW1lbnRSZXF1ZXN0LT5wYXltZW50RGV0YWlscygpLmRp c3BsYXlJdGVtcywgZXhwZWN0ZWRDdXJyZW5jeSk7CisgICAgaWYgKGNvbnZlcnRlZExpbmVJdGVt cy5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAgcmV0dXJuIGNvbnZlcnRlZExpbmVJdGVtcy5yZWxl YXNlRXhjZXB0aW9uKCk7CisKKyAgICBhdXRvIGxpbmVJdGVtcyA9IGNvbnZlcnRlZExpbmVJdGVt cy5yZWxlYXNlUmV0dXJuVmFsdWUoKTsKICAgICBmb3IgKGF1dG8mIG1vZGlmaWVyIDogbV9wYXlt ZW50UmVxdWVzdC0+cGF5bWVudERldGFpbHMoKS5tb2RpZmllcnMpIHsKICAgICAgICAgYXV0byBj b252ZXJ0ZWRJZGVudGlmaWVyID0gY29udmVydEFuZFZhbGlkYXRlUGF5bWVudE1ldGhvZElkZW50 aWZpZXIobW9kaWZpZXIuc3VwcG9ydGVkTWV0aG9kcyk7Ci0gICAgICAgIGlmIChjb252ZXJ0ZWRJ ZGVudGlmaWVyICYmIGhhbmRsZXNJZGVudGlmaWVyKCpjb252ZXJ0ZWRJZGVudGlmaWVyKSkKLSAg ICAgICAgICAgIGxpbmVJdGVtcy5hcHBlbmRWZWN0b3IoY29udmVydChtb2RpZmllci5hZGRpdGlv bmFsRGlzcGxheUl0ZW1zKSk7CisgICAgICAgIGlmICghY29udmVydGVkSWRlbnRpZmllciB8fCAh aGFuZGxlc0lkZW50aWZpZXIoKmNvbnZlcnRlZElkZW50aWZpZXIpKQorICAgICAgICAgICAgY29u dGludWU7CisKKyAgICAgICAgYXV0byBhZGRpdGlvbmFsRGlzcGxheUl0ZW1zID0gY29udmVydEFu ZFZhbGlkYXRlKG1vZGlmaWVyLmFkZGl0aW9uYWxEaXNwbGF5SXRlbXMsIGV4cGVjdGVkQ3VycmVu Y3kpOworICAgICAgICBpZiAoYWRkaXRpb25hbERpc3BsYXlJdGVtcy5oYXNFeGNlcHRpb24oKSkK KyAgICAgICAgICAgIHJldHVybiBhZGRpdGlvbmFsRGlzcGxheUl0ZW1zLnJlbGVhc2VFeGNlcHRp b24oKTsKKworICAgICAgICBsaW5lSXRlbXMuYXBwZW5kVmVjdG9yKGFkZGl0aW9uYWxEaXNwbGF5 SXRlbXMucmVsZWFzZVJldHVyblZhbHVlKCkpOwogICAgIH0KICAgICByZXF1ZXN0LnNldExpbmVJ dGVtcyhsaW5lSXRlbXMpOwogCkBAIC0xNTMsOCArMTg4LDEyIEBAIEV4Y2VwdGlvbk9yPHZvaWQ+ IEFwcGxlUGF5UGF5bWVudEhhbmRsZXI6OnNob3coRG9jdW1lbnQmIGRvY3VtZW50KQogCiAgICAg VmVjdG9yPEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OjpTaGlwcGluZ01ldGhvZD4gc2hp cHBpbmdNZXRob2RzOwogICAgIHNoaXBwaW5nTWV0aG9kcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5 KG1fcGF5bWVudFJlcXVlc3QtPnBheW1lbnREZXRhaWxzKCkuc2hpcHBpbmdPcHRpb25zLnNpemUo KSk7Ci0gICAgZm9yIChhdXRvJiBzaGlwcGluZ09wdGlvbiA6IG1fcGF5bWVudFJlcXVlc3QtPnBh eW1lbnREZXRhaWxzKCkuc2hpcHBpbmdPcHRpb25zKQotICAgICAgICBzaGlwcGluZ01ldGhvZHMu dW5jaGVja2VkQXBwZW5kKGNvbnZlcnQoc2hpcHBpbmdPcHRpb24pKTsKKyAgICBmb3IgKGF1dG8m IHNoaXBwaW5nT3B0aW9uIDogbV9wYXltZW50UmVxdWVzdC0+cGF5bWVudERldGFpbHMoKS5zaGlw cGluZ09wdGlvbnMpIHsKKyAgICAgICAgYXV0byBjb252ZXJ0ZWRTaGlwcGluZ09wdGlvbiA9IGNv bnZlcnRBbmRWYWxpZGF0ZShzaGlwcGluZ09wdGlvbiwgZXhwZWN0ZWRDdXJyZW5jeSk7CisgICAg ICAgIGlmIChjb252ZXJ0ZWRTaGlwcGluZ09wdGlvbi5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAg ICAgIHJldHVybiBjb252ZXJ0ZWRTaGlwcGluZ09wdGlvbi5yZWxlYXNlRXhjZXB0aW9uKCk7Cisg ICAgICAgIHNoaXBwaW5nTWV0aG9kcy51bmNoZWNrZWRBcHBlbmQoY29udmVydGVkU2hpcHBpbmdP cHRpb24ucmVsZWFzZVJldHVyblZhbHVlKCkpOworICAgIH0KICAgICByZXF1ZXN0LnNldFNoaXBw aW5nTWV0aG9kcyhzaGlwcGluZ01ldGhvZHMpOwogCiAgICAgYXV0byBleGNlcHRpb24gPSBQYXlt ZW50UmVxdWVzdFZhbGlkYXRvcjo6dmFsaWRhdGUocmVxdWVzdCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5UmVxdWVz dC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0Fw cGxlUGF5UmVxdWVzdC5pZGwKaW5kZXggZmI1OTBhZmY4ZmYyZTg0MWYwNmNmM2Q4ZjJmNjQyOTMz ZjYxZjA4NS4uZDgyOWQ0ZjYyYTI5YzI2YzhjZTNiMDc4MGIwMWZhM2UzOTU2Zjk4YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVzdC9BcHBs ZVBheVJlcXVlc3QuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvcGF5 bWVudHJlcXVlc3QvQXBwbGVQYXlSZXF1ZXN0LmlkbApAQCAtMjksMyArMjksNCBAQAogICAgIHJl cXVpcmVkIHVuc2lnbmVkIGxvbmcgdmVyc2lvbjsKICAgICByZXF1aXJlZCBET01TdHJpbmcgbWVy Y2hhbnRJZGVudGlmaWVyOwogfTsKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZmM2QwOGQwMTcyNDE0YWJiYzI4NWJiMDE4 Y2RjYWFlZWRkMmI2NmYuLjM5MTcxNmJlN2FiMWNmMGM0MmQ3OGM2MTc4OGNkZjA2ZjQ3ODBhMjcg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0xMC0xMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0Bh cHBsZS5jb20+CisKKyAgICAgICAgW1BheW1lbnQgUmVxdWVzdF0gVmFsaWRhdGUgdGhhdCBhbGwg UGF5bWVudEN1cnJlbmN5QW1vdW50cyB1c2UgdGhlIHNhbWUgY3VycmVuY3kgY29kZSB3aGVuIHVz aW5nIEFwcGxlIFBheQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc4MTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBodHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1hYm9ydC1t ZXRob2QuaHR0cHMuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3Bh eW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVudC1tZXRob2QuaHR0cHMuaHRtbDoKKyAgICAgICAg KiBodHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1zaG93LW1ldGhvZC5o dHRwcy5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1 ZXN0Lmh0dHBzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NzbC9hcHBsZXBh eS9QYXltZW50UmVxdWVzdC5odHRwcy5odG1sOgorCiAyMDE3LTEwLTEwICBBbmR5IEVzdGVzICA8 YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBJbXBsZW1lbnQg UGF5bWVudFJlcXVlc3QuY2FuTWFrZVBheW1lbnQoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtYWJvcnQtbWV0aG9kLmh0 dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQt cmVxdWVzdC1hYm9ydC1tZXRob2QuaHR0cHMuaHRtbAppbmRleCA4N2UyMGVkMjliOTg5ZGVmN2Iy MzJjZDNkZDk1MWIwOWRhNDE3ZjE5Li5iOWEyYWQ3MTUzYjAwZjI3MTgzNTIxYWMzOWFiODA2YjI5 NzRhMTg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0 L3BheW1lbnQtcmVxdWVzdC1hYm9ydC1tZXRob2QuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1hYm9ydC1tZXRob2Qu aHR0cHMuaHRtbApAQCAtMjIsNyArMjIsNiBAQCBjb25zdCBhcHBsZVBheSA9IE9iamVjdC5mcmVl emUoewogICAgICAgICBtZXJjaGFudENhcGFiaWxpdGllczogWydzdXBwb3J0czNEUyddLAogICAg ICAgICBzdXBwb3J0ZWROZXR3b3JrczogWyd2aXNhJywgJ21hc3RlckNhcmQnXSwKICAgICAgICAg Y291bnRyeUNvZGU6ICdVUycsCi0gICAgICAgIGN1cnJlbmN5Q29kZTogJ1VTRCcsCiAgICAgfSwK IH0pOwogY29uc3QgZGVmYXVsdE1ldGhvZHMgPSBPYmplY3QuZnJlZXplKFthcHBsZVBheV0pOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50 LXJlcXVlc3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVudC1t ZXRob2QuaHR0cHMuaHRtbAppbmRleCAyYWVmNmE4MDMyNGQ0MDU5MjRjNDBhZTg5NDIzYzI0OWI3 NGIxOTQ1Li4zNjlhYzMxMjdmNDM2NjJmNmMwZjZhZGFjNDZiYmQ5YmVlMTRiZmE5IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVz dC1jYW5tYWtlcGF5bWVudC1tZXRob2QuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVudC1tZXRo b2QuaHR0cHMuaHRtbApAQCAtMTYsNyArMTYsNiBAQAogICAgICAgICBtZXJjaGFudENhcGFiaWxp dGllczogWyJzdXBwb3J0czNEUyJdLAogICAgICAgICBzdXBwb3J0ZWROZXR3b3JrczogWyJ2aXNh IiwgIm1hc3RlckNhcmQiXSwKICAgICAgICAgY291bnRyeUNvZGU6ICJVUyIsCi0gICAgICAgIGN1 cnJlbmN5Q29kZTogIlVTRCIsCiAgICAgfQogfSk7CiBjb25zdCBkZWZhdWx0TWV0aG9kcyA9IE9i amVjdC5mcmVlemUoW2FwcGxlUGF5XSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1zaG93LW1ldGhvZC5odHRwcy5odG1s IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3Qt c2hvdy1tZXRob2QuaHR0cHMuaHRtbAppbmRleCBkZmQxMTQyYTFmNWFhYWQ3OWUzZjI2ZTM5ZTQ3 M2VlMjU5OTkwOWRmLi40MGVhZTgzNTc1YjJjMmRkM2M5MzI4MmYyZTdmMjMxMmZmYjQxNTAxIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQt cmVxdWVzdC1zaG93LW1ldGhvZC5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LXNob3ctbWV0aG9kLmh0dHBzLmh0bWwK QEAgLTE3LDcgKzE3LDYgQEAgY29uc3QgYXBwbGVQYXkgPSBPYmplY3QuZnJlZXplKHsKICAgICAg ICAgbWVyY2hhbnRDYXBhYmlsaXRpZXM6IFsnc3VwcG9ydHMzRFMnXSwKICAgICAgICAgc3VwcG9y dGVkTmV0d29ya3M6IFsndmlzYScsICdtYXN0ZXJDYXJkJ10sCiAgICAgICAgIGNvdW50cnlDb2Rl OiAnVVMnLAotICAgICAgICBjdXJyZW5jeUNvZGU6ICdVU0QnLAogICAgIH0sCiB9KTsKIGNvbnN0 IGRlZmF1bHRNZXRob2RzID0gT2JqZWN0LmZyZWV6ZShbYXBwbGVQYXldKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1lbnRSZXF1ZXN0Lmh0dHBz LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5L1BheW1l bnRSZXF1ZXN0Lmh0dHBzLWV4cGVjdGVkLnR4dAppbmRleCBjODA1Mjc0ZGUwY2ZkYWFmODg4Njc4 MGUyYWQ3YWEwODg3ZTgwNGZkLi40MTdjNDU4YjQ3NjExNTE0ODA3NjcxZDBmMGYyNzRiNjU1ZmVl MDhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NzbC9hcHBsZXBheS9QYXlt ZW50UmVxdWVzdC5odHRwcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9zc2wvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0yOCwy NiArMjgsNiBAQCBQQVNTIHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3BheW1lbnRNZXRo b2RdLCB2YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZQogU0VUVVA6IHBheW1lbnRNZXRob2Qg PSB2YWxpZFBheW1lbnRNZXRob2QoKTsgcGF5bWVudE1ldGhvZC5kYXRhLmNvdW50cnlDb2RlID0g NzsKIFBBU1MgcmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVzdChbcGF5bWVudE1ldGhvZF0sIHZh bGlkUGF5bWVudERldGFpbHMoKSk7IHJlcXVlc3Quc2hvdygpIHJlamVjdGVkIHByb21pc2UgIHdp dGggVHlwZUVycm9yOiAiNyIgaXMgbm90IGEgdmFsaWQgY291bnRyeSBjb2RlLi4KIAotVGVzdGlu ZyBBcHBsZVBheVJlcXVlc3QuY3VycmVuY3lDb2RlCi0KLVNFVFVQOiBwYXltZW50TWV0aG9kID0g dmFsaWRQYXltZW50TWV0aG9kKCk7IGRlbGV0ZSBwYXltZW50TWV0aG9kLmRhdGEuY3VycmVuY3lD b2RlOwotUEFTUyByZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFtwYXltZW50TWV0aG9kXSwg dmFsaWRQYXltZW50RGV0YWlscygpKTsgcmVxdWVzdC5zaG93KCkgcmVqZWN0ZWQgcHJvbWlzZSAg d2l0aCBUeXBlRXJyb3I6IE1lbWJlciBBcHBsZVBheVJlcXVlc3QuY3VycmVuY3lDb2RlIGlzIHJl cXVpcmVkIGFuZCBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIERPTVN0cmluZy4KLQotU0VUVVA6IHBh eW1lbnRNZXRob2QgPSB2YWxpZFBheW1lbnRNZXRob2QoKTsgcGF5bWVudE1ldGhvZC5kYXRhLmN1 cnJlbmN5Q29kZSA9ICdpbnZhbGlkJzsKLVBBU1MgcmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVz dChbcGF5bWVudE1ldGhvZF0sIHZhbGlkUGF5bWVudERldGFpbHMoKSk7IHJlcXVlc3Quc2hvdygp IHJlamVjdGVkIHByb21pc2UgIHdpdGggVHlwZUVycm9yOiAiaW52YWxpZCIgaXMgbm90IGEgdmFs aWQgY3VycmVuY3kgY29kZS4uCi0KLVNFVFVQOiBwYXltZW50TWV0aG9kID0gdmFsaWRQYXltZW50 TWV0aG9kKCk7IHBheW1lbnRNZXRob2QuZGF0YS5jdXJyZW5jeUNvZGUgPSAnJzsKLVBBU1MgcmVx dWVzdCA9IG5ldyBQYXltZW50UmVxdWVzdChbcGF5bWVudE1ldGhvZF0sIHZhbGlkUGF5bWVudERl dGFpbHMoKSk7IHJlcXVlc3Quc2hvdygpIHJlamVjdGVkIHByb21pc2UgIHdpdGggVHlwZUVycm9y OiAiIiBpcyBub3QgYSB2YWxpZCBjdXJyZW5jeSBjb2RlLi4KLQotU0VUVVA6IHBheW1lbnRNZXRo b2QgPSB2YWxpZFBheW1lbnRNZXRob2QoKTsgcGF5bWVudE1ldGhvZC5kYXRhLmN1cnJlbmN5Q29k ZSA9IG51bGw7Ci1QQVNTIHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3BheW1lbnRNZXRo b2RdLCB2YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZXN0LnNob3coKSByZWplY3RlZCBwcm9t aXNlICB3aXRoIFR5cGVFcnJvcjogIm51bGwiIGlzIG5vdCBhIHZhbGlkIGN1cnJlbmN5IGNvZGUu LgotCi1TRVRVUDogcGF5bWVudE1ldGhvZCA9IHZhbGlkUGF5bWVudE1ldGhvZCgpOyBwYXltZW50 TWV0aG9kLmRhdGEuY3VycmVuY3lDb2RlID0gdW5kZWZpbmVkOwotUEFTUyByZXF1ZXN0ID0gbmV3 IFBheW1lbnRSZXF1ZXN0KFtwYXltZW50TWV0aG9kXSwgdmFsaWRQYXltZW50RGV0YWlscygpKTsg cmVxdWVzdC5zaG93KCkgcmVqZWN0ZWQgcHJvbWlzZSAgd2l0aCBUeXBlRXJyb3I6IE1lbWJlciBB cHBsZVBheVJlcXVlc3QuY3VycmVuY3lDb2RlIGlzIHJlcXVpcmVkIGFuZCBtdXN0IGJlIGFuIGlu c3RhbmNlIG9mIERPTVN0cmluZy4KLQotU0VUVVA6IHBheW1lbnRNZXRob2QgPSB2YWxpZFBheW1l bnRNZXRob2QoKTsgcGF5bWVudE1ldGhvZC5kYXRhLmN1cnJlbmN5Q29kZSA9IDc7Ci1QQVNTIHJl cXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3BheW1lbnRNZXRob2RdLCB2YWxpZFBheW1lbnRE ZXRhaWxzKCkpOyByZXF1ZXN0LnNob3coKSByZWplY3RlZCBwcm9taXNlICB3aXRoIFR5cGVFcnJv cjogIjciIGlzIG5vdCBhIHZhbGlkIGN1cnJlbmN5IGNvZGUuLgotCiBUZXN0aW5nIEFwcGxlUGF5 UmVxdWVzdC5zdXBwb3J0ZWROZXR3b3JrcwogCiBTRVRVUDogcGF5bWVudE1ldGhvZCA9IHZhbGlk UGF5bWVudE1ldGhvZCgpOyBkZWxldGUgcGF5bWVudE1ldGhvZC5kYXRhLnN1cHBvcnRlZE5ldHdv cmtzOwpAQCAtMjE4LDYgKzE5OCw4IEBAIFBBU1MgcmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVz dChbdmFsaWRQYXltZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscyk7IHJlcXVlCiBTRVRVUDog cGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLmRp c3BsYXlJdGVtcyA9IFt7IGxhYmVsOiAnbGFiZWwnLCBhbW91bnQ6ICcxMC4wMCcsIHR5cGU6ICdp bnZhbGlkJyB9XTsKIFBBU1MgcmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVzdChbdmFsaWRQYXlt ZW50TWV0aG9kKCldLCBwYXltZW50RGV0YWlscyk7IHJlcXVlc3Quc2hvdygpIHRocmV3IGV4Y2Vw dGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCiAKK1NFVFVQOiBwYXltZW50RGV0YWlscyA9IHZh bGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuZGlzcGxheUl0ZW1zID0gW3sgbGFi ZWw6ICdsYWJlbCcsIGFtb3VudDogeyBjdXJyZW5jeTogJ0VVUicsIHZhbHVlOiAnMTAuMDAnIH0g fV07CitQQVNTIHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhv ZCgpXSwgcGF5bWVudERldGFpbHMpOyByZXF1ZXN0LnNob3coKSByZWplY3RlZCBwcm9taXNlICB3 aXRoIFR5cGVFcnJvcjogIkVVUiIgZG9lcyBub3QgbWF0Y2ggdGhlIGV4cGVjdGVkIGN1cnJlbmN5 IG9mICJVU0QiLiBBcHBsZSBQYXkgcmVxdWlyZXMgYWxsIFBheW1lbnRDdXJyZW5jeUFtb3VudHMg dG8gdXNlIHRoZSBzYW1lIGN1cnJlbmN5IGNvZGUuLgogVGVzdGluZyBQYXltZW50RGV0YWlscy5z aGlwcGluZ09wdGlvbnMKIAogU0VUVVA6IHBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0 YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSAnJzsKQEAgLTI1Myw2ICsy MzUsOCBAQCBQQVNTIHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1l dGhvZCgpXSwgcGF5bWVudERldGFpbHMpOyByZXF1ZQogU0VUVVA6IHBheW1lbnREZXRhaWxzID0g dmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBb eyBhbW91bnQ6ICctMScsIGRldGFpbDogJycsIGlkZW50aWZpZXI6ICcnLCBsYWJlbDogJycgfV07 CiBQQVNTIHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgp XSwgcGF5bWVudERldGFpbHMpOyByZXF1ZXN0LnNob3coKSB0aHJldyBleGNlcHRpb24gVHlwZUVy cm9yOiBUeXBlIGVycm9yLgogCitTRVRVUDogcGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnRE ZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBj dXJyZW5jeTogJ0VVUicsIHZhbHVlOiAnMTAuMDAnIH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOwor UEFTUyByZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0s IHBheW1lbnREZXRhaWxzKTsgcmVxdWVzdC5zaG93KCkgcmVqZWN0ZWQgcHJvbWlzZSAgd2l0aCBU eXBlRXJyb3I6ICJFVVIiIGRvZXMgbm90IG1hdGNoIHRoZSBleHBlY3RlZCBjdXJyZW5jeSBvZiAi VVNEIi4gQXBwbGUgUGF5IHJlcXVpcmVzIGFsbCBQYXltZW50Q3VycmVuY3lBbW91bnRzIHRvIHVz ZSB0aGUgc2FtZSBjdXJyZW5jeSBjb2RlLi4KIFRlc3RpbmcgUGF5bWVudE9wdGlvbnMKIAogU0VU VVA6IHBheW1lbnRPcHRpb25zID0ge307IHBheW1lbnRPcHRpb25zLnNoaXBwaW5nVHlwZSA9ICcn OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVu dFJlcXVlc3QuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3NsL2FwcGxlcGF5 L1BheW1lbnRSZXF1ZXN0Lmh0dHBzLmh0bWwKaW5kZXggYTc5OTdjODkzNTQ4ODFiMWZmM2ZlNmQz MGJiOWJiN2VlOTZjYTAzNS4uMDVmOWZiNmM5MmM4YmY2MGJjOGZkNDdlY2ZlNjQ5ZmExNjBhZjJk MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zc2wvYXBwbGVwYXkvUGF5bWVu dFJlcXVlc3QuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NzbC9hcHBs ZXBheS9QYXltZW50UmVxdWVzdC5odHRwcy5odG1sCkBAIC0xOCw3ICsxOCw2IEBAIGZ1bmN0aW9u IHZhbGlkUGF5bWVudE1ldGhvZCgpIHsKICAgICAgICAgICAgIHZlcnNpb246IDIsCiAgICAgICAg ICAgICBtZXJjaGFudElkZW50aWZpZXI6ICcnLAogICAgICAgICAgICAgY291bnRyeUNvZGU6ICdV UycsCi0gICAgICAgICAgICBjdXJyZW5jeUNvZGU6ICdVU0QnLAogICAgICAgICAgICAgc3VwcG9y dGVkTmV0d29ya3M6IFsndmlzYScsICdtYXN0ZXJDYXJkJ10sCiAgICAgICAgICAgICBtZXJjaGFu dENhcGFiaWxpdGllczogWydzdXBwb3J0czNEUyddLAogICAgICAgICB9LApAQCAtNzMsMjEgKzcy LDYgQEAgYXN5bmMgZnVuY3Rpb24gZ28oKSB7CiAgICAgYXdhaXQgbG9nQW5kU2hvdWxkUmVqZWN0 KCJwYXltZW50TWV0aG9kID0gdmFsaWRQYXltZW50TWV0aG9kKCk7IHBheW1lbnRNZXRob2QuZGF0 YS5jb3VudHJ5Q29kZSA9IDc7IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3BheW1l bnRNZXRob2RdLCB2YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZXN0LnNob3coKSIpCiAgICAg ZGVidWcoIiIpCiAKLSAgICBkZWJ1ZygiVGVzdGluZyBBcHBsZVBheVJlcXVlc3QuY3VycmVuY3lD b2RlIikKLSAgICBkZWJ1ZygiIikKLSAgICBhd2FpdCBsb2dBbmRTaG91bGRSZWplY3QoInBheW1l bnRNZXRob2QgPSB2YWxpZFBheW1lbnRNZXRob2QoKTsgZGVsZXRlIHBheW1lbnRNZXRob2QuZGF0 YS5jdXJyZW5jeUNvZGU7IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3BheW1lbnRN ZXRob2RdLCB2YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZXN0LnNob3coKSIpCi0gICAgZGVi dWcoIiIpCi0gICAgYXdhaXQgbG9nQW5kU2hvdWxkUmVqZWN0KCJwYXltZW50TWV0aG9kID0gdmFs aWRQYXltZW50TWV0aG9kKCk7IHBheW1lbnRNZXRob2QuZGF0YS5jdXJyZW5jeUNvZGUgPSAnaW52 YWxpZCc7IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3BheW1lbnRNZXRob2RdLCB2 YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZXN0LnNob3coKSIpCi0gICAgZGVidWcoIiIpCi0g ICAgYXdhaXQgbG9nQW5kU2hvdWxkUmVqZWN0KCJwYXltZW50TWV0aG9kID0gdmFsaWRQYXltZW50 TWV0aG9kKCk7IHBheW1lbnRNZXRob2QuZGF0YS5jdXJyZW5jeUNvZGUgPSAnJzsiLCAicmVxdWVz dCA9IG5ldyBQYXltZW50UmVxdWVzdChbcGF5bWVudE1ldGhvZF0sIHZhbGlkUGF5bWVudERldGFp bHMoKSk7IHJlcXVlc3Quc2hvdygpIikKLSAgICBkZWJ1ZygiIikKLSAgICBhd2FpdCBsb2dBbmRT aG91bGRSZWplY3QoInBheW1lbnRNZXRob2QgPSB2YWxpZFBheW1lbnRNZXRob2QoKTsgcGF5bWVu dE1ldGhvZC5kYXRhLmN1cnJlbmN5Q29kZSA9IG51bGw7IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVu dFJlcXVlc3QoW3BheW1lbnRNZXRob2RdLCB2YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZXN0 LnNob3coKSIpCi0gICAgZGVidWcoIiIpCi0gICAgYXdhaXQgbG9nQW5kU2hvdWxkUmVqZWN0KCJw YXltZW50TWV0aG9kID0gdmFsaWRQYXltZW50TWV0aG9kKCk7IHBheW1lbnRNZXRob2QuZGF0YS5j dXJyZW5jeUNvZGUgPSB1bmRlZmluZWQ7IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3Qo W3BheW1lbnRNZXRob2RdLCB2YWxpZFBheW1lbnREZXRhaWxzKCkpOyByZXF1ZXN0LnNob3coKSIp Ci0gICAgZGVidWcoIiIpCi0gICAgYXdhaXQgbG9nQW5kU2hvdWxkUmVqZWN0KCJwYXltZW50TWV0 aG9kID0gdmFsaWRQYXltZW50TWV0aG9kKCk7IHBheW1lbnRNZXRob2QuZGF0YS5jdXJyZW5jeUNv ZGUgPSA3OyIsICJyZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFtwYXltZW50TWV0aG9kXSwg dmFsaWRQYXltZW50RGV0YWlscygpKTsgcmVxdWVzdC5zaG93KCkiKQotICAgIGRlYnVnKCIiKQot CiAgICAgZGVidWcoIlRlc3RpbmcgQXBwbGVQYXlSZXF1ZXN0LnN1cHBvcnRlZE5ldHdvcmtzIikK ICAgICBkZWJ1ZygiIikKICAgICBhd2FpdCBsb2dBbmRTaG91bGRSZWplY3QoInBheW1lbnRNZXRo b2QgPSB2YWxpZFBheW1lbnRNZXRob2QoKTsgZGVsZXRlIHBheW1lbnRNZXRob2QuZGF0YS5zdXBw b3J0ZWROZXR3b3JrczsiLCAicmVxdWVzdCA9IG5ldyBQYXltZW50UmVxdWVzdChbcGF5bWVudE1l dGhvZF0sIHZhbGlkUGF5bWVudERldGFpbHMoKSk7IHJlcXVlc3Quc2hvdygpIikKQEAgLTE5MCw3 ICsxNzQsOCBAQCBhc3luYyBmdW5jdGlvbiBnbygpIHsKICAgICBsb2dBbmRTaG91bGRUaHJvdygi cGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLmRp c3BsYXlJdGVtcyA9IFt7IGxhYmVsOiAnbGFiZWwnIH1dOyIsICJyZXF1ZXN0ID0gbmV3IFBheW1l bnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKTsgcmVxdWVz dC5zaG93KCkiKQogICAgIGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlk UGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuZGlzcGxheUl0ZW1zID0gW3sgbGFiZWw6 ICdsYWJlbCcsIGFtb3VudDogJycgfV07IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3Qo W3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpOyByZXF1ZXN0LnNob3coKSIp CiAgICAgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0gdmFsaWRQYXltZW50RGV0 YWlscygpOyBwYXltZW50RGV0YWlscy5kaXNwbGF5SXRlbXMgPSBbeyBsYWJlbDogJ2xhYmVsJywg YW1vdW50OiAnMTAuMDAnLCB0eXBlOiAnaW52YWxpZCcgfV07IiwgInJlcXVlc3QgPSBuZXcgUGF5 bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpOyByZXF1 ZXN0LnNob3coKSIpCi0gICAgCisgICAgYXdhaXQgbG9nQW5kU2hvdWxkUmVqZWN0KCJwYXltZW50 RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuZGlzcGxheUl0 ZW1zID0gW3sgbGFiZWw6ICdsYWJlbCcsIGFtb3VudDogeyBjdXJyZW5jeTogJ0VVUicsIHZhbHVl OiAnMTAuMDAnIH0gfV07IiwgInJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5 bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpOyByZXF1ZXN0LnNob3coKSIpCisKICAgICBk ZWJ1ZygiVGVzdGluZyBQYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMiKQogICAgIGRlYnVn KCIiKTsKICAgICBsb2dBbmRTaG91bGRUaHJvdygicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1l bnREZXRhaWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9ICcnOyIsICJyZXF1 ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1lbnRE ZXRhaWxzKTsgcmVxdWVzdC5zaG93KCkiKQpAQCAtMjA0LDYgKzE4OSw3IEBAIGFzeW5jIGZ1bmN0 aW9uIGdvKCkgewogICAgIGxvZ0FuZFNob3VsZFRocm93KCJwYXltZW50RGV0YWlscyA9IHZhbGlk UGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hpcHBpbmdPcHRpb25zID0gW3sgYW1v dW50OiAnJywgZGV0YWlsOiAnJywgaWRlbnRpZmllcjogJycgfV07IiwgInJlcXVlc3QgPSBuZXcg UGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgcGF5bWVudERldGFpbHMpOyBy ZXF1ZXN0LnNob3coKSIpCiAgICAgbG9nQW5kU2hvdWxkVGhyb3coInBheW1lbnREZXRhaWxzID0g dmFsaWRQYXltZW50RGV0YWlscygpOyBwYXltZW50RGV0YWlscy5zaGlwcGluZ09wdGlvbnMgPSBb eyBhbW91bnQ6ICcnLCBkZXRhaWw6ICcnLCBpZGVudGlmaWVyOiAnJywgbGFiZWw6ICcnIH1dOyIs ICJyZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBh eW1lbnREZXRhaWxzKTsgcmVxdWVzdC5zaG93KCkiKQogICAgIGxvZ0FuZFNob3VsZFRocm93KCJw YXltZW50RGV0YWlscyA9IHZhbGlkUGF5bWVudERldGFpbHMoKTsgcGF5bWVudERldGFpbHMuc2hp cHBpbmdPcHRpb25zID0gW3sgYW1vdW50OiAnLTEnLCBkZXRhaWw6ICcnLCBpZGVudGlmaWVyOiAn JywgbGFiZWw6ICcnIH1dOyIsICJyZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBh eW1lbnRNZXRob2QoKV0sIHBheW1lbnREZXRhaWxzKTsgcmVxdWVzdC5zaG93KCkiKQorICAgIGF3 YWl0IGxvZ0FuZFNob3VsZFJlamVjdCgicGF5bWVudERldGFpbHMgPSB2YWxpZFBheW1lbnREZXRh aWxzKCk7IHBheW1lbnREZXRhaWxzLnNoaXBwaW5nT3B0aW9ucyA9IFt7IGFtb3VudDogeyBjdXJy ZW5jeTogJ0VVUicsIHZhbHVlOiAnMTAuMDAnIH0sIGlkOiAnJywgbGFiZWw6ICcnIH1dOyIsICJy ZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFt2YWxpZFBheW1lbnRNZXRob2QoKV0sIHBheW1l bnREZXRhaWxzKTsgcmVxdWVzdC5zaG93KCkiKQogCiAgICAgZGVidWcoIlRlc3RpbmcgUGF5bWVu dE9wdGlvbnMiKQogICAgIGRlYnVnKCIiKTsK