Chromium Code Reviews| 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 <string> | |
| 8 #include <vector> | |
| 9 | |
| 7 #include "base/logging.h" | 10 #include "base/logging.h" |
| 8 #include "base/base_paths.h" | 11 #include "base/base_paths.h" |
| 9 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/string_split.h" | |
| 10 #include "chrome/browser/api/prefs/pref_member.h" | 14 #include "chrome/browser/api/prefs/pref_member.h" |
| 11 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/content_settings/cookie_settings.h" | 16 #include "chrome/browser/content_settings/cookie_settings.h" |
| 13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 17 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 18 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 15 #include "chrome/browser/extensions/api/proxy/proxy_api.h" | 19 #include "chrome/browser/extensions/api/proxy/proxy_api.h" |
| 16 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 20 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
| 17 #include "chrome/browser/extensions/event_router_forwarder.h" | 21 #include "chrome/browser/extensions/event_router_forwarder.h" |
| 18 #include "chrome/browser/extensions/extension_info_map.h" | 22 #include "chrome/browser/extensions/extension_info_map.h" |
| 19 #include "chrome/browser/extensions/extension_process_manager.h" | 23 #include "chrome/browser/extensions/extension_process_manager.h" |
| 24 #include "chrome/browser/google/google_util.h" | |
| 20 #include "chrome/browser/net/load_time_stats.h" | 25 #include "chrome/browser/net/load_time_stats.h" |
| 21 #include "chrome/browser/performance_monitor/performance_monitor.h" | 26 #include "chrome/browser/performance_monitor/performance_monitor.h" |
| 22 #include "chrome/browser/prefs/pref_service.h" | 27 #include "chrome/browser/prefs/pref_service.h" |
| 23 #include "chrome/browser/profiles/profile_manager.h" | 28 #include "chrome/browser/profiles/profile_manager.h" |
| 24 #include "chrome/browser/task_manager/task_manager.h" | 29 #include "chrome/browser/task_manager/task_manager.h" |
| 25 #include "chrome/common/pref_names.h" | 30 #include "chrome/common/pref_names.h" |
| 26 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
| 27 #include "content/public/browser/browser_thread.h" | 32 #include "content/public/browser/browser_thread.h" |
| 28 #include "content/public/browser/render_view_host.h" | 33 #include "content/public/browser/render_view_host.h" |
| 29 #include "content/public/browser/resource_request_info.h" | 34 #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()) { | 85 switch (request->status().error()) { |
| 81 case net::ERR_PROXY_AUTH_UNSUPPORTED: | 86 case net::ERR_PROXY_AUTH_UNSUPPORTED: |
| 82 case net::ERR_PROXY_CONNECTION_FAILED: | 87 case net::ERR_PROXY_CONNECTION_FAILED: |
| 83 case net::ERR_TUNNEL_CONNECTION_FAILED: | 88 case net::ERR_TUNNEL_CONNECTION_FAILED: |
| 84 extensions::ProxyEventRouter::GetInstance()->OnProxyError( | 89 extensions::ProxyEventRouter::GetInstance()->OnProxyError( |
| 85 event_router, profile, request->status().error()); | 90 event_router, profile, request->status().error()); |
| 86 } | 91 } |
| 87 } | 92 } |
| 88 } | 93 } |
| 89 | 94 |
| 95 // Checks to see if the current parameter matches the desired one. |parameter| | |
| 96 // is the current parameter which is being checked; |parameter_to_find| is the | |
| 97 // parameter we are looking for. Returns true if we find the parameter (we | |
| 98 // don't care about the value of the parameter, only the key). | |
| 99 bool CheckForParameter(const std::string& parameter, | |
| 100 const std::string& parameter_to_find) { | |
|
battre
2012/10/30 12:56:10
I think this function does way more than necessary
Sergiu
2012/10/30 21:58:17
What I was trying to accomplish was use as few con
battre
2012/10/31 13:16:55
I like your new implementation.
| |
| 101 DCHECK(parameter_to_find.find("=") != std::string::npos); | |
| 102 // prefix for "safe=off" is "safe=". | |
| 103 std::string parameter_prefix = parameter_to_find.substr( | |
| 104 0, parameter_to_find.find("=") + 1); | |
| 105 if (StartsWithASCII(parameter, parameter_prefix, false)) | |
|
battre
2012/10/30 12:56:10
This does not work if the key in |parameter| is %x
Sergiu
2012/10/30 21:58:17
RFC 3986 [1] states:
URIs that differ in the re
battre
2012/10/31 13:16:55
If the last stated parameter wins in case of two c
| |
| 106 return true; | |
| 107 return false; | |
|
Joao da Silva
2012/10/30 09:09:49
return StartsWithASCII(parameter, parameter_prefix
Sergiu
2012/10/30 21:58:17
Done.
| |
| 108 } | |
| 109 | |
| 110 // Examines a query to see if it should be modified to contain the SafeSearch | |
| 111 // parameters. |query| is the string to examine and the return value is the | |
| 112 // |query| string modified such that SafeSearch is active. | |
| 113 std::string ExamineQueryForSafeSearch(const std::string& query) { | |
|
battre
2012/10/30 12:56:10
How about "void AddSafeSearchParameters(const GURL
Sergiu
2012/10/30 21:58:17
Renamed, although the signature is the same as bef
battre
2012/10/31 13:16:55
SGTM
| |
| 114 std::vector<std::string> new_parameters; | |
| 115 std::string safe_parameter = chrome::kSafeSearchSafeParameter; | |
| 116 std::string ssui_parameter = chrome::kSafeSearchSsuiParameter; | |
| 117 | |
| 118 std::vector<std::string> parameters; | |
| 119 base::SplitString(query, '&', ¶meters); | |
| 120 | |
| 121 std::vector<std::string>::iterator it; | |
| 122 for (it = parameters.begin(); it < parameters.end(); ++it) { | |
| 123 if (!CheckForParameter(*it, safe_parameter) && | |
| 124 !CheckForParameter(*it, ssui_parameter)) { | |
| 125 new_parameters.push_back(*it); | |
| 126 } | |
| 127 } | |
| 128 | |
| 129 new_parameters.push_back(safe_parameter); | |
| 130 new_parameters.push_back(ssui_parameter); | |
| 131 return JoinString(new_parameters, '&'); | |
| 132 } | |
| 133 | |
| 134 // Examines |request| and if it is a request to Google Web Search | |
| 135 // it enforces that the SafeSearch query parameters are set to active | |
|
Joao da Silva
2012/10/30 09:09:49
nit: terminate sentence
Sergiu
2012/10/30 21:58:17
Done.
| |
| 136 // Sets the query part of |new_url| with the new value of the parameters. | |
| 137 void ForceGoogleSafeSearch(net::URLRequest* request, | |
| 138 GURL* new_url) { | |
| 139 const bool is_search_url = google_util::IsGoogleSearchUrl( | |
| 140 request->url().spec()); | |
| 141 const bool is_homepage_url = google_util::IsGoogleHomePageUrl( | |
| 142 request->url().spec()); | |
| 143 if (is_search_url || is_homepage_url) { | |
| 144 std::string query = request->url().query(); | |
| 145 std::string new_query = ExamineQueryForSafeSearch(query); | |
| 146 if (query == new_query) | |
| 147 return; | |
| 148 | |
| 149 GURL::Replacements replacements; | |
| 150 replacements.SetQueryStr(new_query); | |
| 151 *new_url = request->url().ReplaceComponents(replacements); | |
| 152 } | |
| 153 } | |
| 154 | |
| 155 // Gets called when the extensions finish work on the URL. If the extensions | |
| 156 // did not do a redirect (so |new_url| is empty) then we enforce the | |
| 157 // SafeSearch parameters. Otherwise we will get called again after the | |
| 158 // redirect and we enforce SafeSearch then. | |
| 159 void ForceGoogleSafeSearchCallbackWrapper( | |
| 160 const net::CompletionCallback& callback, | |
| 161 net::URLRequest* request, | |
| 162 GURL* new_url, | |
| 163 int rv) { | |
| 164 if (rv == net::OK && new_url->is_empty()) | |
| 165 ForceGoogleSafeSearch(request, new_url); | |
| 166 callback.Run(rv); | |
| 167 } | |
| 168 | |
| 90 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; | 169 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; |
| 91 | 170 |
| 92 // Notifies the ExtensionProcessManager that a request has started or stopped | 171 // Notifies the ExtensionProcessManager that a request has started or stopped |
| 93 // for a particular RenderView. | 172 // for a particular RenderView. |
| 94 void NotifyEPMRequestStatus(RequestStatus status, | 173 void NotifyEPMRequestStatus(RequestStatus status, |
| 95 void* profile_id, | 174 void* profile_id, |
| 96 int process_id, | 175 int process_id, |
| 97 int render_view_id) { | 176 int render_view_id) { |
| 98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 99 Profile* profile = reinterpret_cast<Profile*>(profile_id); | 178 Profile* profile = reinterpret_cast<Profile*>(profile_id); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 | 218 |
| 140 ChromeNetworkDelegate::ChromeNetworkDelegate( | 219 ChromeNetworkDelegate::ChromeNetworkDelegate( |
| 141 extensions::EventRouterForwarder* event_router, | 220 extensions::EventRouterForwarder* event_router, |
| 142 ExtensionInfoMap* extension_info_map, | 221 ExtensionInfoMap* extension_info_map, |
| 143 const policy::URLBlacklistManager* url_blacklist_manager, | 222 const policy::URLBlacklistManager* url_blacklist_manager, |
| 144 const ManagedModeURLFilter* managed_mode_url_filter, | 223 const ManagedModeURLFilter* managed_mode_url_filter, |
| 145 void* profile, | 224 void* profile, |
| 146 CookieSettings* cookie_settings, | 225 CookieSettings* cookie_settings, |
| 147 BooleanPrefMember* enable_referrers, | 226 BooleanPrefMember* enable_referrers, |
| 148 BooleanPrefMember* enable_do_not_track, | 227 BooleanPrefMember* enable_do_not_track, |
| 228 BooleanPrefMember* force_google_safesearch, | |
|
battre
2012/10/30 12:56:10
if your functions use the spelling SafeSearch, I t
Sergiu
2012/10/30 21:58:17
Yeah, SafeSearch was a bit tricky because it is of
| |
| 149 chrome_browser_net::LoadTimeStats* load_time_stats) | 229 chrome_browser_net::LoadTimeStats* load_time_stats) |
| 150 : event_router_(event_router), | 230 : event_router_(event_router), |
| 151 profile_(profile), | 231 profile_(profile), |
| 152 cookie_settings_(cookie_settings), | 232 cookie_settings_(cookie_settings), |
| 153 extension_info_map_(extension_info_map), | 233 extension_info_map_(extension_info_map), |
| 154 enable_referrers_(enable_referrers), | 234 enable_referrers_(enable_referrers), |
| 155 enable_do_not_track_(enable_do_not_track), | 235 enable_do_not_track_(enable_do_not_track), |
| 236 force_google_safesearch_(force_google_safesearch), | |
| 156 url_blacklist_manager_(url_blacklist_manager), | 237 url_blacklist_manager_(url_blacklist_manager), |
| 157 managed_mode_url_filter_(managed_mode_url_filter), | 238 managed_mode_url_filter_(managed_mode_url_filter), |
| 158 load_time_stats_(load_time_stats) { | 239 load_time_stats_(load_time_stats) { |
| 159 DCHECK(event_router); | 240 DCHECK(event_router); |
| 160 DCHECK(enable_referrers); | 241 DCHECK(enable_referrers); |
| 161 DCHECK(!profile || cookie_settings); | 242 DCHECK(!profile || cookie_settings); |
| 162 } | 243 } |
| 163 | 244 |
| 164 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} | 245 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} |
| 165 | 246 |
| 166 // static | 247 // static |
| 167 void ChromeNetworkDelegate::NeverThrottleRequests() { | 248 void ChromeNetworkDelegate::NeverThrottleRequests() { |
| 168 g_never_throttle_requests_ = true; | 249 g_never_throttle_requests_ = true; |
| 169 } | 250 } |
| 170 | 251 |
| 171 // static | 252 // static |
| 172 void ChromeNetworkDelegate::InitializePrefsOnUIThread( | 253 void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| 173 BooleanPrefMember* enable_referrers, | 254 BooleanPrefMember* enable_referrers, |
| 174 BooleanPrefMember* enable_do_not_track, | 255 BooleanPrefMember* enable_do_not_track, |
| 256 BooleanPrefMember* force_google_safesearch, | |
| 175 PrefService* pref_service) { | 257 PrefService* pref_service) { |
| 176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 258 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 177 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); | 259 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); |
| 178 enable_referrers->MoveToThread(BrowserThread::IO); | 260 enable_referrers->MoveToThread(BrowserThread::IO); |
| 179 if (enable_do_not_track) { | 261 if (enable_do_not_track) { |
| 180 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); | 262 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); |
| 181 enable_do_not_track->MoveToThread(BrowserThread::IO); | 263 enable_do_not_track->MoveToThread(BrowserThread::IO); |
| 182 } | 264 } |
| 265 if (force_google_safesearch) { | |
| 266 force_google_safesearch->Init(prefs::kForceSafeSearch, pref_service, NULL); | |
| 267 force_google_safesearch->MoveToThread(BrowserThread::IO); | |
| 268 } | |
| 183 } | 269 } |
| 184 | 270 |
| 185 // static | 271 // static |
| 186 void ChromeNetworkDelegate::AllowAccessToAllFiles() { | 272 void ChromeNetworkDelegate::AllowAccessToAllFiles() { |
| 187 g_allow_file_access_ = true; | 273 g_allow_file_access_ = true; |
| 188 } | 274 } |
| 189 | 275 |
| 190 int ChromeNetworkDelegate::OnBeforeURLRequest( | 276 int ChromeNetworkDelegate::OnBeforeURLRequest( |
| 191 net::URLRequest* request, | 277 net::URLRequest* request, |
| 192 const net::CompletionCallback& callback, | 278 const net::CompletionCallback& callback, |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 213 return net::ERR_NETWORK_ACCESS_DENIED; | 299 return net::ERR_NETWORK_ACCESS_DENIED; |
| 214 } | 300 } |
| 215 #endif | 301 #endif |
| 216 | 302 |
| 217 ForwardRequestStatus(REQUEST_STARTED, request, profile_); | 303 ForwardRequestStatus(REQUEST_STARTED, request, profile_); |
| 218 | 304 |
| 219 if (!enable_referrers_->GetValue()) | 305 if (!enable_referrers_->GetValue()) |
| 220 request->set_referrer(std::string()); | 306 request->set_referrer(std::string()); |
| 221 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) | 307 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) |
| 222 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); | 308 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); |
| 223 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( | 309 |
| 224 profile_, extension_info_map_.get(), request, callback, new_url); | 310 bool force_safesearch = force_google_safesearch_ && |
| 311 force_google_safesearch_->GetValue(); | |
| 312 | |
| 313 net::CompletionCallback wrapped_callback = callback; | |
| 314 if (force_safesearch) { | |
| 315 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, | |
| 316 callback, | |
| 317 base::Unretained(request), | |
| 318 base::Unretained(new_url)); | |
| 319 } | |
| 320 | |
| 321 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( | |
| 322 profile_, extension_info_map_.get(), request, wrapped_callback, | |
| 323 new_url); | |
| 324 | |
| 325 if (force_safesearch && rv == net::OK && new_url->is_empty()) | |
| 326 ForceGoogleSafeSearch(request, new_url); | |
| 327 | |
| 328 return rv; | |
| 225 } | 329 } |
| 226 | 330 |
| 227 int ChromeNetworkDelegate::OnBeforeSendHeaders( | 331 int ChromeNetworkDelegate::OnBeforeSendHeaders( |
| 228 net::URLRequest* request, | 332 net::URLRequest* request, |
| 229 const net::CompletionCallback& callback, | 333 const net::CompletionCallback& callback, |
| 230 net::HttpRequestHeaders* headers) { | 334 net::HttpRequestHeaders* headers) { |
| 231 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( | 335 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( |
| 232 profile_, extension_info_map_.get(), request, callback, headers); | 336 profile_, extension_info_map_.get(), request, callback, headers); |
| 233 } | 337 } |
| 234 | 338 |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 449 #endif | 553 #endif |
| 450 return net::OK; | 554 return net::OK; |
| 451 } | 555 } |
| 452 | 556 |
| 453 void ChromeNetworkDelegate::OnRequestWaitStateChange( | 557 void ChromeNetworkDelegate::OnRequestWaitStateChange( |
| 454 const net::URLRequest& request, | 558 const net::URLRequest& request, |
| 455 RequestWaitState state) { | 559 RequestWaitState state) { |
| 456 if (load_time_stats_) | 560 if (load_time_stats_) |
| 457 load_time_stats_->OnRequestWaitStateChange(request, state); | 561 load_time_stats_->OnRequestWaitStateChange(request, state); |
| 458 } | 562 } |
| OLD | NEW |