OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/settings/device_settings_service.h" | 5 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include <stdint.h> |
| 8 |
8 #include "base/bind.h" | 9 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" |
11 #include "base/time/time.h" | 13 #include "base/time/time.h" |
12 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" | 14 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" |
13 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" | 15 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" |
14 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
ory.h" | 16 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
ory.h" |
15 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
ory.h" | 17 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
ory.h" |
16 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 18 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
17 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" | 19 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" |
18 #include "chrome/test/base/testing_profile.h" | 20 #include "chrome/test/base/testing_profile.h" |
19 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 21 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
20 #include "policy/proto/device_management_backend.pb.h" | 22 #include "policy/proto/device_management_backend.pb.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 FlushDeviceSettings(); | 198 FlushDeviceSettings(); |
197 owner_key_util_->SetPublicKeyFromPrivateKey( | 199 owner_key_util_->SetPublicKeyFromPrivateKey( |
198 *device_policy_.GetNewSigningKey()); | 200 *device_policy_.GetNewSigningKey()); |
199 device_settings_service_.OwnerKeySet(true); | 201 device_settings_service_.OwnerKeySet(true); |
200 FlushDeviceSettings(); | 202 FlushDeviceSettings(); |
201 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, | 203 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, |
202 device_settings_service_.status()); | 204 device_settings_service_.status()); |
203 CheckPolicy(); | 205 CheckPolicy(); |
204 | 206 |
205 // Check the new key has been loaded. | 207 // Check the new key has been loaded. |
206 std::vector<uint8> key; | 208 std::vector<uint8_t> key; |
207 ASSERT_TRUE(device_policy_.GetNewSigningKey()->ExportPublicKey(&key)); | 209 ASSERT_TRUE(device_policy_.GetNewSigningKey()->ExportPublicKey(&key)); |
208 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); | 210 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); |
209 } | 211 } |
210 | 212 |
211 TEST_F(DeviceSettingsServiceTest, OwnershipStatus) { | 213 TEST_F(DeviceSettingsServiceTest, OwnershipStatus) { |
212 owner_key_util_->Clear(); | 214 owner_key_util_->Clear(); |
213 | 215 |
214 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 216 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
215 EXPECT_FALSE(device_settings_service_.GetPublicKey().get()); | 217 EXPECT_FALSE(device_settings_service_.GetPublicKey().get()); |
216 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, | 218 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, |
(...skipping 12 matching lines...) Expand all Loading... |
229 | 231 |
230 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); | 232 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); |
231 ReloadDeviceSettings(); | 233 ReloadDeviceSettings(); |
232 device_settings_service_.GetOwnershipStatusAsync( | 234 device_settings_service_.GetOwnershipStatusAsync( |
233 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, | 235 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, |
234 base::Unretained(this))); | 236 base::Unretained(this))); |
235 FlushDeviceSettings(); | 237 FlushDeviceSettings(); |
236 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 238 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
237 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); | 239 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); |
238 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); | 240 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); |
239 std::vector<uint8> key; | 241 std::vector<uint8_t> key; |
240 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); | 242 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); |
241 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); | 243 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); |
242 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 244 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
243 device_settings_service_.GetOwnershipStatus()); | 245 device_settings_service_.GetOwnershipStatus()); |
244 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); | 246 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); |
245 | 247 |
246 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); | 248 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); |
247 InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()), | 249 InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()), |
248 true); | 250 true); |
249 device_settings_service_.GetOwnershipStatusAsync( | 251 device_settings_service_.GetOwnershipStatusAsync( |
(...skipping 25 matching lines...) Expand all Loading... |
275 ASSERT_TRUE(service); | 277 ASSERT_TRUE(service); |
276 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, | 278 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, |
277 base::Unretained(this))); | 279 base::Unretained(this))); |
278 | 280 |
279 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); | 281 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); |
280 ReloadDeviceSettings(); | 282 ReloadDeviceSettings(); |
281 | 283 |
282 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 284 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
283 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); | 285 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); |
284 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); | 286 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); |
285 std::vector<uint8> key; | 287 std::vector<uint8_t> key; |
286 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); | 288 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); |
287 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); | 289 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); |
288 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 290 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
289 device_settings_service_.GetOwnershipStatus()); | 291 device_settings_service_.GetOwnershipStatus()); |
290 EXPECT_FALSE(is_owner_set_); | 292 EXPECT_FALSE(is_owner_set_); |
291 | 293 |
292 service->OnTPMTokenReady(true /* is ready */); | 294 service->OnTPMTokenReady(true /* is ready */); |
293 FlushDeviceSettings(); | 295 FlushDeviceSettings(); |
294 | 296 |
295 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 297 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
(...skipping 20 matching lines...) Expand all Loading... |
316 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); | 318 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); |
317 InitOwner(AccountId::FromUserEmail(user_id), false); | 319 InitOwner(AccountId::FromUserEmail(user_id), false); |
318 OwnerSettingsServiceChromeOS* service = | 320 OwnerSettingsServiceChromeOS* service = |
319 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get()); | 321 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get()); |
320 ASSERT_TRUE(service); | 322 ASSERT_TRUE(service); |
321 ReloadDeviceSettings(); | 323 ReloadDeviceSettings(); |
322 | 324 |
323 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 325 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
324 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); | 326 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); |
325 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); | 327 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); |
326 std::vector<uint8> key; | 328 std::vector<uint8_t> key; |
327 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); | 329 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); |
328 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); | 330 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); |
329 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 331 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
330 device_settings_service_.GetOwnershipStatus()); | 332 device_settings_service_.GetOwnershipStatus()); |
331 | 333 |
332 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); | 334 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); |
333 service->OnTPMTokenReady(true /* is ready */); | 335 service->OnTPMTokenReady(true /* is ready */); |
334 FlushDeviceSettings(); | 336 FlushDeviceSettings(); |
335 | 337 |
336 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); | 338 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); |
(...skipping 17 matching lines...) Expand all Loading... |
354 OwnerSettingsServiceChromeOS* service = | 356 OwnerSettingsServiceChromeOS* service = |
355 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get()); | 357 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get()); |
356 ASSERT_TRUE(service); | 358 ASSERT_TRUE(service); |
357 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, | 359 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, |
358 base::Unretained(this))); | 360 base::Unretained(this))); |
359 ReloadDeviceSettings(); | 361 ReloadDeviceSettings(); |
360 | 362 |
361 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 363 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
362 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); | 364 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); |
363 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); | 365 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); |
364 std::vector<uint8> key; | 366 std::vector<uint8_t> key; |
365 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); | 367 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); |
366 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); | 368 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); |
367 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 369 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
368 device_settings_service_.GetOwnershipStatus()); | 370 device_settings_service_.GetOwnershipStatus()); |
369 EXPECT_FALSE(is_owner_set_); | 371 EXPECT_FALSE(is_owner_set_); |
370 | 372 |
371 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); | 373 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); |
372 service->OnTPMTokenReady(true /* is ready */); | 374 service->OnTPMTokenReady(true /* is ready */); |
373 FlushDeviceSettings(); | 375 FlushDeviceSettings(); |
374 | 376 |
(...skipping 20 matching lines...) Expand all Loading... |
395 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); | 397 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); |
396 | 398 |
397 InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()), | 399 InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()), |
398 true); | 400 true); |
399 ReloadDeviceSettings(); | 401 ReloadDeviceSettings(); |
400 FlushDeviceSettings(); | 402 FlushDeviceSettings(); |
401 | 403 |
402 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); | 404 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); |
403 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); | 405 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); |
404 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); | 406 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); |
405 std::vector<uint8> key; | 407 std::vector<uint8_t> key; |
406 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); | 408 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); |
407 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); | 409 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); |
408 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 410 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
409 device_settings_service_.GetOwnershipStatus()); | 411 device_settings_service_.GetOwnershipStatus()); |
410 EXPECT_FALSE(is_owner_set_); | 412 EXPECT_FALSE(is_owner_set_); |
411 | 413 |
412 OwnerSettingsServiceChromeOS* service = | 414 OwnerSettingsServiceChromeOS* service = |
413 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get()); | 415 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get()); |
414 ASSERT_TRUE(service); | 416 ASSERT_TRUE(service); |
415 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, | 417 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); | 457 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); |
456 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); | 458 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); |
457 device_settings_service_.PropertyChangeComplete(true); | 459 device_settings_service_.PropertyChangeComplete(true); |
458 FlushDeviceSettings(); | 460 FlushDeviceSettings(); |
459 Mock::VerifyAndClearExpectations(&observer_); | 461 Mock::VerifyAndClearExpectations(&observer_); |
460 | 462 |
461 device_settings_service_.RemoveObserver(&observer_); | 463 device_settings_service_.RemoveObserver(&observer_); |
462 } | 464 } |
463 | 465 |
464 } // namespace chromeos | 466 } // namespace chromeos |
OLD | NEW |