New policy protobuf protocol.

chrome/browser/policy/cloud_policy_cache.h

Index: chrome/browser/policy/cloud_policy_cache.h
diff --git a/chrome/browser/policy/device_management_policy_cache.h b/chrome/browser/policy/cloud_policy_cache.h
similarity index 51%
rename from chrome/browser/policy/device_management_policy_cache.h
rename to chrome/browser/policy/cloud_policy_cache.h
index 50441eb27ff37cbc59e3221e7d7c3fc96e017a2b..518e3f0536148f547a52b2c6df78d3fbc6b8711b 100644
--- a/chrome/browser/policy/device_management_policy_cache.h
+++ b/chrome/browser/policy/cloud_policy_cache.h
@@ -1,9 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_POLICY_DEVICE_MANAGEMENT_POLICY_CACHE_H_
-#define CHROME_BROWSER_POLICY_DEVICE_MANAGEMENT_POLICY_CACHE_H_
+#ifndef CHROME_BROWSER_POLICY_CLOUD_POLICY_CACHE_H_
+#define CHROME_BROWSER_POLICY_CLOUD_POLICY_CACHE_H_
+
+#include <string>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
@@ -11,11 +13,17 @@
 #include "base/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
+#include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "policy/configuration_policy_type.h"
 
 class DictionaryValue;
+class ListValue;
 class Value;
 
+using google::protobuf::RepeatedPtrField;
+
 namespace policy {
 
 namespace em = enterprise_management;
@@ -25,10 +33,10 @@ namespace em = enterprise_management;
 // to the service directly, but receives updated policy information through
 // SetPolicy() calls, which is then persisted and decoded into the internal
 // Value representation chrome uses.
-class DeviceManagementPolicyCache {
+class CloudPolicyCache {
  public:
-  explicit DeviceManagementPolicyCache(const FilePath& backing_file_path);
-  ~DeviceManagementPolicyCache();
+  explicit CloudPolicyCache(const FilePath& backing_file_path);
+  ~CloudPolicyCache();
 
   // Loads policy information from the backing file. Non-existing or erroneous
   // cache files are ignored.
@@ -36,25 +44,50 @@ class DeviceManagementPolicyCache {
 
   // Resets the policy information. Returns true if the new policy is different
   // from the previously stored policy.
-  bool SetPolicy(const em::DevicePolicyResponse& policy);
+  bool SetPolicy(const em::CloudPolicyResponse& policy);
+  bool SetDevicePolicy(const em::DevicePolicyResponse& policy);
 
   // Gets the policy information. Ownership of the return value is transferred
   // to the caller.
-  DictionaryValue* GetPolicy();
+  DictionaryValue* GetDevicePolicy();
+  const PolicyMap* GetMandatoryPolicy() const;
+  const PolicyMap* GetRecommendedPolicy() const;
 
-  void SetDeviceUnmanaged();
-  bool is_device_unmanaged() const {
-    return is_device_unmanaged_;
+  void SetUnmanaged();
+  bool is_unmanaged() const {
+    return is_unmanaged_;
   }
 
-  // Returns the time as which the policy was last fetched.
+  // Returns the time at which the policy was last fetched.
   base::Time last_policy_refresh_time() const {
     return last_policy_refresh_time_;
   }
 
+  // Returns true if this cache holds (old-style) device policy that should be
+  // given preference over (new-style) mandatory/recommended policy.
+  bool has_device_policy() const {
+    return has_device_policy_;
+  }
+
  private:
+  friend class CloudPolicyCacheTest;
   friend class DeviceManagementPolicyCacheDecodeTest;
-  FRIEND_TEST_ALL_PREFIXES(DeviceManagementPolicyCacheDecodeTest, DecodePolicy);
+
+  // Decodes a CloudPolicyResponse into two (ConfigurationPolicyType -> Value*)
+  // maps and a timestamp. Also performs verification, returns NULL if any
+  // check fails.
+  static bool DecodePolicyResponse(
+      const em::CloudPolicyResponse& policy_response,
+      PolicyMap* mandatory,
+      PolicyMap* recommended,
+      base::Time* timestamp);
+
+  // Returns true if |certificate_chain| is trusted and a |signature| created
+  // from it matches |data|.
+  static bool VerifySignature(
+      const std::string& signature,
+      const std::string& data,
+      const RepeatedPtrField<std::string>& certificate_chain);
 
   // Decodes an int64 value. Checks whether the passed value fits the numeric
   // limits of the value representation. Returns a value (ownership is
@@ -67,23 +100,30 @@ class DeviceManagementPolicyCache {
 
   // Decodes a policy message and returns it in Value representation. Ownership
   // of the returned dictionary is transferred to the caller.
-  static DictionaryValue* DecodePolicy(
+  static DictionaryValue* DecodeDevicePolicy(
       const em::DevicePolicyResponse& response);
 
   // The file in which we store a cached version of the policy information.
   const FilePath backing_file_path_;
 
-  // Protects |policy_|.
+  // Protects both |mandatory_policy_| and |recommended_policy_| as well as
+  // |device_policy_|.
   base::Lock lock_;
 
   // Policy key-value information.
-  scoped_ptr<DictionaryValue> policy_;
+  PolicyMap mandatory_policy_;
+  PolicyMap recommended_policy_;
+  scoped_ptr<DictionaryValue> device_policy_;
 
   // Tracks whether the store received a SetPolicy() call, which overrides any
   // information loaded from the file.
   bool fresh_policy_;
 
-  bool is_device_unmanaged_;
+  bool is_unmanaged_;
+
+  // Tracks whether the cache currently stores |device_policy_| that should be
+  // given preference over |mandatory_policy_| and |recommended_policy_|.
+  bool has_device_policy_;
 
   // The time at which the policy was last refreshed.
   base::Time last_policy_refresh_time_;
@@ -91,4 +131,4 @@ class DeviceManagementPolicyCache {
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_POLICY_DEVICE_MANAGEMENT_POLICY_CACHE_H_
+#endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_CACHE_H_