OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" | 5 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 cryptohome::AsyncMethodCaller* async_method_caller, | 66 cryptohome::AsyncMethodCaller* async_method_caller, |
67 std::unique_ptr<chromeos::attestation::AttestationFlow> attestation_flow) | 67 std::unique_ptr<chromeos::attestation::AttestationFlow> attestation_flow) |
68 : local_state_(local_state), | 68 : local_state_(local_state), |
69 enterprise_service_(enterprise_service), | 69 enterprise_service_(enterprise_service), |
70 background_task_runner_(background_task_runner), | 70 background_task_runner_(background_task_runner), |
71 install_attributes_(install_attributes), | 71 install_attributes_(install_attributes), |
72 state_keys_broker_(state_keys_broker), | 72 state_keys_broker_(state_keys_broker), |
73 device_store_(device_store), | 73 device_store_(device_store), |
74 manager_(manager), | 74 manager_(manager), |
75 attestation_flow_(std::move(attestation_flow)), | 75 attestation_flow_(std::move(attestation_flow)), |
76 signing_service_(async_method_caller) {} | 76 signing_service_(base::MakeUnique<TpmEnrollmentKeySigningService>( |
| 77 async_method_caller)) {} |
| 78 |
| 79 void DeviceCloudPolicyInitializer::SetSigningServiceForTesting( |
| 80 std::unique_ptr<policy::SigningService> signing_service) { |
| 81 signing_service_ = std::move(signing_service); |
| 82 } |
77 | 83 |
78 DeviceCloudPolicyInitializer::~DeviceCloudPolicyInitializer() { | 84 DeviceCloudPolicyInitializer::~DeviceCloudPolicyInitializer() { |
79 DCHECK(!is_initialized_); | 85 DCHECK(!is_initialized_); |
80 } | 86 } |
81 | 87 |
82 void DeviceCloudPolicyInitializer::Init() { | 88 void DeviceCloudPolicyInitializer::Init() { |
83 DCHECK(!is_initialized_); | 89 DCHECK(!is_initialized_); |
84 | 90 |
85 is_initialized_ = true; | 91 is_initialized_ = true; |
86 device_store_->AddObserver(this); | 92 device_store_->AddObserver(this); |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 if (!enrollment_callback.is_null()) | 256 if (!enrollment_callback.is_null()) |
251 enrollment_callback.Run(status); | 257 enrollment_callback.Run(status); |
252 } | 258 } |
253 | 259 |
254 std::unique_ptr<CloudPolicyClient> DeviceCloudPolicyInitializer::CreateClient( | 260 std::unique_ptr<CloudPolicyClient> DeviceCloudPolicyInitializer::CreateClient( |
255 DeviceManagementService* device_management_service) { | 261 DeviceManagementService* device_management_service) { |
256 return base::MakeUnique<CloudPolicyClient>( | 262 return base::MakeUnique<CloudPolicyClient>( |
257 DeviceCloudPolicyManagerChromeOS::GetMachineID(), | 263 DeviceCloudPolicyManagerChromeOS::GetMachineID(), |
258 DeviceCloudPolicyManagerChromeOS::GetMachineModel(), | 264 DeviceCloudPolicyManagerChromeOS::GetMachineModel(), |
259 kPolicyVerificationKeyHash, device_management_service, | 265 kPolicyVerificationKeyHash, device_management_service, |
260 g_browser_process->system_request_context(), &signing_service_); | 266 g_browser_process->system_request_context(), signing_service_.get()); |
261 } | 267 } |
262 | 268 |
263 void DeviceCloudPolicyInitializer::TryToCreateClient() { | 269 void DeviceCloudPolicyInitializer::TryToCreateClient() { |
264 if (!device_store_->is_initialized() || | 270 if (!device_store_->is_initialized() || |
265 !device_store_->has_policy() || | 271 !device_store_->has_policy() || |
266 state_keys_broker_->pending() || | 272 state_keys_broker_->pending() || |
267 enrollment_handler_) { | 273 enrollment_handler_) { |
268 return; | 274 return; |
269 } | 275 } |
270 StartConnection(CreateClient(enterprise_service_)); | 276 StartConnection(CreateClient(enterprise_service_)); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 if (success && (success = att_signed_data.ParseFromString(signed_data))) { | 317 if (success && (success = att_signed_data.ParseFromString(signed_data))) { |
312 em_signed_data.set_data(att_signed_data.data()); | 318 em_signed_data.set_data(att_signed_data.data()); |
313 em_signed_data.set_signature(att_signed_data.signature()); | 319 em_signed_data.set_signature(att_signed_data.signature()); |
314 em_signed_data.set_extra_data_bytes(att_signed_data.data().size() - | 320 em_signed_data.set_extra_data_bytes(att_signed_data.data().size() - |
315 data.size()); | 321 data.size()); |
316 } | 322 } |
317 callback.Run(success, em_signed_data); | 323 callback.Run(success, em_signed_data); |
318 } | 324 } |
319 | 325 |
320 } // namespace policy | 326 } // namespace policy |
OLD | NEW |