240459 2022-05-16 09:28:45 -0700 [WebAuthn] Set displayName in AuthenticatorAssertionResponse for platform authenticator 2022-05-17 12:03:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pascoe pascoe bfulgham webkit-bug-importer oldest_to_newest 1869267 0 pascoe 2022-05-16 09:28:45 -0700 This prevents the display name from being passed to the UI. 1869269 1 webkit-bug-importer 2022-05-16 09:28:54 -0700 <rdar://problem/93350479> 1869340 2 459440 pascoe 2022-05-16 11:36:14 -0700 Created attachment 459440 Patch 1869347 3 459442 pascoe 2022-05-16 11:50:59 -0700 Created attachment 459442 Patch 1869718 4 459442 bfulgham 2022-05-17 09:58:23 -0700 Comment on attachment 459442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459442&action=review r=me > Source/WebKit/ChangeLog:3 > + [WebAuthn] Set displayName in AuthenticatorAssertionResponse for platform authenticator Question: I'm not sure how setting the displayName here "prevents the display name from being passed to the UI". Did the bug mean to say "prevents the user name from being passed to the UI?" 1869719 5 bfulgham 2022-05-17 09:59:38 -0700 The windows test failure does not seem to be related to this Cocoa and WebAuth-specific change. 1869720 6 pascoe 2022-05-17 10:03:12 -0700 (In reply to Brent Fulgham from comment #4) > > > Source/WebKit/ChangeLog:3 > > + [WebAuthn] Set displayName in AuthenticatorAssertionResponse for platform authenticator > > Question: I'm not sure how setting the displayName here "prevents the > display name from being passed to the UI". Did the bug mean to say "prevents > the user name from being passed to the UI?" Thank you for the review. I meant to say: Not setting the displayName in AuthenticatorAssertionResponse for platform credentials is a bug. This bug prevents the UI code from seeing the displayName for a credential, if available. The patch fixes this. 1869747 7 pascoe 2022-05-17 11:42:18 -0700 Pull request: https://github.com/WebKit/WebKit/pull/682 1869751 8 ews-feeder 2022-05-17 12:03:15 -0700 Committed r294331 (250651@main): <https://commits.webkit.org/250651@main> Reviewed commits have been landed. Closing PR #682 and removing active labels. 459440 2022-05-16 11:36:14 -0700 2022-05-16 11:50:58 -0700 Patch bug-240459-20220516113613.patch text/plain 5490 pascoe ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOTE2ODhiMTNhODdiYjMyMDIxZTQyNTk2Y2IxYjM5YjZhZTViMzBjZi4uMzFk NjVlZDlkMjgxNjFkZjczMmNkNTU4YTc4ZjNjN2U3NWRlODQ3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAyMi0wNS0xNiAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dlYkF1dGhuXSBTZXQgZGlzcGxheU5hbWUgaW4gQXV0aGVudGljYXRvckFzc2VydGlv blJlc3BvbnNlIGZvciBwbGF0Zm9ybSBhdXRoZW50aWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDA0NTkKKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vOTMzNTA0NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVcGRhdGVkIEFQSSB0ZXN0IHRvIGFjY291bnQgZm9yIGRpc3BsYXlOYW1lLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRv ci5tbToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxBdXRoZW50aWNhdG9ySW50ZXJuYWw6OmdldEV4 aXN0aW5nQ3JlZGVudGlhbHMpOgorCiAyMDIyLTA1LTE2ICBBbGV4IENocmlzdGVuc2VuICA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNlIF9hZG9wdEVmZmVjdGl2ZUNvbmZp Z3VyYXRpb24gaW5zdGVhZCBvZiBhIHNlcGFyYXRlIE5TVVJMU2Vzc2lvbiB3aXRob3V0IGNyZWRl bnRpYWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNh dGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KaW5kZXggM2Ix YmY1YTRlMWU1ZDhlZGJhNDdkOWE1MTAxNmM1M2I1YjM5Yzg3NS4uNDY3ZjE2M2NkOWI0NzY1ZGJm OWMwMDI4OWIxYWFkYjQ1ZTM3ODM0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVu dGljYXRvci5tbQpAQCAtMTg3LDYgKzE4Nyw5IEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPFZlY3Rv cjxSZWY8QXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlPj4+IGdldEV4aXN0aW5nQ3JlCiAg ICAgICAgICAgICByZXNwb25zZS0+c2V0R3JvdXAoZ3JvdXApOwogICAgICAgICBpZiAoW1thdHRy aWJ1dGVzIGFsbEtleXNdIGNvbnRhaW5zT2JqZWN0OmJyaWRnZV9jYXN0KGtTZWNBdHRyU3luY2hy b25pemFibGUpXSkKICAgICAgICAgICAgIHJlc3BvbnNlLT5zZXRTeW5jaHJvbml6YWJsZShhdHRy aWJ1dGVzWyhpZClrU2VjQXR0clN5bmNocm9uaXphYmxlXSk7CisgICAgICAgIGl0ID0gcmVzcG9u c2VNYXAuZmluZChDQk9SKGZpZG86OmtEaXNwbGF5TmFtZU1hcEtleSkpOworICAgICAgICBpZiAo aXQgIT0gcmVzcG9uc2VNYXAuZW5kKCkgJiYgaXQtPnNlY29uZC5pc1N0cmluZygpKQorICAgICAg ICAgICAgcmVzcG9uc2UtPnNldERpc3BsYXlOYW1lKGl0LT5zZWNvbmQuZ2V0U3RyaW5nKCkpOwog CiAgICAgICAgIHJlc3VsdC51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZShyZXNwb25zZSkpOwogICAg IH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5 ZTY4NWZjODFmNTJjMWNmZDBhZWIwMDU2ZTAzYTMzMTUyM2ZmNGE0Li44NzQ5NmI4OTA1NjA5N2Mw YmYwNjgwYjJkZDgyM2ExOWNjOGY4MWExIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDUtMTYgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gU2V0IGRpc3BsYXlO YW1lIGluIEF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZSBmb3IgcGxhdGZvcm0gYXV0aGVu dGljYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjQwNDU5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzkzMzUwNDc5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIEFQSSB0ZXN0IGZvciBkaXNw bGF5TmFtZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dL V2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAgICAgKC1bVGVzdFdlYkF1dGhlbnRpY2F0 aW9uUGFuZWxEZWxlZ2F0ZSBwYW5lbDpzZWxlY3RBc3NlcnRpb25SZXNwb25zZTpzb3VyY2U6Y29t cGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAy Mi0wNS0xNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFr ZSBzdXJlIGNhbGxpbmcgc2hvd05vdGlmaWNhdGlvbiB3aWxsIGV4dGVuZCB0aGUgc2VydmljZSB3 b3JrZXIgbGlmZXRpbWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQppbmRleCBl ZWUzZTAyODE1ZGUyZDFiOThhNWUyNTcxMDQ0NDc1ZTUyOGVhM2ZiLi45ZTdjZmQyM2ZmOGE5ZWNl NTk4YzFjNzU4Y2EzMjlhN2RjMjE2NjcwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBh bmVsLm1tCkBAIC04Myw2ICs4Myw3IEBAIHN0YXRpYyBTdHJpbmcgdGVzdEVTMjU2UHJpdmF0ZUtl eUJhc2U2NCA9CiBzdGF0aWMgU3RyaW5nIHRlc3RVc2VyRW50aXR5QnVuZGxlQmFzZTY0ID0gIm9t SnBaRW9BQVFJREJBVUdCd2dKWkc1aGJXVmtTbTlvYmc9PSJfczsgLy8geyAiaWQiOiBoJzAwMDEw MjAzMDQwNTA2MDcwODA5JywgIm5hbWUiOiAiSm9obiIgfQogc3RhdGljIFN0cmluZyB0ZXN0VXNl ckVudGl0eUJ1bmRsZU5vVXNlckhhbmRsZUJhc2U2NCA9ICJvV1J1WVcxbGJFMURJRTV2TFVoaGJt UnNaUT09Il9zOyAvLyB7Im5hbWUiOiAiTUMgTm8tSGFuZGxlIn0KIHN0YXRpYyBTdHJpbmcgd2Vi QXV0aGVudGljYXRpb25QYW5lbFNlbGVjdGVkQ3JlZGVudGlhbE5hbWU7CitzdGF0aWMgU3RyaW5n IHdlYkF1dGhlbnRpY2F0aW9uUGFuZWxTZWxlY3RlZENyZWRlbnRpYWxEaXNwbGF5TmFtZTsKIHN0 YXRpYyBTdHJpbmcgdGVzdFdlYktpdEFQSUFjY2Vzc0dyb3VwID0gImNvbS5hcHBsZS5UZXN0V2Vi S2l0QVBJIl9zOwogc3RhdGljIFN0cmluZyB0ZXN0V2ViS2l0QVBJQWx0ZXJuYXRlQWNjZXNzR3Jv dXAgPSAiY29tLmFwcGxlLlRlc3RXZWJLaXRBUElBbHRlcm5hdGUiX3M7CiBzdGF0aWMgYm9vbCBs YUNvbnRleHRSZXF1ZXN0ZWQgPSBmYWxzZTsKQEAgLTE3NCw2ICsxNzUsNyBAQCBzdGF0aWMgYm9v bCBsYUNvbnRleHRSZXF1ZXN0ZWQgPSBmYWxzZTsKICAgICAgICAgW29iamVjdCBzZXRMQUNvbnRl eHQ6bGFDb250ZXh0LmdldCgpXTsKIAogICAgICAgICB3ZWJBdXRoZW50aWNhdGlvblBhbmVsU2Vs ZWN0ZWRDcmVkZW50aWFsTmFtZSA9IG9iamVjdC5uYW1lOworICAgICAgICB3ZWJBdXRoZW50aWNh dGlvblBhbmVsU2VsZWN0ZWRDcmVkZW50aWFsRGlzcGxheU5hbWUgPSBvYmplY3QuZGlzcGxheU5h bWU7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG9iamVjdCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CkBAIC0xNTEwLDcgKzE1MTIsNyBAQCBURVNUKFdlYkF1dGhlbnRpY2F0aW9uUGFuZWws IExBR2V0QXNzZXJ0aW9uTXVsdGlwbGVDcmVkZW50aWFsU3RvcmUpCiAgICAgW3dlYlZpZXcgZm9j dXNdOwogCiAgICAgQVNTRVJUX1RSVUUoYWRkS2V5VG9LZXljaGFpbih0ZXN0RVMyNTZQcml2YXRl S2V5QmFzZTY0LCBlbXB0eVN0cmluZygpLCB0ZXN0VXNlckVudGl0eUJ1bmRsZUJhc2U2NCkpOwot ICAgIEFTU0VSVF9UUlVFKGFkZEtleVRvS2V5Y2hhaW4oIkJCUm9pMkpiUjBJWFRlSm12WFVwMVlJ dU00c3BoL0x1M2VHZjc1RjduK0hvakhLRzcwYTRSMHJCMlBRY2U1L1NKbGU2VDdPTzVDcWV0L0xK WlZNNk5ROHlERHhXdmF5ZjcxR1REcDJ5VXR1SWJxSkxGVmJwV3ltbGo5V1JpemdYM0E9PSJfcywg ZW1wdHlTdHJpbmcoKSwgIm9tSnBaRW9BQVFJREJBVUdCd2dKWkc1aGJXVmtTbUZ1WlE9PSJfcy8q IHsgImlkIjogaCcwMDAxMDIwMzA0MDUwNjA3MDgwOScsICJuYW1lIjogIkphbmUiIH0gKi8sIHRy dWUgLyogc3luY2hyb25pemFibGUgKi8pKTsKKyAgICBBU1NFUlRfVFJVRShhZGRLZXlUb0tleWNo YWluKCJCQlJvaTJKYlIwSVhUZUptdlhVcDFZSXVNNHNwaC9MdTNlR2Y3NUY3bitIb2pIS0c3MGE0 UjByQjJQUWNlNS9TSmxlNlQ3T081Q3FldC9MSlpWTTZOUTh5RER4V3ZheWY3MUdURHAyeVV0dUli cUpMRlZicFd5bWxqOVdSaXpnWDNBPT0iX3MsIGVtcHR5U3RyaW5nKCksICJvMkpwWkVvQUFRSURC QVVHQndnSlpHNWhiV1ZrU21GdVpXdGthWE53YkdGNVRtRnRaV3BLWVc1bElGTnRhWFJvIl9zLyog eyAiaWQiOiBoJzAwMDEwMjAzMDQwNTA2MDcwODA5JywgIm5hbWUiOiAiSmFuZSIsICJkaXNwbGF5 TmFtZSI6ICJKYW5lIFNtaXRoIiB9ICovLCB0cnVlIC8qIHN5bmNocm9uaXphYmxlICovKSk7CiAK ICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnRl c3RVUkwuZ2V0KCldXTsKICAgICBbd2ViVmlldyB3YWl0Rm9yTWVzc2FnZTpAIlN1Y2NlZWRlZCEi XTsKQEAgLTE1MTksNiArMTUyMSw3IEBAIFRFU1QoV2ViQXV0aGVudGljYXRpb25QYW5lbCwgTEFH ZXRBc3NlcnRpb25NdWx0aXBsZUNyZWRlbnRpYWxTdG9yZSkKICAgICBbd2ViVmlldyBsb2FkUmVx dWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnRlc3RVUkwuZ2V0KCldXTsKICAgICBb d2ViVmlldyB3YWl0Rm9yTWVzc2FnZTpAIlN1Y2NlZWRlZCEiXTsKICAgICBFWFBFQ1RfV0tfU1RS RVEod2ViQXV0aGVudGljYXRpb25QYW5lbFNlbGVjdGVkQ3JlZGVudGlhbE5hbWUsICJKYW5lIik7 CisgICAgRVhQRUNUX1dLX1NUUkVRKHdlYkF1dGhlbnRpY2F0aW9uUGFuZWxTZWxlY3RlZENyZWRl bnRpYWxEaXNwbGF5TmFtZSwgIkphbmUgU21pdGgiKTsKIAogICAgIGNsZWFuVXBLZXljaGFpbihl bXB0eVN0cmluZygpKTsKIH0K 459442 2022-05-16 11:50:59 -0700 2022-05-17 09:58:23 -0700 Patch bug-240459-20220516115058.patch text/plain 5498 pascoe ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZDI5NDYyYTQwYTQ5YjJiOWNjNTkwNWZjMmQzZWIxMTVjY2U0ZmY2ZC4uNWIy YzE2MDAxMDVjODE5MzYwOTM2M2NjNjU2YTNkMjZhMGE4ZGU3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAyMi0wNS0xNiAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dlYkF1dGhuXSBTZXQgZGlzcGxheU5hbWUgaW4gQXV0aGVudGljYXRvckFzc2VydGlv blJlc3BvbnNlIGZvciBwbGF0Zm9ybSBhdXRoZW50aWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDA0NTkKKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vOTMzNTA0NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVcGRhdGVkIEFQSSB0ZXN0IHRvIGFjY291bnQgZm9yIGRpc3BsYXlOYW1lLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRv ci5tbToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxBdXRoZW50aWNhdG9ySW50ZXJuYWw6OmdldEV4 aXN0aW5nQ3JlZGVudGlhbHMpOgorCiAyMDIyLTA1LTE2ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OICgyNTA1MDFAbWFpbik6IFsgTWFjIF0gMiBU ZXN0V2ViS2l0QVBJLldlYkF1dGhlbnRpY2F0aW9uUGFuZWwuR2V0QXNzZXJ0aW9uTEEgdGVzdHMg ZmFpbGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGlj YXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCmluZGV4IDhk YzBhZWUwZDgzNWYxYWYzMGQ5NjY4ZTc2NDg3NDM0Yjg0NTk0ZTkuLjQyOGNkZjQwMDRmYTkzYjU1 MDczYWYxZjE3ZGY3Y2YzMGZhMWM2YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhl bnRpY2F0b3IubW0KQEAgLTE4Nyw2ICsxODcsOSBAQCBzdGF0aWMgc3RkOjpvcHRpb25hbDxWZWN0 b3I8UmVmPEF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZT4+PiBnZXRFeGlzdGluZ0NyZQog ICAgICAgICAgICAgcmVzcG9uc2UtPnNldEdyb3VwKGdyb3VwKTsKICAgICAgICAgaWYgKFtbYXR0 cmlidXRlcyBhbGxLZXlzXSBjb250YWluc09iamVjdDpicmlkZ2VfY2FzdChrU2VjQXR0clN5bmNo cm9uaXphYmxlKV0pCiAgICAgICAgICAgICByZXNwb25zZS0+c2V0U3luY2hyb25pemFibGUoW2F0 dHJpYnV0ZXNbKGlkKWtTZWNBdHRyU3luY2hyb25pemFibGVdIGlzRXF1YWw6QFlFU10pOworICAg ICAgICBpdCA9IHJlc3BvbnNlTWFwLmZpbmQoQ0JPUihmaWRvOjprRGlzcGxheU5hbWVNYXBLZXkp KTsKKyAgICAgICAgaWYgKGl0ICE9IHJlc3BvbnNlTWFwLmVuZCgpICYmIGl0LT5zZWNvbmQuaXNT dHJpbmcoKSkKKyAgICAgICAgICAgIHJlc3BvbnNlLT5zZXREaXNwbGF5TmFtZShpdC0+c2Vjb25k LmdldFN0cmluZygpKTsKIAogICAgICAgICByZXN1bHQudW5jaGVja2VkQXBwZW5kKFdURk1vdmUo cmVzcG9uc2UpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMzcxNDRhMGRiZjQ5NmFlZGQ1MmUwMDhhYThjNTRiYjM3ZGIwOGMzMy4u NDQ1NzYzZmJiOTdmNjQ0YTI1MzUyYzU3YTFlNWQ1YjY1YjgzNGFmZiAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIy LTA1LTE2ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0 aG5dIFNldCBkaXNwbGF5TmFtZSBpbiBBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2UgZm9y IHBsYXRmb3JtIGF1dGhlbnRpY2F0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI0MDQ1OQorICAgICAgICByZGFyOi8vcHJvYmxlbS85MzM1MDQ3OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBB UEkgdGVzdCBmb3IgZGlzcGxheU5hbWUuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW06CisgICAgICAgICgtW1Rl c3RXZWJBdXRoZW50aWNhdGlvblBhbmVsRGVsZWdhdGUgcGFuZWw6c2VsZWN0QXNzZXJ0aW9uUmVz cG9uc2U6c291cmNlOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6VEVTVCk6CisKIDIwMjItMDUtMTYgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBNYWtlIEFOR0xFIGJhY2tlbmQgRUdMIGNvbnRl eHQgaW5pdGlhbGl6YXRpb24gd29yawpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1t CmluZGV4IDlhOGU3Yzk3ZDlmZjJiZTRmNWQzMmIzZTRiMjE5NjU2NTNmOGRjNGYuLmVmMGJiZWNl Mzg2NTc3OGQwNjg1NTRlYTNhYzUzYjU1OWNjMzNiOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL19XS1dlYkF1dGhlbnRp Y2F0aW9uUGFuZWwubW0KQEAgLTgzLDYgKzgzLDcgQEAgc3RhdGljIFN0cmluZyB0ZXN0RVMyNTZQ cml2YXRlS2V5QmFzZTY0ID0KIHN0YXRpYyBTdHJpbmcgdGVzdFVzZXJFbnRpdHlCdW5kbGVCYXNl NjQgPSAib21KcFpFb0FBUUlEQkFVR0J3Z0paRzVoYldWa1NtOW9iZz09Il9zOyAvLyB7ICJpZCI6 IGgnMDAwMTAyMDMwNDA1MDYwNzA4MDknLCAibmFtZSI6ICJKb2huIiB9CiBzdGF0aWMgU3RyaW5n IHRlc3RVc2VyRW50aXR5QnVuZGxlTm9Vc2VySGFuZGxlQmFzZTY0ID0gIm9XUnVZVzFsYkUxRElF NXZMVWhoYm1Sc1pRPT0iX3M7IC8vIHsibmFtZSI6ICJNQyBOby1IYW5kbGUifQogc3RhdGljIFN0 cmluZyB3ZWJBdXRoZW50aWNhdGlvblBhbmVsU2VsZWN0ZWRDcmVkZW50aWFsTmFtZTsKK3N0YXRp YyBTdHJpbmcgd2ViQXV0aGVudGljYXRpb25QYW5lbFNlbGVjdGVkQ3JlZGVudGlhbERpc3BsYXlO YW1lOwogc3RhdGljIFN0cmluZyB0ZXN0V2ViS2l0QVBJQWNjZXNzR3JvdXAgPSAiY29tLmFwcGxl LlRlc3RXZWJLaXRBUEkiX3M7CiBzdGF0aWMgU3RyaW5nIHRlc3RXZWJLaXRBUElBbHRlcm5hdGVB Y2Nlc3NHcm91cCA9ICJjb20uYXBwbGUuVGVzdFdlYktpdEFQSUFsdGVybmF0ZSJfczsKIHN0YXRp YyBib29sIGxhQ29udGV4dFJlcXVlc3RlZCA9IGZhbHNlOwpAQCAtMTc0LDYgKzE3NSw3IEBAIHN0 YXRpYyBib29sIGxhQ29udGV4dFJlcXVlc3RlZCA9IGZhbHNlOwogICAgICAgICBbb2JqZWN0IHNl dExBQ29udGV4dDpsYUNvbnRleHQuZ2V0KCldOwogCiAgICAgICAgIHdlYkF1dGhlbnRpY2F0aW9u UGFuZWxTZWxlY3RlZENyZWRlbnRpYWxOYW1lID0gb2JqZWN0Lm5hbWU7CisgICAgICAgIHdlYkF1 dGhlbnRpY2F0aW9uUGFuZWxTZWxlY3RlZENyZWRlbnRpYWxEaXNwbGF5TmFtZSA9IG9iamVjdC5k aXNwbGF5TmFtZTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIob2JqZWN0KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KQEAgLTE1MTAsNyArMTUxMiw3IEBAIFRFU1QoV2ViQXV0aGVudGljYXRp b25QYW5lbCwgTEFHZXRBc3NlcnRpb25NdWx0aXBsZUNyZWRlbnRpYWxTdG9yZSkKICAgICBbd2Vi VmlldyBmb2N1c107CiAKICAgICBBU1NFUlRfVFJVRShhZGRLZXlUb0tleWNoYWluKHRlc3RFUzI1 NlByaXZhdGVLZXlCYXNlNjQsIGVtcHR5U3RyaW5nKCksIHRlc3RVc2VyRW50aXR5QnVuZGxlQmFz ZTY0KSk7Ci0gICAgQVNTRVJUX1RSVUUoYWRkS2V5VG9LZXljaGFpbigiQkJSb2kySmJSMElYVGVK bXZYVXAxWUl1TTRzcGgvTHUzZUdmNzVGN24rSG9qSEtHNzBhNFIwckIyUFFjZTUvU0psZTZUN09P NUNxZXQvTEpaVk02TlE4eUREeFd2YXlmNzFHVERwMnlVdHVJYnFKTEZWYnBXeW1sajlXUml6Z1gz QT09Il9zLCBlbXB0eVN0cmluZygpLCAib21KcFpFb0FBUUlEQkFVR0J3Z0paRzVoYldWa1NtRnVa UT09Il9zLyogeyAiaWQiOiBoJzAwMDEwMjAzMDQwNTA2MDcwODA5JywgIm5hbWUiOiAiSmFuZSIg fSAqLywgdHJ1ZSAvKiBzeW5jaHJvbml6YWJsZSAqLykpOworICAgIEFTU0VSVF9UUlVFKGFkZEtl eVRvS2V5Y2hhaW4oIkJCUm9pMkpiUjBJWFRlSm12WFVwMVlJdU00c3BoL0x1M2VHZjc1RjduK0hv akhLRzcwYTRSMHJCMlBRY2U1L1NKbGU2VDdPTzVDcWV0L0xKWlZNNk5ROHlERHhXdmF5ZjcxR1RE cDJ5VXR1SWJxSkxGVmJwV3ltbGo5V1JpemdYM0E9PSJfcywgZW1wdHlTdHJpbmcoKSwgIm8ySnBa RW9BQVFJREJBVUdCd2dKWkc1aGJXVmtTbUZ1Wld0a2FYTndiR0Y1VG1GdFpXcEtZVzVsSUZOdGFY Um8iX3MvKiB7ICJpZCI6IGgnMDAwMTAyMDMwNDA1MDYwNzA4MDknLCAibmFtZSI6ICJKYW5lIiwg ImRpc3BsYXlOYW1lIjogIkphbmUgU21pdGgiIH0gKi8sIHRydWUgLyogc3luY2hyb25pemFibGUg Ki8pKTsKIAogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdp dGhVUkw6dGVzdFVSTC5nZXQoKV1dOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JNZXNzYWdlOkAiU3Vj Y2VlZGVkISJdOwpAQCAtMTUxOSw2ICsxNTIxLDcgQEAgVEVTVChXZWJBdXRoZW50aWNhdGlvblBh bmVsLCBMQUdldEFzc2VydGlvbk11bHRpcGxlQ3JlZGVudGlhbFN0b3JlKQogICAgIFt3ZWJWaWV3 IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6dGVzdFVSTC5nZXQoKV1d OwogICAgIFt3ZWJWaWV3IHdhaXRGb3JNZXNzYWdlOkAiU3VjY2VlZGVkISJdOwogICAgIEVYUEVD VF9XS19TVFJFUSh3ZWJBdXRoZW50aWNhdGlvblBhbmVsU2VsZWN0ZWRDcmVkZW50aWFsTmFtZSwg IkphbmUiKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEod2ViQXV0aGVudGljYXRpb25QYW5lbFNlbGVj dGVkQ3JlZGVudGlhbERpc3BsYXlOYW1lLCAiSmFuZSBTbWl0aCIpOwogCiAgICAgY2xlYW5VcEtl eWNoYWluKGVtcHR5U3RyaW5nKCkpOwogfQo=