Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: chrome/common/extensions/extension.cc

Issue 10689097: Enforce the 'requirements' field in manifests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Multiple Disable Reasons! Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/extension.h" 5 #include "chrome/common/extensions/extension.h"
6 6
7 #include <ostream> 7 #include <ostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 261
262 const int Extension::kPageActionIconMaxSize = 19; 262 const int Extension::kPageActionIconMaxSize = 19;
263 const int Extension::kBrowserActionIconMaxSize = 19; 263 const int Extension::kBrowserActionIconMaxSize = 19;
264 264
265 const int Extension::kValidWebExtentSchemes = 265 const int Extension::kValidWebExtentSchemes =
266 URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS; 266 URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS;
267 267
268 const int Extension::kValidHostPermissionSchemes = 268 const int Extension::kValidHostPermissionSchemes =
269 UserScript::kValidUserScriptSchemes | URLPattern::SCHEME_CHROMEUI; 269 UserScript::kValidUserScriptSchemes | URLPattern::SCHEME_CHROMEUI;
270 270
271 Extension::Requirements::Requirements()
272 : webgl(false),
273 css3d(false),
274 plugins(false) {
275 }
276
277 Extension::Requirements::~Requirements() {}
278
271 Extension::InputComponentInfo::InputComponentInfo() 279 Extension::InputComponentInfo::InputComponentInfo()
272 : type(INPUT_COMPONENT_TYPE_NONE), 280 : type(INPUT_COMPONENT_TYPE_NONE),
273 shortcut_alt(false), 281 shortcut_alt(false),
274 shortcut_ctrl(false), 282 shortcut_ctrl(false),
275 shortcut_shift(false) { 283 shortcut_shift(false) {
276 } 284 }
277 285
278 Extension::InputComponentInfo::~InputComponentInfo() {} 286 Extension::InputComponentInfo::~InputComponentInfo() {}
279 287
280 Extension::TtsVoice::TtsVoice() {} 288 Extension::TtsVoice::TtsVoice() {}
(...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 string16* error) { 1309 string16* error) {
1302 if (!LoadDescription(error) || 1310 if (!LoadDescription(error) ||
1303 !LoadHomepageURL(error) || 1311 !LoadHomepageURL(error) ||
1304 !LoadUpdateURL(error) || 1312 !LoadUpdateURL(error) ||
1305 !LoadIcons(error) || 1313 !LoadIcons(error) ||
1306 !LoadCommands(error) || 1314 !LoadCommands(error) ||
1307 !LoadPlugins(error) || 1315 !LoadPlugins(error) ||
1308 !LoadNaClModules(error) || 1316 !LoadNaClModules(error) ||
1309 !LoadWebAccessibleResources(error) || 1317 !LoadWebAccessibleResources(error) ||
1310 !LoadSandboxedPages(error) || 1318 !LoadSandboxedPages(error) ||
1311 !CheckRequirements(error) || 1319 !LoadRequirements(error) ||
1312 !LoadDefaultLocale(error) || 1320 !LoadDefaultLocale(error) ||
1313 !LoadOfflineEnabled(error) || 1321 !LoadOfflineEnabled(error) ||
1314 !LoadOptionsPage(error) || 1322 !LoadOptionsPage(error) ||
1315 // LoadBackgroundScripts() must be called before LoadBackgroundPage(). 1323 // LoadBackgroundScripts() must be called before LoadBackgroundPage().
1316 !LoadBackgroundScripts(error) || 1324 !LoadBackgroundScripts(error) ||
1317 !LoadBackgroundPage(api_permissions, error) || 1325 !LoadBackgroundPage(api_permissions, error) ||
1318 !LoadBackgroundPersistent(api_permissions, error) || 1326 !LoadBackgroundPersistent(api_permissions, error) ||
1319 !LoadBackgroundAllowJSAccess(api_permissions, error) || 1327 !LoadBackgroundAllowJSAccess(api_permissions, error) ||
1320 !LoadWebIntentServices(error) || 1328 !LoadWebIntentServices(error) ||
1321 !LoadOAuth2Info(error)) 1329 !LoadOAuth2Info(error))
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1676 } else { 1684 } else {
1677 sandboxed_pages_content_security_policy_ = 1685 sandboxed_pages_content_security_policy_ =
1678 kDefaultSandboxedPageContentSecurityPolicy; 1686 kDefaultSandboxedPageContentSecurityPolicy;
1679 CHECK(ContentSecurityPolicyIsSandboxed( 1687 CHECK(ContentSecurityPolicyIsSandboxed(
1680 sandboxed_pages_content_security_policy_, GetType())); 1688 sandboxed_pages_content_security_policy_, GetType()));
1681 } 1689 }
1682 1690
1683 return true; 1691 return true;
1684 } 1692 }
1685 1693
1686 // These are not actually persisted (they're only used by the store), but 1694 bool Extension::LoadRequirements(string16* error) {
1687 // still validated.
1688 bool Extension::CheckRequirements(string16* error) {
1689 if (!manifest_->HasKey(keys::kRequirements)) 1695 if (!manifest_->HasKey(keys::kRequirements))
1690 return true; 1696 return true;
1691 DictionaryValue* requirements_value = NULL; 1697 DictionaryValue* requirements_value = NULL;
1692 if (!manifest_->GetDictionary(keys::kRequirements, &requirements_value)) { 1698 if (!manifest_->GetDictionary(keys::kRequirements, &requirements_value)) {
1693 *error = ASCIIToUTF16(errors::kInvalidRequirements); 1699 *error = ASCIIToUTF16(errors::kInvalidRequirements);
1694 return false; 1700 return false;
1695 } 1701 }
1696 1702
1697 for (DictionaryValue::key_iterator it = requirements_value->begin_keys(); 1703 for (DictionaryValue::key_iterator it = requirements_value->begin_keys();
1698 it != requirements_value->end_keys(); ++it) { 1704 it != requirements_value->end_keys(); ++it) {
1699 DictionaryValue* requirement_value; 1705 DictionaryValue* requirement_value;
1700 if (!requirements_value->GetDictionaryWithoutPathExpansion( 1706 if (!requirements_value->GetDictionaryWithoutPathExpansion(
1701 *it, &requirement_value)) { 1707 *it, &requirement_value)) {
1702 *error = ExtensionErrorUtils::FormatErrorMessageUTF16( 1708 *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
1703 errors::kInvalidRequirement, *it); 1709 errors::kInvalidRequirement, *it);
1704 return false; 1710 return false;
1705 } 1711 }
1712
1713 if (*it == "plugins") {
1714 requirements_.plugins = true;
1715 } else if (*it == "3D") {
1716 ListValue* features = NULL;
1717 if (!requirement_value->GetListWithoutPathExpansion("features",
1718 &features) ||
1719 !features) {
1720 *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
1721 errors::kInvalidRequirement, *it);
1722 return false;
1723 }
1724
1725 for (base::ListValue::iterator feature_it = features->begin();
1726 feature_it != features->end();
1727 ++feature_it) {
1728 std::string feature;
1729 if ((*feature_it)->GetAsString(&feature)) {
1730 if (feature == "webgl") {
1731 requirements_.webgl = true;
1732 } else if (feature == "css3d") {
1733 requirements_.css3d = true;
1734 } else {
1735 *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
1736 errors::kInvalidRequirement, *it);
1737 return false;
1738 }
1739 }
1740 }
1741 } else {
1742 *error = ASCIIToUTF16(errors::kInvalidRequirements);
1743 return false;
1744 }
1706 } 1745 }
1707 return true; 1746 return true;
1708 } 1747 }
1709 1748
1710 bool Extension::LoadDefaultLocale(string16* error) { 1749 bool Extension::LoadDefaultLocale(string16* error) {
1711 if (!manifest_->HasKey(keys::kDefaultLocale)) 1750 if (!manifest_->HasKey(keys::kDefaultLocale))
1712 return true; 1751 return true;
1713 if (!manifest_->GetString(keys::kDefaultLocale, &default_locale_) || 1752 if (!manifest_->GetString(keys::kDefaultLocale, &default_locale_) ||
1714 !l10n_util::IsValidLocaleSyntax(default_locale_)) { 1753 !l10n_util::IsValidLocaleSyntax(default_locale_)) {
1715 *error = ASCIIToUTF16(errors::kInvalidDefaultLocale); 1754 *error = ASCIIToUTF16(errors::kInvalidDefaultLocale);
(...skipping 2210 matching lines...) Expand 10 before | Expand all | Expand 10 after
3926 3965
3927 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( 3966 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
3928 const Extension* extension, 3967 const Extension* extension,
3929 const PermissionSet* permissions, 3968 const PermissionSet* permissions,
3930 Reason reason) 3969 Reason reason)
3931 : reason(reason), 3970 : reason(reason),
3932 extension(extension), 3971 extension(extension),
3933 permissions(permissions) {} 3972 permissions(permissions) {}
3934 3973
3935 } // namespace extensions 3974 } // namespace extensions
OLDNEW
« chrome/browser/extensions/extension_service.h ('K') | « chrome/common/extensions/extension.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698