summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_prefs.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_prefs.cc')
-rw-r--r--chrome/browser/extensions/extension_prefs.cc171
1 files changed, 105 insertions, 66 deletions
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 334b64f..e0a8d6e 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -102,11 +102,15 @@ const char kBrowserActionVisible[] = "browser_action_visible";
// Preferences that hold which permissions the user has granted the extension.
// We explicitly keep track of these so that extensions can contain unknown
// permissions, for backwards compatibility reasons, and we can still prompt
-// the user to accept them once recognized.
-const char kPrefGrantedAPIs[] = "granted_permissions.api";
-const char kPrefGrantedExplicitHosts[] = "granted_permissions.explicit_host";
-const char kPrefGrantedScriptableHosts[] =
- "granted_permissions.scriptable_host";
+// the user to accept them once recognized. We store the active permission
+// permissions because they may differ from those defined in the manifest.
+const char kPrefActivePermissions[] = "active_permissions";
+const char kPrefGrantedPermissions[] = "granted_permissions";
+
+// The preference names for ExtensionPermissionSet values.
+const char kPrefAPIs[] = "api";
+const char kPrefExplicitHosts[] = "explicit_host";
+const char kPrefScriptableHosts[] = "scriptable_host";
// The preference names for the old granted permissions scheme.
const char kPrefOldGrantedFullAccess[] = "granted_permissions.full";
@@ -206,6 +210,10 @@ class ScopedExtensionControlledPrefUpdate : public DictionaryPrefUpdate {
DISALLOW_COPY_AND_ASSIGN(ScopedExtensionControlledPrefUpdate);
};
+std::string JoinPrefs(std::string parent, const char* child) {
+ return parent + "." + child;
+}
+
} // namespace
ExtensionPrefs::ExtensionPrefs(
@@ -423,6 +431,75 @@ void ExtensionPrefs::SetExtensionPrefURLPatternSet(
UpdateExtensionPref(extension_id, pref_key, value);
}
+ExtensionPermissionSet* ExtensionPrefs::ReadExtensionPrefPermissionSet(
+ const std::string& extension_id,
+ const std::string& pref_key) {
+ if (!GetExtensionPref(extension_id))
+ return NULL;
+
+ // Retrieve the API permissions.
+ ExtensionAPIPermissionSet apis;
+ const ListValue* api_values = NULL;
+ std::string api_pref = JoinPrefs(pref_key, kPrefAPIs);
+ if (ReadExtensionPrefList(extension_id, api_pref, &api_values)) {
+ ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
+ for (size_t i = 0; i < api_values->GetSize(); ++i) {
+ std::string permission_name;
+ if (api_values->GetString(i, &permission_name)) {
+ ExtensionAPIPermission *permission = info->GetByName(permission_name);
+ if (permission)
+ apis.insert(permission->id());
+ }
+ }
+ }
+
+ // Retrieve the explicit host permissions.
+ URLPatternSet explicit_hosts;
+ ReadExtensionPrefURLPatternSet(
+ extension_id, JoinPrefs(pref_key, kPrefExplicitHosts),
+ &explicit_hosts, Extension::kValidHostPermissionSchemes);
+
+ // Retrieve the scriptable host permissions.
+ URLPatternSet scriptable_hosts;
+ ReadExtensionPrefURLPatternSet(
+ extension_id, JoinPrefs(pref_key, kPrefScriptableHosts),
+ &scriptable_hosts, UserScript::kValidUserScriptSchemes);
+
+ return new ExtensionPermissionSet(apis, explicit_hosts, scriptable_hosts);
+}
+
+void ExtensionPrefs::SetExtensionPrefPermissionSet(
+ const std::string& extension_id,
+ const std::string& pref_key,
+ const ExtensionPermissionSet* new_value) {
+ // Set the API permissions.
+ ListValue* api_values = new ListValue();
+ ExtensionAPIPermissionSet apis = new_value->apis();
+ ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
+ std::string api_pref = JoinPrefs(pref_key, kPrefAPIs);
+ for (ExtensionAPIPermissionSet::const_iterator i = apis.begin();
+ i != apis.end(); ++i) {
+ ExtensionAPIPermission* perm = info->GetByID(*i);
+ if (perm)
+ api_values->Append(Value::CreateStringValue(perm->name()));
+ }
+ UpdateExtensionPref(extension_id, api_pref, api_values);
+
+ // Set the explicit host permissions.
+ if (!new_value->explicit_hosts().is_empty()) {
+ SetExtensionPrefURLPatternSet(extension_id,
+ JoinPrefs(pref_key, kPrefExplicitHosts),
+ new_value->explicit_hosts());
+ }
+
+ // Set the scriptable host permissions.
+ if (!new_value->scriptable_hosts().is_empty()) {
+ SetExtensionPrefURLPatternSet(extension_id,
+ JoinPrefs(pref_key, kPrefScriptableHosts),
+ new_value->scriptable_hosts());
+ }
+}
+
void ExtensionPrefs::SavePrefs() {
prefs_->ScheduleSavePersistentPrefs();
}
@@ -638,7 +715,9 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
ListValue* apis = NULL;
ListValue* new_apis = NULL;
- if (ext->GetList(kPrefGrantedAPIs, &apis))
+ std::string granted_apis =
+ JoinPrefs(kPrefGrantedPermissions, kPrefAPIs);
+ if (ext->GetList(kPrefOldGrantedAPIs, &apis))
new_apis = apis->DeepCopy();
else
new_apis = new ListValue();
@@ -646,7 +725,7 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
std::string plugin_name = info->GetByID(
ExtensionAPIPermission::kPlugin)->name();
new_apis->Append(Value::CreateStringValue(plugin_name));
- UpdateExtensionPref(*ext_id, kPrefGrantedAPIs, new_apis);
+ UpdateExtensionPref(*ext_id, granted_apis, new_apis);
}
// The granted permissions originally only held the effective hosts,
@@ -656,9 +735,11 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
// new effective hosts will be the same, so we move them to explicit
// host permissions.
ListValue* hosts;
+ std::string explicit_hosts =
+ JoinPrefs(kPrefGrantedPermissions, kPrefExplicitHosts);
if (ext->GetList(kPrefOldGrantedHosts, &hosts)) {
UpdateExtensionPref(
- *ext_id, kPrefGrantedExplicitHosts, hosts->DeepCopy());
+ *ext_id, explicit_hosts, hosts->DeepCopy());
// We can get rid of the old one by setting it to an empty list.
UpdateExtensionPref(*ext_id, kPrefOldGrantedHosts, new ListValue());
@@ -669,39 +750,7 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
ExtensionPermissionSet* ExtensionPrefs::GetGrantedPermissions(
const std::string& extension_id) {
CHECK(Extension::IdIsValid(extension_id));
-
- const DictionaryValue* ext = GetExtensionPref(extension_id);
- if (!ext)
- return NULL;
-
- // Retrieve the API permissions.
- ExtensionAPIPermissionSet apis;
- const ListValue* api_values = NULL;
- if (ReadExtensionPrefList(extension_id, kPrefGrantedAPIs, &api_values)) {
- ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
- for (size_t i = 0; i < api_values->GetSize(); ++i) {
- std::string permission_name;
- if (api_values->GetString(i, &permission_name)) {
- ExtensionAPIPermission *permission = info->GetByName(permission_name);
- if (permission)
- apis.insert(permission->id());
- }
- }
- }
-
- // Retrieve the explicit host permissions.
- URLPatternSet explicit_hosts;
- ReadExtensionPrefURLPatternSet(
- extension_id, kPrefGrantedExplicitHosts,
- &explicit_hosts, Extension::kValidHostPermissionSchemes);
-
- // Retrieve the scriptable host permissions.
- URLPatternSet scriptable_hosts;
- ReadExtensionPrefURLPatternSet(
- extension_id, kPrefGrantedScriptableHosts,
- &scriptable_hosts, UserScript::kValidUserScriptSchemes);
-
- return new ExtensionPermissionSet(apis, explicit_hosts, scriptable_hosts);
+ return ReadExtensionPrefPermissionSet(extension_id, kPrefGrantedPermissions);
}
void ExtensionPrefs::AddGrantedPermissions(
@@ -709,40 +758,30 @@ void ExtensionPrefs::AddGrantedPermissions(
const ExtensionPermissionSet* permissions) {
CHECK(Extension::IdIsValid(extension_id));
- scoped_ptr<ExtensionPermissionSet> granted_permissions(
+ scoped_refptr<ExtensionPermissionSet> granted_permissions(
GetGrantedPermissions(extension_id));
// The new granted permissions are the union of the already granted
// permissions and the newly granted permissions.
- scoped_ptr<ExtensionPermissionSet> new_perms(
+ scoped_refptr<ExtensionPermissionSet> new_perms(
ExtensionPermissionSet::CreateUnion(
permissions, granted_permissions.get()));
- // Set the API permissions.
- ListValue* api_values = new ListValue();
- ExtensionAPIPermissionSet apis = new_perms->apis();
- ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
- for (ExtensionAPIPermissionSet::const_iterator i = apis.begin();
- i != apis.end(); ++i) {
- ExtensionAPIPermission* perm = info->GetByID(*i);
- if (perm)
- api_values->Append(Value::CreateStringValue(perm->name()));
- }
- UpdateExtensionPref(extension_id, kPrefGrantedAPIs, api_values);
+ SetExtensionPrefPermissionSet(
+ extension_id, kPrefGrantedPermissions, new_perms.get());
+}
- // Set the explicit host permissions.
- if (!new_perms->explicit_hosts().is_empty()) {
- SetExtensionPrefURLPatternSet(extension_id,
- kPrefGrantedExplicitHosts,
- new_perms->explicit_hosts());
- }
+ExtensionPermissionSet* ExtensionPrefs::GetActivePermissions(
+ const std::string& extension_id) {
+ CHECK(Extension::IdIsValid(extension_id));
+ return ReadExtensionPrefPermissionSet(extension_id, kPrefActivePermissions);
+}
- // Set the scriptable host permissions.
- if (!new_perms->scriptable_hosts().is_empty()) {
- SetExtensionPrefURLPatternSet(extension_id,
- kPrefGrantedScriptableHosts,
- new_perms->scriptable_hosts());
- }
+void ExtensionPrefs::SetActivePermissions(
+ const std::string& extension_id,
+ const ExtensionPermissionSet* permissions) {
+ SetExtensionPrefPermissionSet(
+ extension_id, kPrefActivePermissions, permissions);
}
bool ExtensionPrefs::IsIncognitoEnabled(const std::string& extension_id) {
generated by cgit v1.1 at 2025-01-18 03:01:56 +0000