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

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

Issue 11946017: Remove old cloud policy code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits. Created 7 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
« no previous file with comments | « chrome/browser/policy/user_policy_cache.h ('k') | chrome/browser/policy/user_policy_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/user_policy_cache.cc
diff --git a/chrome/browser/policy/user_policy_cache.cc b/chrome/browser/policy/user_policy_cache.cc
deleted file mode 100644
index 16fae15b11053baf232cc3cf89482edc3f774367..0000000000000000000000000000000000000000
--- a/chrome/browser/policy/user_policy_cache.cc
+++ /dev/null
@@ -1,241 +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/user_policy_cache.h"
-
-#include <limits>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/file_path.h"
-#include "base/logging.h"
-#include "base/metrics/histogram.h"
-#include "chrome/browser/policy/enterprise_metrics.h"
-#include "chrome/browser/policy/policy_map.h"
-#include "chrome/browser/policy/proto/cloud_policy.pb.h"
-#include "chrome/browser/policy/proto/device_management_local.pb.h"
-#include "chrome/browser/policy/proto/old_generic_format.pb.h"
-
-namespace em = enterprise_management;
-
-namespace policy {
-
-// Decodes a CloudPolicySettings object into a PolicyMap. All the policies will
-// be POLICY_SCOPE_USER. The PolicyLevel is decoded from the protobuf.
-// The implementation is generated code in policy/cloud_policy_generated.cc.
-void DecodePolicy(const em::CloudPolicySettings& policy, PolicyMap* map);
-
-UserPolicyCache::UserPolicyCache(const FilePath& backing_file_path,
- bool wait_for_policy_fetch)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
- disk_cache_ready_(false),
- fetch_ready_(!wait_for_policy_fetch) {
- disk_cache_ = new UserPolicyDiskCache(weak_ptr_factory_.GetWeakPtr(),
- backing_file_path);
-}
-
-UserPolicyCache::~UserPolicyCache() {
-}
-
-void UserPolicyCache::Load() {
- disk_cache_->Load();
-}
-
-bool UserPolicyCache::SetPolicy(const em::PolicyFetchResponse& policy) {
- base::Time now = base::Time::NowFromSystemTime();
- set_last_policy_refresh_time(now);
- base::Time timestamp;
- if (!SetPolicyInternal(policy, &timestamp, false))
- return false;
- UMA_HISTOGRAM_ENUMERATION(kMetricPolicy, kMetricPolicyFetchOK,
- kMetricPolicySize);
-
- if (timestamp > base::Time::NowFromSystemTime() +
- base::TimeDelta::FromMinutes(1)) {
- LOG(WARNING) << "Server returned policy with timestamp from the future, "
- "not persisting to disk.";
- return false;
- }
-
- em::CachedCloudPolicyResponse cached_policy;
- cached_policy.mutable_cloud_policy()->CopyFrom(policy);
- disk_cache_->Store(cached_policy);
- return true;
-}
-
-void UserPolicyCache::SetUnmanaged() {
- DCHECK(CalledOnValidThread());
- SetUnmanagedInternal(base::Time::NowFromSystemTime());
-
- em::CachedCloudPolicyResponse cached_policy;
- cached_policy.set_unmanaged(true);
- cached_policy.set_timestamp(base::Time::NowFromSystemTime().ToTimeT());
- disk_cache_->Store(cached_policy);
-}
-
-void UserPolicyCache::SetFetchingDone() {
- CloudPolicyCacheBase::SetFetchingDone();
- if (!fetch_ready_)
- DVLOG(1) << "SetFetchingDone, cache is now fetch_ready_";
- fetch_ready_ = true;
- CheckIfReady();
-}
-
-void UserPolicyCache::OnDiskCacheLoaded(
- UserPolicyDiskCache::LoadResult result,
- const em::CachedCloudPolicyResponse& cached_response) {
- if (IsReady())
- return;
-
- if (result == UserPolicyDiskCache::LOAD_RESULT_SUCCESS) {
- if (cached_response.unmanaged()) {
- SetUnmanagedInternal(base::Time::FromTimeT(cached_response.timestamp()));
- } else if (cached_response.has_cloud_policy()) {
- base::Time timestamp;
- if (SetPolicyInternal(cached_response.cloud_policy(), &timestamp, true))
- set_last_policy_refresh_time(timestamp);
- }
- }
-
- // Ready to feed policy up the chain!
- disk_cache_ready_ = true;
- CheckIfReady();
-}
-
-bool UserPolicyCache::DecodePolicyData(const em::PolicyData& policy_data,
- PolicyMap* policies) {
- // TODO(jkummerow): Verify policy_data.device_token(). Needs final
- // specification which token we're actually sending / expecting to get back.
- em::CloudPolicySettings policy;
- if (!policy.ParseFromString(policy_data.policy_value())) {
- LOG(WARNING) << "Failed to parse CloudPolicySettings protobuf.";
- return false;
- }
- DecodePolicy(policy, policies);
- MaybeDecodeOldstylePolicy(policy_data.policy_value(), policies);
- return true;
-}
-
-void UserPolicyCache::CheckIfReady() {
- if (!IsReady() && disk_cache_ready_ && fetch_ready_)
- SetReady();
-}
-
-// Everything below is only needed for supporting old-style GenericNamedValue
-// based policy data and can be removed once this support is no longer needed.
-
-using google::protobuf::RepeatedField;
-using google::protobuf::RepeatedPtrField;
-
-void UserPolicyCache::MaybeDecodeOldstylePolicy(
- const std::string& policy_data,
- PolicyMap* policies) {
- // Return immediately if we already have policy information in the maps.
- if (!policies->empty())
- return;
- em::LegacyChromeSettingsProto policy;
- // Return if the input string doesn't match the protobuf definition.
- if (!policy.ParseFromString(policy_data))
- return;
- // Return if there's no old-style policy to decode.
- if (policy.named_value_size() == 0)
- return;
-
- // Inspect GenericNamedValues and decode them.
- DictionaryValue result;
- RepeatedPtrField<em::GenericNamedValue>::const_iterator named_value;
- for (named_value = policy.named_value().begin();
- named_value != policy.named_value().end();
- ++named_value) {
- if (named_value->has_value()) {
- Value* decoded_value = DecodeValue(named_value->value());
- if (decoded_value)
- result.Set(named_value->name(), decoded_value);
- }
- }
- policies->LoadFrom(&result, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER);
-}
-
-Value* UserPolicyCache::DecodeIntegerValue(
- google::protobuf::int64 value) const {
- if (value < std::numeric_limits<int>::min() ||
- value > std::numeric_limits<int>::max()) {
- LOG(WARNING) << "Integer value " << value
- << " out of numeric limits, ignoring.";
- return NULL;
- }
-
- return Value::CreateIntegerValue(static_cast<int>(value));
-}
-
-Value* UserPolicyCache::DecodeValue(const em::GenericValue& value) const {
- if (!value.has_value_type())
- return NULL;
-
- switch (value.value_type()) {
- case em::GenericValue::VALUE_TYPE_BOOL:
- if (value.has_bool_value())
- return Value::CreateBooleanValue(value.bool_value());
- return NULL;
- case em::GenericValue::VALUE_TYPE_INT64:
- if (value.has_int64_value())
- return DecodeIntegerValue(value.int64_value());
- return NULL;
- case em::GenericValue::VALUE_TYPE_STRING:
- if (value.has_string_value())
- return Value::CreateStringValue(value.string_value());
- return NULL;
- case em::GenericValue::VALUE_TYPE_DOUBLE:
- if (value.has_double_value())
- return Value::CreateDoubleValue(value.double_value());
- return NULL;
- case em::GenericValue::VALUE_TYPE_BYTES:
- if (value.has_bytes_value()) {
- std::string bytes = value.bytes_value();
- return base::BinaryValue::CreateWithCopiedBuffer(bytes.c_str(),
- bytes.size());
- }
- return NULL;
- case em::GenericValue::VALUE_TYPE_BOOL_ARRAY: {
- ListValue* list = new ListValue;
- RepeatedField<bool>::const_iterator i;
- for (i = value.bool_array().begin(); i != value.bool_array().end(); ++i)
- list->Append(Value::CreateBooleanValue(*i));
- return list;
- }
- case em::GenericValue::VALUE_TYPE_INT64_ARRAY: {
- ListValue* list = new ListValue;
- RepeatedField<google::protobuf::int64>::const_iterator i;
- for (i = value.int64_array().begin();
- i != value.int64_array().end(); ++i) {
- Value* int_value = DecodeIntegerValue(*i);
- if (int_value)
- list->Append(int_value);
- }
- return list;
- }
- case em::GenericValue::VALUE_TYPE_STRING_ARRAY: {
- ListValue* list = new ListValue;
- RepeatedPtrField<std::string>::const_iterator i;
- for (i = value.string_array().begin();
- i != value.string_array().end(); ++i)
- list->Append(Value::CreateStringValue(*i));
- return list;
- }
- case em::GenericValue::VALUE_TYPE_DOUBLE_ARRAY: {
- ListValue* list = new ListValue;
- RepeatedField<double>::const_iterator i;
- for (i = value.double_array().begin();
- i != value.double_array().end(); ++i)
- list->Append(Value::CreateDoubleValue(*i));
- return list;
- }
- default:
- NOTREACHED() << "Unhandled value type";
- }
-
- return NULL;
-}
-
-} // namespace policy
« no previous file with comments | « chrome/browser/policy/user_policy_cache.h ('k') | chrome/browser/policy/user_policy_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698