White list of users is updated on show. Supervised users not present on the device are removed.

chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/accounts_options_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #include "chrome/grit/generated_resources.h"
+#include "chromeos/login/user_names.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+

[Nikita (slow), 2014/10/16 17:36:51]

nit: drop this line

[merkulova, 2014/10/17 07:56:08]

Done.

 namespace chromeos {
 
 namespace {
 
 // Adds specified user to the whitelist. Returns false if that user is already
 // in the whitelist.
 bool WhitelistUser(const std::string& username) {
   CrosSettings* cros_settings = CrosSettings::Get();
   if (cros_settings->FindEmailInList(kAccountsPrefUsers, username, NULL))
     return false;
@@ skipping 12 matching lines @@
 AccountsOptionsHandler::~AccountsOptionsHandler() {
 }
 
 void AccountsOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("whitelistUser",
       base::Bind(&AccountsOptionsHandler::HandleWhitelistUser,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("unwhitelistUser",
       base::Bind(&AccountsOptionsHandler::HandleUnwhitelistUser,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("whitelistExistingUsers",
-      base::Bind(&AccountsOptionsHandler::HandleWhitelistExistingUsers,
+  web_ui()->RegisterMessageCallback("updateWhitelist",
+      base::Bind(&AccountsOptionsHandler::HandleUpdateWhitelist,
                  base::Unretained(this)));
 }
 
 void AccountsOptionsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   RegisterTitle(localized_strings, "accountsPage",
                 IDS_OPTIONS_ACCOUNTS_TAB_LABEL);
 
@@ skipping 40 matching lines @@
   std::string email;
   if (!args->GetString(0, &email)) {
     return;
   }
 
   base::StringValue canonical_email(gaia::CanonicalizeEmail(email));
   CrosSettings::Get()->RemoveFromList(kAccountsPrefUsers, &canonical_email);
   user_manager::UserManager::Get()->RemoveUser(email, NULL);
 }
 
-void AccountsOptionsHandler::HandleWhitelistExistingUsers(
+void AccountsOptionsHandler::HandleUpdateWhitelist(
     const base::ListValue* args) {
-  DCHECK(args && args->empty());

[Nikita (slow), 2014/10/16 17:36:51]

I think this DCHECK should stay since argument list is supposed to be empty.

[merkulova, 2014/10/17 07:56:08]

Done.

-
   // Creates one list to set. This is needed because user white list update is
   // asynchronous and sequential. Before previous write comes back, cached list
   // is stale and should not be used for appending. See http://crbug.com/127215
   scoped_ptr<base::ListValue> new_list;
 
   CrosSettings* cros_settings = CrosSettings::Get();
   const base::ListValue* existing = NULL;
   if (cros_settings->GetList(kAccountsPrefUsers, &existing) && existing)
     new_list.reset(existing->DeepCopy());
   else
     new_list.reset(new base::ListValue);
 
+  // Remove supervised users if they're not present on the device;

[Nikita (slow), 2014/10/16 17:36:51]

Not clear from the code where exactly do you check that supervised user is not
present on the device.

nit: dot at the end

[merkulova, 2014/10/17 07:56:08]

Done.

[Nikita (slow), 2014/10/17 11:05:11]

Still it's not quite clear why supervised users needs that kind of special
treatment. How are regular users different?
What happens if you remove regular user from login UI (that is part of
whitelist). When exactly would that user be removed?

+  for (size_t i = 0; i < new_list->GetSize(); ++i) {
+    std::string whitelisted_user;
+    new_list->GetString(i, &whitelisted_user);
+    LOG(ERROR) << gaia::ExtractDomainName(whitelisted_user);
+    if (gaia::ExtractDomainName(whitelisted_user) ==
+        chromeos::login::kSupervisedUserDomain) {
+      new_list->Remove(i, NULL);
+      --i;
+    }
+  }
+
   const user_manager::UserList& users =
       user_manager::UserManager::Get()->GetUsers();
   for (user_manager::UserList::const_iterator it = users.begin();
        it < users.end();
        ++it)
     new_list->AppendIfNotPresent(new base::StringValue((*it)->email()));
 
   cros_settings->Set(kAccountsPrefUsers, *new_list.get());
 }
 
 }  // namespace options
 }  // namespace chromeos