Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/device_policy_cache.cc

 // 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.
 
 #include "chrome/browser/policy/device_policy_cache.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/task.h"

[Joao da Silva, 2011/07/06 16:45:14]

Nit: task.h not used

[gfeher, 2011/07/07 13:51:00]

Done.

 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/update_library.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"

[Joao da Silva, 2011/07/06 16:45:14]

Nit: configuration_policy_pref_store.h not used

[gfeher, 2011/07/07 13:51:00]

Done.

-#include "chrome/browser/policy/device_policy_identity_strategy.h"
+#include "chrome/browser/policy/cloud_policy_data.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/proto/device_management_constants.h"
 #include "chrome/browser/policy/proto/device_management_local.pb.h"
 #include "content/browser/browser_thread.h"

[Joao da Silva, 2011/07/06 16:45:14]

Nit: browser_thread.h not used

[gfeher, 2011/07/07 13:51:00]

Done.

 #include "policy/configuration_policy_type.h"
 
 namespace {
 
 // Stores policy, updates the owner key if required and reports the status
 // through a callback.
 class StorePolicyOperation : public chromeos::SignedSettingsHelper::Callback,
                              public chromeos::OwnerManager::KeyUpdateDelegate {
  public:
   typedef Callback1<chromeos::SignedSettings::ReturnCode>::Type Callback;
@@ skipping 69 matching lines @@
   }
 
   return Value::CreateIntegerValue(static_cast<int>(value));
 }
 
 }  // namespace
 
 namespace policy {
 
 DevicePolicyCache::DevicePolicyCache(
-    DevicePolicyIdentityStrategy* identity_strategy,
+    CloudPolicyData* data,
     EnterpriseInstallAttributes* install_attributes)
-    : identity_strategy_(identity_strategy),
+    : data_(data),
       install_attributes_(install_attributes),
       signed_settings_helper_(chromeos::SignedSettingsHelper::Get()),
       starting_up_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
 }
 
 DevicePolicyCache::DevicePolicyCache(
-    DevicePolicyIdentityStrategy* identity_strategy,
+    CloudPolicyData* data,
     EnterpriseInstallAttributes* install_attributes,
     chromeos::SignedSettingsHelper* signed_settings_helper)
-    : identity_strategy_(identity_strategy),
+    : data_(data),
       install_attributes_(install_attributes),
       signed_settings_helper_(signed_settings_helper),
       starting_up_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
 }
 
 DevicePolicyCache::~DevicePolicyCache() {
   signed_settings_helper_->CancelCallback(this);
 }
 
@@ skipping 47 matching lines @@
 bool DevicePolicyCache::IsReady() {
   return initialization_complete() || !starting_up_;
 }
 
 void DevicePolicyCache::OnRetrievePolicyCompleted(
     chromeos::SignedSettings::ReturnCode code,
     const em::PolicyFetchResponse& policy) {
   DCHECK(CalledOnValidThread());
   if (starting_up_) {
     starting_up_ = false;
+    // All the code pathes should issue a data_->SetDeviceToken(..., true)

[Joao da Silva, 2011/07/06 16:45:14]

Nit: pathes -> paths

[gfeher, 2011/07/07 13:51:00]

Done.

+    // to signal that the cache has finished loading, so other components
+    // are free to modify token data.
     if (code == chromeos::SignedSettings::NOT_FOUND ||
         code == chromeos::SignedSettings::KEY_UNAVAILABLE ||
         !policy.has_policy_data()) {
       InformNotifier(CloudPolicySubsystem::UNENROLLED,
                      CloudPolicySubsystem::NO_DETAILS);
+      data_->SetDeviceToken("", true);
       return;
     }
     em::PolicyData policy_data;
     if (!policy_data.ParseFromString(policy.policy_data())) {
       LOG(WARNING) << "Failed to parse PolicyData protobuf.";
       InformNotifier(CloudPolicySubsystem::LOCAL_ERROR,
                      CloudPolicySubsystem::POLICY_LOCAL_ERROR);
+      data_->SetDeviceToken("", true);
       return;
     }
     if (!policy_data.has_request_token() ||
         policy_data.request_token().empty()) {
       SetUnmanagedInternal(base::Time::NowFromSystemTime());
       InformNotifier(CloudPolicySubsystem::UNMANAGED,
                      CloudPolicySubsystem::NO_DETAILS);
       // TODO(jkummerow): Reminder: When we want to feed device-wide settings

[pastarmovj, 2011/07/06 12:11:57]

Is this todo still relevant?

[gfeher, 2011/07/06 15:14:20]

TODO(gfeher): investigate more and discuss with Mattias

       // made by a local owner into this cache, we need to call
       // SetPolicyInternal() here.
+      data_->SetDeviceToken("", true);
       return;
     }
     if (!policy_data.has_username() || !policy_data.has_device_id()) {
       InformNotifier(CloudPolicySubsystem::LOCAL_ERROR,
                      CloudPolicySubsystem::POLICY_LOCAL_ERROR);
+      data_->SetDeviceToken("", true);
       return;
     }
-    identity_strategy_->SetDeviceManagementCredentials(
-        policy_data.username(),
-        policy_data.device_id(),
-        policy_data.request_token());
+    data_->set_user_name(policy_data.username());
+    data_->set_device_id(policy_data.device_id());
+    data_->SetDeviceToken(policy_data.request_token(), true);
     SetPolicyInternal(policy, NULL, false);
   } else {  // In other words, starting_up_ == false.
     if (code != chromeos::SignedSettings::SUCCESS) {
       if (code == chromeos::SignedSettings::BAD_SIGNATURE) {
         InformNotifier(CloudPolicySubsystem::LOCAL_ERROR,
                        CloudPolicySubsystem::SIGNATURE_MISMATCH);
       } else {
         InformNotifier(CloudPolicySubsystem::LOCAL_ERROR,
                        CloudPolicySubsystem::POLICY_LOCAL_ERROR);
       }
@@ skipping 72 matching lines @@
     std::string channel = policy.release_channel().release_channel();
     mandatory->Set(
         kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel));
     // TODO: We should probably set the release track somewhere else, but this
     // policy is a work-in-progress (http://crosbug.com/15382).
     chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
   }
 }
 
 }  // namespace policy