Whitelist extensions from EXTERNAL_COMPONENT for public sessions

chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc

 // Copyright 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/extensions/device_local_account_management_policy_provider.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
-// Apps/extensions explicitly whitelisted for use in device-local accounts.
-const char* kDeviceLocalAccountWhitelist[] = {
+// Apps/extensions explicitly whitelisted for use in public sessions.
+const char* kPublicSessionWhitelist[] = {
   // Public sessions in general:
   "cbkkbcmdlboombapidmoeolnmdacpkch",  // Chrome RDP
   "djflhoibgkdhkhhcedjiklpkjnoahfmg",  // User Agent Switcher
   "iabmpiboiopbgfabjmgeedhcmjenhbla",  // VNC Viewer
 
   // Retail mode:
   "ehcabepphndocfmgbdkbjibfodelmpbb",  // Angry Birds demo
   "kgimkbnclbekdkabkpjhpakhhalfanda",  // Bejeweled demo
   "joodangkbfjnajiiifokapkpmhfnpleo",  // Calculator
   "fpgfohogebplgnamlafljlcidjedbdeb",  // Calendar demo
@@ skipping 53 matching lines @@
   NOTREACHED();
   return std::string();
 #else
   return "whitelist for device-local accounts";
 #endif
 }
 
 bool DeviceLocalAccountManagementPolicyProvider::UserMayLoad(
     const extensions::Extension* extension,
     base::string16* error) const {
-  if (account_type_ == policy::DeviceLocalAccount::TYPE_KIOSK_APP) {
+  if (account_type_ == policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION) {
+    // Allow extension if it is an externally hosted component of Chrome.
+    if (extension->location() ==
+        extensions::Manifest::EXTERNAL_COMPONENT) {
+      return true;
+    }
+
+    // Allow extension if its type is whitelisted for use in public sessions.
+    if (extension->GetType() == extensions::Manifest::TYPE_HOSTED_APP)
+      return true;
+
+    // Allow extension if its specific ID is whitelisted for use in public
+    // sessions.
+    for (size_t i = 0; i < arraysize(kPublicSessionWhitelist); ++i) {
+      if (extension->id() == kPublicSessionWhitelist[i])
+        return true;
+    }
+  } else if (account_type_ == policy::DeviceLocalAccount::TYPE_KIOSK_APP) {
     // For single-app kiosk sessions, allow only platform apps.
     if (extension->GetType() == extensions::Manifest::TYPE_PLATFORM_APP)
       return true;
-
-  } else {
-    // Allow extension if its type is whitelisted for use in device-local
-    // accounts.
-    if (extension->GetType() == extensions::Manifest::TYPE_HOSTED_APP)
-      return true;
-
-    // Allow extension if its specific ID is whitelisted for use in device-local
-    // accounts.
-    for (size_t i = 0; i < arraysize(kDeviceLocalAccountWhitelist); ++i) {
-      if (extension->id() == kDeviceLocalAccountWhitelist[i])
-        return true;
-    }

[asargent_no_longer_on_chrome, 2014/01/23 18:53:35]

Just to double-check, it looks like this CL changes things so that hosted apps
and kDeviceLocalAccountWhitelist members now are only allowed for
TYPE_PUBLIC_SESSION account types, whereas before they were allowed for any
account whose type != TYPE_KIOSK_APP. Was that what you intended?

[bartfab (slow), 2014/01/24 10:06:19]

Yes, this was intentional. There is actually no functional change here. The new
code just makes it more explicit what is going on. Right now,
TYPE_PUBLIC_SESSION and TYPE_KIOSK_APP are the only types of device-local
accounts that exist. If in the future we add a new TYPE_X, I do not want it to
implictly inherit the behavior of TYPE_PUBLIC_SESSION. Instead, *all*
apps/extensions will be blocked for TYPE_X until we make an explicit decision
what should be allowed and add it to the code here.

   }
 
   // Disallow all other extensions.
   if (error) {
     *error = l10n_util::GetStringFUTF16(
           IDS_EXTENSION_CANT_INSTALL_IN_DEVICE_LOCAL_ACCOUNT,
           base::UTF8ToUTF16(extension->name()),
           base::UTF8ToUTF16(extension->id()));
   }
   return false;
 }
 
 }  // namespace chromeos