Plumb transport protocol from //device/fido to UI.

For all successful WebAuthN API transactions, notify observers of
FidoRequestHandler, then AuthenticatorRequestClientDelegate of which
transport protocol was used to talk to the authenticator that was used
to service the request.

This will be saved as Chromium preference, and used to infer which
transport type to default to when user invokes WebAuthN API again.

Bug: 847985
Change-Id: I9ecf27209ec959d740664e34fe088a2e4499e982
Reviewed-on: https://chromium-review.googlesource.com/1175500
Commit-Queue: Jun Choi <hongjunchoi@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583517}

content/browser/webauth/authenticator_impl.cc

@@ -646,7 +646,8 @@ void AuthenticatorImpl::DidFinishNavigation(
 // Callback to handle the async registration response from a U2fDevice.
 void AuthenticatorImpl::OnRegisterResponse(
     device::FidoReturnCode status_code,
-    base::Optional<device::AuthenticatorMakeCredentialResponse> response_data) {
+    base::Optional<device::AuthenticatorMakeCredentialResponse> response_data,
+    device::FidoTransportProtocol transport_used) {
   if (!request_) {
     // Either the callback was called immediately and |request_| has not yet
     // been assigned (this is a bug), or a navigation caused the request to be
@@ -676,6 +677,7 @@ void AuthenticatorImpl::OnRegisterResponse(
       return;
     case device::FidoReturnCode::kSuccess:
       DCHECK(response_data.has_value());
+      request_delegate_->UpdateLastTransportUsed(transport_used);
 
       if (attestation_preference_ !=
           blink::mojom::AttestationConveyancePreference::NONE) {
@@ -752,7 +754,8 @@ void AuthenticatorImpl::OnRegisterResponseAttestationDecided(
 
 void AuthenticatorImpl::OnSignResponse(
     device::FidoReturnCode status_code,
-    base::Optional<device::AuthenticatorGetAssertionResponse> response_data) {
+    base::Optional<device::AuthenticatorGetAssertionResponse> response_data,
+    device::FidoTransportProtocol transport_used) {
   if (!request_) {
     // Either the callback was called immediately and |request_| has not yet
     // been assigned (this is a bug), or a navigation caused the request to be
@@ -779,6 +782,8 @@ void AuthenticatorImpl::OnSignResponse(
       return;
     case device::FidoReturnCode::kSuccess:
       DCHECK(response_data.has_value());
+      request_delegate_->UpdateLastTransportUsed(transport_used);
+
       base::Optional<bool> echo_appid_extension;
       if (alternative_application_parameter_) {
         echo_appid_extension = (response_data->GetRpIdHash() ==

content/browser/webauth/authenticator_impl.h

@@ -125,8 +125,8 @@ class CONTENT_EXPORT AuthenticatorImpl : public blink::mojom::Authenticator,
   // Callback to handle the async response from a U2fDevice.
   void OnRegisterResponse(
       device::FidoReturnCode status_code,
-      base::Optional<device::AuthenticatorMakeCredentialResponse>
-          response_data);
+      base::Optional<device::AuthenticatorMakeCredentialResponse> response_data,
+      device::FidoTransportProtocol transport_used);
 
   // Callback to complete the registration process once a decision about
   // whether or not to return attestation data has been made.
@@ -137,7 +137,8 @@ class CONTENT_EXPORT AuthenticatorImpl : public blink::mojom::Authenticator,
   // Callback to handle the async response from a U2fDevice.
   void OnSignResponse(
       device::FidoReturnCode status_code,
-      base::Optional<device::AuthenticatorGetAssertionResponse> response_data);
+      base::Optional<device::AuthenticatorGetAssertionResponse> response_data,
+      device::FidoTransportProtocol transport_used);
 
   // Runs when timer expires and cancels all issued requests to a U2fDevice.
   void OnTimeout();

device/fido/fido_request_handler.h

@@ -27,7 +27,8 @@ class FidoRequestHandler : public FidoRequestHandlerBase {
  public:
   using CompletionCallback =
       base::OnceCallback<void(FidoReturnCode status_code,
-                              base::Optional<Response> response_data)>;
+                              base::Optional<Response> response_data,
+                              FidoTransportProtocol transport_used)>;
 
   FidoRequestHandler(service_manager::Connector* connector,
                      const base::flat_set<FidoTransportProtocol>& transports,
@@ -78,7 +79,9 @@ class FidoRequestHandler : public FidoRequestHandlerBase {
     // Once response has been passed to the relying party, cancel all other on
     // going requests.
     CancelOngoingTasks(authenticator->GetId());
-    std::move(completion_callback_).Run(*return_code, std::move(response_data));
+    std::move(completion_callback_)
+        .Run(*return_code, std::move(response_data),
+             authenticator->AuthenticatorTransport());
   }
 
  private:

device/fido/fido_request_handler_unittest.cc

@@ -30,12 +30,14 @@ namespace {
 using FakeTaskCallback =
     base::OnceCallback<void(CtapDeviceResponseCode status_code,
                             base::Optional<std::vector<uint8_t>>)>;
-using FakeHandlerCallback = base::OnceCallback<void(
-    FidoReturnCode status_code,
-    base::Optional<std::vector<uint8_t>> response_data)>;
+using FakeHandlerCallback =
+    base::OnceCallback<void(FidoReturnCode status_code,
+                            base::Optional<std::vector<uint8_t>> response_data,
+                            FidoTransportProtocol)>;
 using FakeHandlerCallbackReceiver =
-    test::StatusAndValueCallbackReceiver<FidoReturnCode,
-                                         base::Optional<std::vector<uint8_t>>>;
+    test::StatusAndValuesCallbackReceiver<FidoReturnCode,
+                                          base::Optional<std::vector<uint8_t>>,
+                                          FidoTransportProtocol>;
 
 enum class FakeTaskResponse : uint8_t {
   kSuccess = 0x00,

device/fido/get_assertion_handler_unittest.cc

@@ -25,9 +25,10 @@ namespace device {
 
 namespace {
 
-using TestGetAssertionRequestCallback = test::StatusAndValueCallbackReceiver<
+using TestGetAssertionRequestCallback = test::StatusAndValuesCallbackReceiver<
     FidoReturnCode,
-    base::Optional<AuthenticatorGetAssertionResponse>>;
+    base::Optional<AuthenticatorGetAssertionResponse>,
+    FidoTransportProtocol>;
 
 }  // namespace
 
@@ -96,7 +97,7 @@ TEST_F(FidoGetAssertionHandlerTest, CtapRequestOnSingleDevice) {
   get_assertion_callback().WaitForCallback();
 
   EXPECT_EQ(FidoReturnCode::kSuccess, get_assertion_callback().status());
-  EXPECT_TRUE(get_assertion_callback().value());
+  EXPECT_TRUE(get_assertion_callback().value<0>());
   EXPECT_TRUE(request_handler->is_complete());
 }
 
@@ -116,7 +117,7 @@ TEST_F(FidoGetAssertionHandlerTest, TestU2fSign) {
   discovery()->AddDevice(std::move(device));
   scoped_task_environment_.FastForwardUntilNoTasksRemain();
   EXPECT_EQ(FidoReturnCode::kSuccess, get_assertion_callback().status());
-  EXPECT_TRUE(get_assertion_callback().value());
+  EXPECT_TRUE(get_assertion_callback().value<0>());
   EXPECT_TRUE(request_handler->is_complete());
 }
 
@@ -139,7 +140,7 @@ TEST_F(FidoGetAssertionHandlerTest, TestU2fSignWithoutCtapFlag) {
   discovery()->AddDevice(std::move(device));
   scoped_task_environment_.FastForwardUntilNoTasksRemain();
   EXPECT_EQ(FidoReturnCode::kSuccess, get_assertion_callback().status());
-  EXPECT_TRUE(get_assertion_callback().value());
+  EXPECT_TRUE(get_assertion_callback().value<0>());
   EXPECT_TRUE(request_handler->is_complete());
 }
 

device/fido/get_assertion_request_handler.h

@@ -27,7 +27,8 @@ class AuthenticatorGetAssertionResponse;
 
 using SignResponseCallback =
     base::OnceCallback<void(FidoReturnCode,
-                            base::Optional<AuthenticatorGetAssertionResponse>)>;
+                            base::Optional<AuthenticatorGetAssertionResponse>,
+                            FidoTransportProtocol)>;
 
 class COMPONENT_EXPORT(DEVICE_FIDO) GetAssertionRequestHandler
     : public FidoRequestHandler<AuthenticatorGetAssertionResponse> {

device/fido/make_credential_handler_unittest.cc

@@ -30,9 +30,10 @@ namespace device {
 
 namespace {
 
-using TestMakeCredentialRequestCallback = test::StatusAndValueCallbackReceiver<
+using TestMakeCredentialRequestCallback = test::StatusAndValuesCallbackReceiver<
     FidoReturnCode,
-    base::Optional<AuthenticatorMakeCredentialResponse>>;
+    base::Optional<AuthenticatorMakeCredentialResponse>,
+    FidoTransportProtocol>;
 
 }  // namespace
 

device/fido/make_credential_request_handler.h

@@ -27,8 +27,10 @@ namespace device {
 class FidoAuthenticator;
 class AuthenticatorMakeCredentialResponse;
 
-using RegisterResponseCallback = base::OnceCallback<
-    void(FidoReturnCode, base::Optional<AuthenticatorMakeCredentialResponse>)>;
+using RegisterResponseCallback =
+    base::OnceCallback<void(FidoReturnCode,
+                            base::Optional<AuthenticatorMakeCredentialResponse>,
+                            FidoTransportProtocol)>;
 
 class COMPONENT_EXPORT(DEVICE_FIDO) MakeCredentialRequestHandler
     : public FidoRequestHandler<AuthenticatorMakeCredentialResponse> {

device/fido/test_callback_receiver.h

@@ -114,6 +114,20 @@ class StatusAndValueCallbackReceiver
   }
 };
 
+template <class Status, class... Values>
+class StatusAndValuesCallbackReceiver
+    : public TestCallbackReceiver<Status, Values...> {
+ public:
+  const Status& status() const {
+    return std::get<0>(*TestCallbackReceiver<Status, Values...>::result());
+  }
+
+  template <size_t I>
+  const std::tuple_element_t<I, std::tuple<Values...>>& value() const {
+    return std::get<I + 1>(*TestCallbackReceiver<Status, Values...>::result());
+  }
+};
+
 }  // namespace test
 }  // namespace device