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

Unified Diff: webkit/plugins/npapi/plugin_list.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added empty group prunning. Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/npapi/plugin_list.cc
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index db82d3591c88d1fa56eb67f885e558f7117f2476..2dc9230d22fc0f315b4f7775287405bb6f440326 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -221,13 +221,6 @@ void PluginList::RegisterInternalPlugin(const PluginVersionInfo& info) {
internal_plugins_.push_back(info);
}
-void PluginList::RegisterInternalPlugin(const FilePath& path) {
- webkit::npapi::PluginVersionInfo info;
- info.path = path;
- memset(&info.entry_points, 0, sizeof(info.entry_points));
- RegisterInternalPlugin(info);
-}
-
void PluginList::RegisterInternalPlugin(const FilePath& filename,
const std::string& name,
const std::string& description,
@@ -296,7 +289,7 @@ bool PluginList::CreateWebPluginInfo(const PluginVersionInfo& pvi,
info->desc = WideToUTF16(pvi.file_description);
info->version = WideToUTF16(pvi.file_version);
info->path = pvi.path;
- info->enabled = true;
+ info->enabled = WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
for (size_t i = 0; i < mime_types.size(); ++i) {
WebPluginMimeType mime_type;
@@ -329,20 +322,11 @@ PluginList::PluginList()
: plugins_loaded_(false),
plugins_need_refresh_(false),
disable_outdated_plugins_(false),
- next_priority_(0) {
+ next_priority_(1) {
jam 2011/01/19 20:22:09 next_priority_ isn't needed amymore
pastarmovj 2011/01/19 23:39:17 Done.
PlatformInit();
AddHardcodedPluginGroups();
}
-bool PluginList::ShouldDisableGroup(const string16& group_name) {
- AutoLock lock(lock_);
- if (PluginGroup::IsPluginNameDisabledByPolicy(group_name)) {
- disabled_groups_.insert(group_name);
- return true;
- }
- return disabled_groups_.count(group_name) > 0;
-}
-
void PluginList::LoadPlugins(bool refresh) {
// Don't want to hold the lock while loading new plugins, so we don't block
// other methods if they're called on other threads.
@@ -401,32 +385,56 @@ void PluginList::LoadPlugins(bool refresh) {
if (webkit_glue::IsDefaultPluginEnabled())
LoadPlugin(FilePath(kDefaultPluginLibraryName), &new_plugins);
+ AutoLock lock(lock_);
+ std::vector<std::string> empty_groups;
// Disable all of the plugins and plugin groups that are disabled by policy.
- // There's currenly a bug that makes it impossible to correctly re-enable
- // plugins or plugin-groups to their original, "pre-policy" state, so
- // plugins and groups are only changed to a more "safe" state after a policy
- // change, i.e. from enabled to disabled. See bug 54681.
for (PluginGroup::PluginMap::iterator it = plugin_groups_.begin();
it != plugin_groups_.end(); ++it) {
PluginGroup* group = it->second;
string16 group_name = group->GetGroupName();
- if (ShouldDisableGroup(group_name)) {
- group->Enable(false);
- }
- if (disable_outdated_plugins_) {
- group->DisableOutdatedPlugins();
+ const std::vector<WebPluginInfo>& gr_plugins = group->GetPlugins();
+ for (size_t i = 0; i < gr_plugins.size(); ++i) {
+ bool plugin_found = false;
+ for (size_t j = 0; j < new_plugins.size(); ++j) {
+ if (gr_plugins[i].path == new_plugins[j].path) {
+ plugin_found = true;
+ break;
+ }
+ }
+ if (!plugin_found) {
+ // Clean up the plugins that have disappeared from the groups.
+ group->RemovePlugin(gr_plugins[i].path);
+ --i;
+ } else {
+ // Set the disabled flag of all plugins scheduled for disabling.
+ for (size_t j = 0; j < prematurely_disabled_plugins_.size(); ++j) {
+ if (gr_plugins[i].path == prematurely_disabled_plugins_[j]) {
+ group->DisablePlugin(gr_plugins[i].path);
+ }
+ }
+ }
}
- if (!group->Enabled()) {
- AutoLock lock(lock_);
- disabled_groups_.insert(group_name);
+ if (group->IsEmpty()) {
jam 2011/01/19 20:22:09 if plugin_groups_ was a vector, wouldn't need the
pastarmovj 2011/01/19 23:39:17 Ditto copied from plugin_group.cc question about t
jam 2011/01/20 00:24:25 in case of collision (when exactly?), can't we jus
+ if (!group->Enabled())
+ prematurely_disabled_groups_.push_back(group->GetGroupName());
+ empty_groups.push_back(it->first);
}
+
+ group->EnforceGroupPolicy();
+ if (disable_outdated_plugins_)
+ group->DisableOutdatedPlugins();
}
+ // Prune empty groups.
+ for(size_t i = 0; i < empty_groups.size(); ++i)
+ plugin_groups_.erase(empty_groups[i]);
- // Only update the data now since loading plugins can take a while.
- AutoLock lock(lock_);
+ // We flush the list of prematurely disabled plugins after the load has
+ // finished. If for some reason a plugin reappears on a second load it is
+ // going to be loaded normally. This is only true for non-policy controlled
+ // plugins though.
+ prematurely_disabled_plugins_.clear();
- plugins_ = new_plugins;
plugins_loaded_ = true;
}
@@ -434,7 +442,6 @@ void PluginList::LoadPlugin(const FilePath& path,
std::vector<WebPluginInfo>* plugins) {
LOG_IF(ERROR, PluginList::DebugPluginLoading())
<< "Loading plugin " << path.value();
-
WebPluginInfo plugin_info;
const PluginEntryPoints* entry_points;
@@ -459,61 +466,20 @@ void PluginList::LoadPlugin(const FilePath& path,
}
}
- // Mark disabled plugins as such. (This has to happen before calling
- // |AddToPluginGroups(plugin_info)|.)
- if (disabled_plugins_.count(plugin_info.path)) {
- plugin_info.enabled = false;
- } else {
- plugin_info.enabled = true;
- }
-
AutoLock lock(lock_);
jam 2011/01/19 20:22:09 this code is broken I think. unfortunately the wa
pastarmovj 2011/01/19 23:39:17 I don't think it is that bad. Actually the way we
jam 2011/01/20 00:24:25 I'm not sure which consistency you're referring to
- plugins->push_back(plugin_info);
AddToPluginGroups(plugin_info);
+ plugins->push_back(plugin_info);
}
-bool PluginList::SupportsType(const WebPluginInfo& info,
- const std::string &mime_type,
- bool allow_wildcard) {
- // Webkit will ask for a plugin to handle empty mime types.
- if (mime_type.empty())
- return false;
-
- for (size_t i = 0; i < info.mime_types.size(); ++i) {
- const WebPluginMimeType& mime_info = info.mime_types[i];
- if (net::MatchesMimeType(mime_info.mime_type, mime_type)) {
- if (!allow_wildcard && mime_info.mime_type == "*") {
- continue;
- }
- return true;
- }
- }
- return false;
-}
-
-bool PluginList::SupportsExtension(const WebPluginInfo& info,
- const std::string &extension,
- std::string* actual_mime_type) {
- for (size_t i = 0; i < info.mime_types.size(); ++i) {
- const WebPluginMimeType& mime_type = info.mime_types[i];
- for (size_t j = 0; j < mime_type.file_extensions.size(); ++j) {
- if (mime_type.file_extensions[j] == extension) {
- if (actual_mime_type)
- *actual_mime_type = mime_type.mime_type;
- return true;
- }
- }
- }
-
- return false;
-}
-
-
void PluginList::GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
LoadPlugins(refresh);
AutoLock lock(lock_);
- *plugins = plugins_;
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+ const std::vector<WebPluginInfo>& gr_plugins = group->second->GetPlugins();
+ plugins->insert(plugins->end(), gr_plugins.begin(), gr_plugins.end());
+ }
}
void PluginList::GetEnabledPlugins(bool refresh,
@@ -522,11 +488,13 @@ void PluginList::GetEnabledPlugins(bool refresh,
plugins->clear();
AutoLock lock(lock_);
- for (std::vector<WebPluginInfo>::const_iterator it = plugins_.begin();
- it != plugins_.end();
- ++it) {
- if (it->enabled)
- plugins->push_back(*it);
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+ const std::vector<WebPluginInfo>& gr_plugins = group->second->GetPlugins();
+ for (size_t i = 0; i < gr_plugins.size(); ++i) {
+ if (IsPluginEnabled(gr_plugins[i]))
+ plugins->push_back(gr_plugins[i]);
+ }
}
}
@@ -549,15 +517,19 @@ void PluginList::GetPluginInfoArray(
// Add in enabled plugins by mime type.
WebPluginInfo default_plugin;
- for (size_t i = 0; i < plugins_.size(); ++i) {
- if (plugins_[i].enabled &&
- SupportsType(plugins_[i], mime_type, allow_wildcard)) {
- FilePath path = plugins_[i].path;
- if (path.value() != kDefaultPluginLibraryName &&
- visited_plugins.insert(path).second) {
- info->push_back(plugins_[i]);
- if (actual_mime_types)
- actual_mime_types->push_back(mime_type);
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+ const std::vector<WebPluginInfo>& plugins = group->second->GetPlugins();
+ for (size_t i = 0; i < plugins.size(); ++i) {
+ if (IsPluginEnabled(plugins[i]) && SupportsType(plugins[i],
+ mime_type, allow_wildcard)) {
+ FilePath path = plugins[i].path;
+ if (path.value() != kDefaultPluginLibraryName &&
+ visited_plugins.insert(path).second) {
+ info->push_back(plugins[i]);
+ if (actual_mime_types)
+ actual_mime_types->push_back(mime_type);
+ }
}
}
}
@@ -568,42 +540,58 @@ void PluginList::GetPluginInfoArray(
if (last_dot != std::string::npos) {
std::string extension = StringToLowerASCII(std::string(path, last_dot+1));
std::string actual_mime_type;
- for (size_t i = 0; i < plugins_.size(); ++i) {
- if (plugins_[i].enabled &&
- SupportsExtension(plugins_[i], extension, &actual_mime_type)) {
- FilePath path = plugins_[i].path;
- if (path.value() != kDefaultPluginLibraryName &&
- visited_plugins.insert(path).second) {
- info->push_back(plugins_[i]);
- if (actual_mime_types)
- actual_mime_types->push_back(actual_mime_type);
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+ const std::vector<WebPluginInfo>& plugins = group->second->GetPlugins();
+ for (size_t i = 0; i < plugins.size(); ++i) {
+ if (IsPluginEnabled(plugins[i]) &&
+ SupportsExtension(plugins[i], extension, &actual_mime_type)) {
+ FilePath path = plugins[i].path;
+ if (path.value() != kDefaultPluginLibraryName &&
+ visited_plugins.insert(path).second) {
+ info->push_back(plugins[i]);
+ if (actual_mime_types)
+ actual_mime_types->push_back(actual_mime_type);
+ }
}
}
}
}
// Add in disabled plugins by mime type.
- for (size_t i = 0; i < plugins_.size(); ++i) {
- if (!plugins_[i].enabled &&
- SupportsType(plugins_[i], mime_type, allow_wildcard)) {
- FilePath path = plugins_[i].path;
- if (path.value() != kDefaultPluginLibraryName &&
- visited_plugins.insert(path).second) {
- info->push_back(plugins_[i]);
- if (actual_mime_types)
- actual_mime_types->push_back(mime_type);
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+ const std::vector<WebPluginInfo>& plugins = group->second->GetPlugins();
+ for (size_t i = 0; i < plugins.size(); ++i) {
+ if (!IsPluginEnabled(plugins[i]) &&
+ SupportsType(plugins[i], mime_type, allow_wildcard)) {
+ FilePath path = plugins[i].path;
+ if (path.value() != kDefaultPluginLibraryName &&
+ visited_plugins.insert(path).second) {
+ info->push_back(plugins[i]);
+ if (actual_mime_types)
+ actual_mime_types->push_back(mime_type);
+ }
}
}
}
// Add the default plugin at the end if it supports the mime type given,
// and the default plugin is enabled.
- if (!plugins_.empty() && webkit_glue::IsDefaultPluginEnabled()) {
- const WebPluginInfo& default_info = plugins_.back();
- if (SupportsType(default_info, mime_type, allow_wildcard)) {
- info->push_back(default_info);
- if (actual_mime_types)
- actual_mime_types->push_back(mime_type);
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+#if defined(OS_WIN)
+ if (group->first.compare(WideToUTF8(kDefaultPluginLibraryName)) == 0) {
+#else
+ if (group->first.compare(kDefaultPluginLibraryName) == 0) {
+#endif
+ DCHECK_NE(0U, group->second->GetPlugins().size());
+ const WebPluginInfo& default_info = group->second->GetPlugins().front();
+ if (SupportsType(default_info, mime_type, allow_wildcard)) {
+ info->push_back(default_info);
+ if (actual_mime_types)
+ actual_mime_types->push_back(mime_type);
+ }
}
}
}
@@ -641,10 +629,14 @@ bool PluginList::GetPluginInfoByPath(const FilePath& plugin_path,
WebPluginInfo* info) {
LoadPlugins(false);
AutoLock lock(lock_);
- for (size_t i = 0; i < plugins_.size(); ++i) {
- if (plugins_[i].path == plugin_path) {
- *info = plugins_[i];
- return true;
+ for (PluginGroup::PluginMap::const_iterator group = plugin_groups_.begin();
+ group != plugin_groups_.end(); ++group) {
+ const std::vector<WebPluginInfo>& plugins = group->second->GetPlugins();
+ for (size_t i = 0; i < plugins.size(); ++i) {
+ if (plugins[i].path == plugin_path) {
+ *info = plugins[i];
+ return true;
+ }
}
}
@@ -656,10 +648,13 @@ void PluginList::GetPluginGroups(
std::vector<PluginGroup>* plugin_groups) {
if (load_if_necessary)
LoadPlugins(false);
+ AutoLock lock(lock_);
plugin_groups->clear();
for (PluginGroup::PluginMap::const_iterator it = plugin_groups_.begin();
it != plugin_groups_.end(); ++it) {
- if (!it->second->IsEmpty())
+ // In some unit tests we can get confronted with empty groups but in real
+ // world code this if should never be false here.
+ if(!it->second->IsEmpty())
plugin_groups->push_back(*it->second);
}
}
@@ -691,6 +686,7 @@ void PluginList::AddHardcodedPluginGroups() {
for (size_t i = 0; i < GetPluginGroupDefinitionsSize(); ++i) {
PluginGroup* definition_group = PluginGroup::FromPluginGroupDefinition(
definitions[i]);
+ ProcessGroupAfterInitialize(definition_group);
std::string identifier = definition_group->identifier();
DCHECK(plugin_groups_.find(identifier) == plugin_groups_.end());
plugin_groups_.insert(std::make_pair(identifier, definition_group));
@@ -702,11 +698,23 @@ PluginGroup* PluginList::AddToPluginGroups(
PluginGroup* group = NULL;
for (PluginGroup::PluginMap::iterator it = plugin_groups_.begin();
it != plugin_groups_.end(); ++it) {
- if (it->second->Match(web_plugin_info))
+ if (it->second->Match(web_plugin_info)) {
group = it->second;
+ break;
+ }
}
if (!group) {
group = PluginGroup::FromWebPluginInfo(web_plugin_info);
+ // If group is scheduled for disabling do that now and remove it from the
+ // list.
+ for(size_t i = 0; i < prematurely_disabled_groups_.size(); ++i) {
+ if (group->GetGroupName() == prematurely_disabled_groups_[i]) {
+ group->EnableGroup(false);
+ prematurely_disabled_groups_.erase(
+ prematurely_disabled_groups_.begin() + i);
+ }
+ }
+ ProcessGroupAfterInitialize(group);
std::string identifier = group->identifier();
// If the identifier is not unique, use the full path. This means that we
// probably won't be able to search for this group by identifier, but at
@@ -719,88 +727,92 @@ PluginGroup* PluginList::AddToPluginGroups(
DCHECK(plugin_groups_.find(identifier) == plugin_groups_.end());
plugin_groups_.insert(std::make_pair(identifier, group));
}
- group->AddPlugin(web_plugin_info, next_priority_++);
+ bool is_new_addition = group->AddPlugin(web_plugin_info, next_priority_);
+ if (is_new_addition)
+ next_priority_++;
return group;
}
bool PluginList::EnablePlugin(const FilePath& filename) {
AutoLock lock(lock_);
-
- bool did_enable = false;
-
- std::set<FilePath>::iterator entry = disabled_plugins_.find(filename);
- if (entry == disabled_plugins_.end())
- return did_enable; // Early exit if plugin not in disabled list.
-
- disabled_plugins_.erase(entry); // Remove from disabled list.
-
- // Set enabled flags if necessary.
- for (std::vector<WebPluginInfo>::iterator it = plugins_.begin();
- it != plugins_.end();
- ++it) {
- if (it->path == filename) {
- DCHECK(!it->enabled); // Should have been disabled.
- it->enabled = true;
- did_enable = true;
- }
+ for (PluginGroup::PluginMap::iterator it = plugin_groups_.begin();
+ it != plugin_groups_.end(); ++it) {
+ if (it->second->ContainsPlugin(filename))
+ return it->second->EnablePlugin(filename);
}
- return did_enable;
+ // Non existing plugin is beig enabled. Ignore this request for now because
+ // plugins are anyway born enabled.
+ return true;
}
bool PluginList::DisablePlugin(const FilePath& filename) {
AutoLock lock(lock_);
+ for (PluginGroup::PluginMap::iterator it = plugin_groups_.begin();
+ it != plugin_groups_.end(); ++it) {
+ if (it->second->ContainsPlugin(filename))
+ return it->second->DisablePlugin(filename);
+ }
- bool did_disable = false;
-
- if (disabled_plugins_.find(filename) != disabled_plugins_.end())
- return did_disable; // Early exit if plugin already in disabled list.
-
- disabled_plugins_.insert(filename); // Add to disabled list.
+ // Non existing plugin is being disabled. Queue the plugin so that on the next
+ // load plugins call they will be disabled.
+ prematurely_disabled_plugins_.push_back(filename);
+ return true;
+}
- // Unset enabled flags if necessary.
- for (std::vector<WebPluginInfo>::iterator it = plugins_.begin();
- it != plugins_.end();
- ++it) {
- if (it->path == filename) {
- DCHECK(it->enabled); // Should have been enabled.
- it->enabled = false;
- did_disable = true;
+bool PluginList::EnableGroup(bool enable, const string16& group_name) {
+ AutoLock lock(lock_);
+ PluginGroup* group = NULL;
+ for (PluginGroup::PluginMap::iterator it = plugin_groups_.begin();
+ it != plugin_groups_.end(); ++it) {
+ if (it->second->GetGroupName().find(group_name) != string16::npos) {
+ group = it->second;
+ break;
}
}
+ if (!group) {
+ // Non existing group is being enabled. Queue the group so that on the next
+ // load plugins call they will be disabled.
+ if(!enable)
+ prematurely_disabled_groups_.push_back(group_name);
+ return true;
+ }
- return did_disable;
+ return group->EnableGroup(enable);
}
-bool PluginList::EnableGroup(bool enable, const string16& group_name) {
- bool did_change = false;
- {
- AutoLock lock(lock_);
+bool PluginList::SupportsType(const WebPluginInfo& plugin,
+ const std::string& mime_type,
+ bool allow_wildcard) {
+ // Webkit will ask for a plugin to handle empty mime types.
+ if (mime_type.empty())
+ return false;
- std::set<string16>::iterator entry = disabled_groups_.find(group_name);
- if (enable) {
- if (entry == disabled_groups_.end())
- return did_change; // Early exit if group not in disabled list.
- disabled_groups_.erase(entry); // Remove from disabled list.
- } else {
- if (entry != disabled_groups_.end())
- return did_change; // Early exit if group already in disabled list.
- disabled_groups_.insert(group_name);
+ for (size_t i = 0; i < plugin.mime_types.size(); ++i) {
+ const WebPluginMimeType& mime_info = plugin.mime_types[i];
+ if (net::MatchesMimeType(mime_info.mime_type, mime_type)) {
+ if (!allow_wildcard && mime_info.mime_type == "*")
+ continue;
+ return true;
}
}
+ return false;
+}
- for (PluginGroup::PluginMap::iterator it = plugin_groups_.begin();
- it != plugin_groups_.end(); ++it) {
- if (it->second->GetGroupName() == group_name) {
- if (it->second->Enabled() != enable) {
- it->second->Enable(enable);
- did_change = true;
- break;
+bool PluginList::SupportsExtension(const WebPluginInfo& plugin,
+ const std::string& extension,
+ std::string* actual_mime_type) {
+ for (size_t i = 0; i < plugin.mime_types.size(); ++i) {
+ const WebPluginMimeType& mime_type = plugin.mime_types[i];
+ for (size_t j = 0; j < mime_type.file_extensions.size(); ++j) {
+ if (mime_type.file_extensions[j] == extension) {
+ if (actual_mime_type)
+ *actual_mime_type = mime_type.mime_type;
+ return true;
}
}
}
-
- return did_change;
+ return false;
}
void PluginList::DisableOutdatedPluginGroups() {

Powered by Google App Engine
This is Rietveld 408576698