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

Unified Diff: components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.cc

Issue 2645283007: Add the client for accessing Subresource Filter only list. (Closed)
Patch Set: fix HistoryNavTest Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.cc
diff --git a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.cc b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.cc
new file mode 100644
index 0000000000000000000000000000000000000000..97642f1e63953d6db59aa5f1e9f252e4f18dc0fe
--- /dev/null
+++ b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.cc
@@ -0,0 +1,145 @@
+// Copyright (c) 2017 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 "components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.h"
+
+#include "base/memory/ptr_util.h"
+#include "base/timer/timer.h"
+#include "components/safe_browsing_db/v4_local_database_manager.h"
+#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/web_contents.h"
+
+namespace {
+
+// Maximum time in milliseconds to wait for the safe browsing service to
+// verify a URL. After this amount of time the outstanding check will be
+// aborted, and the URL will be treated as if it doesn't belong to the
+// Subresource Filter only list.
+const int kCheckUrlTimeoutMs = 5000;
+
+} // namespace
+
+namespace subresource_filter {
+
+class SubresourceFilterSafeBrowsingActivationThrottle::ActivationClient
+ : public safe_browsing::SafeBrowsingDatabaseManager::Client {
+ public:
+ ActivationClient(
+ const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>&
+ database_manager,
+ base::WeakPtr<SubresourceFilterSafeBrowsingActivationThrottle> throttle,
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner)
+ : database_manager_(database_manager),
+ throttle_(throttle),
+ task_runner_(task_runner) {
+ thread_checker_.DetachFromThread();
+ }
+
+ ~ActivationClient() override {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ }
+
+ void CheckUrlOnIO(const GURL& url) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ if (database_manager_->CheckUrlForSubresourceFilter(url, this)) {
+ url_being_checked_ = url;
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&subresource_filter::
+ SubresourceFilterSafeBrowsingActivationThrottle::
+ OnCheckUrlResultOnUI,
+ throttle_, url, safe_browsing::SB_THREAT_TYPE_SAFE,
+ safe_browsing::ThreatPatternType::NONE));
+ timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMilliseconds(kCheckUrlTimeoutMs), this,
+ &SubresourceFilterSafeBrowsingActivationThrottle::
+ ActivationClient::OnCheckUrlTimeout);
+ }
+ }
+
+ void OnCheckBrowseUrlResult(
+ const GURL& url,
+ safe_browsing::SBThreatType threat_type,
+ const safe_browsing::ThreatMetadata& metadata) override {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ timer_.Stop(); // Cancel the timeout timer.
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&SubresourceFilterSafeBrowsingActivationThrottle::
+ OnCheckUrlResultOnUI,
+ throttle_, url, threat_type, metadata.threat_pattern_type));
+ }
+
+ // Callback for when the safe browsing check has taken longer than
+ // kCheckUrlTimeoutMs.
+ void OnCheckUrlTimeout() {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ database_manager_->CancelCheck(this);
+
+ OnCheckBrowseUrlResult(url_being_checked_,
+ safe_browsing::SB_THREAT_TYPE_SAFE,
+ safe_browsing::ThreatMetadata());
+ }
+
+ private:
+ scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager_;
+ // Timer to abort the safe browsing check if it takes too long.
+ base::OneShotTimer timer_;
+ GURL url_being_checked_;
+ base::ThreadChecker thread_checker_;
+
+ base::WeakPtr<SubresourceFilterSafeBrowsingActivationThrottle> throttle_;
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+
+ DISALLOW_COPY_AND_ASSIGN(ActivationClient);
+};
+
+SubresourceFilterSafeBrowsingActivationThrottle::
+ SubresourceFilterSafeBrowsingActivationThrottle(
+ content::NavigationHandle* handle,
+ const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>&
+ database_manager)
+ : NavigationThrottle(handle) {
+ task_runner_ = content::BrowserThread::GetTaskRunnerForThread(
+ content::BrowserThread::IO);
+ activation_client_ = base::MakeUnique<
+ SubresourceFilterSafeBrowsingActivationThrottle::ActivationClient>(
+ database_manager, AsWeakPtr(), base::ThreadTaskRunnerHandle::Get());
+}
+
+SubresourceFilterSafeBrowsingActivationThrottle::
+ ~SubresourceFilterSafeBrowsingActivationThrottle() {
+ task_runner_->DeleteSoon(FROM_HERE, activation_client_.release());
engedy 2017/03/02 12:00:43 nit: You get this for free with std::unique_ptr<T,
melandory 2017/03/06 15:00:00 Done.
+}
+
+content::NavigationThrottle::ThrottleCheckResult
+SubresourceFilterSafeBrowsingActivationThrottle::WillProcessResponse() {
+ task_runner_->PostTask(
+ FROM_HERE, base::Bind(&SubresourceFilterSafeBrowsingActivationThrottle::
+ ActivationClient::CheckUrlOnIO,
+ base::Unretained(activation_client_.get()),
+ navigation_handle()->GetURL()));
+ return content::NavigationThrottle::ThrottleCheckResult::DEFER;
+}
+
+void SubresourceFilterSafeBrowsingActivationThrottle::OnCheckUrlResultOnUI(
+ const GURL& url,
+ safe_browsing::SBThreatType threat_type,
+ safe_browsing::ThreatPatternType pattern_type) {
+ content::WebContents* web_contents = navigation_handle()->GetWebContents();
+ if (web_contents) {
+ using subresource_filter::ContentSubresourceFilterDriverFactory;
+ ContentSubresourceFilterDriverFactory* driver_factory =
+ ContentSubresourceFilterDriverFactory::FromWebContents(web_contents);
+ DCHECK(driver_factory);
+
+ driver_factory->OnMainResourceMatchedSafeBrowsingBlacklist(
+ url, std::vector<GURL>(), threat_type, pattern_type);
+ }
+ navigation_handle()->Resume();
+}
+
+} // namespace subresource_filter

Powered by Google App Engine
This is Rietveld 408576698