237399 2022-03-02 16:32:42 -0800 [WebAuthn] Give Storage Access API whenever user accepts cross-origin Webauthn prompt 2022-06-23 15:42:27 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 222240 1 pascoe pascoe bfulgham webkit-bug-importer wilander oldest_to_newest 1847672 0 pascoe 2022-03-02 16:32:42 -0800 This is needed for cross-origin authenticating i-frames to use cookies. 1847673 1 webkit-bug-importer 2022-03-02 16:34:07 -0800 <rdar://problem/89719739> 1848008 2 wilander 2022-03-03 11:36:47 -0800 It's important that anything that opens up storage access uses prompt language that makes cross-site tracking capabilities clear. 1852621 3 455067 pascoe 2022-03-17 23:02:23 -0700 Created attachment 455067 Patch 1852741 4 455067 bfulgham 2022-03-18 09:37:37 -0700 Comment on attachment 455067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=455067&action=review r=me > Source/WebKit/ChangeLog:10 > + assertion. On the apple port, the prompt required for cross-origin assertions includes Nit: 'Apple' port > Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp:62 > + crossOriginParent = document->securityOrigin().data(); Are these ever different when the 'isSameOriginAs' test passes? I wonder if this part of the change is needed. 1852743 5 pascoe 2022-03-18 09:39:37 -0700 (In reply to Brent Fulgham from comment #4) > > Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp:62 > > + crossOriginParent = document->securityOrigin().data(); > > Are these ever different when the 'isSameOriginAs' test passes? I wonder if > this part of the change is needed. They are different here because the check above checks that isSameOriginAs doesn't pass. > if (!crossOriginParent && !origin.isSameOriginAs(document->securityOrigin())) Thank you for the review. 1852786 6 455120 pascoe 2022-03-18 11:53:23 -0700 Created attachment 455120 Patch for landing 1877941 7 bfulgham 2022-06-23 15:42:27 -0700 After further discussion, this will be handled a different way. 455067 2022-03-17 23:02:23 -0700 2022-03-18 11:53:21 -0700 Patch bug-237399-20220317230222.patch text/plain 9666 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmIzZmY3OGI3MWVkOTA5 ZjkwMDUyNDI1YzczMmEzMzAzNGIyMDg5ZC4uNjY1Mzc5OTk5MmIzMWY0ZTg0NzE4MjhhMTI2OTBm YmU0NmU5NTJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAzLTE3ICBKIFBh c2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEdpdmUgU3Rv cmFnZSBBY2Nlc3MgQVBJIHdoZW5ldmVyIHVzZXIgYWNjZXB0cyBjcm9zcy1vcmlnaW4gV2ViYXV0 aG4gcHJvbXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzczOTkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vODk3MTk3MzkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgIAorICAgICAgICBSZXR1cm4gcHJvcGVyIG9yaWdp biBmb3IgY3Jvc3Mtb3JpZ2luIHBhcmVudC4KKworICAgICAgICAqIE1vZHVsZXMvY3JlZGVudGlh bG1hbmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q3JlZGVudGlhbHNDb250YWluZXI6OnNjb3BlQW5kQ3Jvc3NPcmlnaW5QYXJlbnQgY29uc3QpOgor CiAyMDIyLTAzLTE3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFJFR1JFU1NJT04gKGlPUyAxNS40IC8gcjI4NzY2OSk6IE1vYmlsZSBhcHAgc3RvcHBlZCB3 b3JraW5nIGR1ZSB0byBDU1MgLyBhbmd1bGFyIGFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBiMWNiMjll M2E2OGQwMDRhZDljOTlhOWZmNzI3MDEyZWI0MmQ0ZGRhLi5mNWFlNWNhZWVlNWQ0M2I5MjZmYzU5 NWM3MmNiNjBjMDZiMWQzMDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAzLTE3 ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEdp dmUgU3RvcmFnZSBBY2Nlc3MgQVBJIHdoZW5ldmVyIHVzZXIgYWNjZXB0cyBjcm9zcy1vcmlnaW4g V2ViYXV0aG4gcHJvbXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzczOTkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vODk3MTk3MzkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGdpdmVz IGNyb3NzLW9yaWdpbiBzdWJmcmFtZXMgU3RvcmFnZSBBY2Nlc3MgQVBJIHVwb24gYSBzdWNjZXNz ZnVsIGNyb3NzLW9yaWdpbgorICAgICAgICBhc3NlcnRpb24uIE9uIHRoZSBhcHBsZSBwb3J0LCB0 aGUgcHJvbXB0IHJlcXVpcmVkIGZvciBjcm9zcy1vcmlnaW4gYXNzZXJ0aW9ucyBpbmNsdWRlcwor ICAgICAgICBsYW5ndWFnZSBhYm91dCB0aGUgdHJhY2tpbmcgYWJpbGl0aWVzIGdyYW50ZWQgdG8g dGhlIHN1Yi1mcmFtZS4KKworICAgICAgICBNb2RpZmllZCBsYXlvdXQgdGVzdHMgdG8gY2hlY2sg Zm9yIHN0b3JhZ2UgYWNjZXNzIGFwaSBiZWluZyBncmFudGVkIG9uIHN1Y2Nlc3NmdWwgY3Jvc3Mt b3JpZ2luCisgICAgICAgIGFzc2VydHMuIFRoaXMgYWxzbyBjaGVja3MgdGhhdCBpdCBpcyBub3Qg Z3JhbnRlZCBvbiBzYW1lLXNpdGUgYXNzZXJ0cyB3aGVyZSB0aGUgcHJvbXB0IGlzIG5vdAorICAg ICAgICBzaG93bi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2Vi QXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0aGVu dGljYXRvckNvb3JkaW5hdG9yOjpnZXRBc3NlcnRpb24pOgorCiAyMDIyLTAzLTE3ICBCZW4gTmhh bSAgPG5oYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IHB1c2ggcHJlZmVyZW5jZSB0byBi ZSBzZXQgcHJvZ3JhbWF0aWNhbGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2NyZWRlbnRpYWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1hbmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIu Y3BwCmluZGV4IDczZjY5NzFkMjBmZmE0NWQ5YjA5NjdlNGQ5NDgyMDMwOTZkM2Y1OTQuLmFhNjBl YjYyODRkMzk0YjBkODJjMDA1NTIwMDRlY2NmMzMyZmQ2NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1hbmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1hbmFnZW1lbnQvQ3Jl ZGVudGlhbHNDb250YWluZXIuY3BwCkBAIC01OSw3ICs1OSw3IEBAIFNjb3BlQW5kQ3Jvc3NPcmln aW5QYXJlbnQgQ3JlZGVudGlhbHNDb250YWluZXI6OnNjb3BlQW5kQ3Jvc3NPcmlnaW5QYXJlbnQo KSBjb25zCiAgICAgICAgIGlmICghb3JpZ2luLmlzU2FtZU9yaWdpbkRvbWFpbihkb2N1bWVudC0+ c2VjdXJpdHlPcmlnaW4oKSkgJiYgIWFyZVJlZ2lzdHJhYmxlRG9tYWluc0VxdWFsKHVybCwgZG9j dW1lbnQtPnVybCgpKSkKICAgICAgICAgICAgIGlzU2FtZVNpdGUgPSBmYWxzZTsKICAgICAgICAg aWYgKCFjcm9zc09yaWdpblBhcmVudCAmJiAhb3JpZ2luLmlzU2FtZU9yaWdpbkFzKGRvY3VtZW50 LT5zZWN1cml0eU9yaWdpbigpKSkKLSAgICAgICAgICAgIGNyb3NzT3JpZ2luUGFyZW50ID0gb3Jp Z2luLmRhdGEoKTsKKyAgICAgICAgICAgIGNyb3NzT3JpZ2luUGFyZW50ID0gZG9jdW1lbnQtPnNl Y3VyaXR5T3JpZ2luKCkuZGF0YSgpOwogICAgIH0KIAogICAgIGlmICghY3Jvc3NPcmlnaW5QYXJl bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3IuY3BwCmlu ZGV4IDBlMTE3YTBlYzYxOTAwZDE1MGFkYjFkZTljNjgyMjlhOGU3YWI1NzAuLmZiN2M5Mjk5ZjNl ZTU3MTk2YzBjYmQwYWIxZWYyMWE1YzQzZTAyMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3Iu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJB dXRoZW50aWNhdG9yQ29vcmRpbmF0b3IuY3BwCkBAIC05NCw3ICs5NCw3IEBAIHZvaWQgV2ViQXV0 aGVudGljYXRvckNvb3JkaW5hdG9yOjptYWtlQ3JlZGVudGlhbChjb25zdCBGcmFtZSYgZnJhbWUs IGNvbnN0IFNlY3VyCiAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlV2ViQXV0aG5Q cm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2Fn ZXM6OldlYkF1dGhuQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6TWFrZUNyZWRlbnRpYWwoaGFzaCwg b3B0aW9ucywgaXNQcm9jZXNzaW5nVXNlckdlc3R1cmUpLCBXVEZNb3ZlKGhhbmRsZXIpKTsKIH0K IAotdm9pZCBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6OmdldEFzc2VydGlvbihjb25zdCBG cmFtZSYgZnJhbWUsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiwgY29uc3QgVmVjdG9yPHVpbnQ4X3Q+ JiBoYXNoLCBjb25zdCBQdWJsaWNLZXlDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnMmIG9wdGlvbnMs IE1lZGlhdGlvblJlcXVpcmVtZW50IG1lZGlhdGlvbiwgY29uc3QgU2NvcGVBbmRDcm9zc09yaWdp blBhcmVudCYgc2NvcGVBbmRDcm9zc09yaWdpblBhcmVudCwgUmVxdWVzdENvbXBsZXRpb25IYW5k bGVyJiYgaGFuZGxlcikKK3ZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpnZXRBc3Nl cnRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luLCBj b25zdCBWZWN0b3I8dWludDhfdD4mIGhhc2gsIGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1 ZXN0T3B0aW9ucyYgb3B0aW9ucywgTWVkaWF0aW9uUmVxdWlyZW1lbnQgbWVkaWF0aW9uLCBjb25z dCBTY29wZUFuZENyb3NzT3JpZ2luUGFyZW50JiBzY29wZUFuZENyb3NzT3JpZ2luUGFyZW50LCBS ZXF1ZXN0Q29tcGxldGlvbkhhbmRsZXImJiBoYW5kbGVyKQogewogICAgIGF1dG8qIHdlYkZyYW1l ID0gV2ViRnJhbWU6OmZyb21Db3JlRnJhbWUoZnJhbWUpOwogICAgIGlmICghd2ViRnJhbWUpCkBA IC0xMDcsNyArMTA3LDE1IEBAIHZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpnZXRB c3NlcnRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBTZWN1cml0CiAgICAgYm9vbCB1c2VX ZWJBdXRoblByb2Nlc3MgPSBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygp LndlYkF1dGhlbnRpY2F0aW9uTW9kZXJuRW5hYmxlZCgpOwogI2VuZGlmCiAgICAgaWYgKCF1c2VX ZWJBdXRoblByb2Nlc3MpIHsKLSAgICAgICAgbV93ZWJQYWdlLnNlbmRXaXRoQXN5bmNSZXBseShN ZXNzYWdlczo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHk6OkdldEFzc2VydGlvbih3 ZWJGcmFtZS0+ZnJhbWVJRCgpLCB3ZWJGcmFtZS0+aW5mbygpLCBoYXNoLCBvcHRpb25zLCBtZWRp YXRpb24sIHNjb3BlQW5kQ3Jvc3NPcmlnaW5QYXJlbnQuc2Vjb25kLCBpc1Byb2Nlc3NpbmdVc2Vy R2VzdHVyZSksIFdURk1vdmUoaGFuZGxlcikpOworICAgICAgICBhdXRvKiBwYWdlID0gd2ViRnJh bWUtPnBhZ2UoKTsKKyAgICAgICAgYXV0byBncmFudFN0b3JhZ2VBY2Nlc3NJZkNyb3NzT3JpZ2lu SGFuZGxlciA9IFtwYWdlID0gV1RGTW92ZShwYWdlKSwgc3ViRnJhbWVPcmlnaW4gPSBvcmlnaW4u ZGF0YSgpLCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgc2NvcGVBbmRDcm9zc09yaWdpblBh cmVudF0gKEF1dGhlbnRpY2F0b3JSZXNwb25zZURhdGEmJiBkYXRhLCBBdXRoZW50aWNhdG9yQXR0 YWNobWVudCBhdHRhY2htZW50LCBFeGNlcHRpb25EYXRhJiYgZXhjZXB0aW9uKSBtdXRhYmxlIHsK KyAgICAgICAgICAgIGlmIChzY29wZUFuZENyb3NzT3JpZ2luUGFyZW50LmZpcnN0ID09IFdlYkF1 dGhuOjpTY29wZTo6Q3Jvc3NPcmlnaW4gJiYgc2NvcGVBbmRDcm9zc09yaWdpblBhcmVudC5zZWNv bmQgJiYgcGFnZSkKKyAgICAgICAgICAgICAgICBwYWdlLT5hZGREb21haW5XaXRoUGFnZUxldmVs U3RvcmFnZUFjY2VzcyhSZWdpc3RyYWJsZURvbWFpbigqc2NvcGVBbmRDcm9zc09yaWdpblBhcmVu dC5zZWNvbmQpLCBSZWdpc3RyYWJsZURvbWFpbihzdWJGcmFtZU9yaWdpbikpOworCisgICAgICAg ICAgICBoYW5kbGVyKFdURk1vdmUoZGF0YSksIGF0dGFjaG1lbnQsIFdURk1vdmUoZXhjZXB0aW9u KSk7CisgICAgICAgIH07CisKKyAgICAgICAgbV93ZWJQYWdlLnNlbmRXaXRoQXN5bmNSZXBseShN ZXNzYWdlczo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHk6OkdldEFzc2VydGlvbih3 ZWJGcmFtZS0+ZnJhbWVJRCgpLCB3ZWJGcmFtZS0+aW5mbygpLCBoYXNoLCBvcHRpb25zLCBtZWRp YXRpb24sIHNjb3BlQW5kQ3Jvc3NPcmlnaW5QYXJlbnQuc2Vjb25kLCBpc1Byb2Nlc3NpbmdVc2Vy R2VzdHVyZSksIFdURk1vdmUoZ3JhbnRTdG9yYWdlQWNjZXNzSWZDcm9zc09yaWdpbkhhbmRsZXIp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoc2NvcGVBbmRDcm9zc09yaWdpblBh cmVudC5maXJzdCA9PSBXZWJBdXRobjo6U2NvcGU6OkNyb3NzT3JpZ2luKSB7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWQx YzVhZjk0M2JlOTU5YzM4ZmU1NjA4YzhmZjg4ZjlkODQ2Y2EzNy4uNWUwMGEyNGY5NTBmMjcyNDJl ZjliNDIzNjcyN2YwYWI2ZmQ3NTNiNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAzLTE3 ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEdp dmUgU3RvcmFnZSBBY2Nlc3MgQVBJIHdoZW5ldmVyIHVzZXIgYWNjZXB0cyBjcm9zcy1vcmlnaW4g V2ViYXV0aG4gcHJvbXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzczOTkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vODk3MTk3MzkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZmllZCBsYXlvdXQg dGVzdHMgdG8gY2hlY2sgZm9yIHN0b3JhZ2UgYWNjZXNzIGFwaSBiZWluZyBncmFudGVkIG9uIHN1 Y2Nlc3NmdWwgY3Jvc3Mtb3JpZ2luCisgICAgICAgIGFzc2VydHMuIFRoaXMgYWxzbyBjaGVja3Mg dGhhdCBpdCBpcyBub3QgZ3JhbnRlZCBvbiBzYW1lLXNpdGUgYXNzZXJ0cyB3aGVyZSB0aGUgcHJv bXB0IGlzIG5vdAorICAgICAgICBzaG93bi4KKworICAgICAgICAqIGh0dHAvd3B0L3dlYmF1dGhu L3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGh0dHAvd3B0L3dlYmF1dGhuL3Jlc291cmNlcy9wdWJsaWMta2V5LWNyZWRlbnRp YWwtY3Jvc3Mtb3JpZ2luLmh0dHBzLmh0bWw6CisgICAgICAgICogaHR0cC93cHQvd2ViYXV0aG4v cmVzb3VyY2VzL3NhbWVzaXRlLWlmcmFtZS5odG1sOgorCiAyMDIyLTAzLTE3ICBCZW4gTmhhbSAg PG5oYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkgc2hvdyBub3RpZmljYXRpb24gcGVybWlz c2lvbiBwcm9tcHQgb24gdXNlciBnZXN0dXJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw L3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jvc3Mtb3JpZ2luLmh0dHBzLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3Jl ZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMtZXhwZWN0ZWQudHh0CmluZGV4IGIwYTZjMTBiYWQz ZDYwZTg4ZmYxMjIyMmNlNWUwZDI3ODJkMjk4ZjcuLjA1YTJjMGE0ZmRhNmM2MGI2NGQxMTc5ODFl MWViMzUzYjRmYzYzODMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhu L3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1j cm9zcy1vcmlnaW4uaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBAQAogCiAKLVBBU1Mg VGVzdHMgdGhhdCBhIGZyYW1lIHRoYXQgaXMgY3Jvc3Mtb3JpZ2luLCBOT1Qgc2FtZS1zaXRlIHdp dGggcHVibGlja2V5LWNyZWRlbnRpYWxzLWdldCBmZWF0dXJlIHBvbGljeSBjYW4gdXNlIGdldCgp LgorUEFTUyBUZXN0cyB0aGF0IGEgZnJhbWUgdGhhdCBpcyBjcm9zcy1vcmlnaW4sIE5PVCBzYW1l LXNpdGUgd2l0aCBwdWJsaWNrZXktY3JlZGVudGlhbHMtZ2V0IGZlYXR1cmUgcG9saWN5IGNhbiB1 c2UgZ2V0KCkgYW5kIHJlY2VpdmVzIHN0b3JhZ2UgYWNjZXNzLgogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvcHVibGljLWtleS1jcmVkZW50aWFs LWNyb3NzLW9yaWdpbi5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4v cmVzb3VyY2VzL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMuaHRtbApp bmRleCA2OTVkMjE3OTEzMzViYjE1YzhiZDJkMjc5Mjk0MDU1YjFlOWExYzZmLi42ODkzYjY0NTUw OTdkODZhMzdiNmQxZmM4Mzk1MGZhOWUzMDQxZTUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvcHVibGljLWtleS1jcmVkZW50aWFsLWNyb3NzLW9y aWdpbi5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3Jlc291 cmNlcy9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jvc3Mtb3JpZ2luLmh0dHBzLmh0bWwKQEAgLTE0 LDkgKzE0LDkgQEAKICAgICAgICAgcHJvbWlzZV90ZXN0KHQgPT4gewogICAgICAgICAgICAgLy8g bG9jYWxob3N0IGlzIGNyb3NzLW9yaWdpbiBoZXJlLgogICAgICAgICAgICAgcmV0dXJuIHdpdGhT YW1lU2l0ZUlmcmFtZSgic2FtZXNpdGUtaWZyYW1lLmh0bWwiLCAicHVibGlja2V5LWNyZWRlbnRp YWxzLWdldCIpLnRoZW4oKG1lc3NhZ2UpID0+IHsKLSAgICAgICAgICAgICAgICBhc3NlcnRfZXF1 YWxzKG1lc3NhZ2UuZGF0YSwgIlBBU1MhIik7CisgICAgICAgICAgICAgICAgYXNzZXJ0X2VxdWFs cyhtZXNzYWdlLmRhdGEsICJQQVNTIHdpdGggU0EhIik7CiAgICAgICAgICAgICB9KTsKLSAgICAg ICAgfSwgIlRlc3RzIHRoYXQgYSBmcmFtZSB0aGF0IGlzIGNyb3NzLW9yaWdpbiwgTk9UIHNhbWUt c2l0ZSB3aXRoIHB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQgZmVhdHVyZSBwb2xpY3kgY2FuIHVz ZSBnZXQoKS4iKTsKKyAgICAgICAgfSwgIlRlc3RzIHRoYXQgYSBmcmFtZSB0aGF0IGlzIGNyb3Nz LW9yaWdpbiwgTk9UIHNhbWUtc2l0ZSB3aXRoIHB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQgZmVh dHVyZSBwb2xpY3kgY2FuIHVzZSBnZXQoKSBhbmQgcmVjZWl2ZXMgc3RvcmFnZSBhY2Nlc3MuIik7 CiAgICAgPC9zY3JpcHQ+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvc2FtZXNpdGUtaWZyYW1lLmh0bWwgYi9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvc2FtZXNpdGUtaWZyYW1lLmh0bWwK aW5kZXggZTY0NjhmNDM1NTMwZTc1ZDliZDMyYTVhNTM4ZmVlZGE2YjFiYWJlMy4uYjc1NDhlZjkx MTNjYzBmZjFjMmYzMzY5MTdhMjAyOWFlMGZlNjBjNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aHR0cC93cHQvd2ViYXV0aG4vcmVzb3VyY2VzL3NhbWVzaXRlLWlmcmFtZS5odG1sCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3Jlc291cmNlcy9zYW1lc2l0ZS1pZnJhbWUuaHRt bApAQCAtMjEsNyArMjEsNyBAQAogCiAgICAgbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmdldChyZXF1 ZXN0T3B0aW9ucykudGhlbigKICAgICAgICAgZnVuY3Rpb24odmFsdWUpIHsKLSAgICAgICAgICAg IG1lc3NhZ2VUb1RvcCgiUEFTUyEiKTsKKyAgICAgICAgICAgIGRvY3VtZW50Lmhhc1N0b3JhZ2VB Y2Nlc3MoKS50aGVuKGhhc0FjY2VzcyA9PiBtZXNzYWdlVG9Ub3AoaGFzQWNjZXNzID8gIlBBU1Mg d2l0aCBTQSEiIDogIlBBU1MhIikpOwogICAgICAgICB9LAogICAgICAgICBmdW5jdGlvbihleGNl cHRpb24pIHsKICAgICAgICAgICAgIG1lc3NhZ2VUb1RvcCgiVGhyb3cgIiArIGV4Y2VwdGlvbi5u YW1lICsgIjogIiArIGV4Y2VwdGlvbi5tZXNzYWdlKTsK 455120 2022-03-18 11:53:23 -0700 2022-03-18 13:01:33 -0700 Patch for landing bug-237399-20220318115322.patch text/plain 9681 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDcwMTQyYmVlMjZjMzc4 Zjg5Njc4ZmU0NzM4YzMwZmNiOGNiMWE2OS4uZDgwZmFlMWUyMmNhY2RjNWRhMGRlNGRiZjY4MWVi ZjNmZjljODBiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAzLTE4ICBKIFBh c2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEdpdmUgU3Rv cmFnZSBBY2Nlc3MgQVBJIHdoZW5ldmVyIHVzZXIgYWNjZXB0cyBjcm9zcy1vcmlnaW4gV2ViYXV0 aG4gcHJvbXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzczOTkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vODk3MTk3MzkKKworICAgICAgICBSZXZp ZXdlZCBieSBCcmVudCBGdWxnaGFtLgorICAgCisgICAgICAgIFJldHVybiBwcm9wZXIgb3JpZ2lu IGZvciBjcm9zcy1vcmlnaW4gcGFyZW50LgorCisgICAgICAgICogTW9kdWxlcy9jcmVkZW50aWFs bWFuYWdlbWVudC9DcmVkZW50aWFsc0NvbnRhaW5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD cmVkZW50aWFsc0NvbnRhaW5lcjo6c2NvcGVBbmRDcm9zc09yaWdpblBhcmVudCBjb25zdCk6CisK IDIwMjItMDMtMTggIEVucmlxdWUgT2Nhw7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBBZGQgc3RvcCBwb3NpdGlvbiB0byB0aGUgcmFuZ2Ug cmVxdWVzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCA5ZjQ0YTc2ODI2YWFiOTcwZWUxZmQyMDFhOTQ0MDRhOTcwODYw MWExLi5iN2YxZTY5NTE4ZjI2NzJiN2ViZGIwMGU4YTlkNTYxOTFhY2VlMTA3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDIyLTAzLTE4ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViQXV0aG5dIEdpdmUgU3RvcmFnZSBBY2Nlc3MgQVBJIHdoZW5ldmVy IHVzZXIgYWNjZXB0cyBjcm9zcy1vcmlnaW4gV2ViYXV0aG4gcHJvbXB0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzczOTkKKyAgICAgICAgcmRhcjov L3Byb2JsZW0vODk3MTk3MzkKKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgor CisgICAgICAgIFRoaXMgcGF0Y2ggZ2l2ZXMgY3Jvc3Mtb3JpZ2luIHN1YmZyYW1lcyBTdG9yYWdl IEFjY2VzcyBBUEkgdXBvbiBhIHN1Y2Nlc3NmdWwgY3Jvc3Mtb3JpZ2luCisgICAgICAgIGFzc2Vy dGlvbi4gT24gdGhlIEFwcGxlIHBvcnQsIHRoZSBwcm9tcHQgcmVxdWlyZWQgZm9yIGNyb3NzLW9y aWdpbiBhc3NlcnRpb25zIGluY2x1ZGVzCisgICAgICAgIGxhbmd1YWdlIGFib3V0IHRoZSB0cmFj a2luZyBhYmlsaXRpZXMgZ3JhbnRlZCB0byB0aGUgc3ViLWZyYW1lLgorCisgICAgICAgIE1vZGlm aWVkIGxheW91dCB0ZXN0cyB0byBjaGVjayBmb3Igc3RvcmFnZSBhY2Nlc3MgYXBpIGJlaW5nIGdy YW50ZWQgb24gc3VjY2Vzc2Z1bCBjcm9zcy1vcmlnaW4KKyAgICAgICAgYXNzZXJ0cy4gVGhpcyBh bHNvIGNoZWNrcyB0aGF0IGl0IGlzIG5vdCBncmFudGVkIG9uIHNhbWUtc2l0ZSBhc3NlcnRzIHdo ZXJlIHRoZSBwcm9tcHQgaXMgbm90CisgICAgICAgIHNob3duLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3IuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6OmdldEFzc2VydGlv bik6CisKIDIwMjItMDMtMTggIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4K IAogICAgICAgICBSZWN5Y2xpbmcgYSB3ZWJnbCBjb250ZXh0IHdoZW4gaXQgaGFzIGJlZW4gbG9z dCBhbmQgcmVzdG9yZWQgY2F1c2VzIGEgY3Jhc2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvY3JlZGVudGlhbG1hbmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9jcmVkZW50aWFsbWFuYWdlbWVudC9DcmVkZW50aWFsc0Nv bnRhaW5lci5jcHAKaW5kZXggNzNmNjk3MWQyMGZmYTQ1ZDliMDk2N2U0ZDk0ODIwMzA5NmQzZjU5 NC4uYWE2MGViNjI4NGQzOTRiMGQ4MmMwMDU1MjAwNGVjY2YzMzJmZDY3MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9jcmVkZW50aWFsbWFuYWdlbWVudC9DcmVkZW50aWFsc0Nv bnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jcmVkZW50aWFsbWFuYWdl bWVudC9DcmVkZW50aWFsc0NvbnRhaW5lci5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgU2NvcGVBbmRD cm9zc09yaWdpblBhcmVudCBDcmVkZW50aWFsc0NvbnRhaW5lcjo6c2NvcGVBbmRDcm9zc09yaWdp blBhcmVudCgpIGNvbnMKICAgICAgICAgaWYgKCFvcmlnaW4uaXNTYW1lT3JpZ2luRG9tYWluKGRv Y3VtZW50LT5zZWN1cml0eU9yaWdpbigpKSAmJiAhYXJlUmVnaXN0cmFibGVEb21haW5zRXF1YWwo dXJsLCBkb2N1bWVudC0+dXJsKCkpKQogICAgICAgICAgICAgaXNTYW1lU2l0ZSA9IGZhbHNlOwog ICAgICAgICBpZiAoIWNyb3NzT3JpZ2luUGFyZW50ICYmICFvcmlnaW4uaXNTYW1lT3JpZ2luQXMo ZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCkpKQotICAgICAgICAgICAgY3Jvc3NPcmlnaW5QYXJl bnQgPSBvcmlnaW4uZGF0YSgpOworICAgICAgICAgICAgY3Jvc3NPcmlnaW5QYXJlbnQgPSBkb2N1 bWVudC0+c2VjdXJpdHlPcmlnaW4oKS5kYXRhKCk7CiAgICAgfQogCiAgICAgaWYgKCFjcm9zc09y aWdpblBhcmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJBdXRo ZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRv ci5jcHAKaW5kZXggMGUxMTdhMGVjNjE5MDBkMTUwYWRiMWRlOWM2ODIyOWE4ZTdhYjU3MC4uZmI3 YzkyOTlmM2VlNTcxOTZjMGNiZDBhYjFlZjIxYTVjNDNlMDIyNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29y ZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkF1dGhlbnRpY2F0 aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvci5jcHAKQEAgLTk0LDcgKzk0LDcgQEAgdm9p ZCBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6Om1ha2VDcmVkZW50aWFsKGNvbnN0IEZyYW1l JiBmcmFtZSwgY29uc3QgU2VjdXIKICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVX ZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmRXaXRoQXN5bmNSZXBs eShNZXNzYWdlczo6V2ViQXV0aG5Db25uZWN0aW9uVG9XZWJQcm9jZXNzOjpNYWtlQ3JlZGVudGlh bChoYXNoLCBvcHRpb25zLCBpc1Byb2Nlc3NpbmdVc2VyR2VzdHVyZSksIFdURk1vdmUoaGFuZGxl cikpOwogfQogCi12b2lkIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Z2V0QXNzZXJ0aW9u KGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3QgU2VjdXJpdHlPcmlnaW4mLCBjb25zdCBWZWN0b3I8 dWludDhfdD4mIGhhc2gsIGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyYg b3B0aW9ucywgTWVkaWF0aW9uUmVxdWlyZW1lbnQgbWVkaWF0aW9uLCBjb25zdCBTY29wZUFuZENy b3NzT3JpZ2luUGFyZW50JiBzY29wZUFuZENyb3NzT3JpZ2luUGFyZW50LCBSZXF1ZXN0Q29tcGxl dGlvbkhhbmRsZXImJiBoYW5kbGVyKQordm9pZCBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6 OmdldEFzc2VydGlvbihjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBv cmlnaW4sIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgaGFzaCwgY29uc3QgUHVibGljS2V5Q3JlZGVu dGlhbFJlcXVlc3RPcHRpb25zJiBvcHRpb25zLCBNZWRpYXRpb25SZXF1aXJlbWVudCBtZWRpYXRp b24sIGNvbnN0IFNjb3BlQW5kQ3Jvc3NPcmlnaW5QYXJlbnQmIHNjb3BlQW5kQ3Jvc3NPcmlnaW5Q YXJlbnQsIFJlcXVlc3RDb21wbGV0aW9uSGFuZGxlciYmIGhhbmRsZXIpCiB7CiAgICAgYXV0byog d2ViRnJhbWUgPSBXZWJGcmFtZTo6ZnJvbUNvcmVGcmFtZShmcmFtZSk7CiAgICAgaWYgKCF3ZWJG cmFtZSkKQEAgLTEwNyw3ICsxMDcsMTUgQEAgdm9pZCBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0 b3I6OmdldEFzc2VydGlvbihjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IFNlY3VyaXQKICAgICBi b29sIHVzZVdlYkF1dGhuUHJvY2VzcyA9IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZl YXR1cmVzKCkud2ViQXV0aGVudGljYXRpb25Nb2Rlcm5FbmFibGVkKCk7CiAjZW5kaWYKICAgICBp ZiAoIXVzZVdlYkF1dGhuUHJvY2VzcykgewotICAgICAgICBtX3dlYlBhZ2Uuc2VuZFdpdGhBc3lu Y1JlcGx5KE1lc3NhZ2VzOjpXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eTo6R2V0QXNz ZXJ0aW9uKHdlYkZyYW1lLT5mcmFtZUlEKCksIHdlYkZyYW1lLT5pbmZvKCksIGhhc2gsIG9wdGlv bnMsIG1lZGlhdGlvbiwgc2NvcGVBbmRDcm9zc09yaWdpblBhcmVudC5zZWNvbmQsIGlzUHJvY2Vz c2luZ1VzZXJHZXN0dXJlKSwgV1RGTW92ZShoYW5kbGVyKSk7CisgICAgICAgIGF1dG8qIHBhZ2Ug PSB3ZWJGcmFtZS0+cGFnZSgpOworICAgICAgICBhdXRvIGdyYW50U3RvcmFnZUFjY2Vzc0lmQ3Jv c3NPcmlnaW5IYW5kbGVyID0gW3BhZ2UgPSBXVEZNb3ZlKHBhZ2UpLCBzdWJGcmFtZU9yaWdpbiA9 IG9yaWdpbi5kYXRhKCksIGhhbmRsZXIgPSBXVEZNb3ZlKGhhbmRsZXIpLCBzY29wZUFuZENyb3Nz T3JpZ2luUGFyZW50XSAoQXV0aGVudGljYXRvclJlc3BvbnNlRGF0YSYmIGRhdGEsIEF1dGhlbnRp Y2F0b3JBdHRhY2htZW50IGF0dGFjaG1lbnQsIEV4Y2VwdGlvbkRhdGEmJiBleGNlcHRpb24pIG11 dGFibGUgeworICAgICAgICAgICAgaWYgKHNjb3BlQW5kQ3Jvc3NPcmlnaW5QYXJlbnQuZmlyc3Qg PT0gV2ViQXV0aG46OlNjb3BlOjpDcm9zc09yaWdpbiAmJiBzY29wZUFuZENyb3NzT3JpZ2luUGFy ZW50LnNlY29uZCAmJiBwYWdlKQorICAgICAgICAgICAgICAgIHBhZ2UtPmFkZERvbWFpbldpdGhQ YWdlTGV2ZWxTdG9yYWdlQWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluKCpzY29wZUFuZENyb3NzT3Jp Z2luUGFyZW50LnNlY29uZCksIFJlZ2lzdHJhYmxlRG9tYWluKHN1YkZyYW1lT3JpZ2luKSk7CisK KyAgICAgICAgICAgIGhhbmRsZXIoV1RGTW92ZShkYXRhKSwgYXR0YWNobWVudCwgV1RGTW92ZShl eGNlcHRpb24pKTsKKyAgICAgICAgfTsKKworICAgICAgICBtX3dlYlBhZ2Uuc2VuZFdpdGhBc3lu Y1JlcGx5KE1lc3NhZ2VzOjpXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eTo6R2V0QXNz ZXJ0aW9uKHdlYkZyYW1lLT5mcmFtZUlEKCksIHdlYkZyYW1lLT5pbmZvKCksIGhhc2gsIG9wdGlv bnMsIG1lZGlhdGlvbiwgc2NvcGVBbmRDcm9zc09yaWdpblBhcmVudC5zZWNvbmQsIGlzUHJvY2Vz c2luZ1VzZXJHZXN0dXJlKSwgV1RGTW92ZShncmFudFN0b3JhZ2VBY2Nlc3NJZkNyb3NzT3JpZ2lu SGFuZGxlcikpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChzY29wZUFuZENyb3Nz T3JpZ2luUGFyZW50LmZpcnN0ID09IFdlYkF1dGhuOjpTY29wZTo6Q3Jvc3NPcmlnaW4pIHsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA3N2U3MzRhMDg3Nzk2NjBhYjJkMTc2MDM0MDQ0M2M1ZWE5YTk1YmQ0Li5mMzdkZjc3Nzdi Y2JkNDIxMTc2N2YxYTkxMDA3NWQwMzJmNDJjNDk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIw MjItMDMtMTggIEogUGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJB dXRobl0gR2l2ZSBTdG9yYWdlIEFjY2VzcyBBUEkgd2hlbmV2ZXIgdXNlciBhY2NlcHRzIGNyb3Nz LW9yaWdpbiBXZWJhdXRobiBwcm9tcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzM5OQorICAgICAgICByZGFyOi8vcHJvYmxlbS84OTcxOTczOQor CisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgTW9kaWZpZWQg bGF5b3V0IHRlc3RzIHRvIGNoZWNrIGZvciBzdG9yYWdlIGFjY2VzcyBhcGkgYmVpbmcgZ3JhbnRl ZCBvbiBzdWNjZXNzZnVsIGNyb3NzLW9yaWdpbgorICAgICAgICBhc3NlcnRzLiBUaGlzIGFsc28g Y2hlY2tzIHRoYXQgaXQgaXMgbm90IGdyYW50ZWQgb24gc2FtZS1zaXRlIGFzc2VydHMgd2hlcmUg dGhlIHByb21wdCBpcyBub3QKKyAgICAgICAgc2hvd24uCisKKyAgICAgICAgKiBodHRwL3dwdC93 ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jvc3Mtb3JpZ2luLmh0dHBzLWV4cGVjdGVk LnR4dDoKKyAgICAgICAgKiBodHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvcHVibGljLWtleS1j cmVkZW50aWFsLWNyb3NzLW9yaWdpbi5odHRwcy5odG1sOgorICAgICAgICAqIGh0dHAvd3B0L3dl YmF1dGhuL3Jlc291cmNlcy9zYW1lc2l0ZS1pZnJhbWUuaHRtbDoKKwogMjAyMi0wMy0xOCAgUGhp bGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1l cl0gSW5pdGlhbCBpbXBvcnQgb2YgdGhlIEdzdFdlYlJUQyBiYWNrZW5kCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jvc3Mt b3JpZ2luLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhu L3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMtZXhwZWN0ZWQudHh0Cmlu ZGV4IGIwYTZjMTBiYWQzZDYwZTg4ZmYxMjIyMmNlNWUwZDI3ODJkMjk4ZjcuLjA1YTJjMGE0ZmRh NmM2MGI2NGQxMTc5ODFlMWViMzUzYjRmYzYzODMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0 dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMt ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1r ZXktY3JlZGVudGlhbC1jcm9zcy1vcmlnaW4uaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEs NCBAQAogCiAKLVBBU1MgVGVzdHMgdGhhdCBhIGZyYW1lIHRoYXQgaXMgY3Jvc3Mtb3JpZ2luLCBO T1Qgc2FtZS1zaXRlIHdpdGggcHVibGlja2V5LWNyZWRlbnRpYWxzLWdldCBmZWF0dXJlIHBvbGlj eSBjYW4gdXNlIGdldCgpLgorUEFTUyBUZXN0cyB0aGF0IGEgZnJhbWUgdGhhdCBpcyBjcm9zcy1v cmlnaW4sIE5PVCBzYW1lLXNpdGUgd2l0aCBwdWJsaWNrZXktY3JlZGVudGlhbHMtZ2V0IGZlYXR1 cmUgcG9saWN5IGNhbiB1c2UgZ2V0KCkgYW5kIHJlY2VpdmVzIHN0b3JhZ2UgYWNjZXNzLgogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvcHVibGlj LWtleS1jcmVkZW50aWFsLWNyb3NzLW9yaWdpbi5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0 cC93cHQvd2ViYXV0aG4vcmVzb3VyY2VzL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcm9zcy1vcmln aW4uaHR0cHMuaHRtbAppbmRleCA2OTVkMjE3OTEzMzViYjE1YzhiZDJkMjc5Mjk0MDU1YjFlOWEx YzZmLi42ODkzYjY0NTUwOTdkODZhMzdiNmQxZmM4Mzk1MGZhOWUzMDQxZTUxIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvcHVibGljLWtleS1jcmVk ZW50aWFsLWNyb3NzLW9yaWdpbi5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0 L3dlYmF1dGhuL3Jlc291cmNlcy9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jvc3Mtb3JpZ2luLmh0 dHBzLmh0bWwKQEAgLTE0LDkgKzE0LDkgQEAKICAgICAgICAgcHJvbWlzZV90ZXN0KHQgPT4gewog ICAgICAgICAgICAgLy8gbG9jYWxob3N0IGlzIGNyb3NzLW9yaWdpbiBoZXJlLgogICAgICAgICAg ICAgcmV0dXJuIHdpdGhTYW1lU2l0ZUlmcmFtZSgic2FtZXNpdGUtaWZyYW1lLmh0bWwiLCAicHVi bGlja2V5LWNyZWRlbnRpYWxzLWdldCIpLnRoZW4oKG1lc3NhZ2UpID0+IHsKLSAgICAgICAgICAg ICAgICBhc3NlcnRfZXF1YWxzKG1lc3NhZ2UuZGF0YSwgIlBBU1MhIik7CisgICAgICAgICAgICAg ICAgYXNzZXJ0X2VxdWFscyhtZXNzYWdlLmRhdGEsICJQQVNTIHdpdGggU0EhIik7CiAgICAgICAg ICAgICB9KTsKLSAgICAgICAgfSwgIlRlc3RzIHRoYXQgYSBmcmFtZSB0aGF0IGlzIGNyb3NzLW9y aWdpbiwgTk9UIHNhbWUtc2l0ZSB3aXRoIHB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQgZmVhdHVy ZSBwb2xpY3kgY2FuIHVzZSBnZXQoKS4iKTsKKyAgICAgICAgfSwgIlRlc3RzIHRoYXQgYSBmcmFt ZSB0aGF0IGlzIGNyb3NzLW9yaWdpbiwgTk9UIHNhbWUtc2l0ZSB3aXRoIHB1YmxpY2tleS1jcmVk ZW50aWFscy1nZXQgZmVhdHVyZSBwb2xpY3kgY2FuIHVzZSBnZXQoKSBhbmQgcmVjZWl2ZXMgc3Rv cmFnZSBhY2Nlc3MuIik7CiAgICAgPC9zY3JpcHQ+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvc2FtZXNpdGUtaWZy YW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvc2FtZXNp dGUtaWZyYW1lLmh0bWwKaW5kZXggZTY0NjhmNDM1NTMwZTc1ZDliZDMyYTVhNTM4ZmVlZGE2YjFi YWJlMy4uYjc1NDhlZjkxMTNjYzBmZjFjMmYzMzY5MTdhMjAyOWFlMGZlNjBjNSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcmVzb3VyY2VzL3NhbWVzaXRlLWlmcmFt ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3Jlc291cmNlcy9zYW1l c2l0ZS1pZnJhbWUuaHRtbApAQCAtMjEsNyArMjEsNyBAQAogCiAgICAgbmF2aWdhdG9yLmNyZWRl bnRpYWxzLmdldChyZXF1ZXN0T3B0aW9ucykudGhlbigKICAgICAgICAgZnVuY3Rpb24odmFsdWUp IHsKLSAgICAgICAgICAgIG1lc3NhZ2VUb1RvcCgiUEFTUyEiKTsKKyAgICAgICAgICAgIGRvY3Vt ZW50Lmhhc1N0b3JhZ2VBY2Nlc3MoKS50aGVuKGhhc0FjY2VzcyA9PiBtZXNzYWdlVG9Ub3AoaGFz QWNjZXNzID8gIlBBU1Mgd2l0aCBTQSEiIDogIlBBU1MhIikpOwogICAgICAgICB9LAogICAgICAg ICBmdW5jdGlvbihleGNlcHRpb24pIHsKICAgICAgICAgICAgIG1lc3NhZ2VUb1RvcCgiVGhyb3cg IiArIGV4Y2VwdGlvbi5uYW1lICsgIjogIiArIGV4Y2VwdGlvbi5tZXNzYWdlKTsK