Changeset 238240 in webkit

Timestamp:

Nov 15, 2018 12:28:07 PM (5 years ago)

Author:

jiewen_tan@apple.com

Message:

[WebAuthN] PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria::AuthenticatorAttachment should be optional
​https://bugs.webkit.org/show_bug.cgi?id=191522

Reviewed by Brent Fulgham.

Source/WebCore:

Accordign to the WebIDL, AuthenticatorSelectionCriteria::AuthenticatorAttachment should be optional.
​https://www.w3.org/TR/webauthn/#dictdef-authenticatorselectioncriteria

Covered by existing tests.

• Modules/webauthn/PublicKeyCredentialCreationOptions.h:

(WebCore::PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria::decode):

Source/WebKit:

• UIProcess/WebAuthentication/AuthenticatorManager.cpp:

(WebKit::AuthenticatorManagerInternal::collectTransports):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/webauthn/PublicKeyCredentialCreationOptions.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-15  Jiewen Tan  <jiewen_tan@apple.com>
+
+        [WebAuthN] PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria::AuthenticatorAttachment should be optional
+        https://bugs.webkit.org/show_bug.cgi?id=191522
+
+        Reviewed by Brent Fulgham.
+
+        Accordign to the WebIDL, AuthenticatorSelectionCriteria::AuthenticatorAttachment should be optional.
+        https://www.w3.org/TR/webauthn/#dictdef-authenticatorselectioncriteria
+
+        Covered by existing tests.
+
+        * Modules/webauthn/PublicKeyCredentialCreationOptions.h:
+        (WebCore::PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria::decode):
+
 2018-11-15  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialCreationOptions.h

@@ -67 +67 @@
 
     struct AuthenticatorSelectionCriteria {
-        // FIXME(191522)
-        AuthenticatorAttachment authenticatorAttachment { AuthenticatorAttachment::CrossPlatform };
+        std::optional<AuthenticatorAttachment> authenticatorAttachment;
         bool requireResidentKey { false };
         UserVerificationRequirement userVerification { UserVerificationRequirement::Preferred };
@@ -118 +117 @@
     PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria result;
 
-    std::optional<AuthenticatorAttachment> authenticatorAttachment;
+    std::optional<std::optional<AuthenticatorAttachment>> authenticatorAttachment;
     decoder >> authenticatorAttachment;
     if (!authenticatorAttachment)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-15  Jiewen Tan  <jiewen_tan@apple.com>
+
+        [WebAuthN] PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria::AuthenticatorAttachment should be optional
+        https://bugs.webkit.org/show_bug.cgi?id=191522
+
+        Reviewed by Brent Fulgham.
+
+        * UIProcess/WebAuthentication/AuthenticatorManager.cpp:
+        (WebKit::AuthenticatorManagerInternal::collectTransports):
+
 2018-11-15  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -50 +50 @@
 {
     AuthenticatorManager::TransportSet result;
-    if (!authenticatorSelection) {
+    if (!authenticatorSelection || !authenticatorSelection->authenticatorAttachment) {
         auto addResult = result.add(AuthenticatorTransport::Internal);
         ASSERT_UNUSED(addResult, addResult.isNewEntry);