Changeset 261588 in webkit


Ignore:
Timestamp:
May 12, 2020 5:11:00 PM (4 years ago)
Author:
jiewen_tan@apple.com
Message:

[WebAuthn] Don't assume extensions always exist
​https://bugs.webkit.org/show_bug.cgi?id=211760
<rdar://problem/61217642>

Reviewed by Brent Fulgham.

Source/WebCore:

  • Modules/webauthn/fido/U2fCommandConstructor.cpp:

(fido::processGoogleLegacyAppIdSupportExtension):

Source/WebKit:

  • UIProcess/WebAuthentication/AuthenticatorManager.cpp:

(WebKit::WebCore::processGoogleLegacyAppIdSupportExtension):

  • UIProcess/WebAuthentication/fido/CtapAuthenticator.cpp:

(WebKit::CtapAuthenticator::processGoogleLegacyAppIdSupportExtension):

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r261587 r261588  
     12020-05-12  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        [WebAuthn] Don't assume extensions always exist
     4        https://bugs.webkit.org/show_bug.cgi?id=211760
     5        <rdar://problem/61217642>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        * Modules/webauthn/fido/U2fCommandConstructor.cpp:
     10        (fido::processGoogleLegacyAppIdSupportExtension):
     11
    1122020-05-12  Jer Noble  <jer.noble@apple.com>
    213

  • trunk/Source/WebCore/Modules/webauthn/fido/U2fCommandConstructor.cpp

    r250659 r261588  
    134134String processGoogleLegacyAppIdSupportExtension(const Optional<AuthenticationExtensionsClientInputs>& extensions)
    135135{
    136     // AuthenticatorCoordinator::create should always set it.
    137     ASSERT(!!extensions);
     136    if (!extensions) {
     137        // AuthenticatorCoordinator::create should always set it.
     138        ASSERT_NOT_REACHED();
     139        return String();
     140    }
     141
    138142    if (!extensions->googleLegacyAppidSupport)
    139143        return String();

  • trunk/Source/WebKit/ChangeLog

    r261586 r261588  
     12020-05-12  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        [WebAuthn] Don't assume extensions always exist
     4        https://bugs.webkit.org/show_bug.cgi?id=211760
     5        <rdar://problem/61217642>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        * UIProcess/WebAuthentication/AuthenticatorManager.cpp:
     10        (WebKit::WebCore::processGoogleLegacyAppIdSupportExtension):
     11        * UIProcess/WebAuthentication/fido/CtapAuthenticator.cpp:
     12        (WebKit::CtapAuthenticator::processGoogleLegacyAppIdSupportExtension):
     13
    1142020-05-12  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp

    r260983 r261588  
    124124static void processGoogleLegacyAppIdSupportExtension(const Optional<AuthenticationExtensionsClientInputs>& extensions, AuthenticatorManager::TransportSet& transports)
    125125{
    126     // AuthenticatorCoordinator::create should always set it.
    127     ASSERT(!!extensions);
     126    if (!extensions) {
     127        // AuthenticatorCoordinator::create should always set it.
     128        ASSERT_NOT_REACHED();
     129        return;
     130    }
    128131    if (!extensions->googleLegacyAppidSupport)
    129132        return;

  • trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapAuthenticator.cpp

    r260970 r261588  
    356356bool CtapAuthenticator::processGoogleLegacyAppIdSupportExtension()
    357357{
    358     // AuthenticatorCoordinator::create should always set it.
    359358    auto& extensions = WTF::get<PublicKeyCredentialCreationOptions>(requestData().options).extensions;
    360     ASSERT(!!extensions);
     359    if (!extensions) {
     360        // AuthenticatorCoordinator::create should always set it.
     361        ASSERT_NOT_REACHED();
     362        return false;
     363    }
    361364    if (extensions->googleLegacyAppidSupport)
    362365        tryDowngrade();
Note: See TracChangeset for help on using the changeset viewer.