Allow sync with 2-factor StrongAuth accounts in ChromeOS.

chrome/browser/chromeos/login/google_authenticator.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/google_authenticator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 43 matching lines @@
 const int GoogleAuthenticator::kLocalaccountRetryIntervalMs = 20;
 
 const int kPassHashLen = 32;
 
 GoogleAuthenticator::GoogleAuthenticator(LoginStatusConsumer* consumer)
     : Authenticator(consumer),
       user_manager_(UserManager::Get()),
       hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
       unlock_(false),
       try_again_(true),
-      checked_for_localaccount_(false) {
+      checked_for_localaccount_(false),
+      last_error_(GoogleServiceAuthError::None()) {
   CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   // If not already owned, this is a no-op.  If it is, this loads the owner's
   // public key off of disk.
   OwnershipService::GetSharedInstance()->StartLoadOwnerKeyAttempt();
 }
 
 GoogleAuthenticator::~GoogleAuthenticator() {}
 
 void GoogleAuthenticator::CancelClientLogin() {
   if (gaia_authenticator_->HasPendingFetch()) {
@@ skipping 123 matching lines @@
     return;
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this,
                         &GoogleAuthenticator::OnLoginSuccess,
                         credentials, false));
 }
 
 void GoogleAuthenticator::OnClientLoginFailure(
-   const GoogleServiceAuthError& error) {
+    const GoogleServiceAuthError& error) {
+  // Save off the last error.
+  last_error_ = error;
 
   if (error.state() == GoogleServiceAuthError::REQUEST_CANCELED) {
     if (try_again_) {
       try_again_ = false;
       LOG(ERROR) << "Login attempt canceled!?!?  Trying again.";
       TryClientLogin();
       return;
     }
     LOG(ERROR) << "Login attempt canceled again?  Already retried...";
   }
@@ skipping 15 matching lines @@
                           failure_details));
     LOG(WARNING) << "Rejecting valid HOSTED account.";
     hosted_policy_ = GaiaAuthFetcher::HostedAccountsNotAllowed;
     return;
   }
 
   ClearClientLoginAttempt();
 
   if (error.state() == GoogleServiceAuthError::TWO_FACTOR) {
     LOG(WARNING) << "Two factor authenticated. Sync will not work.";
     OnClientLoginSuccess(GaiaAuthConsumer::ClientLoginResult());

[Chris Masone, 2010/11/17 01:11:09]

And then, here, you would create an appropriately configured CLientLoginResult
object, obviating the need for exposing this notion of "last error"

     return;
   }
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &GoogleAuthenticator::LoadLocalaccount,
                         std::string(kLocalaccountFile)));
 
   LoginFailure failure_details = LoginFailure::FromNetworkAuthFailure(error);
@@ skipping 18 matching lines @@
 void GoogleAuthenticator::OnLoginSuccess(
     const GaiaAuthConsumer::ClientLoginResult& credentials,
     bool request_pending) {
   // Send notification of success
   AuthenticationNotificationDetails details(true);
   NotificationService::current()->Notify(
       NotificationType::LOGIN_AUTHENTICATION,
       NotificationService::AllSources(),
       Details<AuthenticationNotificationDetails>(&details));
 
+  // If there was an error during the login attempt, notify the consumer.
+  if (last_error_.state() != GoogleServiceAuthError::NONE) {

[Chris Masone, 2010/11/17 01:11:09]

You could toss this too.

+    consumer_->SetLoginFailure(
+        LoginFailure::FromNetworkAuthFailure(last_error_));
+    last_error_ = GoogleServiceAuthError::None();
+  }
+
   int mount_error = chromeos::kCryptohomeMountErrorNone;
   BootTimesLoader::Get()->AddLoginTimeMarker("CryptohomeMounting", false);
   if (unlock_ ||
       (CrosLibrary::Get()->GetCryptohomeLibrary()->Mount(username_.c_str(),
                                                          ascii_hash_.c_str(),
                                                          &mount_error))) {
     BootTimesLoader::Get()->AddLoginTimeMarker("CryptohomeMounted", true);
     consumer_->OnLoginSuccess(username_,
                               password_,
                               credentials,
@@ skipping 187 matching lines @@
                                       const unsigned int len) {
   if (len < 2*binary_len)
     return false;
   memset(hex_string, 0, len);
   for (uint i = 0, j = 0; i < binary_len; i++, j+=2)
     snprintf(hex_string + j, len - j, "%02x", binary[i]);
   return true;
 }
 
 }  // namespace chromeos