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

Unified Diff: chrome/browser/policy/config_dir_policy_loader.cc

Issue 109743002: Move policy code into components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar fixes Created 7 years 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: chrome/browser/policy/config_dir_policy_loader.cc
diff --git a/chrome/browser/policy/config_dir_policy_loader.cc b/chrome/browser/policy/config_dir_policy_loader.cc
deleted file mode 100644
index b35064d6c5ace26c7d04f6f401e67300b974f514..0000000000000000000000000000000000000000
--- a/chrome/browser/policy/config_dir_policy_loader.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) 2012 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/policy/config_dir_policy_loader.h"
-
-#include <algorithm>
-#include <set>
-#include <string>
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
-#include "base/json/json_file_value_serializer.h"
-#include "base/json/json_reader.h"
-#include "base/logging.h"
-#include "base/platform_file.h"
-#include "base/stl_util.h"
-#include "chrome/browser/policy/policy_load_status.h"
-#include "components/policy/core/common/policy_bundle.h"
-
-namespace policy {
-
-namespace {
-
-// Subdirectories that contain the mandatory and recommended policies.
-const base::FilePath::CharType kMandatoryConfigDir[] =
- FILE_PATH_LITERAL("managed");
-const base::FilePath::CharType kRecommendedConfigDir[] =
- FILE_PATH_LITERAL("recommended");
-
-PolicyLoadStatus JsonErrorToPolicyLoadStatus(int status) {
- switch (status) {
- case JSONFileValueSerializer::JSON_ACCESS_DENIED:
- case JSONFileValueSerializer::JSON_CANNOT_READ_FILE:
- case JSONFileValueSerializer::JSON_FILE_LOCKED:
- return POLICY_LOAD_STATUS_READ_ERROR;
- case JSONFileValueSerializer::JSON_NO_SUCH_FILE:
- return POLICY_LOAD_STATUS_MISSING;
- case base::JSONReader::JSON_INVALID_ESCAPE:
- case base::JSONReader::JSON_SYNTAX_ERROR:
- case base::JSONReader::JSON_UNEXPECTED_TOKEN:
- case base::JSONReader::JSON_TRAILING_COMMA:
- case base::JSONReader::JSON_TOO_MUCH_NESTING:
- case base::JSONReader::JSON_UNEXPECTED_DATA_AFTER_ROOT:
- case base::JSONReader::JSON_UNSUPPORTED_ENCODING:
- case base::JSONReader::JSON_UNQUOTED_DICTIONARY_KEY:
- return POLICY_LOAD_STATUS_PARSE_ERROR;
- case base::JSONReader::JSON_NO_ERROR:
- NOTREACHED();
- return POLICY_LOAD_STATUS_STARTED;
- }
- NOTREACHED() << "Invalid status " << status;
- return POLICY_LOAD_STATUS_PARSE_ERROR;
-}
-
-} // namespace
-
-ConfigDirPolicyLoader::ConfigDirPolicyLoader(
- scoped_refptr<base::SequencedTaskRunner> task_runner,
- const base::FilePath& config_dir,
- PolicyScope scope)
- : AsyncPolicyLoader(task_runner), config_dir_(config_dir), scope_(scope) {}
-
-ConfigDirPolicyLoader::~ConfigDirPolicyLoader() {}
-
-void ConfigDirPolicyLoader::InitOnBackgroundThread() {
- base::FilePathWatcher::Callback callback =
- base::Bind(&ConfigDirPolicyLoader::OnFileUpdated, base::Unretained(this));
- mandatory_watcher_.Watch(config_dir_.Append(kMandatoryConfigDir), false,
- callback);
- recommended_watcher_.Watch(config_dir_.Append(kRecommendedConfigDir), false,
- callback);
-}
-
-scoped_ptr<PolicyBundle> ConfigDirPolicyLoader::Load() {
- scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
- LoadFromPath(config_dir_.Append(kMandatoryConfigDir),
- POLICY_LEVEL_MANDATORY,
- bundle.get());
- LoadFromPath(config_dir_.Append(kRecommendedConfigDir),
- POLICY_LEVEL_RECOMMENDED,
- bundle.get());
- return bundle.Pass();
-}
-
-base::Time ConfigDirPolicyLoader::LastModificationTime() {
- static const base::FilePath::CharType* kConfigDirSuffixes[] = {
- kMandatoryConfigDir,
- kRecommendedConfigDir,
- };
-
- base::Time last_modification = base::Time();
- base::PlatformFileInfo info;
-
- for (size_t i = 0; i < arraysize(kConfigDirSuffixes); ++i) {
- base::FilePath path(config_dir_.Append(kConfigDirSuffixes[i]));
-
- // Skip if the file doesn't exist, or it isn't a directory.
- if (!base::GetFileInfo(path, &info) || !info.is_directory)
- continue;
-
- // Enumerate the files and find the most recent modification timestamp.
- base::FileEnumerator file_enumerator(path, false,
- base::FileEnumerator::FILES);
- for (base::FilePath config_file = file_enumerator.Next();
- !config_file.empty();
- config_file = file_enumerator.Next()) {
- if (base::GetFileInfo(config_file, &info) && !info.is_directory)
- last_modification = std::max(last_modification, info.last_modified);
- }
- }
-
- return last_modification;
-}
-
-void ConfigDirPolicyLoader::LoadFromPath(const base::FilePath& path,
- PolicyLevel level,
- PolicyBundle* bundle) {
- // Enumerate the files and sort them lexicographically.
- std::set<base::FilePath> files;
- base::FileEnumerator file_enumerator(path, false,
- base::FileEnumerator::FILES);
- for (base::FilePath config_file_path = file_enumerator.Next();
- !config_file_path.empty(); config_file_path = file_enumerator.Next())
- files.insert(config_file_path);
-
- PolicyLoadStatusSample status;
- if (files.empty()) {
- status.Add(POLICY_LOAD_STATUS_NO_POLICY);
- return;
- }
-
- // Start with an empty dictionary and merge the files' contents.
- // The files are processed in reverse order because |MergeFrom| gives priority
- // to existing keys, but the ConfigDirPolicyProvider gives priority to the
- // last file in lexicographic order.
- for (std::set<base::FilePath>::reverse_iterator config_file_iter =
- files.rbegin(); config_file_iter != files.rend();
- ++config_file_iter) {
- JSONFileValueSerializer deserializer(*config_file_iter);
- deserializer.set_allow_trailing_comma(true);
- int error_code = 0;
- std::string error_msg;
- scoped_ptr<base::Value> value(
- deserializer.Deserialize(&error_code, &error_msg));
- if (!value.get()) {
- LOG(WARNING) << "Failed to read configuration file "
- << config_file_iter->value() << ": " << error_msg;
- status.Add(JsonErrorToPolicyLoadStatus(error_code));
- continue;
- }
- base::DictionaryValue* dictionary_value = NULL;
- if (!value->GetAsDictionary(&dictionary_value)) {
- LOG(WARNING) << "Expected JSON dictionary in configuration file "
- << config_file_iter->value();
- status.Add(POLICY_LOAD_STATUS_PARSE_ERROR);
- continue;
- }
-
- // Detach the "3rdparty" node.
- scoped_ptr<base::Value> third_party;
- if (dictionary_value->Remove("3rdparty", &third_party))
- Merge3rdPartyPolicy(third_party.get(), level, bundle);
-
- // Add chrome policy.
- PolicyMap policy_map;
- policy_map.LoadFrom(dictionary_value, level, scope_);
- bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
- .MergeFrom(policy_map);
- }
-}
-
-void ConfigDirPolicyLoader::Merge3rdPartyPolicy(
- const base::Value* policies,
- PolicyLevel level,
- PolicyBundle* bundle) {
- // The first-level entries in |policies| are PolicyDomains. The second-level
- // entries are component IDs, and the third-level entries are the policies
- // for that domain/component namespace.
-
- const base::DictionaryValue* domains_dictionary;
- if (!policies->GetAsDictionary(&domains_dictionary)) {
- LOG(WARNING) << "3rdparty value is not a dictionary!";
- return;
- }
-
- // Helper to lookup a domain given its string name.
- std::map<std::string, PolicyDomain> supported_domains;
- supported_domains["extensions"] = POLICY_DOMAIN_EXTENSIONS;
-
- for (base::DictionaryValue::Iterator domains_it(*domains_dictionary);
- !domains_it.IsAtEnd(); domains_it.Advance()) {
- if (!ContainsKey(supported_domains, domains_it.key())) {
- LOG(WARNING) << "Unsupported 3rd party policy domain: "
- << domains_it.key();
- continue;
- }
-
- const base::DictionaryValue* components_dictionary;
- if (!domains_it.value().GetAsDictionary(&components_dictionary)) {
- LOG(WARNING) << "3rdparty/" << domains_it.key()
- << " value is not a dictionary!";
- continue;
- }
-
- PolicyDomain domain = supported_domains[domains_it.key()];
- for (base::DictionaryValue::Iterator components_it(*components_dictionary);
- !components_it.IsAtEnd(); components_it.Advance()) {
- const base::DictionaryValue* policy_dictionary;
- if (!components_it.value().GetAsDictionary(&policy_dictionary)) {
- LOG(WARNING) << "3rdparty/" << domains_it.key() << "/"
- << components_it.key() << " value is not a dictionary!";
- continue;
- }
-
- PolicyMap policy;
- policy.LoadFrom(policy_dictionary, level, scope_);
- bundle->Get(PolicyNamespace(domain, components_it.key()))
- .MergeFrom(policy);
- }
- }
-}
-
-void ConfigDirPolicyLoader::OnFileUpdated(const base::FilePath& path,
- bool error) {
- if (!error)
- Reload(false);
-}
-
-} // namespace policy
« no previous file with comments | « chrome/browser/policy/config_dir_policy_loader.h ('k') | chrome/browser/policy/config_dir_policy_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698