cros: Auto-retry external binary auth within a timeout

Bug: 890912
Change-Id: Idc11767c37580c540cbb741a4cce5cabc3a0f29f
Reviewed-on: https://chromium-review.googlesource.com/c/1277989
Commit-Queue: Quan Nguyen <qnnguyen@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599337}

ash/login/ui/login_auth_user_view.cc

@@ -777,6 +777,7 @@ void LoginAuthUserView::ButtonPressed(views::Button* sender,
     OnOnlineSignInMessageTap();
   } else if (sender == external_binary_auth_button_) {
     password_view_->SetReadOnly(true);
+    external_binary_auth_button_->SetEnabled(false);
     Shell::Get()->login_screen_controller()->AuthenticateUserWithExternalBinary(
         current_user()->basic_user_info->account_id,
         base::BindOnce(&LoginAuthUserView::OnAuthComplete,
@@ -812,6 +813,7 @@ void LoginAuthUserView::OnAuthComplete(base::Optional<bool> auth_success) {
   if (!auth_success.value()) {
     password_view_->Clear();
     password_view_->SetReadOnly(false);
+    external_binary_auth_button_->SetEnabled(true);
   }
 
   on_auth_.Run(auth_success.value());

chrome/browser/chromeos/login/lock/views_screen_locker.cc

@@ -13,6 +13,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
+#include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -44,6 +45,8 @@ namespace {
 constexpr char kLockDisplay[] = "lock";
 constexpr char kExternalBinaryAuth[] = "external_binary_auth";
 constexpr char kWebCameraDeviceContext[] = "WebCamera: WebCamera";
+constexpr base::TimeDelta kExternalBinaryAuthTimeout =
+    base::TimeDelta::FromSeconds(2);
 
 ash::mojom::FingerprintUnlockState ConvertFromFingerprintState(
     ScreenLocker::FingerprintState state) {
@@ -233,6 +236,10 @@ void ViewsScreenLocker::HandleAuthenticateUserWithExternalBinary(
     const AccountId& account_id,
     AuthenticateUserWithExternalBinaryCallback callback) {
   authenticate_with_external_binary_callback_ = std::move(callback);
+  external_binary_auth_timer_.Start(
+      FROM_HERE, kExternalBinaryAuthTimeout,
+      base::BindOnce(&ViewsScreenLocker::OnExternalBinaryAuthTimeout,
+                     weak_factory_.GetWeakPtr()));
   media_analytics_client_->GetState(base::BindOnce(
       &StartGraphIfNeeded, media_analytics_client_, kExternalBinaryAuth));
 }
@@ -335,17 +342,14 @@ void ViewsScreenLocker::OnDetectionSignal(
     return;
 
   const mri::FramePerception& frame = media_perception.frame_perception(0);
-  if (frame.frame_id() != 1) {
-    // TODO: implement some sort of auto-retry logic.
-    std::move(authenticate_with_external_binary_callback_)
-        .Run(false /*auth_success*/);
+  if (frame.frame_id() != 1)
     return;
-  }
 
   mri::State new_state;
   new_state.set_status(mri::State::SUSPENDED);
   media_analytics_client_->SetState(new_state, base::DoNothing());
 
+  external_binary_auth_timer_.Stop();
   std::move(authenticate_with_external_binary_callback_)
       .Run(true /*auth_success*/);
   ScreenLocker::Hide();
@@ -376,4 +380,12 @@ void ViewsScreenLocker::OnPinCanAuthenticate(const AccountId& account_id,
       account_id, can_authenticate);
 }
 
+void ViewsScreenLocker::OnExternalBinaryAuthTimeout() {
+  std::move(authenticate_with_external_binary_callback_)
+      .Run(false /*auth_success*/);
+  mri::State new_state;
+  new_state.set_status(mri::State::SUSPENDED);
+  media_analytics_client_->SetState(new_state, base::DoNothing());
+}
+
 }  // namespace chromeos

chrome/browser/chromeos/login/lock/views_screen_locker.h

@@ -7,6 +7,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
+#include "base/timer/timer.h"
 #include "chrome/browser/chromeos/lock_screen_apps/focus_cycler_delegate.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -89,6 +90,7 @@ class ViewsScreenLocker : public LoginScreenClient::Delegate,
   void UpdatePinKeyboardState(const AccountId& account_id);
   void OnAllowedInputMethodsChanged();
   void OnPinCanAuthenticate(const AccountId& account_id, bool can_authenticate);
+  void OnExternalBinaryAuthTimeout();
 
   std::unique_ptr<UserBoardViewMojo> user_board_view_mojo_;
   std::unique_ptr<UserSelectionScreen> user_selection_screen_;
@@ -121,6 +123,10 @@ class ViewsScreenLocker : public LoginScreenClient::Delegate,
 
   chromeos::MediaAnalyticsClient* media_analytics_client_;
 
+  // Timer for external binary auth attempt. Allows repeated auth attempts up to
+  // a specific timeout.
+  base::OneShotTimer external_binary_auth_timer_;
+
   ScopedObserver<chromeos::MediaAnalyticsClient, ViewsScreenLocker>
       scoped_observer_{this};