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/net/chrome_network_delegate.h" | 5 #include "chrome/browser/net/chrome_network_delegate.h" |
6 | 6 |
7 #include <vector> | |
8 | |
7 #include "base/logging.h" | 9 #include "base/logging.h" |
8 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
9 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/string_util.h" | |
10 #include "chrome/browser/api/prefs/pref_member.h" | 13 #include "chrome/browser/api/prefs/pref_member.h" |
11 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/content_settings/cookie_settings.h" | 15 #include "chrome/browser/content_settings/cookie_settings.h" |
13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 16 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 17 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
15 #include "chrome/browser/extensions/api/proxy/proxy_api.h" | 18 #include "chrome/browser/extensions/api/proxy/proxy_api.h" |
16 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 19 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
17 #include "chrome/browser/extensions/event_router_forwarder.h" | 20 #include "chrome/browser/extensions/event_router_forwarder.h" |
18 #include "chrome/browser/extensions/extension_info_map.h" | 21 #include "chrome/browser/extensions/extension_info_map.h" |
19 #include "chrome/browser/extensions/extension_process_manager.h" | 22 #include "chrome/browser/extensions/extension_process_manager.h" |
23 #include "chrome/browser/google/google_util.h" | |
20 #include "chrome/browser/net/load_time_stats.h" | 24 #include "chrome/browser/net/load_time_stats.h" |
21 #include "chrome/browser/performance_monitor/performance_monitor.h" | 25 #include "chrome/browser/performance_monitor/performance_monitor.h" |
22 #include "chrome/browser/prefs/pref_service.h" | 26 #include "chrome/browser/prefs/pref_service.h" |
23 #include "chrome/browser/profiles/profile_manager.h" | 27 #include "chrome/browser/profiles/profile_manager.h" |
24 #include "chrome/browser/task_manager/task_manager.h" | 28 #include "chrome/browser/task_manager/task_manager.h" |
25 #include "chrome/common/pref_names.h" | 29 #include "chrome/common/pref_names.h" |
26 #include "chrome/common/url_constants.h" | 30 #include "chrome/common/url_constants.h" |
27 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
28 #include "content/public/browser/render_view_host.h" | 32 #include "content/public/browser/render_view_host.h" |
29 #include "content/public/browser/resource_request_info.h" | 33 #include "content/public/browser/resource_request_info.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
80 switch (request->status().error()) { | 84 switch (request->status().error()) { |
81 case net::ERR_PROXY_AUTH_UNSUPPORTED: | 85 case net::ERR_PROXY_AUTH_UNSUPPORTED: |
82 case net::ERR_PROXY_CONNECTION_FAILED: | 86 case net::ERR_PROXY_CONNECTION_FAILED: |
83 case net::ERR_TUNNEL_CONNECTION_FAILED: | 87 case net::ERR_TUNNEL_CONNECTION_FAILED: |
84 extensions::ProxyEventRouter::GetInstance()->OnProxyError( | 88 extensions::ProxyEventRouter::GetInstance()->OnProxyError( |
85 event_router, profile, request->status().error()); | 89 event_router, profile, request->status().error()); |
86 } | 90 } |
87 } | 91 } |
88 } | 92 } |
89 | 93 |
94 // Gets called when the extensions finish work on the URL. If the extensions | |
95 // did not do a redirect (so |new_url| is empty) then we enforce the | |
96 // SafeSearch parameters. Otherwise we will get called again after the | |
97 // redirect and we enforce SafeSearch then. | |
98 void ForceGoogleSafeSearchCallbackWrapper( | |
99 const net::CompletionCallback& callback, | |
100 net::URLRequest* request, | |
101 GURL* new_url, | |
102 int rv) { | |
103 if (rv == net::OK && new_url->is_empty()) | |
104 ChromeNetworkDelegate::ForceGoogleSafeSearch(request, new_url); | |
105 callback.Run(rv); | |
106 } | |
107 | |
108 enum SafeSearchCheckState { | |
109 KEEP_SEARCHING = 0, | |
110 ADD_PARAMETER, | |
111 PARAMETER_PRESENT, | |
112 }; | |
113 | |
114 // Checks a parameter to see if it is present in the query. |parameter| is the | |
115 // current parameter which is being checked; |parameter_to_find| is the | |
116 // parameter we are looking for; |keep_element| returns whether we want to keep | |
117 // |parameter| in the list of parameters. The return value shows the action | |
118 // that needs to be taken. | |
119 SafeSearchCheckState CheckForParameter(const std::string& parameter, | |
120 const std::string& parameter_to_find, | |
121 bool* keep_element) { | |
122 DCHECK(parameter_to_find.find("=") != std::string::npos); | |
123 // prefix for "safe=off" is "safe=". | |
124 std::string parameter_prefix = parameter_to_find.substr( | |
125 0, parameter_to_find.find("=") + 1); | |
126 if (parameter.length() >= parameter_prefix.length()) { | |
127 if (parameter == parameter_to_find) | |
Bernhard Bauer
2012/10/22 09:50:18
You could do this check right at the beginning, no
Sergiu
2012/10/30 01:08:11
Done.
| |
128 return PARAMETER_PRESENT; | |
129 // Found the parameter but not the correct value, remove it. | |
130 if (parameter.substr(0, parameter_prefix.length()) == parameter_prefix) { | |
Bernhard Bauer
2012/10/22 09:50:18
You could write this as `base::StartsWith(paramete
Sergiu
2012/10/30 01:08:11
Done.
| |
131 *keep_element = false; | |
132 return ADD_PARAMETER; | |
133 } | |
134 } | |
135 return KEEP_SEARCHING; | |
136 } | |
137 | |
138 // Examines a query to see if it should be modified to contain the SafeSearch | |
139 // parameters. |query| is the string to examine and |new_query| is the output | |
140 // string which should be set such that SafeSearch is on. If the proper | |
141 // options are already set for SafeSearch then |new_query| will be equal | |
142 // to |query|. | |
143 void ExamineQueryForSafeSearch(const std::string& query, | |
144 std::string* new_query) { | |
Bernhard Bauer
2012/10/22 09:50:18
Do you need to return the value by outparam?
Sergiu
2012/10/30 01:08:11
Returned a string object now.
| |
145 std::vector<std::string> new_parameters; | |
146 SafeSearchCheckState safe_check = KEEP_SEARCHING; | |
147 SafeSearchCheckState ssui_check = KEEP_SEARCHING; | |
148 std::string safe_parameter = chrome::kSafeSearchSafeParameter; | |
149 std::string ssui_parameter = chrome::kSafeSearchSsuiParameter; | |
150 | |
151 std::vector<std::string> parameters; | |
152 Tokenize(query, std::string("&"), ¶meters); | |
Bernhard Bauer
2012/10/22 09:50:18
I think the explicit constructor isn't necessary.
Sergiu
2012/10/30 01:08:11
Done.
| |
153 | |
154 std::vector<std::string>::reverse_iterator rit; | |
155 for (rit = parameters.rbegin(); rit < parameters.rend(); ++rit) { | |
156 bool keep_current_parameter = true; | |
157 if (safe_check == KEEP_SEARCHING) { | |
158 safe_check = CheckForParameter(*rit, safe_parameter, | |
159 &keep_current_parameter); | |
Joao da Silva
2012/10/22 21:14:20
The ChecForParameter() function and the enum value
Sergiu
2012/10/30 01:08:11
No, it makes total sense.. the initial idea was to
| |
160 } | |
161 if (ssui_check == KEEP_SEARCHING) { | |
162 ssui_check = CheckForParameter(*rit, ssui_parameter, | |
163 &keep_current_parameter); | |
164 } | |
165 if (keep_current_parameter) { | |
166 // Iterating in reverse so make sure that we add it in the correct | |
167 // position. | |
168 new_parameters.insert(new_parameters.begin(), *rit); | |
Joao da Silva
2012/10/22 21:14:20
Why not iterate forward (not reverse) and push_bac
Sergiu
2012/10/30 01:08:11
Done.
| |
169 } | |
170 } | |
171 | |
172 if (safe_check != PARAMETER_PRESENT) | |
173 new_parameters.insert(new_parameters.end(), safe_parameter); | |
Bernhard Bauer
2012/10/22 09:50:18
I think you can just do push_back().
Sergiu
2012/10/30 01:08:11
Done.
| |
174 if (ssui_check != PARAMETER_PRESENT) | |
175 new_parameters.insert(new_parameters.end(), ssui_parameter); | |
176 *new_query = JoinString(new_parameters, std::string("&")); | |
177 } | |
178 | |
90 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; | 179 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; |
91 | 180 |
92 // Notifies the ExtensionProcessManager that a request has started or stopped | 181 // Notifies the ExtensionProcessManager that a request has started or stopped |
93 // for a particular RenderView. | 182 // for a particular RenderView. |
94 void NotifyEPMRequestStatus(RequestStatus status, | 183 void NotifyEPMRequestStatus(RequestStatus status, |
95 void* profile_id, | 184 void* profile_id, |
96 int process_id, | 185 int process_id, |
97 int render_view_id) { | 186 int render_view_id) { |
98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 187 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
99 Profile* profile = reinterpret_cast<Profile*>(profile_id); | 188 Profile* profile = reinterpret_cast<Profile*>(profile_id); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
139 | 228 |
140 ChromeNetworkDelegate::ChromeNetworkDelegate( | 229 ChromeNetworkDelegate::ChromeNetworkDelegate( |
141 extensions::EventRouterForwarder* event_router, | 230 extensions::EventRouterForwarder* event_router, |
142 ExtensionInfoMap* extension_info_map, | 231 ExtensionInfoMap* extension_info_map, |
143 const policy::URLBlacklistManager* url_blacklist_manager, | 232 const policy::URLBlacklistManager* url_blacklist_manager, |
144 const ManagedModeURLFilter* managed_mode_url_filter, | 233 const ManagedModeURLFilter* managed_mode_url_filter, |
145 void* profile, | 234 void* profile, |
146 CookieSettings* cookie_settings, | 235 CookieSettings* cookie_settings, |
147 BooleanPrefMember* enable_referrers, | 236 BooleanPrefMember* enable_referrers, |
148 BooleanPrefMember* enable_do_not_track, | 237 BooleanPrefMember* enable_do_not_track, |
238 BooleanPrefMember* force_google_safesearch, | |
149 chrome_browser_net::LoadTimeStats* load_time_stats) | 239 chrome_browser_net::LoadTimeStats* load_time_stats) |
150 : event_router_(event_router), | 240 : event_router_(event_router), |
151 profile_(profile), | 241 profile_(profile), |
152 cookie_settings_(cookie_settings), | 242 cookie_settings_(cookie_settings), |
153 extension_info_map_(extension_info_map), | 243 extension_info_map_(extension_info_map), |
154 enable_referrers_(enable_referrers), | 244 enable_referrers_(enable_referrers), |
155 enable_do_not_track_(enable_do_not_track), | 245 enable_do_not_track_(enable_do_not_track), |
246 force_google_safesearch_(force_google_safesearch), | |
156 url_blacklist_manager_(url_blacklist_manager), | 247 url_blacklist_manager_(url_blacklist_manager), |
157 managed_mode_url_filter_(managed_mode_url_filter), | 248 managed_mode_url_filter_(managed_mode_url_filter), |
158 load_time_stats_(load_time_stats) { | 249 load_time_stats_(load_time_stats) { |
159 DCHECK(event_router); | 250 DCHECK(event_router); |
160 DCHECK(enable_referrers); | 251 DCHECK(enable_referrers); |
161 DCHECK(!profile || cookie_settings); | 252 DCHECK(!profile || cookie_settings); |
162 } | 253 } |
163 | 254 |
164 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} | 255 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} |
165 | 256 |
166 // static | 257 // static |
167 void ChromeNetworkDelegate::NeverThrottleRequests() { | 258 void ChromeNetworkDelegate::NeverThrottleRequests() { |
168 g_never_throttle_requests_ = true; | 259 g_never_throttle_requests_ = true; |
169 } | 260 } |
170 | 261 |
171 // static | 262 // static |
172 void ChromeNetworkDelegate::InitializePrefsOnUIThread( | 263 void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
173 BooleanPrefMember* enable_referrers, | 264 BooleanPrefMember* enable_referrers, |
174 BooleanPrefMember* enable_do_not_track, | 265 BooleanPrefMember* enable_do_not_track, |
266 BooleanPrefMember* force_google_safesearch, | |
175 PrefService* pref_service) { | 267 PrefService* pref_service) { |
176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 268 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
177 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); | 269 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); |
178 enable_referrers->MoveToThread(BrowserThread::IO); | 270 enable_referrers->MoveToThread(BrowserThread::IO); |
179 if (enable_do_not_track) { | 271 if (enable_do_not_track) { |
180 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); | 272 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); |
181 enable_do_not_track->MoveToThread(BrowserThread::IO); | 273 enable_do_not_track->MoveToThread(BrowserThread::IO); |
182 } | 274 } |
275 if (force_google_safesearch) { | |
276 force_google_safesearch->Init(prefs::kForceSafeSearch, pref_service, NULL); | |
277 force_google_safesearch->MoveToThread(BrowserThread::IO); | |
278 } | |
183 } | 279 } |
184 | 280 |
185 // static | 281 // static |
186 void ChromeNetworkDelegate::AllowAccessToAllFiles() { | 282 void ChromeNetworkDelegate::AllowAccessToAllFiles() { |
187 g_allow_file_access_ = true; | 283 g_allow_file_access_ = true; |
188 } | 284 } |
189 | 285 |
286 // static | |
287 void ChromeNetworkDelegate::ForceGoogleSafeSearch(net::URLRequest* request, | |
Joao da Silva
2012/10/22 21:14:20
It's not clear to me why this is a static method o
Sergiu
2012/10/30 01:08:11
Initially I touched some stuff in the delegate but
| |
288 GURL* new_url) { | |
289 // Force SafeSearch. | |
290 const bool is_search_url = google_util::IsGoogleSearchUrl( | |
291 request->url().spec()); | |
292 const bool is_homepage_url = google_util::IsGoogleHomePageUrl( | |
293 request->url().spec()); | |
294 if (is_search_url || is_homepage_url) { | |
295 std::string query = request->url().query(); | |
296 std::string new_query; | |
297 | |
298 ExamineQueryForSafeSearch(query, &new_query); | |
299 if (query == new_query) | |
300 return; | |
301 | |
302 GURL::Replacements replacements; | |
303 replacements.SetQueryStr(new_query); | |
304 *new_url = request->url().ReplaceComponents(replacements); | |
305 } | |
306 } | |
307 | |
190 int ChromeNetworkDelegate::OnBeforeURLRequest( | 308 int ChromeNetworkDelegate::OnBeforeURLRequest( |
191 net::URLRequest* request, | 309 net::URLRequest* request, |
192 const net::CompletionCallback& callback, | 310 const net::CompletionCallback& callback, |
193 GURL* new_url) { | 311 GURL* new_url) { |
194 #if defined(ENABLE_CONFIGURATION_POLICY) | 312 #if defined(ENABLE_CONFIGURATION_POLICY) |
195 // TODO(joaodasilva): This prevents extensions from seeing URLs that are | 313 // TODO(joaodasilva): This prevents extensions from seeing URLs that are |
196 // blocked. However, an extension might redirect the request to another URL, | 314 // blocked. However, an extension might redirect the request to another URL, |
197 // which is not blocked. | 315 // which is not blocked. |
198 if (url_blacklist_manager_ && | 316 if (url_blacklist_manager_ && |
199 url_blacklist_manager_->IsURLBlocked(request->url())) { | 317 url_blacklist_manager_->IsURLBlocked(request->url())) { |
(...skipping 13 matching lines...) Expand all Loading... | |
213 return net::ERR_NETWORK_ACCESS_DENIED; | 331 return net::ERR_NETWORK_ACCESS_DENIED; |
214 } | 332 } |
215 #endif | 333 #endif |
216 | 334 |
217 ForwardRequestStatus(REQUEST_STARTED, request, profile_); | 335 ForwardRequestStatus(REQUEST_STARTED, request, profile_); |
218 | 336 |
219 if (!enable_referrers_->GetValue()) | 337 if (!enable_referrers_->GetValue()) |
220 request->set_referrer(std::string()); | 338 request->set_referrer(std::string()); |
221 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) | 339 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) |
222 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); | 340 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); |
223 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( | 341 |
224 profile_, extension_info_map_.get(), request, callback, new_url); | 342 bool force_safesearch = force_google_safesearch_ && |
343 force_google_safesearch_->GetValue(); | |
344 | |
345 net::CompletionCallback wrapped_callback = callback; | |
346 if (force_safesearch) { | |
347 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, | |
348 callback, | |
349 base::Unretained(request), | |
350 base::Unretained(new_url)); | |
351 } | |
352 | |
353 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( | |
354 profile_, extension_info_map_.get(), request, wrapped_callback, | |
355 new_url); | |
356 | |
357 if (force_safesearch && rv == net::OK && new_url->is_empty()) | |
358 ForceGoogleSafeSearch(request, new_url); | |
359 | |
360 return rv; | |
225 } | 361 } |
226 | 362 |
227 int ChromeNetworkDelegate::OnBeforeSendHeaders( | 363 int ChromeNetworkDelegate::OnBeforeSendHeaders( |
228 net::URLRequest* request, | 364 net::URLRequest* request, |
229 const net::CompletionCallback& callback, | 365 const net::CompletionCallback& callback, |
230 net::HttpRequestHeaders* headers) { | 366 net::HttpRequestHeaders* headers) { |
231 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( | 367 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( |
232 profile_, extension_info_map_.get(), request, callback, headers); | 368 profile_, extension_info_map_.get(), request, callback, headers); |
233 } | 369 } |
234 | 370 |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
449 #endif | 585 #endif |
450 return net::OK; | 586 return net::OK; |
451 } | 587 } |
452 | 588 |
453 void ChromeNetworkDelegate::OnRequestWaitStateChange( | 589 void ChromeNetworkDelegate::OnRequestWaitStateChange( |
454 const net::URLRequest& request, | 590 const net::URLRequest& request, |
455 RequestWaitState state) { | 591 RequestWaitState state) { |
456 if (load_time_stats_) | 592 if (load_time_stats_) |
457 load_time_stats_->OnRequestWaitStateChange(request, state); | 593 load_time_stats_->OnRequestWaitStateChange(request, state); |
458 } | 594 } |
OLD | NEW |