Restrict access to permissions based on extension types.

chrome/common/extensions/extension.cc

 // Copyright (c) 2011 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/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 2828 matching lines @@
     }
   }
 
   if (permission->id() == ExtensionAPIPermission::kExperimental) {
     if (!CanSpecifyExperimentalPermission()) {
       *error = errors::kExperimentalFlagRequired;
       return false;
     }
   }
 
-  if (is_hosted_app()) {
-    if (!CanSpecifyPermissionForHostedApp(permission)) {
-      // Some old versions of Chrome did not return errors here and we ended up
-      // with extensions in the store containing bad data: crbug.com/101993.
-      //
-      // TODO(aa): Consider just being a lot looser when loading and installing
-      // extensions. We can be strict when packing and in development mode. Then
-      // we won't have to maintain all these tricky backward compat issues:
-      // crbug.com/102328.
-      if (creation_flags_ & STRICT_ERROR_CHECKS) {
-        *error = ExtensionErrorUtils::FormatErrorMessage(
-            errors::kPermissionNotAllowed, permission->name());
-      }
-      return false;
+  if (location_ != Extension::COMPONENT &&
+      !CanSpecifyPermissionForType(permission)) {
+    // Some old versions of Chrome did not return errors here and we ended up
+    // with extensions in the store containing bad data: crbug.com/101993.
+    //
+    // TODO(aa): Consider just being a lot looser when loading and installing
+    // extensions. We can be strict when packing and in development mode. Then
+    // we won't have to maintain all these tricky backward compat issues:
+    // crbug.com/102328.
+    if (creation_flags_ & STRICT_ERROR_CHECKS) {

[Aaron Boodman, 2011/11/22 09:40:32]

I don't think we want to be lose with the errors for new types right? The
behavior with hosted apps was a mistake.

[Aaron Boodman, 2011/11/22 09:41:17]

sigh, *loose*

[jstritar, 2011/11/22 15:58:29]

Won't we run into this again?

http://b/issue?id=5514150

+      *error = ExtensionErrorUtils::FormatErrorMessage(
+          errors::kPermissionNotAllowed, permission->name());
     }
+    return false;
   }
 
   return true;
 }
 
 bool Extension::CanSpecifyComponentOnlyPermission() const {
   // Only COMPONENT extensions can use private APIs.
   // TODO(asargent) - We want a more general purpose mechanism for this,
   // and better error messages. (http://crbug.com/54013)
   if (location_ == Extension::COMPONENT)
@@ skipping 20 matching lines @@
 
   // We rely on the webstore to check access to experimental. This way we can
   // whitelist extensions to have access to experimental in just the store, and
   // not have to push a new version of the client.
   if (from_webstore())
     return true;
 
   return false;
 }
 
-bool Extension::CanSpecifyPermissionForHostedApp(
+bool Extension::CanSpecifyPermissionForType(
     const ExtensionAPIPermission* permission) const {
-  if (location_ == Extension::COMPONENT)
-    return true;
-
-  if (permission->is_hosted_app())
-    return true;
-
-  return false;
+  switch (GetType()) {

[Aaron Boodman, 2011/11/22 09:40:32]

This is so short, you could just fold it into CanSpecifyAPIPermission() to
address my 'how is this different than...' comment.

[jstritar, 2011/11/22 15:58:29]

Done.

+    case TYPE_USER_SCRIPT: // Pass through.
+    case TYPE_EXTENSION:
+      return permission->supports_extensions();
+    case TYPE_HOSTED_APP:
+      return permission->supports_hosted_apps();
+    case TYPE_PACKAGED_APP:
+      return permission->supports_packaged_apps();
+    case TYPE_PLATFORM_APP:
+      return permission->supports_platform_apps();
+    default:
+      return false;
+  }
 }
 
 bool Extension::CanExecuteScriptEverywhere() const {
   if (location() == Extension::COMPONENT
 #ifndef NDEBUG
       || CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExposePrivateExtensionApi)
 #endif
       )
     return true;
@@ skipping 129 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}