240038 2022-05-03 14:07:20 -0700 [WebAuthn] Remove user gesture requirement for mediation=conditional assertions 2022-05-04 13:29:55 -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 1866238 0 pascoe 2022-05-03 14:07:20 -0700 Conditional assertions are non-modal and already require a gesture to complete via a different mechanism. So if conditional mediation is available on the platform and requested, we should not require a gesture. 1866240 1 pascoe 2022-05-03 14:07:28 -0700 rdar://92137603 1866242 2 458756 pascoe 2022-05-03 14:09:58 -0700 Created attachment 458756 Patch 1866254 3 458756 bfulgham 2022-05-03 14:34:31 -0700 Comment on attachment 458756 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458756&action=review r=me, but please check the cause of the debug failure. > Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:326 > + requestContext.get().requestStyle = ASCredentialRequestStyleAutoFill; Nit: I'd prefer to check and do an early return if it does NOT respond to the selector, rather than this form. It's slightly easier to read and a little more concise. > Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.cpp:110 > + if (!data.processingUserGesture && !m_webPageProxy.websiteDataStore().authenticatorManager().isVirtual() && data.mediation != MediationRequirement::Conditional) Nit: It might be slightly more efficient to test the 'data.mediation' condition before retrieving the websiteDataStore->authenticator and calling its isVirtual method. 1866258 4 458758 pascoe 2022-05-03 14:42:32 -0700 Created attachment 458758 Patch for landing 1866533 5 ews-feeder 2022-05-04 10:54:43 -0700 ChangeLog entry in Source/WebKit/ChangeLog contains OOPS!. 1866536 6 458812 pascoe 2022-05-04 10:59:08 -0700 Created attachment 458812 Patch for landing 1866574 7 ews-feeder 2022-05-04 13:29:53 -0700 Committed r293786 (250265@main): <https://commits.webkit.org/250265@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458812. 458756 2022-05-03 14:09:58 -0700 2022-05-03 14:42:30 -0700 Patch bug-240038-20220503140957.patch text/plain 3564 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJiMzEyNzBkNGZiMzViOTdh ZTY2YTEyZDA0M2M3MTIxNTdjNjFmMTcuLjBkMjVlZTcyMzBiNmU2MDJiMTY5ZGFiNDA1YjFlNDhh Y2RmNGY5MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDUtMDMgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUmVtb3ZlIHVzZXIg Z2VzdHVyZSByZXF1aXJlbWVudCBmb3IgbWVkaWF0aW9uPWNvbmRpdGlvbmFsIGFzc2VydGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDAzOAor ICAgICAgICByZGFyOi8vOTIxMzc2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDb25kaXRpb25hbCBhc3NlcnRpb25zIGFyZSBub24tbW9kYWwgYW5k IGFscmVhZHkgcmVxdWlyZSBhIGdlc3R1cmUgdG8gY29tcGxldGUgdmlhCisgICAgICAgIGEgZGlm ZmVyZW50IG1lY2hhbmlzbS4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkgb24gZGV2aWNlLgor CisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhlbnRp Y2F0b3JDb29yZGluYXRvclByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0Ojpjb25maWd1cmF0aW9u QXNzZXJ0aW9uUmVxdWVzdENvbnRleHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50 aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5OjpoYW5kbGVSZXF1ZXN0KToK KwogMjAyMi0wNS0wMyAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU11bV1BdIE9ubHkgYmxvY2sgSU9LaXQgYWNjZXNzIGlmIGFsbCBHUFVQIGZlYXR1 cmVzIGFyZSBlbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhl bnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tCmluZGV4IGE1YmJlZDVlYzQ1OWUyN2IyNjQ1ODM0 Mjc2MDRmMDExN2Q2MmRjN2MuLmFhMTliMWViYWQ1MThjNTcwYzliZWU1ZTM3NWM2MmM0ZTE1MzE0 NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9u L0NvY29hL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhlbnRpY2F0b3JD b29yZGluYXRvclByb3h5Lm1tCkBAIC0zMjEsOCArMzIxLDEyIEBAIHN0YXRpYyBSZXRhaW5QdHI8 QVNDQ3JlZGVudGlhbFJlcXVlc3RDb250ZXh0PiBjb25maWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVz dENvbnRlCiAKICAgICBhdXRvIHJlcXVlc3RDb250ZXh0ID0gYWRvcHROUyhbYWxsb2NBU0NDcmVk ZW50aWFsUmVxdWVzdENvbnRleHRJbnN0YW5jZSgpIGluaXRXaXRoUmVxdWVzdFR5cGVzOnJlcXVl c3RUeXBlc10pOwogICAgIFtyZXF1ZXN0Q29udGV4dCBzZXRSZWx5aW5nUGFydHlJZGVudGlmaWVy Om9wdGlvbnMucnBJZF07Ci0gICAgaWYgKG1lZGlhdGlvbiA9PSBNZWRpYXRpb25SZXF1aXJlbWVu dDo6Q29uZGl0aW9uYWwgJiYgW3JlcXVlc3RDb250ZXh0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Ioc2V0UmVxdWVzdFN0eWxlOildKQotICAgICAgICByZXF1ZXN0Q29udGV4dC5nZXQoKS5y ZXF1ZXN0U3R5bGUgPSBBU0NyZWRlbnRpYWxSZXF1ZXN0U3R5bGVBdXRvRmlsbDsKKyAgICBpZiAo bWVkaWF0aW9uID09IE1lZGlhdGlvblJlcXVpcmVtZW50OjpDb25kaXRpb25hbCkgeworICAgICAg ICBpZiAoW3JlcXVlc3RDb250ZXh0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0UmVx dWVzdFN0eWxlOildKQorICAgICAgICAgICAgcmVxdWVzdENvbnRleHQuZ2V0KCkucmVxdWVzdFN0 eWxlID0gQVNDcmVkZW50aWFsUmVxdWVzdFN0eWxlQXV0b0ZpbGw7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIHJldHVybiBuaWw7CisgICAgfQogICAgIHNldEdsb2JhbEZyYW1lSURGb3JDb250 ZXh0KHJlcXVlc3RDb250ZXh0LCBnbG9iYWxGcmFtZUlEKTsKIAogICAgIGlmIChyZXF1ZXN0VHlw ZXMgJiBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVQbGF0Zm9ybVB1YmxpY0tleUFzc2VydGlvbikg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHku Y3BwCmluZGV4IDFjYzcyYTU0NjgxNjBhMDQ1YWU4YjllNTlhZTgxODM2OGNlY2M5NGMuLjEzYmYy NDBjNGZjNmMwMzg0YWVkMzEwMGI4MDk2Nzc5NGI0MjM2NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGlu YXRvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNh dGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5jcHAKQEAgLTEwNyw3ICsxMDcs NyBAQCB2b2lkIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5OjpoYW5kbGVSZXF1ZXN0 KFdlYkF1dGhlbnRpY2F0aW9uUmVxdWVzdERhdAogICAgICAgICAgICAgaGFuZGxlcih7IH0sIChB dXRoZW50aWNhdG9yQXR0YWNobWVudCkwLCBFeGNlcHRpb25EYXRhIHsgTm90QWxsb3dlZEVycm9y LCAiVGhpcyByZXF1ZXN0IGhhcyBiZWVuIGNhbmNlbGxlZCBieSB0aGUgdXNlci4iX3MgfSk7CiAg ICAgfTsKICAgICAKLSAgICBpZiAoIWRhdGEucHJvY2Vzc2luZ1VzZXJHZXN0dXJlICYmICFtX3dl YlBhZ2VQcm94eS53ZWJzaXRlRGF0YVN0b3JlKCkuYXV0aGVudGljYXRvck1hbmFnZXIoKS5pc1Zp cnR1YWwoKSkKKyAgICBpZiAoIWRhdGEucHJvY2Vzc2luZ1VzZXJHZXN0dXJlICYmICFtX3dlYlBh Z2VQcm94eS53ZWJzaXRlRGF0YVN0b3JlKCkuYXV0aGVudGljYXRvck1hbmFnZXIoKS5pc1ZpcnR1 YWwoKSAmJiBkYXRhLm1lZGlhdGlvbiAhPSBNZWRpYXRpb25SZXF1aXJlbWVudDo6Q29uZGl0aW9u YWwpCiAgICAgICAgIG1fd2ViUGFnZVByb3h5LnVpQ2xpZW50KCkucmVxdWVzdFdlYkF1dGhlbnRp Y2F0aW9uTm9HZXN0dXJlKG9yaWdpbiwgV1RGTW92ZShhZnRlckNvbnNlbnQpKTsKICAgICBlbHNl CiAgICAgICAgIGFmdGVyQ29uc2VudCh0cnVlKTsK 458758 2022-05-03 14:42:32 -0700 2022-05-04 10:59:06 -0700 Patch for landing bug-240038-20220503144231.patch text/plain 3468 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJiMzEyNzBkNGZiMzViOTdh ZTY2YTEyZDA0M2M3MTIxNTdjNjFmMTcuLjBkMjVlZTcyMzBiNmU2MDJiMTY5ZGFiNDA1YjFlNDhh Y2RmNGY5MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDUtMDMgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUmVtb3ZlIHVzZXIg Z2VzdHVyZSByZXF1aXJlbWVudCBmb3IgbWVkaWF0aW9uPWNvbmRpdGlvbmFsIGFzc2VydGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDAzOAor ICAgICAgICByZGFyOi8vOTIxMzc2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDb25kaXRpb25hbCBhc3NlcnRpb25zIGFyZSBub24tbW9kYWwgYW5k IGFscmVhZHkgcmVxdWlyZSBhIGdlc3R1cmUgdG8gY29tcGxldGUgdmlhCisgICAgICAgIGEgZGlm ZmVyZW50IG1lY2hhbmlzbS4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkgb24gZGV2aWNlLgor CisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhlbnRp Y2F0b3JDb29yZGluYXRvclByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0Ojpjb25maWd1cmF0aW9u QXNzZXJ0aW9uUmVxdWVzdENvbnRleHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50 aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5OjpoYW5kbGVSZXF1ZXN0KToK KwogMjAyMi0wNS0wMyAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU11bV1BdIE9ubHkgYmxvY2sgSU9LaXQgYWNjZXNzIGlmIGFsbCBHUFVQIGZlYXR1 cmVzIGFyZSBlbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhl bnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tCmluZGV4IGE1YmJlZDVlYzQ1OWUyN2IyNjQ1ODM0 Mjc2MDRmMDExN2Q2MmRjN2MuLjA0Mjk5OTQxNmJjYzlkYzE4M2VmODBjNDExYWUwZjIzMGUzYWIy ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9u L0NvY29hL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhlbnRpY2F0b3JD b29yZGluYXRvclByb3h5Lm1tCkBAIC0zMjEsOCArMzIxLDExIEBAIHN0YXRpYyBSZXRhaW5QdHI8 QVNDQ3JlZGVudGlhbFJlcXVlc3RDb250ZXh0PiBjb25maWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVz dENvbnRlCiAKICAgICBhdXRvIHJlcXVlc3RDb250ZXh0ID0gYWRvcHROUyhbYWxsb2NBU0NDcmVk ZW50aWFsUmVxdWVzdENvbnRleHRJbnN0YW5jZSgpIGluaXRXaXRoUmVxdWVzdFR5cGVzOnJlcXVl c3RUeXBlc10pOwogICAgIFtyZXF1ZXN0Q29udGV4dCBzZXRSZWx5aW5nUGFydHlJZGVudGlmaWVy Om9wdGlvbnMucnBJZF07Ci0gICAgaWYgKG1lZGlhdGlvbiA9PSBNZWRpYXRpb25SZXF1aXJlbWVu dDo6Q29uZGl0aW9uYWwgJiYgW3JlcXVlc3RDb250ZXh0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Ioc2V0UmVxdWVzdFN0eWxlOildKQorICAgIGlmIChtZWRpYXRpb24gPT0gTWVkaWF0aW9u UmVxdWlyZW1lbnQ6OkNvbmRpdGlvbmFsKSB7CisgICAgICAgIGlmICghW3JlcXVlc3RDb250ZXh0 IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0UmVxdWVzdFN0eWxlOildKQorICAgICAg ICAgICAgcmV0dXJuIG5pbDsKICAgICAgICAgcmVxdWVzdENvbnRleHQuZ2V0KCkucmVxdWVzdFN0 eWxlID0gQVNDcmVkZW50aWFsUmVxdWVzdFN0eWxlQXV0b0ZpbGw7CisgICAgfQogICAgIHNldEds b2JhbEZyYW1lSURGb3JDb250ZXh0KHJlcXVlc3RDb250ZXh0LCBnbG9iYWxGcmFtZUlEKTsKIAog ICAgIGlmIChyZXF1ZXN0VHlwZXMgJiBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVQbGF0Zm9ybVB1 YmxpY0tleUFzc2VydGlvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRv ckNvb3JkaW5hdG9yUHJveHkuY3BwCmluZGV4IDFjYzcyYTU0NjgxNjBhMDQ1YWU4YjllNTlhZTgx ODM2OGNlY2M5NGMuLjc4ZjVhMmQzZmM0ZTg2YjY0YmRiZWQ1M2M3NTNjMzI1OWUxMDViYTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1 dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5j cHAKQEAgLTEwNyw3ICsxMDcsNyBAQCB2b2lkIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclBy b3h5OjpoYW5kbGVSZXF1ZXN0KFdlYkF1dGhlbnRpY2F0aW9uUmVxdWVzdERhdAogICAgICAgICAg ICAgaGFuZGxlcih7IH0sIChBdXRoZW50aWNhdG9yQXR0YWNobWVudCkwLCBFeGNlcHRpb25EYXRh IHsgTm90QWxsb3dlZEVycm9yLCAiVGhpcyByZXF1ZXN0IGhhcyBiZWVuIGNhbmNlbGxlZCBieSB0 aGUgdXNlci4iX3MgfSk7CiAgICAgfTsKICAgICAKLSAgICBpZiAoIWRhdGEucHJvY2Vzc2luZ1Vz ZXJHZXN0dXJlICYmICFtX3dlYlBhZ2VQcm94eS53ZWJzaXRlRGF0YVN0b3JlKCkuYXV0aGVudGlj YXRvck1hbmFnZXIoKS5pc1ZpcnR1YWwoKSkKKyAgICBpZiAoIWRhdGEucHJvY2Vzc2luZ1VzZXJH ZXN0dXJlICYmIGRhdGEubWVkaWF0aW9uICE9IE1lZGlhdGlvblJlcXVpcmVtZW50OjpDb25kaXRp b25hbCAmJiAhbV93ZWJQYWdlUHJveHkud2Vic2l0ZURhdGFTdG9yZSgpLmF1dGhlbnRpY2F0b3JN YW5hZ2VyKCkuaXNWaXJ0dWFsKCkpCiAgICAgICAgIG1fd2ViUGFnZVByb3h5LnVpQ2xpZW50KCku cmVxdWVzdFdlYkF1dGhlbnRpY2F0aW9uTm9HZXN0dXJlKG9yaWdpbiwgV1RGTW92ZShhZnRlckNv bnNlbnQpKTsKICAgICBlbHNlCiAgICAgICAgIGFmdGVyQ29uc2VudCh0cnVlKTsK 458812 2022-05-04 10:59:08 -0700 2022-05-04 13:29:54 -0700 Patch for landing bug-240038-20220504105907.patch text/plain 3458 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYyZjE4ODEwMmU3NDBhM2Qx NWFhYmQxODUxYzhjMGI1NWJkMGRjNDQuLjU1NDA5N2MzYWI3OTU4MjI1ZWQ1ZTUwZDdmMGE0MTgy ZGFkY2Y0MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDUtMDQgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUmVtb3ZlIHVzZXIg Z2VzdHVyZSByZXF1aXJlbWVudCBmb3IgbWVkaWF0aW9uPWNvbmRpdGlvbmFsIGFzc2VydGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDAzOAor ICAgICAgICByZGFyOi8vOTIxMzc2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxn aGFtLgorCisgICAgICAgIENvbmRpdGlvbmFsIGFzc2VydGlvbnMgYXJlIG5vbi1tb2RhbCBhbmQg YWxyZWFkeSByZXF1aXJlIGEgZ2VzdHVyZSB0byBjb21wbGV0ZSB2aWEKKyAgICAgICAgYSBkaWZm ZXJlbnQgbWVjaGFuaXNtLgorCisgICAgICAgIFRlc3RlZCBtYW51YWxseSBvbiBkZXZpY2UuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OmNvbmZpZ3VyYXRpb25B c3NlcnRpb25SZXF1ZXN0Q29udGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRp Y2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHk6OmhhbmRsZVJlcXVlc3QpOgor CiAyMDIyLTA1LTA0ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAg ICAgICAgRGlzcGxheUxpc3Q6OlJlY29yZGVyIGhhcyByZWR1bmRhbnQsIHVudXNlZCBmbHVzaENv bnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0 aW9uL0NvY29hL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNv b3JkaW5hdG9yUHJveHkubW0KaW5kZXggYTViYmVkNWVjNDU5ZTI3YjI2NDU4MzQyNzYwNGYwMTE3 ZDYyZGM3Yy4uMDQyOTk5NDE2YmNjOWRjMTgzZWY4MGM0MTFhZTBmMjMwZTNhYjJlMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2Vi QXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9y UHJveHkubW0KQEAgLTMyMSw4ICszMjEsMTEgQEAgc3RhdGljIFJldGFpblB0cjxBU0NDcmVkZW50 aWFsUmVxdWVzdENvbnRleHQ+IGNvbmZpZ3VyYXRpb25Bc3NlcnRpb25SZXF1ZXN0Q29udGUKIAog ICAgIGF1dG8gcmVxdWVzdENvbnRleHQgPSBhZG9wdE5TKFthbGxvY0FTQ0NyZWRlbnRpYWxSZXF1 ZXN0Q29udGV4dEluc3RhbmNlKCkgaW5pdFdpdGhSZXF1ZXN0VHlwZXM6cmVxdWVzdFR5cGVzXSk7 CiAgICAgW3JlcXVlc3RDb250ZXh0IHNldFJlbHlpbmdQYXJ0eUlkZW50aWZpZXI6b3B0aW9ucy5y cElkXTsKLSAgICBpZiAobWVkaWF0aW9uID09IE1lZGlhdGlvblJlcXVpcmVtZW50OjpDb25kaXRp b25hbCAmJiBbcmVxdWVzdENvbnRleHQgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRS ZXF1ZXN0U3R5bGU6KV0pCisgICAgaWYgKG1lZGlhdGlvbiA9PSBNZWRpYXRpb25SZXF1aXJlbWVu dDo6Q29uZGl0aW9uYWwpIHsKKyAgICAgICAgaWYgKCFbcmVxdWVzdENvbnRleHQgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3RvcihzZXRSZXF1ZXN0U3R5bGU6KV0pCisgICAgICAgICAgICByZXR1 cm4gbmlsOwogICAgICAgICByZXF1ZXN0Q29udGV4dC5nZXQoKS5yZXF1ZXN0U3R5bGUgPSBBU0Ny ZWRlbnRpYWxSZXF1ZXN0U3R5bGVBdXRvRmlsbDsKKyAgICB9CiAgICAgc2V0R2xvYmFsRnJhbWVJ REZvckNvbnRleHQocmVxdWVzdENvbnRleHQsIGdsb2JhbEZyYW1lSUQpOwogCiAgICAgaWYgKHJl cXVlc3RUeXBlcyAmIEFTQ0NyZWRlbnRpYWxSZXF1ZXN0VHlwZVBsYXRmb3JtUHVibGljS2V5QXNz ZXJ0aW9uKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50 aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0 b3JQcm94eS5jcHAKaW5kZXggMWNjNzJhNTQ2ODE2MGEwNDVhZThiOWU1OWFlODE4MzY4Y2VjYzk0 Yy4uNzhmNWEyZDNmYzRlODZiNjRiZGJlZDUzYzc1M2MzMjU5ZTEwNWJhNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRv ckNvb3JkaW5hdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1 dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5LmNwcApAQCAtMTA3 LDcgKzEwNyw3IEBAIHZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHk6OmhhbmRs ZVJlcXVlc3QoV2ViQXV0aGVudGljYXRpb25SZXF1ZXN0RGF0CiAgICAgICAgICAgICBoYW5kbGVy KHsgfSwgKEF1dGhlbnRpY2F0b3JBdHRhY2htZW50KTAsIEV4Y2VwdGlvbkRhdGEgeyBOb3RBbGxv d2VkRXJyb3IsICJUaGlzIHJlcXVlc3QgaGFzIGJlZW4gY2FuY2VsbGVkIGJ5IHRoZSB1c2VyLiJf cyB9KTsKICAgICB9OwogICAgIAotICAgIGlmICghZGF0YS5wcm9jZXNzaW5nVXNlckdlc3R1cmUg JiYgIW1fd2ViUGFnZVByb3h5LndlYnNpdGVEYXRhU3RvcmUoKS5hdXRoZW50aWNhdG9yTWFuYWdl cigpLmlzVmlydHVhbCgpKQorICAgIGlmICghZGF0YS5wcm9jZXNzaW5nVXNlckdlc3R1cmUgJiYg ZGF0YS5tZWRpYXRpb24gIT0gTWVkaWF0aW9uUmVxdWlyZW1lbnQ6OkNvbmRpdGlvbmFsICYmICFt X3dlYlBhZ2VQcm94eS53ZWJzaXRlRGF0YVN0b3JlKCkuYXV0aGVudGljYXRvck1hbmFnZXIoKS5p c1ZpcnR1YWwoKSkKICAgICAgICAgbV93ZWJQYWdlUHJveHkudWlDbGllbnQoKS5yZXF1ZXN0V2Vi QXV0aGVudGljYXRpb25Ob0dlc3R1cmUob3JpZ2luLCBXVEZNb3ZlKGFmdGVyQ29uc2VudCkpOwog ICAgIGVsc2UKICAgICAgICAgYWZ0ZXJDb25zZW50KHRydWUpOwo=