Canonicalize user ID passed via chromeos::switches::kLoginUser

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 26 matching lines @@
 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/auth/authenticator.h"
+#include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
@@ skipping 104 matching lines @@
                                         false,          // has_cookies
                                         true,           // has_active_session
                                         this);
     } else {
       delete this;
     }
   }
 
   // LoginUtils::Delegate implementation:
   virtual void OnProfilePrepared(Profile* profile) OVERRIDE {
-    const std::string login_user =
+    const std::string login_user = login::CanonicalizeUserID(
         CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            chromeos::switches::kLoginUser);
+            switches::kLoginUser));
     if (!policy::IsDeviceLocalAccountUser(login_user, NULL)) {
       profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                      login_user);
     }
     profile_prepared_ = true;
     LoginUtils::Get()->DoBrowserLaunch(profile, NULL);
     delete this;
   }
 
   scoped_refptr<Authenticator> authenticator_;
@@ skipping 165 matching lines @@
 void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {
   CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
 
   if (parsed_command_line().HasSwitch(switches::kGuestSession)) {
     // Disable sync and extensions if we're in "browse without sign-in" mode.
     singleton_command_line->AppendSwitch(::switches::kDisableSync);
     singleton_command_line->AppendSwitch(::switches::kDisableExtensions);
     browser_defaults::bookmarks_enabled = false;
   }
 
-  // If we're not running on real ChromeOS hardware (or under VM), and are not
+  // If we're not running on real Chrome OS hardware (or under VM), and are not
   // showing the login manager or attempting a command line login, login with a
   // stub user.
   if (!base::SysInfo::IsRunningOnChromeOS() &&
       !parsed_command_line().HasSwitch(switches::kLoginManager) &&
       !parsed_command_line().HasSwitch(switches::kLoginUser) &&
       !parsed_command_line().HasSwitch(switches::kGuestSession)) {
     singleton_command_line->AppendSwitchASCII(
         switches::kLoginUser, UserManager::kStubUser);
     if (!parsed_command_line().HasSwitch(switches::kLoginProfile)) {
       singleton_command_line->AppendSwitchASCII(switches::kLoginProfile,
@@ skipping 146 matching lines @@
     WizardController::SetZeroDelays();
   }
 
   power_prefs_.reset(new PowerPrefs(
       DBusThreadManager::Get()->GetPowerPolicyController()));
 
   // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 
   if (immediate_login) {
-    const std::string user_id =
-        parsed_command_line().GetSwitchValueASCII(switches::kLoginUser);
+    const std::string user_id = login::CanonicalizeUserID(
+        parsed_command_line().GetSwitchValueASCII(switches::kLoginUser));
     UserManager* user_manager = UserManager::Get();
 
     if (policy::IsDeviceLocalAccountUser(user_id, NULL) &&
         !user_manager->IsKnownUser(user_id)) {
       // When a device-local account is removed, its policy is deleted from disk
       // immediately. If a session using this account happens to be in progress,
       // the session is allowed to continue with policy served from an in-memory
       // cache. If Chrome crashes later in the session, the policy becomes
       // completely unavailable. Exit the session in that case, rather than
       // allowing it to continue without policy.
@@ skipping 71 matching lines @@
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just after CreateProfile().
 
   // Restarting Chrome inside existing user session. Possible cases:
   // 1. Chrome is restarted after crash.
   // 2. Chrome is started in browser_tests skipping the login flow
   // 3. Chrome is started on dev machine
   //    i.e. not on Chrome OS device w/o login flow.
   if (parsed_command_line().HasSwitch(switches::kLoginUser) &&
       !parsed_command_line().HasSwitch(switches::kLoginPassword)) {
-    std::string login_user = parsed_command_line().GetSwitchValueASCII(
-        chromeos::switches::kLoginUser);
+    std::string login_user = login::CanonicalizeUserID(
+        parsed_command_line().GetSwitchValueASCII(
+            chromeos::switches::kLoginUser));
     if (!base::SysInfo::IsRunningOnChromeOS() &&
         login_user == UserManager::kStubUser) {
       // For dev machines and stub user emulate as if sync has been initialized.
       profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                        login_user);
     }
 
     // This is done in LoginUtils::OnProfileCreated during normal login.
     LoginUtils::Get()->InitRlzDelayed(profile());
 
@@ skipping 224 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos