OLD | NEW |
---|---|
(Empty) | |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | |
2 // Use of this source code is governed by a BSD-style license that can be | |
3 // found in the LICENSE file. | |
4 | |
5 #include "components/subresource_filter/content/browser/subresource_filter_safe_ browsing_client.h" | |
6 | |
7 #include <utility> | |
8 | |
9 #include "base/bind.h" | |
10 #include "base/memory/ptr_util.h" | |
11 #include "base/metrics/histogram_macros.h" | |
12 #include "base/single_thread_task_runner.h" | |
13 #include "components/safe_browsing_db/util.h" | |
14 #include "components/subresource_filter/content/browser/subresource_filter_safe_ browsing_activation_throttle.h" | |
15 #include "content/public/browser/browser_thread.h" | |
16 | |
17 namespace subresource_filter { | |
18 | |
19 constexpr base::TimeDelta | |
20 SubresourceFilterSafeBrowsingClientRequest::kCheckURLTimeout; | |
21 | |
22 SubresourceFilterSafeBrowsingClient::SubresourceFilterSafeBrowsingClient( | |
23 scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager, | |
24 const base::WeakPtr<SubresourceFilterSafeBrowsingActivationThrottle>& | |
25 throttle, | |
26 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | |
27 scoped_refptr<base::SingleThreadTaskRunner> ui_io_task_runner) | |
engedy
2017/04/25 22:03:54
nit: s//ui_task_runner|throttle_task_runner/
Charlie Harrison
2017/04/26 14:30:25
Done.
| |
28 : database_manager_(std::move(database_manager)), | |
29 throttle_(throttle), | |
30 io_task_runner_(std::move(io_task_runner)), | |
31 ui_task_runner_(std::move(ui_io_task_runner)) {} | |
32 | |
33 SubresourceFilterSafeBrowsingClient::~SubresourceFilterSafeBrowsingClient() {} | |
34 | |
35 void SubresourceFilterSafeBrowsingClient::CheckUrlOnIO(const GURL& url, | |
36 size_t request_id) { | |
37 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | |
38 DCHECK(!url.is_empty()); | |
39 | |
40 auto request = base::MakeUnique<SubresourceFilterSafeBrowsingClientRequest>( | |
41 url, request_id, database_manager_, io_task_runner_, this); | |
42 auto* raw_request = request.get(); | |
43 DCHECK(requests_.find(raw_request) == requests_.end()); | |
44 requests_[raw_request] = std::move(request); | |
45 raw_request->Start(); | |
engedy
2017/04/25 22:03:54
nit: Add comment that |raw_request| might be destr
Charlie Harrison
2017/04/26 14:30:25
Done.
| |
46 } | |
47 | |
48 void SubresourceFilterSafeBrowsingClient::OnCheckBrowseUrlResult( | |
49 SubresourceFilterSafeBrowsingClientRequest* request, | |
50 safe_browsing::SBThreatType threat_type, | |
51 const safe_browsing::ThreatMetadata& metadata) { | |
52 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | |
53 ui_task_runner_->PostTask( | |
54 FROM_HERE, base::Bind(&SubresourceFilterSafeBrowsingActivationThrottle:: | |
55 OnCheckUrlResultOnUI, | |
56 throttle_, request->url(), request->request_id(), | |
57 threat_type, metadata.threat_pattern_type)); | |
58 | |
59 DCHECK(requests_.find(request) != requests_.end()); | |
60 requests_.erase(request); | |
61 } | |
62 | |
63 SubresourceFilterSafeBrowsingClientRequest:: | |
64 SubresourceFilterSafeBrowsingClientRequest( | |
65 const GURL& url, | |
66 size_t request_id, | |
67 scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> | |
68 database_manager, | |
69 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | |
70 SubresourceFilterSafeBrowsingClient* client) | |
71 : url_(url), | |
72 request_id_(request_id), | |
73 database_manager_(std::move(database_manager)), | |
74 client_(client) { | |
75 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | |
76 timer_.SetTaskRunner(std::move(io_task_runner)); | |
77 } | |
78 | |
79 SubresourceFilterSafeBrowsingClientRequest:: | |
80 ~SubresourceFilterSafeBrowsingClientRequest() { | |
81 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | |
82 database_manager_->CancelCheck(this); | |
engedy
2017/04/25 22:03:54
Could you please double-check that spurious calls
Charlie Harrison
2017/04/26 14:30:25
For the former: I don't think spurious calls are
engedy
2017/04/26 14:56:39
To clarify the latter: I was wondering if the foll
Charlie Harrison
2017/04/26 15:29:16
Yes that was my understanding of your question. As
| |
83 timer_.Stop(); | |
84 } | |
85 | |
86 void SubresourceFilterSafeBrowsingClientRequest::Start() { | |
87 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | |
88 start_time_ = base::TimeTicks::Now(); | |
89 if (database_manager_->CheckUrlForSubresourceFilter(url_, this)) { | |
90 OnCheckBrowseUrlResult(url_, safe_browsing::SB_THREAT_TYPE_SAFE, | |
91 safe_browsing::ThreatMetadata()); | |
92 return; | |
93 } | |
94 timer_.Start( | |
95 FROM_HERE, kCheckURLTimeout, | |
engedy
2017/04/25 22:03:54
nit: #include "base/location.h"
Charlie Harrison
2017/04/26 14:30:25
Done.
| |
96 base::Bind(&SubresourceFilterSafeBrowsingClientRequest::OnCheckUrlTimeout, | |
97 base::Unretained(this))); | |
engedy
2017/04/25 22:03:54
nit: #include "base/bind_helpers.h"
Charlie Harrison
2017/04/26 14:30:25
Done.
| |
98 } | |
99 | |
100 void SubresourceFilterSafeBrowsingClientRequest::OnCheckBrowseUrlResult( | |
101 const GURL& url, | |
102 safe_browsing::SBThreatType threat_type, | |
103 const safe_browsing::ThreatMetadata& metadata) { | |
engedy
2017/04/25 22:03:54
nit: DCHECK_CURRENTLY_ON(content::BrowserThread::I
Charlie Harrison
2017/04/26 14:30:25
Done.
| |
104 DCHECK_EQ(url_, url); | |
105 UMA_HISTOGRAM_TIMES("SubresourceFilter.SafeBrowsing.CheckTime", | |
106 base::TimeTicks::Now() - start_time_); | |
107 client_->OnCheckBrowseUrlResult(this, threat_type, metadata); | |
108 } | |
109 | |
110 void SubresourceFilterSafeBrowsingClientRequest::OnCheckUrlTimeout() { | |
111 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | |
112 database_manager_->CancelCheck(this); | |
113 OnCheckBrowseUrlResult(url_, safe_browsing::SB_THREAT_TYPE_SAFE, | |
114 safe_browsing::ThreatMetadata()); | |
115 } | |
116 | |
117 } // namespace subresource_filter | |
OLD | NEW |