Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: chrome/browser/extensions/content_verifier_browsertest.cc

Issue 2790823004: Retry reinstallation of corrupted policy extensions. (Closed)
Patch Set: address comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <list> 5 #include <list>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/scoped_observer.h" 14 #include "base/scoped_observer.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
17 #include "chrome/browser/extensions/browsertest_util.h" 17 #include "chrome/browser/extensions/browsertest_util.h"
18 #include "chrome/browser/extensions/chrome_content_verifier_delegate.h" 18 #include "chrome/browser/extensions/chrome_content_verifier_delegate.h"
19 #include "chrome/browser/extensions/extension_browsertest.h" 19 #include "chrome/browser/extensions/extension_browsertest.h"
20 #include "chrome/browser/extensions/extension_management_test_util.h" 20 #include "chrome/browser/extensions/extension_management_test_util.h"
21 #include "chrome/browser/extensions/extension_service.h" 21 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/browser/extensions/policy_extension_reinstaller.h"
22 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
23 #include "components/policy/core/browser/browser_policy_connector.h" 24 #include "components/policy/core/browser/browser_policy_connector.h"
24 #include "components/policy/core/common/mock_configuration_policy_provider.h" 25 #include "components/policy/core/common/mock_configuration_policy_provider.h"
25 #include "content/public/common/browser_side_navigation_policy.h" 26 #include "content/public/common/browser_side_navigation_policy.h"
26 #include "content/public/test/test_utils.h" 27 #include "content/public/test/test_utils.h"
27 #include "extensions/browser/content_verifier.h" 28 #include "extensions/browser/content_verifier.h"
28 #include "extensions/browser/content_verify_job.h" 29 #include "extensions/browser/content_verify_job.h"
29 #include "extensions/browser/crx_file_info.h" 30 #include "extensions/browser/crx_file_info.h"
30 #include "extensions/browser/extension_prefs.h" 31 #include "extensions/browser/extension_prefs.h"
31 #include "extensions/browser/extension_registry.h" 32 #include "extensions/browser/extension_registry.h"
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 EXPECT_TRUE(registry->enabled_extensions().Contains(id_)); 769 EXPECT_TRUE(registry->enabled_extensions().Contains(id_));
769 } 770 }
770 771
771 namespace { 772 namespace {
772 773
773 // A helper for intercepting the normal action that 774 // A helper for intercepting the normal action that
774 // ChromeContentVerifierDelegate would take on discovering corruption, letting 775 // ChromeContentVerifierDelegate would take on discovering corruption, letting
775 // us track the delay for each consecutive reinstall. 776 // us track the delay for each consecutive reinstall.
776 class DelayTracker { 777 class DelayTracker {
777 public: 778 public:
778 DelayTracker() {} 779 DelayTracker()
780 : action_(base::Bind(&DelayTracker::ReinstallAction,
781 base::Unretained(this))) {
782 PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(&action_);
783 }
784
785 ~DelayTracker() {
786 PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(nullptr);
787 }
779 788
780 const std::vector<base::TimeDelta>& calls() { return calls_; } 789 const std::vector<base::TimeDelta>& calls() { return calls_; }
781 790
782 void ReinstallAction(base::TimeDelta delay) { calls_.push_back(delay); } 791 void ReinstallAction(const base::Closure& callback, base::TimeDelta delay) {
792 saved_callback_ = callback;
793 calls_.push_back(delay);
794 }
795
796 void Proceed() {
797 ASSERT_TRUE(saved_callback_);
798 ASSERT_TRUE(!saved_callback_->is_null());
799 // Run() will set |saved_callback_| again, so use a temporary: |callback|.
800 base::Closure callback = saved_callback_.value();
801 saved_callback_.reset();
802 callback.Run();
803 }
783 804
784 private: 805 private:
785 std::vector<base::TimeDelta> calls_; 806 std::vector<base::TimeDelta> calls_;
807 base::Optional<base::Closure> saved_callback_;
808 PolicyExtensionReinstaller::ReinstallCallback action_;
786 809
787 DISALLOW_COPY_AND_ASSIGN(DelayTracker); 810 DISALLOW_COPY_AND_ASSIGN(DelayTracker);
788 }; 811 };
789 812
790 } // namespace 813 } // namespace
791 814
792 IN_PROC_BROWSER_TEST_F(ContentVerifierPolicyTest, Backoff) { 815 IN_PROC_BROWSER_TEST_F(ContentVerifierPolicyTest, Backoff) {
793 ExtensionRegistry* registry = ExtensionRegistry::Get(profile()); 816 ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
794 ExtensionSystem* system = ExtensionSystem::Get(profile()); 817 ExtensionSystem* system = ExtensionSystem::Get(profile());
795 ExtensionService* service = system->extension_service();
796 ContentVerifier* verifier = system->content_verifier(); 818 ContentVerifier* verifier = system->content_verifier();
797 819
798 // Wait for the extension to be installed by the policy we set up in 820 // Wait for the extension to be installed by the policy we set up in
799 // SetUpInProcessBrowserTestFixture. 821 // SetUpInProcessBrowserTestFixture.
800 if (!registry->GetInstalledExtension(id_)) { 822 if (!registry->GetInstalledExtension(id_)) {
801 RegistryObserver registry_observer(registry); 823 RegistryObserver registry_observer(registry);
802 EXPECT_TRUE(registry_observer.WaitForInstall(id_)); 824 EXPECT_TRUE(registry_observer.WaitForInstall(id_));
803 } 825 }
804 826
805 // Setup to intercept reinstall action, so we can see what the delay would 827 // Setup to intercept reinstall action, so we can see what the delay would
806 // have been for the real action. 828 // have been for the real action.
807 DelayTracker delay_tracker; 829 DelayTracker delay_tracker;
808 base::Callback<void(base::TimeDelta)> action = base::Bind(
809 &DelayTracker::ReinstallAction, base::Unretained(&delay_tracker));
810 ChromeContentVerifierDelegate::set_policy_reinstall_action_for_test(&action);
811 830
812 // Do 4 iterations of disabling followed by reinstall. 831 // Do 4 iterations of disabling followed by reinstall.
813 const size_t iterations = 4; 832 const size_t iterations = 4;
814 for (size_t i = 0; i < iterations; i++) { 833 for (size_t i = 0; i < iterations; i++) {
815 RegistryObserver registry_observer(registry); 834 RegistryObserver registry_observer(registry);
816 verifier->VerifyFailed(id_, ContentVerifyJob::HASH_MISMATCH); 835 verifier->VerifyFailed(id_, ContentVerifyJob::HASH_MISMATCH);
817 EXPECT_TRUE(registry_observer.WaitForUnload(id_)); 836 EXPECT_TRUE(registry_observer.WaitForUnload(id_));
818 // Trigger reinstall manually (since we overrode default reinstall action). 837 // Resolve the request to |delay_tracker|, so the reinstallation can
819 service->CheckForExternalUpdates(); 838 // proceed.
839 delay_tracker.Proceed();
820 EXPECT_TRUE(registry_observer.WaitForInstall(id_)); 840 EXPECT_TRUE(registry_observer.WaitForInstall(id_));
821 } 841 }
822 const std::vector<base::TimeDelta>& calls = delay_tracker.calls(); 842 const std::vector<base::TimeDelta>& calls = delay_tracker.calls();
823 843
844 // After |delay_tracker| resolves the 4 (|iterations|) reinstallation
845 // requests, it will get an additional request (right away) for retrying
846 // reinstallation.
847 // Note: the additional request in non-test environment will arrive with
848 // a (backoff) delay. But during test, |delay_tracker| issues the request
849 // immediately.
850 ASSERT_EQ(iterations, calls.size() - 1);
824 // Assert that the first reinstall action happened with a delay of 0, and 851 // Assert that the first reinstall action happened with a delay of 0, and
825 // then kept growing each additional time. 852 // then kept growing each additional time.
826 ASSERT_EQ(iterations, calls.size());
827 EXPECT_EQ(base::TimeDelta(), delay_tracker.calls()[0]); 853 EXPECT_EQ(base::TimeDelta(), delay_tracker.calls()[0]);
828 for (size_t i = 1; i < delay_tracker.calls().size(); i++) { 854 for (size_t i = 1; i < delay_tracker.calls().size(); i++) {
829 EXPECT_LT(calls[i - 1], calls[i]); 855 EXPECT_LT(calls[i - 1], calls[i]);
830 } 856 }
831 } 857 }
832 858
859 // Tests that if CheckForExternalUpdates() fails, then we retry reinstalling
860 // corrupted policy extensions. For example: if network is unavailable,
861 // CheckForExternalUpdates() will fail.
862 IN_PROC_BROWSER_TEST_F(ContentVerifierPolicyTest, FailedUpdateRetries) {
863 ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
864 ExtensionSystem* system = ExtensionSystem::Get(profile());
865 ExtensionService* service = system->extension_service();
866 ContentVerifier* verifier = system->content_verifier();
867
868 // Wait for the extension to be installed by the policy we set up in
869 // SetUpInProcessBrowserTestFixture.
870 if (!registry->GetInstalledExtension(id_)) {
871 RegistryObserver registry_observer(registry);
872 EXPECT_TRUE(registry_observer.WaitForInstall(id_));
873 }
874
875 DelayTracker delay_tracker;
876 service->set_external_updates_disabled_for_test(true);
877 RegistryObserver registry_observer(registry);
878 verifier->VerifyFailed(id_, ContentVerifyJob::HASH_MISMATCH);
879 EXPECT_TRUE(registry_observer.WaitForUnload(id_));
880
881 const std::vector<base::TimeDelta>& calls = delay_tracker.calls();
882 ASSERT_EQ(1u, calls.size());
883 EXPECT_EQ(base::TimeDelta(), delay_tracker.calls()[0]);
884
885 delay_tracker.Proceed();
886
887 // Remove the override and set ExtensionService to update again. The extension
888 // should be now installed.
889 PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(nullptr);
890 service->set_external_updates_disabled_for_test(false);
891 delay_tracker.Proceed();
892
893 EXPECT_TRUE(registry_observer.WaitForInstall(id_));
894 }
895
833 } // namespace extensions 896 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_content_verifier_delegate.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698