225613 2021-05-10 14:28:41 -0700 Speculative revalidation requests not properly attributed as app-bound 2021-05-10 16:52:48 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney achristensen bfulgham cdumez cgarcia ews-watchlist oldest_to_newest 1758635 0 katherine_cheney 2021-05-10 14:28:41 -0700 We should attribute app-bound status to speculative revalidation requests. 1758636 1 katherine_cheney 2021-05-10 14:29:17 -0700 <rdar://problem/77664358> 1758663 2 428206 katherine_cheney 2021-05-10 14:56:55 -0700 Created attachment 428206 Patch 1758667 3 katherine_cheney 2021-05-10 14:58:03 -0700 The test for this technically relies on infrastructure added in https://bugs.webkit.org/show_bug.cgi?id=225596 (in review) but since they are skipped for open source builds this won't affect EWS. 1758686 4 428206 bfulgham 2021-05-10 15:31:49 -0700 Comment on attachment 428206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428206&action=review > Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:96 > + revalidationRequest.setIsAppBound(subResourceInfo.isAppBound()); I suggest we bundle these various "copy request state to new request" into some common function somewhere (not for this patch though). > LayoutTests/platform/ios-wk2/TestExpectations:1794 > +http/tests/in-app-browser-privacy/app-bound-attribution-speculative-revalidation.html [ Skip ] Why do we need to skip on iOS? Is this because of missing test features, or does the test just not work on iOS? 1758689 5 428206 bfulgham 2021-05-10 15:36:26 -0700 Comment on attachment 428206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428206&action=review r=me >> LayoutTests/platform/ios-wk2/TestExpectations:1794 >> +http/tests/in-app-browser-privacy/app-bound-attribution-speculative-revalidation.html [ Skip ] > > Why do we need to skip on iOS? Is this because of missing test features, or does the test just not work on iOS? I spoke with Kate about this offline. It's skipped in iOS on Open Source. So this is fine (and will be unskilled in future). 1758707 6 428217 katherine_cheney 2021-05-10 16:19:34 -0700 Created attachment 428217 Patch for landing 1758721 7 ews-feeder 2021-05-10 16:52:46 -0700 Committed r277306 (237567@main): <https://commits.webkit.org/237567@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428217. 428206 2021-05-10 14:56:55 -0700 2021-05-10 16:19:31 -0700 Patch bug-225613-20210510145654.patch text/plain 15158 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzOTFlZmVhZmRlMzQxZGUy NjE1NTlmMmM4ZThkMzZlMTBkZWJmMTIuLjEyMWZkNGM1MTNmZTQ1MThlMzNjNjAwMmI3ODk3OGMy YTE5NTk0NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDUtMTAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgU3BlY3VsYXRpdmUg cmV2YWxpZGF0aW9uIHJlcXVlc3RzIG5vdCBwcm9wZXJseSBhdHRyaWJ1dGVkIGFzIGFwcC1ib3Vu ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NjEz CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzY2NDM1OD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTcGVjdWxhdGl2ZSByZXZhbGlkYXRpb24gcmVx dWVzdHMgbWFrZSBuZXR3b3JrIGNvbm5lY3Rpb25zIGFuZCBzaG91bGQKKyAgICAgICAgYmUgYXR0 cmlidXRlZCBhcyBhcHAtYm91bmQgYmFzZWQgb24gdGhlIGluaXRpYXRpbmcgbmF2aWdhdGlvbi4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZl TG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmNvbnN0cnVj dFJldmFsaWRhdGlvblJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlNw ZWN1bGF0aXZlTG9hZE1hbmFnZXI6OnJlZ2lzdGVyTG9hZCk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6c3RhcnRTcGVjdWxhdGl2ZVJldmFs aWRhdGlvbik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Bl Y3VsYXRpdmVMb2FkTWFuYWdlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN1YnJlc291cmNlc0VudHJ5Lmg6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtD YWNoZTo6U3VicmVzb3VyY2VJbmZvOjppc0FwcEJvdW5kIGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0NhY2hlOjpTdWJyZXNvdXJjZUluZm86OnNldElzQXBwQm91bmQpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN1YnJlc291cmNlc0VudHJ5OjpzdWJyZXNvdXJjZXMp OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN1YnJlc291cmNlc0VudHJ5OjpzdWJy ZXNvdXJjZXMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICBSZW1vdmUgY29uc3QgcXVhbGlmaWVy IGZvciB0aGUgU3VicmVzb3VyY2VzRW50cnk6OnN1YnJlc291cmNlcygpCisgICAgICAgIGZ1bmN0 aW9uIG5vdyB0aGF0IHdlIG5lZWQgdG8gc3RvcmUgdGhlIGFwcC1ib3VuZCB2YWx1ZS4KKwogMjAy MS0wNS0xMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBG aXggc29tZSB1bmlmaWVkIGJ1aWxkIGVycm9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNw cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3Vs YXRpdmVMb2FkTWFuYWdlci5jcHAKaW5kZXggMjFhM2RkMjkzOTViMTIyMmRhN2ZlMWY0ZDU2YTNi MzM3MGJkMjYwNC4uOTk1NTdkYTIyNTJhZWVlZjg2MWI3NDQzM2I1YjAxMTczYjZhYTU4OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT cGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwCkBAIC05Myw2 ICs5Myw4IEBAIHN0YXRpYyBpbmxpbmUgUmVzb3VyY2VSZXF1ZXN0IGNvbnN0cnVjdFJldmFsaWRh dGlvblJlcXVlc3QoY29uc3QgS2V5JiBrZXksIGNvbnN0CiAgICAgcmV2YWxpZGF0aW9uUmVxdWVz dC5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhzdWJSZXNvdXJjZUluZm8uZmlyc3RQYXJ0eUZvckNv b2tpZXMoKSk7CiAgICAgcmV2YWxpZGF0aW9uUmVxdWVzdC5zZXRJc1NhbWVTaXRlKHN1YlJlc291 cmNlSW5mby5pc1NhbWVTaXRlKCkpOwogICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0SXNUb3BT aXRlKHN1YlJlc291cmNlSW5mby5pc1RvcFNpdGUoKSk7CisgICAgcmV2YWxpZGF0aW9uUmVxdWVz dC5zZXRJc0FwcEJvdW5kKHN1YlJlc291cmNlSW5mby5pc0FwcEJvdW5kKCkpOworCiAgICAgaWYg KCFrZXkucGFydGl0aW9uKCkuaXNFbXB0eSgpKQogICAgICAgICByZXZhbGlkYXRpb25SZXF1ZXN0 LnNldENhY2hlUGFydGl0aW9uKGtleS5wYXJ0aXRpb24oKSk7CiAgICAgQVNTRVJUX1dJVEhfTUVT U0FHRShrZXkucmFuZ2UoKS5pc0VtcHR5KCksICJyYW5nZSBpcyBub3Qgc3VwcG9ydGVkIik7CkBA IC0zNjcsMTIgKzM2OSwxMiBAQCB2b2lkIFNwZWN1bGF0aXZlTG9hZE1hbmFnZXI6OnJlZ2lzdGVy TG9hZChjb25zdCBHbG9iYWxGcmFtZUlEJiBmcmFtZUlELCBjb25zdCBSZQogICAgICAgICBtX3Bl bmRpbmdGcmFtZUxvYWRzLmFkZChmcmFtZUlELCBwZW5kaW5nRnJhbWVMb2FkLmNvcHlSZWYoKSk7 CiAKICAgICAgICAgLy8gUmV0cmlldmUgdGhlIHN1YnJlc291cmNlcyBlbnRyeSBpZiBpdCBleGlz dHMgdG8gc3RhcnQgc3BlY3VsYXRpdmUgcmV2YWxpZGF0aW9uIGFuZCB0byB1cGRhdGUgaXQuCi0g ICAgICAgIHJldHJpZXZlU3VicmVzb3VyY2VzRW50cnkocmVzb3VyY2VLZXksIFt0aGlzLCB3ZWFr VGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgZnJhbWVJRCwgcGVuZGluZ0ZyYW1lTG9hZCA9IFdU Rk1vdmUocGVuZGluZ0ZyYW1lTG9hZCksIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW5dKHN0 ZDo6dW5pcXVlX3B0cjxTdWJyZXNvdXJjZXNFbnRyeT4gZW50cnkpIHsKKyAgICAgICAgcmV0cmll dmVTdWJyZXNvdXJjZXNFbnRyeShyZXNvdXJjZUtleSwgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdl YWtQdHIoKnRoaXMpLCBmcmFtZUlELCBwZW5kaW5nRnJhbWVMb2FkID0gV1RGTW92ZShwZW5kaW5n RnJhbWVMb2FkKSwgcmVxdWVzdElzQXBwQm91bmQgPSByZXF1ZXN0LmlzQXBwQm91bmQoKSwgaXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbl0oc3RkOjp1bmlxdWVfcHRyPFN1YnJlc291cmNlc0Vu dHJ5PiBlbnRyeSkgewogICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgICAg ICByZXR1cm47CiAKICAgICAgICAgICAgIGlmIChlbnRyeSkKLSAgICAgICAgICAgICAgICBzdGFy dFNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKGZyYW1lSUQsICplbnRyeSwgaXNOYXZpZ2F0aW5nVG9B cHBCb3VuZERvbWFpbik7CisgICAgICAgICAgICAgICAgc3RhcnRTcGVjdWxhdGl2ZVJldmFsaWRh dGlvbihmcmFtZUlELCAqZW50cnksIHJlcXVlc3RJc0FwcEJvdW5kLCBpc05hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluKTsKIAogICAgICAgICAgICAgcGVuZGluZ0ZyYW1lTG9hZC0+c2V0RXhpc3Rp bmdTdWJyZXNvdXJjZXNFbnRyeShXVEZNb3ZlKGVudHJ5KSk7CiAgICAgICAgIH0pOwpAQCAtNTkw LDEwICs1OTIsMTEgQEAgdm9pZCBTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpwcmVsb2FkRW50cnko Y29uc3QgS2V5JiBrZXksIGNvbnN0IFN1YnJlc291cmNlSW5mbyYKICAgICB9KTsKIH0KIAotdm9p ZCBTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpzdGFydFNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKGNv bnN0IEdsb2JhbEZyYW1lSUQmIGZyYW1lSUQsIFN1YnJlc291cmNlc0VudHJ5JiBlbnRyeSwgT3B0 aW9uYWw8TmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4+IGlzTmF2aWdhdGluZ1RvQXBwQm91bmRE b21haW4pCit2b2lkIFNwZWN1bGF0aXZlTG9hZE1hbmFnZXI6OnN0YXJ0U3BlY3VsYXRpdmVSZXZh bGlkYXRpb24oY29uc3QgR2xvYmFsRnJhbWVJRCYgZnJhbWVJRCwgU3VicmVzb3VyY2VzRW50cnkm IGVudHJ5LCBib29sIHJlcXVlc3RJc0FwcEJvdW5kLCBPcHRpb25hbDxOYXZpZ2F0aW5nVG9BcHBC b3VuZERvbWFpbj4gaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbikKIHsKICAgICBmb3IgKGF1 dG8mIHN1YnJlc291cmNlSW5mbyA6IGVudHJ5LnN1YnJlc291cmNlcygpKSB7CiAgICAgICAgIGF1 dG8mIGtleSA9IHN1YnJlc291cmNlSW5mby5rZXkoKTsKKyAgICAgICAgc3VicmVzb3VyY2VJbmZv LnNldElzQXBwQm91bmQocmVxdWVzdElzQXBwQm91bmQpOwogICAgICAgICBpZiAoIXN1YnJlc291 cmNlSW5mby5pc1RyYW5zaWVudCgpKQogICAgICAgICAgICAgcHJlbG9hZEVudHJ5KGtleSwgc3Vi cmVzb3VyY2VJbmZvLCBmcmFtZUlELCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKICAg ICAgICAgZWxzZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5o CmluZGV4IGExNDEwMTQzYzdmMTBjNDdhMzI3YmNkNjI3MTVjZmYyYTZiZmU2MTEuLjg1NmNkNWQ0 NTA5MzY2ZTU4YmZkNjVhYWZiNzUzOWZjOTBkY2Q2ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdl ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3BlY3VsYXRpdmVMb2FkTWFuYWdlci5oCkBAIC02OSw3ICs2OSw3IEBAIHByaXZhdGU6CiAgICAg dm9pZCBwcmVjb25uZWN0Rm9yU3VicmVzb3VyY2UoY29uc3QgU3VicmVzb3VyY2VJbmZvJiwgRW50 cnkqLCBjb25zdCBHbG9iYWxGcmFtZUlEJiwgT3B0aW9uYWw8TmF2aWdhdGluZ1RvQXBwQm91bmRE b21haW4+KTsKICAgICBib29sIHNhdGlzZnlQZW5kaW5nUmVxdWVzdHMoY29uc3QgS2V5JiwgRW50 cnkqKTsKICAgICB2b2lkIHJldHJpZXZlU3VicmVzb3VyY2VzRW50cnkoY29uc3QgS2V5JiBzdG9y YWdlS2V5LCBXVEY6OkZ1bmN0aW9uPHZvaWQgKHN0ZDo6dW5pcXVlX3B0cjxTdWJyZXNvdXJjZXNF bnRyeT4pPiYmKTsKLSAgICB2b2lkIHN0YXJ0U3BlY3VsYXRpdmVSZXZhbGlkYXRpb24oY29uc3Qg R2xvYmFsRnJhbWVJRCYsIFN1YnJlc291cmNlc0VudHJ5JiwgT3B0aW9uYWw8TmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW4+KTsKKyAgICB2b2lkIHN0YXJ0U3BlY3VsYXRpdmVSZXZhbGlkYXRpb24o Y29uc3QgR2xvYmFsRnJhbWVJRCYsIFN1YnJlc291cmNlc0VudHJ5JiwgYm9vbCwgT3B0aW9uYWw8 TmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4+KTsKIAogICAgIHN0YXRpYyBib29sIGNhblVzZVBy ZWxvYWRlZEVudHJ5KGNvbnN0IFByZWxvYWRlZEVudHJ5JiwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiBhY3R1YWxSZXF1ZXN0KTsKICAgICBzdGF0aWMgYm9vbCBjYW5Vc2VQZW5kaW5n UHJlbG9hZChjb25zdCBTcGVjdWxhdGl2ZUxvYWQmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmIGFjdHVhbFJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdWJyZXNvdXJjZXNFbnRyeS5oIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdWJyZXNvdXJjZXNFbnRyeS5o CmluZGV4IDM3N2QzMzc5OWY3YmI1ZGNlNmNlNWI5MDZhMzdlNTI0OGU1MDkxYTQuLjIzZTczNTBl OTU4ZDYxNjRkMzdiZTAyYTEyOTQxMmI1YWI4NDkxOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3VicmVzb3VyY2VzRW50cnkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN1YnJl c291cmNlc0VudHJ5LmgKQEAgLTU5LDEyICs1OSwxNiBAQCBwdWJsaWM6CiAKICAgICBib29sIGlz Rmlyc3RQYXJ0eSgpIGNvbnN0OwogCisgICAgYm9vbCBpc0FwcEJvdW5kKCkgY29uc3QgeyByZXR1 cm4gbV9pc0FwcEJvdW5kOyB9CisgICAgdm9pZCBzZXRJc0FwcEJvdW5kKGJvb2wgaXNBcHBCb3Vu ZCkgeyBtX2lzQXBwQm91bmQgPSBpc0FwcEJvdW5kOyB9CisKIHByaXZhdGU6CiAgICAgS2V5IG1f a2V5OwogICAgIFdhbGxUaW1lIG1fbGFzdFNlZW47CiAgICAgV2FsbFRpbWUgbV9maXJzdFNlZW47 CiAgICAgYm9vbCBtX2lzVHJhbnNpZW50IHsgZmFsc2UgfTsKICAgICBib29sIG1faXNTYW1lU2l0 ZSB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzQXBwQm91bmQgeyBmYWxzZSB9OwogICAgIFVSTCBt X2ZpcnN0UGFydHlGb3JDb29raWVzOwogICAgIFdlYkNvcmU6OkhUVFBIZWFkZXJNYXAgbV9yZXF1 ZXN0SGVhZGVyczsKICAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRQcmlvcml0eSBtX3ByaW9yaXR5 OwpAQCAtOTMsNyArOTcsNyBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBLZXkmIGtleSgpIGNvbnN0 IHsgcmV0dXJuIG1fa2V5OyB9CiAgICAgV2FsbFRpbWUgdGltZVN0YW1wKCkgY29uc3QgeyByZXR1 cm4gbV90aW1lU3RhbXA7IH0KLSAgICBjb25zdCBWZWN0b3I8U3VicmVzb3VyY2VJbmZvPiYgc3Vi cmVzb3VyY2VzKCkgY29uc3QgeyByZXR1cm4gbV9zdWJyZXNvdXJjZXM7IH0KKyAgICBWZWN0b3I8 U3VicmVzb3VyY2VJbmZvPiYgc3VicmVzb3VyY2VzKCkgeyByZXR1cm4gbV9zdWJyZXNvdXJjZXM7 IH0KIAogICAgIHZvaWQgdXBkYXRlU3VicmVzb3VyY2VMb2Fkcyhjb25zdCBWZWN0b3I8c3RkOjp1 bmlxdWVfcHRyPFN1YnJlc291cmNlTG9hZD4+Jik7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1Y2Y2MWY2NzM2YjkwN2Jl MTI1MmJhOGFlNWExZjQ2ODc3YjBlZTkwLi5jZjQ3OWRjYTQ0NjU2Y2IzZGY0OTAzYmE5NDAzOGRi ZjUxZGMzZDNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMDUtMTAgIEthdGUgQ2hlbmV5 ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgU3BlY3VsYXRpdmUgcmV2 YWxpZGF0aW9uIHJlcXVlc3RzIG5vdCBwcm9wZXJseSBhdHRyaWJ1dGVkIGFzIGFwcC1ib3VuZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NjEzCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzY2NDM1OD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXlvdXQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAg ICAqIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmlidXRp b24tc3BlY3VsYXRpdmUtcmV2YWxpZGF0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlv bi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24uaHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC90 ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5L3Jlc291cmNlcy9mcmFtZS13aXRoLWF1dGhlbnRp Y2F0ZWQtcmVzb3VyY2UucHk6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvaW4tYXBwLWJy b3dzZXItcHJpdmFjeS9yZXNvdXJjZXMvcmVzb3VyY2Utd2l0aC1hdXRoLnB5OiBBZGRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgIEVzc2Vu dGlhbGx5IGNvcGllZCBodHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUvc3BlY3VsYXRpdmUtdmFs aWRhdGlvbi9odHRwLWF1dGguaHRtbAorICAgICAgICB0byBoaXQgdGhlIHNwZWN1bGF0aXZlIHJl dmFsaWRhdGlvbiBjb2RlIHBhdGgsIGFuZCBhZGRlZCBpbiBhIGNoZWNrCisgICAgICAgIGZvciBh cHAtYm91bmQgbG9hZCBkYXRhIGF0IHRoZSBlbmQgdG8gY29uZmlybSBhbGwgcmVxdWVzdHMgYXJl IG1hcmtlZAorICAgICAgICBjb3JyZWN0bHkuCisKIDIwMjEtMDUtMTAgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBJbWFnZU92ZXJsYXlD b250cm9sbGVyIHNob3VsZCBwYWludCBzZWxlY3Rpb24gcXVhZHMgaW5zdGVhZCBvZiBib3VuZGlu ZyByZWN0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nl ci1wcml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24t ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2 YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24tZXhwZWN0 ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjYyYjRkNGE1MTJhYmNlYzVkYmI4ZWE5YjY5NDY4M2U4M2FmMmJk NmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luLWFwcC1icm93 c2VyLXByaXZhY3kvYXBwLWJvdW5kLWF0dHJpYnV0aW9uLXNwZWN1bGF0aXZlLXJldmFsaWRhdGlv bi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorMTI3LjAuMC4xOjgwMDAgLSBkaWRSZWNl aXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgLSBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlv blNjaGVtZUhUVFBCYXNpYyAtIFJlc3BvbmRpbmcgd2l0aCB0ZXN0VXNlcm5hbWU6dGVzdFBhc3N3 b3JkCisxMjcuMC4wLjE6ODAwMCAtIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAt IFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lSFRUUEJhc2ljIC0gU2ltdWxhdGlu ZyBjYW5jZWxsZWQgYXV0aGVudGljYXRpb24gc2hlZXQKK1Rlc3RzIHNwZWN1bGF0aXZlIHJldmFs aWRhdGlvbiBvZiBhdXRoZW50aWNhdGVkIHJlc291cmNlcy4KKworT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09N UExFVEUiLgorCisKK1BBU1MgeGhyLnN0YXR1cyBpcyA0MDEKK1BBU1MgU3VjY2Vzc2Z1bHkgbG9h ZGVkLgorUEFTUyBzdWNjZXNzZnVsbHkgbG9hZGVkIG9ubHkgYXBwLWJvdW5kIHJlcXVlc3RzCitQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5L2FwcC1i b3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24uaHRtbCBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmlidXRp b24tc3BlY3VsYXRpdmUtcmV2YWxpZGF0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGMwNzZiNWVlNmVj ZjQ0NDBiY2JmNjA4MTBiOWY0NzE3MThjMTZhYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmlidXRp b24tc3BlY3VsYXRpdmUtcmV2YWxpZGF0aW9uLmh0bWwKQEAgLTAsMCArMSw3MiBAQAorPHNjcmlw dCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHNwZWN1bGF0aXZlIHJldmFsaWRhdGlvbiBvZiBhdXRo ZW50aWNhdGVkIHJlc291cmNlcy4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCit0ZXN0UnVu bmVyLnNldEhhbmRsZXNBdXRoZW50aWNhdGlvbkNoYWxsZW5nZXModHJ1ZSk7Cit0ZXN0UnVubmVy LnNldEF1dGhlbnRpY2F0aW9uVXNlcm5hbWUoInRlc3RVc2VybmFtZSIpOwordGVzdFJ1bm5lci5z ZXRBdXRoZW50aWNhdGlvblBhc3N3b3JkKCJ0ZXN0UGFzc3dvcmQiKTsKKworc3RhdGUgPSAid2Fy bXVwIjsKKworZnVuY3Rpb24gY2xlYXJDcmVkZW50aWFsU3RvcmFnZSgpCit7CisgICAgeGhyID0g bmV3IFhNTEh0dHBSZXF1ZXN0KCk7CisgICAgeGhyLm9wZW4oIkdFVCIsICJyZXNvdXJjZXMvcmVz b3VyY2Utd2l0aC1hdXRoLnB5P290aGVyIiwgZmFsc2UsICJiYWRVc2VybmFtZSIsICJiYWRQYXNz d29yZCIpOworICAgIHhoci5zZW5kKCk7CisgICAgc2hvdWxkQmUoInhoci5zdGF0dXMiLCAiNDAx Iik7Cit9CisKK2Z1bmN0aW9uIGxvZyhtZXNzYWdlKQoreworICAgIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdjb25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobWVz c2FnZSArICdcbicpKTsKK30KKworZnVuY3Rpb24gZnJhbWVMb2FkZWQoKQoreworICAgIGlmIChz dGF0ZSA9PSAid2FybXVwIikgeworICAgICAgICAvLyBOYXZpZ2F0ZSBmcmFtZSB0byAnYWJvdXQ6 YmxhbmsnIHRvIGZsdXNoIHRvIHN1YnJlc291cmNlIGxvYWRzIG1ldGFkYXRhIHRvIGRpc2suCisg ICAgICAgIHN0YXRlID0gImZsdXNoaW5nTWV0YWRhdGEiOworICAgICAgICB0ZXN0UnVubmVyLnNl dEhhbmRsZXNBdXRoZW50aWNhdGlvbkNoYWxsZW5nZXMoZmFsc2UpOworICAgICAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgidGVzdEZyYW1lIikuc3JjID0gImFib3V0OmJsYW5rIjsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAoc3RhdGUgPT0gImZsdXNoaW5nTWV0YWRhdGEiKSB7 CisgICAgICAgIGNsZWFyQ3JlZGVudGlhbFN0b3JhZ2UoKTsKKworICAgICAgICBpbnRlcm5hbHMu Y2xlYXJNZW1vcnlDYWNoZSgpOworICAgICAgICB0ZXN0UnVubmVyLnNldEhhbmRsZXNBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZXMoZmFsc2UpOworCisgICAgICAgIC8vIE5hdmlnYXRlIGZyYW1lIHRv IGl0cyBvcmlnaW5hbCBsb2NhdGlvbiBhZ2Fpbi4gVGhpcyB0aW1lIGl0IHNob3VsZCBzcGVjdWxh dGl2ZWx5CisgICAgICAgIC8vIHZhbGlkYXRlIHN1YnJlc291cmNlcyBhcyB3ZSBoYXZlIHN1YnJl c291cmNlIGxvYWRzIG1ldGFkYXRhIGluIHRoZSBkaXNrIGNhY2hlLgorICAgICAgICBzdGF0ZSA9 ICJzcGVjdWxhdGl2ZVJldmFsaWRhdGlvbiI7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJ0ZXN0RnJhbWUiKS5zcmMgPSAicmVzb3VyY2VzL2ZyYW1lLXdpdGgtYXV0aGVudGljYXRl ZC1yZXNvdXJjZS5weSI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKHN0YXRlID09 ICJzcGVjdWxhdGl2ZVJldmFsaWRhdGlvbiIpIHsKKyAgICAgICAgdGVzdFBhc3NlZCgiU3VjY2Vz c2Z1bHkgbG9hZGVkLiIpOworICAgICAgICB2YXIgZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCA9IHRl c3RSdW5uZXIuZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCgpOworICAgICAgICB2YXIgZGlkTG9hZE5v bkFwcEJvdW5kUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlkTG9hZE5vbkFwcEJvdW5kUmVxdWVzdCgp OworCisgICAgICAgIGlmIChkaWRMb2FkTm9uQXBwQm91bmRSZXF1ZXN0KSB7CisgICAgICAgICAg ICBsb2coIkZBSUwgZGlkIGxvYWQgbm9uIGFwcC1ib3VuZCByZXF1ZXN0Iik7CisgICAgICAgICAg ICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAg ICAgIGlmICghZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCkgeworICAgICAgICAgICAgbG9nKCJGQUlM IGRpZCBub3QgbG9hZCBhcHAtYm91bmQgcmVxdWVzdCIpOworICAgICAgICAgICAgZmluaXNoSlNU ZXN0KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBsb2coIlBB U1Mgc3VjY2Vzc2Z1bGx5IGxvYWRlZCBvbmx5IGFwcC1ib3VuZCByZXF1ZXN0cyIpOworCisgICAg ICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICByZXR1cm47CisgICAgfQorfQorCis8L3Njcmlw dD4KKzxpZnJhbWUgaWQ9InRlc3RGcmFtZSIgc3JjPSJyZXNvdXJjZXMvZnJhbWUtd2l0aC1hdXRo ZW50aWNhdGVkLXJlc291cmNlLnB5IiBvbmxvYWQ9ImZyYW1lTG9hZGVkKCkiPjwvaWZyYW1lPgor PHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0 PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2 YWN5L3Jlc291cmNlcy9mcmFtZS13aXRoLWF1dGhlbnRpY2F0ZWQtcmVzb3VyY2UucHkgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luLWFwcC1icm93c2VyLXByaXZhY3kvcmVzb3VyY2VzL2ZyYW1l LXdpdGgtYXV0aGVudGljYXRlZC1yZXNvdXJjZS5weQpuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44NDhkMGZkMWE2ZDZj MDk5YWFkNjFlMDA0MjQyZTIzODk1NTNlOTQxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5L3Jlc291cmNlcy9mcmFtZS13aXRo LWF1dGhlbnRpY2F0ZWQtcmVzb3VyY2UucHkKQEAgLTAsMCArMSwxMyBAQAorIyEvdXNyL2Jpbi9l bnYgcHl0aG9uMworCitpbXBvcnQgc3lzCisKK3N5cy5zdGRvdXQud3JpdGUoCisgICAgJ0NhY2hl LUNvbnRyb2w6IG1heC1hZ2U9MFxyXG4nCisgICAgJ0V0YWc6IDEyMzQ1Njc4OVxyXG4nCisgICAg J0NvbnRlbnQtVHlwZTogdGV4dC9odG1sXHJcblxyXG4nCisgICAgJzwhRE9DVFlQRSBodG1sPlxu JworICAgICc8Ym9keT5cbicKKyAgICAnPHNjcmlwdCBzcmM9InJlc291cmNlLXdpdGgtYXV0aC5w eSI+PC9zY3JpcHQ+XG4nCisgICAgJzwvYm9keT5cbicKKykKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9yZXNvdXJjZXMvcmVzb3VyY2Ut d2l0aC1hdXRoLnB5IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2 YWN5L3Jlc291cmNlcy9yZXNvdXJjZS13aXRoLWF1dGgucHkKbmV3IGZpbGUgbW9kZSAxMDA3NTUK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2FmYjc4ZDgx YzZmM2M5ZGE0NzlkMjhiZTI0NmFlMTViY2QwNGRkZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9yZXNvdXJjZXMvcmVzb3Vy Y2Utd2l0aC1hdXRoLnB5CkBAIC0wLDAgKzEsMjkgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhvbjMK KworaW1wb3J0IGJhc2U2NAoraW1wb3J0IG9zCitpbXBvcnQgc3lzCisKK2NyZWRlbnRpYWxzID0g YmFzZTY0LmI2NGRlY29kZShvcy5lbnZpcm9uLmdldCgnSFRUUF9BVVRIT1JJWkFUSU9OJywgJyBP Zz09Jykuc3BsaXQoJyAnKVsxXSkuZGVjb2RlKCkuc3BsaXQoJzonKQordXNlcm5hbWUgPSBjcmVk ZW50aWFsc1swXQorcGFzc3dvcmQgPSAnOicuam9pbihjcmVkZW50aWFsc1sxOl0pCisKK2V4cGVj dGVkVXNlcm5hbWUgPSAndGVzdFVzZXJuYW1lJworZXhwZWN0ZWRQYXNzd29yZCA9ICd0ZXN0UGFz c3dvcmQnCityZWFsbSA9IG9zLmVudmlyb24uZ2V0KCdSRVFVRVNUX1VSSScsICcnKQorCitzeXMu c3Rkb3V0LndyaXRlKAorICAgICdDb250ZW50LVR5cGU6IHRleHQvamF2YXNjcmlwdFxyXG4nCisg ICAgJ0NhY2hlLUNvbnRyb2w6IG1heC1hZ2U9MFxyXG4nCisgICAgJ0V0YWc6IDEyMzQ1Njc4OVxy XG4nCispCisKK2lmIHVzZXJuYW1lICE9IGV4cGVjdGVkVXNlcm5hbWUgb3IgcGFzc3dvcmQgIT0g ZXhwZWN0ZWRQYXNzd29yZDoKKyAgICBzeXMuc3Rkb3V0LndyaXRlKAorICAgICAgICBmJ1dXVy1B dXRoZW50aWNhdGU6IEJhc2ljIHJlYWxtPSJ7cmVhbG19IlxyXG4nCisgICAgICAgICdzdGF0dXM6 IDQwMVxyXG5cclxuJworICAgICAgICBmJ1NlbnQgdXNlcm5hbWU6cGFzc3dvcmQgb2YgKHt1c2Vy bmFtZX06e3Bhc3N3b3JkfSkgd2hpY2ggaXMgbm90IHdoYXQgd2FzIGV4cGVjdGVkXG4nCisgICAg KQorICAgIHN5cy5leGl0KDApCisKK3N5cy5zdGRvdXQud3JpdGUoJ1xyXG5sb2FkZWQgPSB0cnVl O1xuJykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVj dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucwpp bmRleCAxMDAyZTVhMzk3M2ViYTE1MDFhZTc3NWUxOGNhZDNlMzY4MmU0MzAxLi43NGU1YWUwOGEz M2I4NmY5OTFmMTZjMTcxMTkwYzU0OWQyYzU2MTZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vaW9zLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNzkxLDYgKzE3OTEsNyBAQCBodHRwL3Rl c3RzL2luLWFwcC1icm93c2VyLXByaXZhY3kvIFsgUGFzcyBdCiBodHRwL3Rlc3RzL2luLWFwcC1i cm93c2VyLXByaXZhY3kvY29udGV4dC1zdHJpbmctZm9yLXN1YmZyYW1lLmh0bWwgWyBTa2lwIF0K IGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9jb250ZXh0LXN0cmluZy1wcmVjb25u ZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9jb250 ZXh0LXN0cmluZy1wcmVmbGlnaHQuaHRtbCBbIFNraXAgXQoraHR0cC90ZXN0cy9pbi1hcHAtYnJv d3Nlci1wcml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRp b24uaHRtbCBbIFNraXAgXQogCiB3ZWJraXQub3JnL2IvMTc1MTkzIGZhc3QvaW1hZ2VzL2FzeW5j LWltYWdlLWJvZHktYmFja2dyb3VuZC1pbWFnZS5odG1sIFsgUGFzcyBUaW1lb3V0IF0KIAo= 428217 2021-05-10 16:19:34 -0700 2021-05-10 16:52:47 -0700 Patch for landing bug-225613-20210510161933.patch text/plain 15212 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgyOGI0NTEwNGEwZjZjMDI0 OTRkOGQ5MWZjYTNkYjBmYWJhYjM5YTcuLjVmYWZiOTZmZDM5MzZmNTQ4ODE2NmJhOWI3ZDdlY2Zl ODk1MmE2ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDUtMTAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgU3BlY3VsYXRpdmUg cmV2YWxpZGF0aW9uIHJlcXVlc3RzIG5vdCBwcm9wZXJseSBhdHRyaWJ1dGVkIGFzIGFwcC1ib3Vu ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NjEz CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzY2NDM1OD4KKworICAgICAgICBSZXZpZXdlZCBi eSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIFNwZWN1bGF0aXZlIHJldmFsaWRhdGlvbiByZXF1 ZXN0cyBtYWtlIG5ldHdvcmsgY29ubmVjdGlvbnMgYW5kIHNob3VsZAorICAgICAgICBiZSBhdHRy aWJ1dGVkIGFzIGFwcC1ib3VuZCBiYXNlZCBvbiB0aGUgaW5pdGlhdGluZyBuYXZpZ2F0aW9uLgor CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVM b2FkTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Y29uc3RydWN0 UmV2YWxpZGF0aW9uUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3Bl Y3VsYXRpdmVMb2FkTWFuYWdlcjo6cmVnaXN0ZXJMb2FkKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya0NhY2hlOjpTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpzdGFydFNwZWN1bGF0aXZlUmV2YWxp ZGF0aW9uKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVj dWxhdGl2ZUxvYWRNYW5hZ2VyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3VicmVzb3VyY2VzRW50cnkuaDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nh Y2hlOjpTdWJyZXNvdXJjZUluZm86OmlzQXBwQm91bmQgY29uc3QpOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrQ2FjaGU6OlN1YnJlc291cmNlSW5mbzo6c2V0SXNBcHBCb3VuZCk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3VicmVzb3VyY2VzRW50cnk6OnN1YnJlc291cmNlcyk6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3VicmVzb3VyY2VzRW50cnk6OnN1YnJl c291cmNlcyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIFJlbW92ZSBjb25zdCBxdWFsaWZpZXIg Zm9yIHRoZSBTdWJyZXNvdXJjZXNFbnRyeTo6c3VicmVzb3VyY2VzKCkKKyAgICAgICAgZnVuY3Rp b24gbm93IHRoYXQgd2UgbmVlZCB0byBzdG9yZSB0aGUgYXBwLWJvdW5kIHZhbHVlLgorCiAyMDIx LTA1LTEwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAg ICAgIFByZWZsaWdodCByZXF1ZXN0cyBub3QgcHJvcGVybHkgYXR0cmlidXRlZCBhcyBhcHAtYm91 bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29y a0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwCmluZGV4 IDIxYTNkZDI5Mzk1YjEyMjJkYTdmZTFmNGQ1NmEzYjMzNzBiZDI2MDQuLjk5NTU3ZGEyMjUyYWVl ZWY4NjFiNzQ0MzNiNWIwMTE3M2I2YWE1ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVj dWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcApAQCAtOTMsNiArOTMsOCBAQCBzdGF0aWMgaW5saW5lIFJl c291cmNlUmVxdWVzdCBjb25zdHJ1Y3RSZXZhbGlkYXRpb25SZXF1ZXN0KGNvbnN0IEtleSYga2V5 LCBjb25zdAogICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMo c3ViUmVzb3VyY2VJbmZvLmZpcnN0UGFydHlGb3JDb29raWVzKCkpOwogICAgIHJldmFsaWRhdGlv blJlcXVlc3Quc2V0SXNTYW1lU2l0ZShzdWJSZXNvdXJjZUluZm8uaXNTYW1lU2l0ZSgpKTsKICAg ICByZXZhbGlkYXRpb25SZXF1ZXN0LnNldElzVG9wU2l0ZShzdWJSZXNvdXJjZUluZm8uaXNUb3BT aXRlKCkpOworICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0SXNBcHBCb3VuZChzdWJSZXNvdXJj ZUluZm8uaXNBcHBCb3VuZCgpKTsKKwogICAgIGlmICgha2V5LnBhcnRpdGlvbigpLmlzRW1wdHko KSkKICAgICAgICAgcmV2YWxpZGF0aW9uUmVxdWVzdC5zZXRDYWNoZVBhcnRpdGlvbihrZXkucGFy dGl0aW9uKCkpOwogICAgIEFTU0VSVF9XSVRIX01FU1NBR0Uoa2V5LnJhbmdlKCkuaXNFbXB0eSgp LCAicmFuZ2UgaXMgbm90IHN1cHBvcnRlZCIpOwpAQCAtMzY3LDEyICszNjksMTIgQEAgdm9pZCBT cGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpyZWdpc3RlckxvYWQoY29uc3QgR2xvYmFsRnJhbWVJRCYg ZnJhbWVJRCwgY29uc3QgUmUKICAgICAgICAgbV9wZW5kaW5nRnJhbWVMb2Fkcy5hZGQoZnJhbWVJ RCwgcGVuZGluZ0ZyYW1lTG9hZC5jb3B5UmVmKCkpOwogCiAgICAgICAgIC8vIFJldHJpZXZlIHRo ZSBzdWJyZXNvdXJjZXMgZW50cnkgaWYgaXQgZXhpc3RzIHRvIHN0YXJ0IHNwZWN1bGF0aXZlIHJl dmFsaWRhdGlvbiBhbmQgdG8gdXBkYXRlIGl0LgotICAgICAgICByZXRyaWV2ZVN1YnJlc291cmNl c0VudHJ5KHJlc291cmNlS2V5LCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyks IGZyYW1lSUQsIHBlbmRpbmdGcmFtZUxvYWQgPSBXVEZNb3ZlKHBlbmRpbmdGcmFtZUxvYWQpLCBp c05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluXShzdGQ6OnVuaXF1ZV9wdHI8U3VicmVzb3VyY2Vz RW50cnk+IGVudHJ5KSB7CisgICAgICAgIHJldHJpZXZlU3VicmVzb3VyY2VzRW50cnkocmVzb3Vy Y2VLZXksIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgZnJhbWVJRCwgcGVu ZGluZ0ZyYW1lTG9hZCA9IFdURk1vdmUocGVuZGluZ0ZyYW1lTG9hZCksIHJlcXVlc3RJc0FwcEJv dW5kID0gcmVxdWVzdC5pc0FwcEJvdW5kKCksIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW5d KHN0ZDo6dW5pcXVlX3B0cjxTdWJyZXNvdXJjZXNFbnRyeT4gZW50cnkpIHsKICAgICAgICAgICAg IGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICBp ZiAoZW50cnkpCi0gICAgICAgICAgICAgICAgc3RhcnRTcGVjdWxhdGl2ZVJldmFsaWRhdGlvbihm cmFtZUlELCAqZW50cnksIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOworICAgICAgICAg ICAgICAgIHN0YXJ0U3BlY3VsYXRpdmVSZXZhbGlkYXRpb24oZnJhbWVJRCwgKmVudHJ5LCByZXF1 ZXN0SXNBcHBCb3VuZCwgaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbik7CiAKICAgICAgICAg ICAgIHBlbmRpbmdGcmFtZUxvYWQtPnNldEV4aXN0aW5nU3VicmVzb3VyY2VzRW50cnkoV1RGTW92 ZShlbnRyeSkpOwogICAgICAgICB9KTsKQEAgLTU5MCwxMCArNTkyLDExIEBAIHZvaWQgU3BlY3Vs YXRpdmVMb2FkTWFuYWdlcjo6cHJlbG9hZEVudHJ5KGNvbnN0IEtleSYga2V5LCBjb25zdCBTdWJy ZXNvdXJjZUluZm8mCiAgICAgfSk7CiB9CiAKLXZvaWQgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6 c3RhcnRTcGVjdWxhdGl2ZVJldmFsaWRhdGlvbihjb25zdCBHbG9iYWxGcmFtZUlEJiBmcmFtZUlE LCBTdWJyZXNvdXJjZXNFbnRyeSYgZW50cnksIE9wdGlvbmFsPE5hdmlnYXRpbmdUb0FwcEJvdW5k RG9tYWluPiBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKQordm9pZCBTcGVjdWxhdGl2ZUxv YWRNYW5hZ2VyOjpzdGFydFNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKGNvbnN0IEdsb2JhbEZyYW1l SUQmIGZyYW1lSUQsIFN1YnJlc291cmNlc0VudHJ5JiBlbnRyeSwgYm9vbCByZXF1ZXN0SXNBcHBC b3VuZCwgT3B0aW9uYWw8TmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4+IGlzTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW4pCiB7CiAgICAgZm9yIChhdXRvJiBzdWJyZXNvdXJjZUluZm8gOiBlbnRy eS5zdWJyZXNvdXJjZXMoKSkgewogICAgICAgICBhdXRvJiBrZXkgPSBzdWJyZXNvdXJjZUluZm8u a2V5KCk7CisgICAgICAgIHN1YnJlc291cmNlSW5mby5zZXRJc0FwcEJvdW5kKHJlcXVlc3RJc0Fw cEJvdW5kKTsKICAgICAgICAgaWYgKCFzdWJyZXNvdXJjZUluZm8uaXNUcmFuc2llbnQoKSkKICAg ICAgICAgICAgIHByZWxvYWRFbnRyeShrZXksIHN1YnJlc291cmNlSW5mbywgZnJhbWVJRCwgaXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbik7CiAgICAgICAgIGVsc2UgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2 ZUxvYWRNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaAppbmRleCBhMTQxMDE0M2M3ZjEwYzQ3YTMy N2JjZDYyNzE1Y2ZmMmE2YmZlNjExLi44NTZjZDVkNDUwOTM2NmU1OGJmZDY1YWFmYjc1MzlmYzkw ZGNkNmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaApA QCAtNjksNyArNjksNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcHJlY29ubmVjdEZvclN1YnJlc291 cmNlKGNvbnN0IFN1YnJlc291cmNlSW5mbyYsIEVudHJ5KiwgY29uc3QgR2xvYmFsRnJhbWVJRCYs IE9wdGlvbmFsPE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluPik7CiAgICAgYm9vbCBzYXRpc2Z5 UGVuZGluZ1JlcXVlc3RzKGNvbnN0IEtleSYsIEVudHJ5Kik7CiAgICAgdm9pZCByZXRyaWV2ZVN1 YnJlc291cmNlc0VudHJ5KGNvbnN0IEtleSYgc3RvcmFnZUtleSwgV1RGOjpGdW5jdGlvbjx2b2lk IChzdGQ6OnVuaXF1ZV9wdHI8U3VicmVzb3VyY2VzRW50cnk+KT4mJik7Ci0gICAgdm9pZCBzdGFy dFNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBTdWJyZXNvdXJj ZXNFbnRyeSYsIE9wdGlvbmFsPE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluPik7CisgICAgdm9p ZCBzdGFydFNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBTdWJy ZXNvdXJjZXNFbnRyeSYsIGJvb2wsIE9wdGlvbmFsPE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWlu Pik7CiAKICAgICBzdGF0aWMgYm9vbCBjYW5Vc2VQcmVsb2FkZWRFbnRyeShjb25zdCBQcmVsb2Fk ZWRFbnRyeSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgYWN0dWFsUmVxdWVzdCk7 CiAgICAgc3RhdGljIGJvb2wgY2FuVXNlUGVuZGluZ1ByZWxvYWQoY29uc3QgU3BlY3VsYXRpdmVM b2FkJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBhY3R1YWxSZXF1ZXN0KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3VicmVzb3VyY2VzRW50cnkuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlU3VicmVzb3VyY2VzRW50cnkuaAppbmRleCAzNzdkMzM3OTlmN2JiNWRjZTZj ZTViOTA2YTM3ZTUyNDhlNTA5MWE0Li4yM2U3MzUwZTk1OGQ2MTY0ZDM3YmUwMmExMjk0MTJiNWFi ODQ5MThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN1YnJlc291cmNlc0VudHJ5LmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdWJyZXNvdXJjZXNFbnRyeS5oCkBAIC01OSwxMiAr NTksMTYgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0ZpcnN0UGFydHkoKSBjb25zdDsKIAorICAg IGJvb2wgaXNBcHBCb3VuZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNBcHBCb3VuZDsgfQorICAgIHZv aWQgc2V0SXNBcHBCb3VuZChib29sIGlzQXBwQm91bmQpIHsgbV9pc0FwcEJvdW5kID0gaXNBcHBC b3VuZDsgfQorCiBwcml2YXRlOgogICAgIEtleSBtX2tleTsKICAgICBXYWxsVGltZSBtX2xhc3RT ZWVuOwogICAgIFdhbGxUaW1lIG1fZmlyc3RTZWVuOwogICAgIGJvb2wgbV9pc1RyYW5zaWVudCB7 IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzU2FtZVNpdGUgeyBmYWxzZSB9OworICAgIGJvb2wgbV9p c0FwcEJvdW5kIHsgZmFsc2UgfTsKICAgICBVUkwgbV9maXJzdFBhcnR5Rm9yQ29va2llczsKICAg ICBXZWJDb3JlOjpIVFRQSGVhZGVyTWFwIG1fcmVxdWVzdEhlYWRlcnM7CiAgICAgV2ViQ29yZTo6 UmVzb3VyY2VMb2FkUHJpb3JpdHkgbV9wcmlvcml0eTsKQEAgLTkzLDcgKzk3LDcgQEAgcHVibGlj OgogCiAgICAgY29uc3QgS2V5JiBrZXkoKSBjb25zdCB7IHJldHVybiBtX2tleTsgfQogICAgIFdh bGxUaW1lIHRpbWVTdGFtcCgpIGNvbnN0IHsgcmV0dXJuIG1fdGltZVN0YW1wOyB9Ci0gICAgY29u c3QgVmVjdG9yPFN1YnJlc291cmNlSW5mbz4mIHN1YnJlc291cmNlcygpIGNvbnN0IHsgcmV0dXJu IG1fc3VicmVzb3VyY2VzOyB9CisgICAgVmVjdG9yPFN1YnJlc291cmNlSW5mbz4mIHN1YnJlc291 cmNlcygpIHsgcmV0dXJuIG1fc3VicmVzb3VyY2VzOyB9CiAKICAgICB2b2lkIHVwZGF0ZVN1YnJl c291cmNlTG9hZHMoY29uc3QgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxTdWJyZXNvdXJjZUxvYWQ+ PiYpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggNmVhMDcwN2YwYWFjYjY1Njk4NWU4OTkwZTAwYmM1YmIyNDNlYmVlNi4u MGZlZDllMzQ3OGM2ZDk3NjkwZWFjYWEyNTlkNTBhN2FlOWM3YWVmOCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIzIEBACisyMDIxLTA1LTEwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUu Y29tPgorCisgICAgICAgIFNwZWN1bGF0aXZlIHJldmFsaWRhdGlvbiByZXF1ZXN0cyBub3QgcHJv cGVybHkgYXR0cmlidXRlZCBhcyBhcHAtYm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTYxMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzc2 NjQzNTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBM YXlvdXQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dz ZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmlidXRpb24tc3BlY3VsYXRpdmUtcmV2YWxpZGF0aW9u LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nl ci1wcml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24u aHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5 L3Jlc291cmNlcy9mcmFtZS13aXRoLWF1dGhlbnRpY2F0ZWQtcmVzb3VyY2UucHk6IEFkZGVkLgor ICAgICAgICAqIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9yZXNvdXJjZXMvcmVz b3VyY2Utd2l0aC1hdXRoLnB5OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mtd2syL1Rl c3RFeHBlY3RhdGlvbnM6CisgICAgICAgIEVzc2VudGlhbGx5IGNvcGllZCBodHRwL3Rlc3RzL2Nh Y2hlL2Rpc2stY2FjaGUvc3BlY3VsYXRpdmUtdmFsaWRhdGlvbi9odHRwLWF1dGguaHRtbAorICAg ICAgICB0byBoaXQgdGhlIHNwZWN1bGF0aXZlIHJldmFsaWRhdGlvbiBjb2RlIHBhdGgsIGFuZCBh ZGRlZCBpbiBhIGNoZWNrCisgICAgICAgIGZvciBhcHAtYm91bmQgbG9hZCBkYXRhIGF0IHRoZSBl bmQgdG8gY29uZmlybSBhbGwgcmVxdWVzdHMgYXJlIG1hcmtlZAorICAgICAgICBjb3JyZWN0bHku CisKIDIwMjEtMDUtMTAgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+ CiAKICAgICAgICAgUHJlZmxpZ2h0IHJlcXVlc3RzIG5vdCBwcm9wZXJseSBhdHRyaWJ1dGVkIGFz IGFwcC1ib3VuZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJv d3Nlci1wcml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRp b24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1w cml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24tZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYyYjRkNGE1MTJhYmNlYzVkYmI4ZWE5YjY5NDY4M2U4M2Fm MmJkNmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luLWFwcC1i cm93c2VyLXByaXZhY3kvYXBwLWJvdW5kLWF0dHJpYnV0aW9uLXNwZWN1bGF0aXZlLXJldmFsaWRh dGlvbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorMTI3LjAuMC4xOjgwMDAgLSBkaWRS ZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgLSBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNh dGlvblNjaGVtZUhUVFBCYXNpYyAtIFJlc3BvbmRpbmcgd2l0aCB0ZXN0VXNlcm5hbWU6dGVzdFBh c3N3b3JkCisxMjcuMC4wLjE6ODAwMCAtIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5n ZSAtIFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lSFRUUEJhc2ljIC0gU2ltdWxh dGluZyBjYW5jZWxsZWQgYXV0aGVudGljYXRpb24gc2hlZXQKK1Rlc3RzIHNwZWN1bGF0aXZlIHJl dmFsaWRhdGlvbiBvZiBhdXRoZW50aWNhdGVkIHJlc291cmNlcy4KKworT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUiLgorCisKK1BBU1MgeGhyLnN0YXR1cyBpcyA0MDEKK1BBU1MgU3VjY2Vzc2Z1bHkg bG9hZGVkLgorUEFTUyBzdWNjZXNzZnVsbHkgbG9hZGVkIG9ubHkgYXBwLWJvdW5kIHJlcXVlc3Rz CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5L2Fw cC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24uaHRtbCBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmli dXRpb24tc3BlY3VsYXRpdmUtcmV2YWxpZGF0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGMwNzZiNWVl NmVjZjQ0NDBiY2JmNjA4MTBiOWY0NzE3MThjMTZhYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmli dXRpb24tc3BlY3VsYXRpdmUtcmV2YWxpZGF0aW9uLmh0bWwKQEAgLTAsMCArMSw3MiBAQAorPHNj cmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8 c2NyaXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHNwZWN1bGF0aXZlIHJldmFsaWRhdGlvbiBvZiBh dXRoZW50aWNhdGVkIHJlc291cmNlcy4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCit0ZXN0 UnVubmVyLnNldEhhbmRsZXNBdXRoZW50aWNhdGlvbkNoYWxsZW5nZXModHJ1ZSk7Cit0ZXN0UnVu bmVyLnNldEF1dGhlbnRpY2F0aW9uVXNlcm5hbWUoInRlc3RVc2VybmFtZSIpOwordGVzdFJ1bm5l ci5zZXRBdXRoZW50aWNhdGlvblBhc3N3b3JkKCJ0ZXN0UGFzc3dvcmQiKTsKKworc3RhdGUgPSAi d2FybXVwIjsKKworZnVuY3Rpb24gY2xlYXJDcmVkZW50aWFsU3RvcmFnZSgpCit7CisgICAgeGhy ID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7CisgICAgeGhyLm9wZW4oIkdFVCIsICJyZXNvdXJjZXMv cmVzb3VyY2Utd2l0aC1hdXRoLnB5P290aGVyIiwgZmFsc2UsICJiYWRVc2VybmFtZSIsICJiYWRQ YXNzd29yZCIpOworICAgIHhoci5zZW5kKCk7CisgICAgc2hvdWxkQmUoInhoci5zdGF0dXMiLCAi NDAxIik7Cit9CisKK2Z1bmN0aW9uIGxvZyhtZXNzYWdlKQoreworICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCdjb25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUo bWVzc2FnZSArICdcbicpKTsKK30KKworZnVuY3Rpb24gZnJhbWVMb2FkZWQoKQoreworICAgIGlm IChzdGF0ZSA9PSAid2FybXVwIikgeworICAgICAgICAvLyBOYXZpZ2F0ZSBmcmFtZSB0byAnYWJv dXQ6YmxhbmsnIHRvIGZsdXNoIHRvIHN1YnJlc291cmNlIGxvYWRzIG1ldGFkYXRhIHRvIGRpc2su CisgICAgICAgIHN0YXRlID0gImZsdXNoaW5nTWV0YWRhdGEiOworICAgICAgICB0ZXN0UnVubmVy LnNldEhhbmRsZXNBdXRoZW50aWNhdGlvbkNoYWxsZW5nZXMoZmFsc2UpOworICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdEZyYW1lIikuc3JjID0gImFib3V0OmJsYW5rIjsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAoc3RhdGUgPT0gImZsdXNoaW5nTWV0YWRhdGEi KSB7CisgICAgICAgIGNsZWFyQ3JlZGVudGlhbFN0b3JhZ2UoKTsKKworICAgICAgICBpbnRlcm5h bHMuY2xlYXJNZW1vcnlDYWNoZSgpOworICAgICAgICB0ZXN0UnVubmVyLnNldEhhbmRsZXNBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZXMoZmFsc2UpOworCisgICAgICAgIC8vIE5hdmlnYXRlIGZyYW1l IHRvIGl0cyBvcmlnaW5hbCBsb2NhdGlvbiBhZ2Fpbi4gVGhpcyB0aW1lIGl0IHNob3VsZCBzcGVj dWxhdGl2ZWx5CisgICAgICAgIC8vIHZhbGlkYXRlIHN1YnJlc291cmNlcyBhcyB3ZSBoYXZlIHN1 YnJlc291cmNlIGxvYWRzIG1ldGFkYXRhIGluIHRoZSBkaXNrIGNhY2hlLgorICAgICAgICBzdGF0 ZSA9ICJzcGVjdWxhdGl2ZVJldmFsaWRhdGlvbiI7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJ0ZXN0RnJhbWUiKS5zcmMgPSAicmVzb3VyY2VzL2ZyYW1lLXdpdGgtYXV0aGVudGlj YXRlZC1yZXNvdXJjZS5weSI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKHN0YXRl ID09ICJzcGVjdWxhdGl2ZVJldmFsaWRhdGlvbiIpIHsKKyAgICAgICAgdGVzdFBhc3NlZCgiU3Vj Y2Vzc2Z1bHkgbG9hZGVkLiIpOworICAgICAgICB2YXIgZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCA9 IHRlc3RSdW5uZXIuZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCgpOworICAgICAgICB2YXIgZGlkTG9h ZE5vbkFwcEJvdW5kUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlkTG9hZE5vbkFwcEJvdW5kUmVxdWVz dCgpOworCisgICAgICAgIGlmIChkaWRMb2FkTm9uQXBwQm91bmRSZXF1ZXN0KSB7CisgICAgICAg ICAgICBsb2coIkZBSUwgZGlkIGxvYWQgbm9uIGFwcC1ib3VuZCByZXF1ZXN0Iik7CisgICAgICAg ICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisg ICAgICAgIGlmICghZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCkgeworICAgICAgICAgICAgbG9nKCJG QUlMIGRpZCBub3QgbG9hZCBhcHAtYm91bmQgcmVxdWVzdCIpOworICAgICAgICAgICAgZmluaXNo SlNUZXN0KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBsb2co IlBBU1Mgc3VjY2Vzc2Z1bGx5IGxvYWRlZCBvbmx5IGFwcC1ib3VuZCByZXF1ZXN0cyIpOworCisg ICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICByZXR1cm47CisgICAgfQorfQorCis8L3Nj cmlwdD4KKzxpZnJhbWUgaWQ9InRlc3RGcmFtZSIgc3JjPSJyZXNvdXJjZXMvZnJhbWUtd2l0aC1h dXRoZW50aWNhdGVkLXJlc291cmNlLnB5IiBvbmxvYWQ9ImZyYW1lTG9hZGVkKCkiPjwvaWZyYW1l PgorPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2Ny aXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1w cml2YWN5L3Jlc291cmNlcy9mcmFtZS13aXRoLWF1dGhlbnRpY2F0ZWQtcmVzb3VyY2UucHkgYi9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luLWFwcC1icm93c2VyLXByaXZhY3kvcmVzb3VyY2VzL2Zy YW1lLXdpdGgtYXV0aGVudGljYXRlZC1yZXNvdXJjZS5weQpuZXcgZmlsZSBtb2RlIDEwMDc1NQpp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44NDhkMGZkMWE2 ZDZjMDk5YWFkNjFlMDA0MjQyZTIzODk1NTNlOTQxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5L3Jlc291cmNlcy9mcmFtZS13 aXRoLWF1dGhlbnRpY2F0ZWQtcmVzb3VyY2UucHkKQEAgLTAsMCArMSwxMyBAQAorIyEvdXNyL2Jp bi9lbnYgcHl0aG9uMworCitpbXBvcnQgc3lzCisKK3N5cy5zdGRvdXQud3JpdGUoCisgICAgJ0Nh Y2hlLUNvbnRyb2w6IG1heC1hZ2U9MFxyXG4nCisgICAgJ0V0YWc6IDEyMzQ1Njc4OVxyXG4nCisg ICAgJ0NvbnRlbnQtVHlwZTogdGV4dC9odG1sXHJcblxyXG4nCisgICAgJzwhRE9DVFlQRSBodG1s PlxuJworICAgICc8Ym9keT5cbicKKyAgICAnPHNjcmlwdCBzcmM9InJlc291cmNlLXdpdGgtYXV0 aC5weSI+PC9zY3JpcHQ+XG4nCisgICAgJzwvYm9keT5cbicKKykKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9yZXNvdXJjZXMvcmVzb3Vy Y2Utd2l0aC1hdXRoLnB5IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nlci1w cml2YWN5L3Jlc291cmNlcy9yZXNvdXJjZS13aXRoLWF1dGgucHkKbmV3IGZpbGUgbW9kZSAxMDA3 NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2FmYjc4 ZDgxYzZmM2M5ZGE0NzlkMjhiZTI0NmFlMTViY2QwNGRkZQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9yZXNvdXJjZXMvcmVz b3VyY2Utd2l0aC1hdXRoLnB5CkBAIC0wLDAgKzEsMjkgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhv bjMKKworaW1wb3J0IGJhc2U2NAoraW1wb3J0IG9zCitpbXBvcnQgc3lzCisKK2NyZWRlbnRpYWxz ID0gYmFzZTY0LmI2NGRlY29kZShvcy5lbnZpcm9uLmdldCgnSFRUUF9BVVRIT1JJWkFUSU9OJywg JyBPZz09Jykuc3BsaXQoJyAnKVsxXSkuZGVjb2RlKCkuc3BsaXQoJzonKQordXNlcm5hbWUgPSBj cmVkZW50aWFsc1swXQorcGFzc3dvcmQgPSAnOicuam9pbihjcmVkZW50aWFsc1sxOl0pCisKK2V4 cGVjdGVkVXNlcm5hbWUgPSAndGVzdFVzZXJuYW1lJworZXhwZWN0ZWRQYXNzd29yZCA9ICd0ZXN0 UGFzc3dvcmQnCityZWFsbSA9IG9zLmVudmlyb24uZ2V0KCdSRVFVRVNUX1VSSScsICcnKQorCitz eXMuc3Rkb3V0LndyaXRlKAorICAgICdDb250ZW50LVR5cGU6IHRleHQvamF2YXNjcmlwdFxyXG4n CisgICAgJ0NhY2hlLUNvbnRyb2w6IG1heC1hZ2U9MFxyXG4nCisgICAgJ0V0YWc6IDEyMzQ1Njc4 OVxyXG4nCispCisKK2lmIHVzZXJuYW1lICE9IGV4cGVjdGVkVXNlcm5hbWUgb3IgcGFzc3dvcmQg IT0gZXhwZWN0ZWRQYXNzd29yZDoKKyAgICBzeXMuc3Rkb3V0LndyaXRlKAorICAgICAgICBmJ1dX Vy1BdXRoZW50aWNhdGU6IEJhc2ljIHJlYWxtPSJ7cmVhbG19IlxyXG4nCisgICAgICAgICdzdGF0 dXM6IDQwMVxyXG5cclxuJworICAgICAgICBmJ1NlbnQgdXNlcm5hbWU6cGFzc3dvcmQgb2YgKHt1 c2VybmFtZX06e3Bhc3N3b3JkfSkgd2hpY2ggaXMgbm90IHdoYXQgd2FzIGV4cGVjdGVkXG4nCisg ICAgKQorICAgIHN5cy5leGl0KDApCisKK3N5cy5zdGRvdXQud3JpdGUoJ1xyXG5sb2FkZWQgPSB0 cnVlO1xuJykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9u cwppbmRleCA4MjJlYjEyZTM4YWI3MzI4OThlZWU2YTA1MTQwMDc5MmZjYzgyMDUyLi4zYjJlOTQ2 Y2VkN2ExYzkzNDE2OWM5Zjg5MzExN2EwMmE5OWJmMmMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vaW9zLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNzkzLDYgKzE3OTMsNyBAQCBodHRw L3Rlc3RzL2luLWFwcC1icm93c2VyLXByaXZhY3kvY29udGV4dC1zdHJpbmctcHJlY29ubmVjdC5o dG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL2luLWFwcC1icm93c2VyLXByaXZhY3kvY29udGV4dC1z dHJpbmctcHJlZmxpZ2h0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXIt cHJpdmFjeS9hcHAtYm91bmQtYXR0cmlidXRpb24tcHJlZmxpZ2h0LWFzeW5jLmh0bWwgWyBTa2lw IF0KIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS9hcHAtYm91bmQtYXR0cmlidXRp b24tcHJlZmxpZ2h0LXN5bmMuaHRtbCBbIFNraXAgXQoraHR0cC90ZXN0cy9pbi1hcHAtYnJvd3Nl ci1wcml2YWN5L2FwcC1ib3VuZC1hdHRyaWJ1dGlvbi1zcGVjdWxhdGl2ZS1yZXZhbGlkYXRpb24u aHRtbCBbIFNraXAgXQogCiB3ZWJraXQub3JnL2IvMTc1MTkzIGZhc3QvaW1hZ2VzL2FzeW5jLWlt YWdlLWJvZHktYmFja2dyb3VuZC1pbWFnZS5odG1sIFsgUGFzcyBUaW1lb3V0IF0KIAo=