Display relying party ID on WebAuthn UI.

Also, fix the plumbing of |rp_id| out of FidoRequestHandlers into
TransportAvailabilityInfo, and add unittests to verify correctness.

Bug: 866601, 849323
Change-Id: I0e8c1250208c52306501fab7b9c55a2b1a34bbd1
Reviewed-on: https://chromium-review.googlesource.com/1181265
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Jun Choi <hongjunchoi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584526}

chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc

@@ -100,9 +100,8 @@ class AuthenticatorDialogViewTest : public DialogBrowserTest {
         browser()->tab_strip_model()->GetActiveWebContents();
 
     auto dialog_model = std::make_unique<AuthenticatorRequestDialogModel>();
-    dialog_model->StartFlow(
-        ::device::FidoRequestHandlerBase::TransportAvailabilityInfo(),
-        base::nullopt);
+    dialog_model->SetCurrentStep(
+        AuthenticatorRequestDialogModel::Step::kErrorTimedOut);
     auto dialog = std::make_unique<AuthenticatorRequestDialogView>(
         web_contents, std::move(dialog_model));
 

chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc

@@ -19,9 +19,10 @@ class AuthenticatorDialogTest : public DialogBrowserTest {
   // DialogBrowserTest:
   void ShowUi(const std::string& name) override {
     auto model = std::make_unique<AuthenticatorRequestDialogModel>();
-    model->StartFlow(
-        ::device::FidoRequestHandlerBase::TransportAvailabilityInfo(),
-        base::nullopt);
+    ::device::FidoRequestHandlerBase::TransportAvailabilityInfo
+        transport_availability;
+    transport_availability.rp_id = "example.com";
+    model->StartFlow(std::move(transport_availability), base::nullopt);
 
     // The dialog should immediately close as soon as it is displayed.
     if (name == "completed") {

chrome/browser/ui/webauthn/sheet_models.cc

@@ -76,6 +76,11 @@ void AuthenticatorSheetModelBase::OnCancel() {
     dialog_model()->Cancel();
 }
 
+base::string16 AuthenticatorSheetModelBase::GetRelyingPartyIdString() const {
+  DCHECK(!dialog_model()->transport_availability()->rp_id.empty());
+  return base::UTF8ToUTF16(dialog_model()->transport_availability()->rp_id);
+}
+
 void AuthenticatorSheetModelBase::OnModelDestroyed() {
   dialog_model_ = nullptr;
 }
@@ -87,11 +92,8 @@ gfx::ImageSkia* AuthenticatorWelcomeSheetModel::GetStepIllustration() const {
 }
 
 base::string16 AuthenticatorWelcomeSheetModel::GetStepTitle() const {
-  // TODO(hongjunchoi): Insert actual domain name from model to
-  // |application_name|.
-  base::string16 application_name = base::UTF8ToUTF16("example.com");
   return l10n_util::GetStringFUTF16(IDS_WEBAUTHN_WELCOME_SCREEN_TITLE,
-                                    application_name);
+                                    GetRelyingPartyIdString());
 }
 
 base::string16 AuthenticatorWelcomeSheetModel::GetStepDescription() const {
@@ -123,11 +125,8 @@ gfx::ImageSkia* AuthenticatorTransportSelectorSheetModel::GetStepIllustration()
 }
 
 base::string16 AuthenticatorTransportSelectorSheetModel::GetStepTitle() const {
-  // TODO(hongjunchoi): Insert actual domain name from model to
-  // |application_name|.
-  base::string16 application_name = base::UTF8ToUTF16("example.com");
   return l10n_util::GetStringFUTF16(IDS_WEBAUTHN_TRANSPORT_SELECTION_TITLE,
-                                    application_name);
+                                    GetRelyingPartyIdString());
 }
 
 base::string16 AuthenticatorTransportSelectorSheetModel::GetStepDescription()
@@ -150,11 +149,8 @@ AuthenticatorInsertAndActivateUsbSheetModel::GetStepIllustration() const {
 
 base::string16 AuthenticatorInsertAndActivateUsbSheetModel::GetStepTitle()
     const {
-  // TODO(hongjunchoi): Insert actual domain name from model to
-  // |application_name|.
-  base::string16 application_name = base::UTF8ToUTF16("example.com");
   return l10n_util::GetStringFUTF16(IDS_WEBAUTHN_GENERIC_TITLE,
-                                    application_name);
+                                    GetRelyingPartyIdString());
 }
 
 base::string16 AuthenticatorInsertAndActivateUsbSheetModel::GetStepDescription()
@@ -279,10 +275,8 @@ gfx::ImageSkia* AuthenticatorBlePinEntrySheetModel::GetStepIllustration()
 }
 
 base::string16 AuthenticatorBlePinEntrySheetModel::GetStepTitle() const {
-  // TODO(hongjunchoi): Insert actual device name from model to |device_name|.
-  base::string16 device_name = base::UTF8ToUTF16("VHGSHSSN");
   return l10n_util::GetStringFUTF16(IDS_WEBAUTHN_BLE_PIN_ENTRY_TITLE,
-                                    device_name);
+                                    GetRelyingPartyIdString());
 }
 
 base::string16 AuthenticatorBlePinEntrySheetModel::GetStepDescription() const {
@@ -325,11 +319,8 @@ gfx::ImageSkia* AuthenticatorBleActivateSheetModel::GetStepIllustration()
 }
 
 base::string16 AuthenticatorBleActivateSheetModel::GetStepTitle() const {
-  // TODO(hongjunchoi): Insert actual domain name from model to
-  // |application_name|.
-  base::string16 application_name = base::UTF8ToUTF16("example.com");
   return l10n_util::GetStringFUTF16(IDS_WEBAUTHN_GENERIC_TITLE,
-                                    application_name);
+                                    GetRelyingPartyIdString());
 }
 
 base::string16 AuthenticatorBleActivateSheetModel::GetStepDescription() const {
@@ -349,11 +340,8 @@ gfx::ImageSkia* AuthenticatorTouchIdSheetModel::GetStepIllustration() const {
 
 base::string16 AuthenticatorTouchIdSheetModel::GetStepTitle() const {
 #if defined(OS_MACOSX)
-  // TODO(martinkr): Insert actual domain name from model to
-  // |application_name|.
-  base::string16 application_name = base::UTF8ToUTF16("example.com");
   return l10n_util::GetStringFUTF16(IDS_WEBAUTHN_TOUCH_ID_TITLE,
-                                    application_name);
+                                    GetRelyingPartyIdString());
 #else
   return base::string16();
 #endif  // defined(OS_MACOSX)

chrome/browser/ui/webauthn/sheet_models.h

@@ -29,6 +29,9 @@ class AuthenticatorSheetModelBase
   // loads it in Skia format.
   static gfx::ImageSkia* GetImage(int resource_id);
 
+  // Returns a string containing the relying party id for this request.
+  base::string16 GetRelyingPartyIdString() const;
+
   // AuthenticatorRequestSheetModel:
   bool IsBackButtonVisible() const override;
   bool IsCancelButtonVisible() const override;

chrome/browser/webauthn/authenticator_request_dialog_model.h

@@ -97,6 +97,9 @@ class AuthenticatorRequestDialogModel {
   Step current_step() const { return current_step_; }
 
   TransportListModel* transport_list_model() { return &transport_list_model_; }
+  const TransportAvailabilityInfo* transport_availability() const {
+    return &transport_availability_;
+  }
 
   // Starts the UX flow, by either showing the welcome screen, the transport
   // selection screen, or the guided flow for them most likely transport.

device/fido/get_assertion_handler_unittest.cc

@@ -162,6 +162,17 @@ class FidoGetAssertionHandlerTest : public ::testing::Test {
       GetTestableTransportProtocols();
 };
 
+TEST_F(FidoGetAssertionHandlerTest, TransportAvailabilityInfo) {
+  auto request_handler =
+      CreateGetAssertionHandlerWithRequest(CtapGetAssertionRequest(
+          test_data::kRelyingPartyId, test_data::kClientDataHash));
+
+  EXPECT_EQ(FidoRequestHandlerBase::RequestType::kGetAssertion,
+            request_handler->transport_availability_info().request_type);
+  EXPECT_EQ(test_data::kRelyingPartyId,
+            request_handler->transport_availability_info().rp_id);
+}
+
 TEST_F(FidoGetAssertionHandlerTest, CtapRequestOnSingleDevice) {
   auto request_handler = CreateGetAssertionHandlerCtap();
   discovery()->WaitForCallToStartAndSimulateSuccess();

device/fido/get_assertion_request_handler.cc

@@ -159,7 +159,7 @@ GetAssertionRequestHandler::GetAssertionRequestHandler(
           std::move(completion_callback)),
       request_(std::move(request)),
       weak_factory_(this) {
-  transport_availability_info().rp_id = request.rp_id();
+  transport_availability_info().rp_id = request_.rp_id();
   transport_availability_info().request_type =
       FidoRequestHandlerBase::RequestType::kGetAssertion;
 

device/fido/make_credential_handler_unittest.cc

@@ -161,6 +161,15 @@ class FidoMakeCredentialHandlerTest : public ::testing::Test {
       GetTestableTransportProtocols();
 };
 
+TEST_F(FidoMakeCredentialHandlerTest, TransportAvailabilityInfo) {
+  auto request_handler = CreateMakeCredentialHandler();
+
+  EXPECT_EQ(FidoRequestHandlerBase::RequestType::kMakeCredential,
+            request_handler->transport_availability_info().request_type);
+  EXPECT_EQ(test_data::kRelyingPartyId,
+            request_handler->transport_availability_info().rp_id);
+}
+
 TEST_F(FidoMakeCredentialHandlerTest, TestCtap2MakeCredentialWithFlagEnabled) {
   auto request_handler = CreateMakeCredentialHandler();
   discovery()->WaitForCallToStartAndSimulateSuccess();

device/fido/make_credential_request_handler.cc

@@ -108,7 +108,7 @@ MakeCredentialRequestHandler::MakeCredentialRequestHandler(
       authenticator_selection_criteria_(
           std::move(authenticator_selection_criteria)),
       weak_factory_(this) {
-  transport_availability_info().rp_id = request.rp().rp_id();
+  transport_availability_info().rp_id = request_parameter_.rp().rp_id();
   transport_availability_info().request_type =
       FidoRequestHandlerBase::RequestType::kMakeCredential;
   Start();