[Chrome OS] Canonicalize username before checking against whitelist

chrome/browser/chromeos/login/signed_settings.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/signed_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
+#include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
 
 namespace chromeos {
 
 SignedSettings::SignedSettings()
     : service_(OwnershipService::GetSharedInstance()) {
 }
 
 SignedSettings::~SignedSettings() {}
@@ skipping 75 matching lines @@
   std::string name_;
   std::string value_;
   SignedSettings::Delegate<std::string>* d_;
 };
 
 // static
 SignedSettings* SignedSettings::CreateCheckWhitelistOp(
     const std::string& email,
     SignedSettings::Delegate<bool>* d) {
   DCHECK(d != NULL);
-  return new CheckWhitelistOp(email, d);
+  return new CheckWhitelistOp(Authenticator::Canonicalize(email), d);
 }
 
 // static
 SignedSettings* SignedSettings::CreateWhitelistOp(
     const std::string& email,
     bool add_to_whitelist,
     SignedSettings::Delegate<bool>* d) {
   DCHECK(d != NULL);
-  return new WhitelistOp(email, add_to_whitelist, d);
+  return new WhitelistOp(Authenticator::Canonicalize(email),
+                         add_to_whitelist,
+                         d);
 }
 
 // static
 SignedSettings* SignedSettings::CreateStorePropertyOp(
     const std::string& name,
     const std::string& value,
     SignedSettings::Delegate<bool>* d) {
   DCHECK(d != NULL);
   return new StorePropertyOp(name, value, d);
 }
@@ skipping 10 matching lines @@
                                    SignedSettings::Delegate<bool>* d)
     : email_(email),
       d_(d) {
 }
 
 CheckWhitelistOp::~CheckWhitelistOp() {}
 
 void CheckWhitelistOp::Execute() {
   CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   std::vector<uint8> sig;
+  LOG(WARNING) << "HEY!  " << email_;

[xiyuan, 2011/01/06 23:28:27]

nit: remove this debug LOG?

   if (!CrosLibrary::Get()->GetLoginLibrary()->CheckWhitelist(email_, &sig)) {
     d_->OnSettingsOpCompleted(NOT_FOUND, false);
     return;
   }
   // Posts a task to the FILE thread to verify |sig|.
   service_->StartVerifyAttempt(email_, sig, this);
 }
 
 void CheckWhitelistOp::OnKeyOpComplete(
     const OwnerManager::KeyOpCode return_code,
     const std::vector<uint8>& payload) {
   // Ensure we're on the UI thread, due to the need to send DBus traffic.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this,
                           &CheckWhitelistOp::OnKeyOpComplete,
                           return_code, payload));
     return;
   }
   if (return_code == OwnerManager::SUCCESS) {
+    VLOG(2) << "Whitelist check was successful.";
     d_->OnSettingsOpCompleted(SUCCESS, true);
   } else {
+    VLOG(2) << "Whitelist check failed.";
     d_->OnSettingsOpCompleted(SignedSettings::MapKeyOpCode(return_code), false);
   }
 }
 
 WhitelistOp::WhitelistOp(const std::string& email,
                          bool add_to_whitelist,
                          SignedSettings::Delegate<bool>* d)
     : email_(email),
       add_to_whitelist_(add_to_whitelist),
       d_(d) {
@@ skipping 156 matching lines @@
   }
   // Now, sure we're on the UI thread.
   if (return_code == OwnerManager::SUCCESS)
     d_->OnSettingsOpCompleted(SUCCESS, value_);
   else
     d_->OnSettingsOpCompleted(SignedSettings::MapKeyOpCode(return_code),
                               std::string());
 }
 
 }  // namespace chromeos