Allow explicitly whitelisted apps/extensions in public sessions

chrome/browser/chromeos/policy/device_local_account.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/policy/device_local_account.h"
 
 #include <set>
 
+#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace policy {
@@ skipping 30 matching lines @@
       break;
     case DeviceLocalAccount::TYPE_COUNT:
       NOTREACHED();
       break;
   }
   return gaia::CanonicalizeEmail(
       base::HexEncode(account_id.c_str(), account_id.size()) + "@" +
       domain_prefix + kDeviceLocalAccountDomainSuffix);
 }
 
-bool IsDeviceLocalAccountUser(const std::string& user_id) {
-  return EndsWith(gaia::ExtractDomainName(user_id),
-                  kDeviceLocalAccountDomainSuffix,
-                  true);
-}
+bool IsDeviceLocalAccountUser(const std::string& user_id,
+                              DeviceLocalAccount::Type* type) {
+  const std::string domain = gaia::ExtractDomainName(user_id);
+  if (!EndsWith(domain, kDeviceLocalAccountDomainSuffix, true))
+    return false;
 
-bool IsKioskAppUser(const std::string& user_id) {
-  return gaia::ExtractDomainName(user_id) ==
-      std::string(kKioskAppAccountDomainPrefix) +
-          kDeviceLocalAccountDomainSuffix;
+  const std::string domain_prefix = domain.substr(
+      0, domain.size() - arraysize(kDeviceLocalAccountDomainSuffix) + 1);
+
+  if (domain_prefix == kPublicAccountDomainPrefix) {
+    if (type)
+      *type = DeviceLocalAccount::TYPE_PUBLIC_SESSION;
+    return true;
+  }
+  if (domain_prefix == kKioskAppAccountDomainPrefix) {
+    if (type)
+      *type = DeviceLocalAccount::TYPE_KIOSK_APP;
+    return true;
+  }
+
+  // |user_id| is a device-local account but its type is not recognized.
+  NOTREACHED();

[pastarmovj, 2013/10/02 14:44:50]

I think it will be still good to set |type| to something in this case as well. I
am not sure whether |DeviceLocalAccount::TYPE_COUNT| is a good choice though or
make it a CHECK to always crash.

[bartfab (slow), 2013/10/02 14:48:35]

Done.

+  return true;
 }
 
 void SetDeviceLocalAccounts(
     chromeos::CrosSettings* cros_settings,
     const std::vector<DeviceLocalAccount>& accounts) {
   base::ListValue list;
   for (std::vector<DeviceLocalAccount>::const_iterator it = accounts.begin();
        it != accounts.end(); ++it) {
     scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
     entry->SetStringWithoutPathExpansion(
@@ skipping 66 matching lines @@
       continue;
     }
 
     accounts.push_back(DeviceLocalAccount(
         static_cast<DeviceLocalAccount::Type>(type), account_id, kiosk_app_id));
   }
   return accounts;
 }
 
 }  // namespace policy