Changeset 285864 in webkit

Timestamp:

Nov 16, 2021, 8:47:40 AM (5 years ago)

Author:

J Pascoe

Message:

[WebAuthn] WebKitTestRunner/TWAPI lacks an entitlement and bundle identifier to use required [ASCAgent performAuthorizationRequestsForContext]
​https://bugs.webkit.org/show_bug.cgi?id=232846
rdar://problem/85170633

Reviewed by Brent Fulgham.

Covered by existing tests.

Calling to ASC requires converting WebAuthenticationRequestData to ASCCredentialRequestContext and then making
a call to _WKAuthenticatorAssertionResponse, while also requiring entitlements currently unavailable in OpenSource.
This change avoids calling out to ASC in tests using mock / virtual authenticators to avoid this problem, the
serialization to and from ASCAgent can be tested seperately.

• UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:

Refactor creation of ASCCredentialRequestContext.
(WebKit::WebAuthenticatorCoordinatorProxy::isUserVerifyingPlatformAuthenticatorAvailable):

• UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.cpp:

(WebKit::WebAuthenticatorCoordinatorProxy::handleRequest):
Refactor use of ASC and add clarifying comment about flow.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (modified) (1 diff)
• UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.cpp (modified) (4 diffs)
• UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-16  J Pascoe  <j_pascoe@apple.com>
+
+        [WebAuthn] WebKitTestRunner/TWAPI lacks an entitlement and bundle identifier to use required [ASCAgent performAuthorizationRequestsForContext]
+        https://bugs.webkit.org/show_bug.cgi?id=232846
+        rdar://problem/85170633
+
+        Reviewed by Brent Fulgham.
+
+        Covered by existing tests.
+
+        Calling to ASC requires converting WebAuthenticationRequestData to ASCCredentialRequestContext and then making
+        a call to _WKAuthenticatorAssertionResponse, while also requiring entitlements currently unavailable in OpenSource.
+        This change avoids calling out to ASC in tests using mock / virtual authenticators to avoid this problem, the
+        serialization to and from ASCAgent can be tested seperately.
+
+        * UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
+        Refactor creation of ASCCredentialRequestContext.
+        (WebKit::WebAuthenticatorCoordinatorProxy::isUserVerifyingPlatformAuthenticatorAvailable):
+        * UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.cpp:
+        (WebKit::WebAuthenticatorCoordinatorProxy::handleRequest):
+        Refactor use of ASC and add clarifying comment about flow.
+
 2021-11-16  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm

@@ -239 +239 @@
 }
 
-void WebAuthenticatorCoordinatorProxy::makeCredential(FrameIdentifier frameId, FrameInfoData&& frameInfo, Vector<uint8_t>&& hash, PublicKeyCredentialCreationOptions&& options, bool processingUserGesture, RequestCompletionHandler&& handler)
-{
-    auto requestContext = configureRegistrationRequestContext(options);
-    performRequest(requestContext, WTFMove(handler));
-}
-
-void WebAuthenticatorCoordinatorProxy::getAssertion(FrameIdentifier frameId, FrameInfoData&& frameInfo, Vector<uint8_t>&& hash, PublicKeyCredentialRequestOptions&& options, bool processingUserGesture, RequestCompletionHandler&& handler)
-{
-    auto requestContext = configurationAssertionRequestContext(options);
-    performRequest(requestContext, WTFMove(handler));
+RetainPtr<ASCCredentialRequestContext> WebAuthenticatorCoordinatorProxy::contextForRequest(WebAuthenticationRequestData&& requestData)
+{
+    RetainPtr<ASCCredentialRequestContext> result;
+    WTF::switchOn(requestData.options, [&](const PublicKeyCredentialCreationOptions& options) {
+        result = configureRegistrationRequestContext(options);
+    }, [&](const PublicKeyCredentialRequestOptions& options) {
+        result = configurationAssertionRequestContext(options);
+    });
+    return result;
 }
 

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

@@ -56 +56 @@
 }
 
-#if !HAVE(UNIFIED_ASC_AUTH_UI)
 void WebAuthenticatorCoordinatorProxy::makeCredential(FrameIdentifier frameId, FrameInfoData&& frameInfo, Vector<uint8_t>&& hash, PublicKeyCredentialCreationOptions&& options, bool processingUserGesture, RequestCompletionHandler&& handler)
 {
@@ -66 +65 @@
     handleRequest({ WTFMove(hash), WTFMove(options), m_webPageProxy, WebAuthenticationPanelResult::Unavailable, nullptr, GlobalFrameIdentifier { m_webPageProxy.webPageID(), frameId }, WTFMove(frameInfo), processingUserGesture, String(), nullptr }, WTFMove(handler));
 }
-#endif
 
 void WebAuthenticatorCoordinatorProxy::handleRequest(WebAuthenticationRequestData&& data, RequestCompletionHandler&& handler)
 {
+    auto& authenticatorManager = m_webPageProxy.websiteDataStore().authenticatorManager();
+
+#if HAVE(UNIFIED_ASC_AUTH_UI)
+    if (!authenticatorManager.isMock() && !authenticatorManager.isVirtual()) {
+        auto context = contextForRequest(WTFMove(data));
+        // performRequest calls out to ASCAgent which will then call [_WKWebAuthenticationPanel makeCredential/getAssertionWithChallenge]
+        // which calls authenticatorManager.handleRequest(..)
+        performRequest(context, WTFMove(handler));
+        return;
+    }
+#endif // HAVE(UNIFIED_ASC_AUTH_UI)
+
     auto callback = [handler = WTFMove(handler)] (std::variant<Ref<AuthenticatorResponse>, ExceptionData>&& result) mutable {
         ASSERT(RunLoop::isMain());
@@ -78 +88 @@
         });
     };
-    m_webPageProxy.websiteDataStore().authenticatorManager().handleRequest(WTFMove(data), WTFMove(callback));
+    authenticatorManager.handleRequest(WTFMove(data), WTFMove(callback));
 }
 
@@ -86 +96 @@
     handler(LocalService::isAvailable());
 }
-#endif
+#endif // !HAVE(UNIFIED_ASC_AUTH_UI)
 
 } // namespace WebKit

trunk/Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.h

@@ -78 +78 @@
 
 #if HAVE(UNIFIED_ASC_AUTH_UI)
+    RetainPtr<ASCCredentialRequestContext> contextForRequest(WebAuthenticationRequestData&&);
     void performRequest(RetainPtr<ASCCredentialRequestContext>, RequestCompletionHandler&&);
     RetainPtr<ASCAuthorizationRemotePresenter> m_presenter;