Chromium Code Reviews| 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/supervised_user/supervised_user_service.h" | 5 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 16 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
| 17 #include "build/build_config.h" | 17 #include "build/build_config.h" |
| 18 #include "chrome/browser/chrome_notification_types.h" | 18 #include "chrome/browser/chrome_notification_types.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" | 20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" |
| 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 22 #include "chrome/browser/signin/signin_manager_factory.h" | 22 #include "chrome/browser/signin/signin_manager_factory.h" |
| 23 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h" | 23 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h" |
| 24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h" | 24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h" |
| 25 #include "chrome/browser/supervised_user/permission_request_creator.h" | 25 #include "chrome/browser/supervised_user/permission_request_creator.h" |
| 26 #include "chrome/browser/supervised_user/supervised_user_features.h" | |
| 26 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 27 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 27 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 28 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
| 28 #include "chrome/browser/ui/browser_list.h" | 29 #include "chrome/browser/ui/browser_list.h" |
| 29 #include "chrome/common/chrome_paths.h" | 30 #include "chrome/common/chrome_paths.h" |
| 30 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
| 31 #include "chrome/test/base/testing_profile.h" | 32 #include "chrome/test/base/testing_profile.h" |
| 32 #include "components/prefs/pref_service.h" | 33 #include "components/prefs/pref_service.h" |
| 33 #include "components/prefs/scoped_user_pref_update.h" | 34 #include "components/prefs/scoped_user_pref_update.h" |
| 34 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" | 35 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" |
| 35 #include "components/signin/core/browser/signin_manager.h" | 36 #include "components/signin/core/browser/signin_manager.h" |
| 36 #include "components/version_info/version_info.h" | 37 #include "components/version_info/version_info.h" |
| 37 #include "content/public/test/test_browser_thread_bundle.h" | 38 #include "content/public/test/test_browser_thread_bundle.h" |
| 38 #include "content/public/test/test_utils.h" | 39 #include "content/public/test/test_utils.h" |
| 39 #include "testing/gtest/include/gtest/gtest.h" | 40 #include "testing/gtest/include/gtest/gtest.h" |
| 40 | 41 |
| 41 #if defined(ENABLE_EXTENSIONS) | 42 #if defined(ENABLE_EXTENSIONS) |
| 42 #include "chrome/browser/extensions/extension_service.h" | 43 #include "chrome/browser/extensions/extension_service.h" |
| 43 #include "chrome/browser/extensions/extension_service_test_base.h" | 44 #include "chrome/browser/extensions/extension_service_test_base.h" |
| 44 #include "chrome/browser/extensions/unpacked_installer.h" | 45 #include "chrome/browser/extensions/unpacked_installer.h" |
| 45 #include "chrome/common/extensions/features/feature_channel.h" | 46 #include "chrome/common/extensions/features/feature_channel.h" |
| 46 #include "extensions/common/extension.h" | 47 #include "extensions/common/extension.h" |
| 47 #include "extensions/common/extension_builder.h" | 48 #include "extensions/common/extension_builder.h" |
| 48 #include "extensions/common/manifest_constants.h" | 49 #include "extensions/common/manifest_constants.h" |
| 49 #endif | 50 #endif |
| 50 | 51 |
| 51 using content::MessageLoopRunner; | 52 using content::MessageLoopRunner; |
| 53 using extensions::Extension; | |
|
Marc Treib
2016/05/24 09:54:58
This should probably go into the ENABLE_EXTENSIONS
mamir
2016/06/03 09:45:55
Done.
| |
| 52 | 54 |
| 53 namespace { | 55 namespace { |
| 54 | 56 |
| 55 #if !defined(OS_ANDROID) | 57 #if !defined(OS_ANDROID) |
| 56 void OnProfileDownloadedFail(const base::string16& full_name) { | 58 void OnProfileDownloadedFail(const base::string16& full_name) { |
| 57 ASSERT_TRUE(false) << "Profile download should not have succeeded."; | 59 ASSERT_TRUE(false) << "Profile download should not have succeeded."; |
| 58 } | 60 } |
| 59 #endif | 61 #endif |
| 60 | 62 |
| 61 // Base class for helper objects that wait for certain events to happen. | 63 // Base class for helper objects that wait for certain events to happen. |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 252 // PermissionRequestCreator: | 254 // PermissionRequestCreator: |
| 253 bool IsEnabled() const override { return enabled_; } | 255 bool IsEnabled() const override { return enabled_; } |
| 254 | 256 |
| 255 void CreateURLAccessRequest(const GURL& url_requested, | 257 void CreateURLAccessRequest(const GURL& url_requested, |
| 256 const SuccessCallback& callback) override { | 258 const SuccessCallback& callback) override { |
| 257 ASSERT_TRUE(enabled_); | 259 ASSERT_TRUE(enabled_); |
| 258 requested_urls_.push_back(url_requested); | 260 requested_urls_.push_back(url_requested); |
| 259 callbacks_.push_back(callback); | 261 callbacks_.push_back(callback); |
| 260 } | 262 } |
| 261 | 263 |
| 264 void CreateExtensionInstallRequest(const std::string& extension_id, | |
| 265 const SuccessCallback& callback) override { | |
| 266 FAIL(); | |
| 267 } | |
| 268 | |
| 262 void CreateExtensionUpdateRequest(const std::string& id, | 269 void CreateExtensionUpdateRequest(const std::string& id, |
| 263 const SuccessCallback& callback) override { | 270 const SuccessCallback& callback) override { |
| 264 FAIL(); | 271 FAIL(); |
| 265 } | 272 } |
| 266 | 273 |
| 267 bool enabled_; | 274 bool enabled_; |
| 268 std::vector<GURL> requested_urls_; | 275 std::vector<GURL> requested_urls_; |
| 269 std::vector<SuccessCallback> callbacks_; | 276 std::vector<SuccessCallback> callbacks_; |
| 270 | 277 |
| 271 DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator); | 278 DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator); |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 429 public: | 436 public: |
| 430 SupervisedUserServiceExtensionTestUnsupervised() | 437 SupervisedUserServiceExtensionTestUnsupervised() |
| 431 : SupervisedUserServiceExtensionTestBase(false) {} | 438 : SupervisedUserServiceExtensionTestBase(false) {} |
| 432 }; | 439 }; |
| 433 | 440 |
| 434 class SupervisedUserServiceExtensionTest | 441 class SupervisedUserServiceExtensionTest |
| 435 : public SupervisedUserServiceExtensionTestBase { | 442 : public SupervisedUserServiceExtensionTestBase { |
| 436 public: | 443 public: |
| 437 SupervisedUserServiceExtensionTest() | 444 SupervisedUserServiceExtensionTest() |
| 438 : SupervisedUserServiceExtensionTestBase(true) {} | 445 : SupervisedUserServiceExtensionTestBase(true) {} |
| 446 | |
| 447 protected: | |
| 448 void InitSupervisedUserInitiatedExtensionInstallFeature(bool enabled) { | |
| 449 base::FeatureList::ClearInstanceForTesting(); | |
| 450 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); | |
| 451 if (enabled) { | |
| 452 feature_list->InitializeFromCommandLine( | |
| 453 "SupervisedUserInitiatedExtensionInstall", std::string()); | |
| 454 } | |
| 455 base::FeatureList::SetInstance(std::move(feature_list)); | |
| 456 } | |
| 439 }; | 457 }; |
| 440 | 458 |
| 441 TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) { | 459 TEST_F(SupervisedUserServiceExtensionTest, |
| 460 ExtensionManagementPolicyProviderWithDisabledSUInitiatedInstalls) { | |
|
Marc Treib
2016/05/24 09:54:58
ExtensionManagementPolicyProviderWithoutSUInitiate
mamir
2016/06/03 09:45:55
Done.
| |
| 442 SupervisedUserService* supervised_user_service = | 461 SupervisedUserService* supervised_user_service = |
| 443 SupervisedUserServiceFactory::GetForProfile(profile_.get()); | 462 SupervisedUserServiceFactory::GetForProfile(profile_.get()); |
| 444 ASSERT_TRUE(profile_->IsSupervised()); | 463 ASSERT_TRUE(profile_->IsSupervised()); |
| 445 | 464 |
| 446 // Check that a supervised user can install and uninstall a theme. | 465 // Disable supervised user initiated installs. |
| 466 InitSupervisedUserInitiatedExtensionInstallFeature(false); | |
| 467 | |
| 468 // Check that a supervised user can install and uninstall a theme even if | |
| 469 // they are not allowed to install extensions. | |
| 447 { | 470 { |
| 448 scoped_refptr<extensions::Extension> theme = MakeThemeExtension(); | 471 scoped_refptr<extensions::Extension> theme = MakeThemeExtension(); |
| 449 | 472 |
| 450 base::string16 error_1; | 473 base::string16 error_1; |
| 451 EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1)); | 474 EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1)); |
| 452 EXPECT_TRUE(error_1.empty()); | 475 EXPECT_TRUE(error_1.empty()); |
| 453 | 476 |
| 454 base::string16 error_2; | 477 base::string16 error_2; |
| 455 EXPECT_FALSE( | 478 EXPECT_FALSE( |
| 456 supervised_user_service->MustRemainInstalled(theme.get(), &error_2)); | 479 supervised_user_service->MustRemainInstalled(theme.get(), &error_2)); |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 482 supervised_user_service->MustRemainInstalled(extension.get(), | 505 supervised_user_service->MustRemainInstalled(extension.get(), |
| 483 &error_2)); | 506 &error_2)); |
| 484 EXPECT_FALSE(error_2.empty()); | 507 EXPECT_FALSE(error_2.empty()); |
| 485 } | 508 } |
| 486 | 509 |
| 487 #ifndef NDEBUG | 510 #ifndef NDEBUG |
| 488 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty()); | 511 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty()); |
| 489 #endif | 512 #endif |
| 490 } | 513 } |
| 491 | 514 |
| 515 TEST_F(SupervisedUserServiceExtensionTest, | |
| 516 ExtensionManagementPolicyProviderWithEnabledSUInitiatedInstalls) { | |
|
Marc Treib
2016/05/24 09:54:58
ExtensionManagementPolicyProviderWithSUInitiatedIn
mamir
2016/06/03 09:45:55
Done.
| |
| 517 SupervisedUserService* supervised_user_service = | |
| 518 SupervisedUserServiceFactory::GetForProfile(profile_.get()); | |
| 519 ASSERT_TRUE(profile_->IsSupervised()); | |
| 520 | |
| 521 // Enable supervised user initiated installs. | |
| 522 InitSupervisedUserInitiatedExtensionInstallFeature(true); | |
| 523 // The supervised user should be able to load and uninstall the extensions | |
| 524 // they install. | |
| 525 { | |
| 526 scoped_refptr<extensions::Extension> extension = MakeExtension(false); | |
| 527 | |
| 528 base::string16 error; | |
| 529 EXPECT_TRUE(supervised_user_service->UserMayLoad(extension.get(), &error)); | |
| 530 EXPECT_TRUE(error.empty()); | |
| 531 | |
| 532 base::string16 error_2; | |
| 533 EXPECT_FALSE(supervised_user_service->MustRemainInstalled(extension.get(), | |
| 534 &error_2)); | |
| 535 EXPECT_TRUE(error_2.empty()); | |
| 536 | |
| 537 base::string16 error_3; | |
| 538 Extension::DisableReason reason = Extension::DISABLE_NONE; | |
| 539 EXPECT_TRUE(supervised_user_service->MustRemainDisabled(extension.get(), | |
| 540 &reason, | |
|
Marc Treib
2016/05/24 09:54:58
misaligned, also below
mamir
2016/06/03 09:45:55
Done.
| |
| 541 &error_3)); | |
| 542 EXPECT_EQ(Extension::DISABLE_CUSTODIAN_APPROVAL_REQUIRED, reason); | |
| 543 EXPECT_FALSE(error_3.empty()); | |
| 544 | |
| 545 base::string16 error_4; | |
| 546 EXPECT_TRUE(supervised_user_service->UserMayModifySettings(extension.get(), | |
| 547 &error_4)); | |
| 548 EXPECT_TRUE(error_4.empty()); | |
| 549 } | |
| 550 | |
| 551 { | |
| 552 // A custodian-installed extension may be loaded, but not uninstalled. | |
| 553 scoped_refptr<extensions::Extension> extension = MakeExtension(true); | |
| 554 | |
| 555 base::string16 error_1; | |
| 556 EXPECT_TRUE( | |
| 557 supervised_user_service->UserMayLoad(extension.get(), &error_1)); | |
| 558 EXPECT_TRUE(error_1.empty()); | |
| 559 | |
| 560 base::string16 error_2; | |
| 561 EXPECT_TRUE(supervised_user_service->MustRemainInstalled(extension.get(), | |
| 562 &error_2)); | |
| 563 EXPECT_FALSE(error_2.empty()); | |
| 564 | |
| 565 base::string16 error_3; | |
| 566 Extension::DisableReason reason = Extension::DISABLE_NONE; | |
| 567 EXPECT_FALSE(supervised_user_service->MustRemainDisabled(extension.get(), | |
| 568 &reason, | |
| 569 &error_3)); | |
| 570 EXPECT_EQ(Extension::DISABLE_NONE, reason); | |
| 571 EXPECT_TRUE(error_3.empty()); | |
| 572 | |
| 573 base::string16 error_4; | |
| 574 EXPECT_FALSE(supervised_user_service->UserMayModifySettings(extension.get(), | |
| 575 &error_4)); | |
| 576 EXPECT_FALSE(error_4.empty()); | |
| 577 } | |
| 578 | |
| 579 #ifndef NDEBUG | |
| 580 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty()); | |
| 581 #endif | |
| 582 } | |
| 583 | |
| 492 TEST_F(SupervisedUserServiceExtensionTest, NoContentPacks) { | 584 TEST_F(SupervisedUserServiceExtensionTest, NoContentPacks) { |
| 493 SupervisedUserService* supervised_user_service = | 585 SupervisedUserService* supervised_user_service = |
| 494 SupervisedUserServiceFactory::GetForProfile(profile_.get()); | 586 SupervisedUserServiceFactory::GetForProfile(profile_.get()); |
| 495 SupervisedUserURLFilter* url_filter = | 587 SupervisedUserURLFilter* url_filter = |
| 496 supervised_user_service->GetURLFilterForUIThread(); | 588 supervised_user_service->GetURLFilterForUIThread(); |
| 497 | 589 |
| 498 // ASSERT_EQ instead of ASSERT_TRUE([...].empty()) so that the error | 590 // ASSERT_EQ instead of ASSERT_TRUE([...].empty()) so that the error |
| 499 // message contains the size in case of failure. | 591 // message contains the size in case of failure. |
| 500 ASSERT_EQ(0u, site_list_observer_.site_lists().size()); | 592 ASSERT_EQ(0u, site_list_observer_.site_lists().size()); |
| 501 | 593 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 582 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); | 674 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); |
| 583 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); | 675 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); |
| 584 | 676 |
| 585 url_filter_observer_.Wait(); | 677 url_filter_observer_.Wait(); |
| 586 EXPECT_EQ(SupervisedUserURLFilter::WARN, | 678 EXPECT_EQ(SupervisedUserURLFilter::WARN, |
| 587 url_filter->GetFilteringBehaviorForURL(youtube_url)); | 679 url_filter->GetFilteringBehaviorForURL(youtube_url)); |
| 588 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, | 680 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, |
| 589 url_filter->GetFilteringBehaviorForURL(moose_url)); | 681 url_filter->GetFilteringBehaviorForURL(moose_url)); |
| 590 } | 682 } |
| 591 #endif // defined(ENABLE_EXTENSIONS) | 683 #endif // defined(ENABLE_EXTENSIONS) |
| OLD | NEW |