Changeset 294298 in webkit

Timestamp:

May 16, 2022, 11:10:46 PM (3 years ago)

Author:

Alan Coon

Message:

Cherry-pick r293433. rdar://problem/91981865

[WebAuthn] Do not pass ASCCredentialRequestTypePlatform... if LocalService unavailable
​https://bugs.webkit.org/show_bug.cgi?id=239746
rdar://91981865

Reviewed by Brent Fulgham.

Passing platform in requestTypes breaks the UI in registerations with the syncing platform
authenticator off and local service is unavailable. This patch stops passing it in this case.

• UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm: (WebKit::configureRegistrationRequestContext): (WebKit::WebAuthenticatorCoordinatorProxy::performRequest):

Canonical link: ​https://commits.webkit.org/249993@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@293433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (modified) (2 diffs)

branches/safari-613-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2022-05-16  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r293433. rdar://problem/91981865
+
+    [WebAuthn] Do not pass ASCCredentialRequestTypePlatform... if LocalService unavailable
+    https://bugs.webkit.org/show_bug.cgi?id=239746
+    rdar://91981865
+    
+    Reviewed by Brent Fulgham.
+    
+    Passing platform in requestTypes breaks the UI in registerations with the syncing platform
+    authenticator off and local service is unavailable. This patch stops passing it in this case.
+    
+    * UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
+    (WebKit::configureRegistrationRequestContext):
+    (WebKit::WebAuthenticatorCoordinatorProxy::performRequest):
+    
+    Canonical link: https://commits.webkit.org/249993@main
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293433 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-04-26  J Pascoe  <j_pascoe@apple.com>
+
+            [WebAuthn] Do not pass ASCCredentialRequestTypePlatform... if LocalService unavailable
+            https://bugs.webkit.org/show_bug.cgi?id=239746
+            rdar://91981865
+
+            Reviewed by Brent Fulgham.
+
+            Passing platform in requestTypes breaks the UI in registerations with the syncing platform
+            authenticator off and local service is unavailable. This patch stops passing it in this case.
+
+            * UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
+            (WebKit::configureRegistrationRequestContext):
+            (WebKit::WebAuthenticatorCoordinatorProxy::performRequest):
+
 2022-05-16  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm

@@ -191 +191 @@
         shouldRequireResidentKey = authenticatorSelection->requireResidentKey;
     }
+    if (!LocalService::isAvailable())
+        requestTypes &= ~ASCCredentialRequestTypePlatformPublicKeyRegistration;
 
     auto requestContext = adoptNS([allocASCCredentialRequestContextInstance() initWithRequestTypes:requestTypes]);
@@ -371 +373 @@
 void WebAuthenticatorCoordinatorProxy::performRequest(RetainPtr<ASCCredentialRequestContext> requestContext, RequestCompletionHandler&& handler)
 {
+    if (requestContext.get().requestTypes == ASCCredentialRequestTypeNone) {
+        handler({ }, (AuthenticatorAttachment)0, ExceptionData { NotAllowedError, "This request has been cancelled by the user."_s });
+        return;
+    }
     m_proxy = adoptNS([allocASCAgentProxyInstance() init]);
 #if PLATFORM(IOS)