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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 11186002: Add a SafeSearch preference, policy and implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fine grain parameter match + more tests. Created 8 years, 2 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 | Annotate | Revision Log
OLDNEW
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
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 void ForceGoogleSafeSearchCallbackWrapper(
battre 2012/10/19 09:02:35 Please add a comment describing the purpose of thi
Sergiu 2012/10/19 12:00:18 Done.
95 const net::CompletionCallback& callback,
96 net::URLRequest* request,
97 GURL* new_url,
98 int rv) {
99 if (rv == net::OK && new_url->is_empty())
Joao da Silva 2012/10/19 10:00:38 If the extension rewrites the URL but it still lan
Sergiu 2012/10/19 12:00:18 As far as I have understood if the extension rewri
100 ChromeNetworkDelegate::ForceGoogleSafeSearch(request, new_url);
101 callback.Run(rv);
102 }
103
104 enum SafeSearchCheckState {
105 KEEP_SEARCHING = 0,
106 ADD_PARAMETER,
107 PARAMETER_PRESENT,
108 };
109
110 // Checks a parameter to see if it is present in the query.
battre 2012/10/19 09:02:35 Please describe the parameters.
Sergiu 2012/10/19 12:00:18 Done.
111 SafeSearchCheckState CheckForParameter(const std::string& parameter,
112 const std::string& parameter_to_find,
113 bool* keep_element) {
114 DCHECK(parameter_to_find.find("=") != std::string::npos);
115 // prefix for "safe=off" is "safe=".
116 std::string parameter_prefix = parameter_to_find.substr(
117 0, parameter_to_find.find("=") + 1);
118 if (parameter.length() >= parameter_prefix.length()) {
119 if (parameter == parameter_to_find)
120 return PARAMETER_PRESENT;
121 // Found the parameter but not the correct value, remove it.
122 if (parameter.substr(0, parameter_prefix.length()) == parameter_prefix) {
123 *keep_element = false;
124 return ADD_PARAMETER;
125 }
126 }
127 return KEEP_SEARCHING;
128 }
129
130 void ExamineQuery(std::string query, std::string* new_query) {
battre 2012/10/19 09:02:35 This function name is not very helpful. Please add
battre 2012/10/19 09:02:35 Strings should be passed as const references.
Sergiu 2012/10/19 12:00:18 Done.
Sergiu 2012/10/19 12:00:18 Done.
131 std::vector<std::string> parameters;
battre 2012/10/19 09:02:35 Please declare variables where they are used first
Sergiu 2012/10/19 12:00:18 Done.
132 std::vector<std::string> new_parameters;
133 std::vector<std::string>::reverse_iterator rit;
134 SafeSearchCheckState safe_check = KEEP_SEARCHING;
135 SafeSearchCheckState ssui_check = KEEP_SEARCHING;
136 std::string safe_parameter = chrome::kSafeSearchSafeParameter;
137 std::string ssui_parameter = chrome::kSafeSearchSsuiParameter;
138
139 Tokenize(query, std::string("&"), &parameters);
battre 2012/10/19 09:02:35 I am not sure whether this approach is sufficient.
Sergiu 2012/10/19 12:00:18 Added a percent-encoded unit test and it seems to
140
141 for (rit = parameters.rbegin(); rit < parameters.rend(); ++rit) {
142 bool keep_current_parameter = true;
143 if (safe_check == KEEP_SEARCHING) {
144 safe_check = CheckForParameter(*rit, chrome::kSafeSearchSafeParameter,
145 &keep_current_parameter);
146 }
147 if (ssui_check == KEEP_SEARCHING) {
148 ssui_check = CheckForParameter(*rit, chrome::kSafeSearchSsuiParameter,
149 &keep_current_parameter);
150 }
151 if (keep_current_parameter) {
152 // Iterating in reverse so make sure that we add it in the correct
153 // position.
154 new_parameters.insert(new_parameters.begin(), *rit);
155 }
156 }
157
158 if (safe_check != PARAMETER_PRESENT)
159 new_parameters.insert(new_parameters.end(), safe_parameter);
battre 2012/10/19 09:02:35 nit: -2 spaces, also below
Sergiu 2012/10/19 12:00:18 Done.
160 if (ssui_check != PARAMETER_PRESENT)
161 new_parameters.insert(new_parameters.end(), ssui_parameter);
162 *new_query = JoinString(new_parameters, std::string("&"));
163 }
164
90 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; 165 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE };
91 166
92 // Notifies the ExtensionProcessManager that a request has started or stopped 167 // Notifies the ExtensionProcessManager that a request has started or stopped
93 // for a particular RenderView. 168 // for a particular RenderView.
94 void NotifyEPMRequestStatus(RequestStatus status, 169 void NotifyEPMRequestStatus(RequestStatus status,
95 void* profile_id, 170 void* profile_id,
96 int process_id, 171 int process_id,
97 int render_view_id) { 172 int render_view_id) {
98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 173 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
99 Profile* profile = reinterpret_cast<Profile*>(profile_id); 174 Profile* profile = reinterpret_cast<Profile*>(profile_id);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 214
140 ChromeNetworkDelegate::ChromeNetworkDelegate( 215 ChromeNetworkDelegate::ChromeNetworkDelegate(
141 extensions::EventRouterForwarder* event_router, 216 extensions::EventRouterForwarder* event_router,
142 ExtensionInfoMap* extension_info_map, 217 ExtensionInfoMap* extension_info_map,
143 const policy::URLBlacklistManager* url_blacklist_manager, 218 const policy::URLBlacklistManager* url_blacklist_manager,
144 const ManagedModeURLFilter* managed_mode_url_filter, 219 const ManagedModeURLFilter* managed_mode_url_filter,
145 void* profile, 220 void* profile,
146 CookieSettings* cookie_settings, 221 CookieSettings* cookie_settings,
147 BooleanPrefMember* enable_referrers, 222 BooleanPrefMember* enable_referrers,
148 BooleanPrefMember* enable_do_not_track, 223 BooleanPrefMember* enable_do_not_track,
224 BooleanPrefMember* force_google_safesearch,
149 chrome_browser_net::LoadTimeStats* load_time_stats) 225 chrome_browser_net::LoadTimeStats* load_time_stats)
150 : event_router_(event_router), 226 : event_router_(event_router),
151 profile_(profile), 227 profile_(profile),
152 cookie_settings_(cookie_settings), 228 cookie_settings_(cookie_settings),
153 extension_info_map_(extension_info_map), 229 extension_info_map_(extension_info_map),
154 enable_referrers_(enable_referrers), 230 enable_referrers_(enable_referrers),
155 enable_do_not_track_(enable_do_not_track), 231 enable_do_not_track_(enable_do_not_track),
232 force_google_safesearch_(force_google_safesearch),
156 url_blacklist_manager_(url_blacklist_manager), 233 url_blacklist_manager_(url_blacklist_manager),
157 managed_mode_url_filter_(managed_mode_url_filter), 234 managed_mode_url_filter_(managed_mode_url_filter),
158 load_time_stats_(load_time_stats) { 235 load_time_stats_(load_time_stats) {
159 DCHECK(event_router); 236 DCHECK(event_router);
160 DCHECK(enable_referrers); 237 DCHECK(enable_referrers);
161 DCHECK(!profile || cookie_settings); 238 DCHECK(!profile || cookie_settings);
162 } 239 }
163 240
164 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 241 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
165 242
166 // static 243 // static
167 void ChromeNetworkDelegate::NeverThrottleRequests() { 244 void ChromeNetworkDelegate::NeverThrottleRequests() {
168 g_never_throttle_requests_ = true; 245 g_never_throttle_requests_ = true;
169 } 246 }
170 247
171 // static 248 // static
172 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 249 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
173 BooleanPrefMember* enable_referrers, 250 BooleanPrefMember* enable_referrers,
174 BooleanPrefMember* enable_do_not_track, 251 BooleanPrefMember* enable_do_not_track,
252 BooleanPrefMember* force_google_safesearch,
175 PrefService* pref_service) { 253 PrefService* pref_service) {
176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 254 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
177 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); 255 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL);
178 enable_referrers->MoveToThread(BrowserThread::IO); 256 enable_referrers->MoveToThread(BrowserThread::IO);
179 if (enable_do_not_track) { 257 if (enable_do_not_track) {
180 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); 258 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL);
181 enable_do_not_track->MoveToThread(BrowserThread::IO); 259 enable_do_not_track->MoveToThread(BrowserThread::IO);
182 } 260 }
261 if (force_google_safesearch) {
262 force_google_safesearch->Init(prefs::kForceSafeSearch, pref_service, NULL);
263 force_google_safesearch->MoveToThread(BrowserThread::IO);
264 }
183 } 265 }
184 266
185 // static 267 // static
186 void ChromeNetworkDelegate::AllowAccessToAllFiles() { 268 void ChromeNetworkDelegate::AllowAccessToAllFiles() {
187 g_allow_file_access_ = true; 269 g_allow_file_access_ = true;
188 } 270 }
189 271
272 // static
273 void ChromeNetworkDelegate::ForceGoogleSafeSearch(net::URLRequest* request,
274 GURL* new_url) {
275 // Force SafeSearch.
276 const bool is_search_url = google_util::IsGoogleSearchUrl(
277 request->url().spec());
278 const bool is_homepage_url = google_util::IsGoogleHomePageUrl(
279 request->url().spec());
280 if (is_search_url || is_homepage_url) {
281 std::string query = request->url().query();
282 std::string new_query;
283
284 ExamineQuery(query, &new_query);
285 if (query == new_query)
286 return;
287
288 GURL::Replacements replacements;
289 replacements.SetQueryStr(new_query);
290 *new_url = request->url().ReplaceComponents(replacements);
291 }
292 }
293
190 int ChromeNetworkDelegate::OnBeforeURLRequest( 294 int ChromeNetworkDelegate::OnBeforeURLRequest(
191 net::URLRequest* request, 295 net::URLRequest* request,
192 const net::CompletionCallback& callback, 296 const net::CompletionCallback& callback,
193 GURL* new_url) { 297 GURL* new_url) {
194 #if defined(ENABLE_CONFIGURATION_POLICY) 298 #if defined(ENABLE_CONFIGURATION_POLICY)
195 // TODO(joaodasilva): This prevents extensions from seeing URLs that are 299 // TODO(joaodasilva): This prevents extensions from seeing URLs that are
196 // blocked. However, an extension might redirect the request to another URL, 300 // blocked. However, an extension might redirect the request to another URL,
197 // which is not blocked. 301 // which is not blocked.
198 if (url_blacklist_manager_ && 302 if (url_blacklist_manager_ &&
199 url_blacklist_manager_->IsURLBlocked(request->url())) { 303 url_blacklist_manager_->IsURLBlocked(request->url())) {
(...skipping 13 matching lines...) Expand all
213 return net::ERR_NETWORK_ACCESS_DENIED; 317 return net::ERR_NETWORK_ACCESS_DENIED;
214 } 318 }
215 #endif 319 #endif
216 320
217 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 321 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
218 322
219 if (!enable_referrers_->GetValue()) 323 if (!enable_referrers_->GetValue())
220 request->set_referrer(std::string()); 324 request->set_referrer(std::string());
221 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) 325 if (enable_do_not_track_ && enable_do_not_track_->GetValue())
222 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); 326 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
327
328 if (force_google_safesearch_ && force_google_safesearch_->GetValue()) {
329 net::CompletionCallback wrapped_callback =
330 base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
battre 2012/10/19 09:02:35 nit: +2 spaces
Sergiu 2012/10/19 12:00:18 Done.
331 callback,
332 base::Unretained(request),
333 base::Unretained(new_url));
334
335 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
336 profile_, extension_info_map_.get(), request, wrapped_callback,
337 new_url);
338
339 if (rv == net::OK && new_url->is_empty()) {
340 ForceGoogleSafeSearch(request, new_url);
341 return net::OK;
342 }
343
344 return rv;
345 }
Joao da Silva 2012/10/19 10:00:38 There are now two paths exiting this function from
Sergiu 2012/10/19 12:00:18 Rewritten, but using wrapped_callback since callba
346
223 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 347 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
224 profile_, extension_info_map_.get(), request, callback, new_url); 348 profile_, extension_info_map_.get(), request, callback, new_url);
225 } 349 }
226 350
227 int ChromeNetworkDelegate::OnBeforeSendHeaders( 351 int ChromeNetworkDelegate::OnBeforeSendHeaders(
228 net::URLRequest* request, 352 net::URLRequest* request,
229 const net::CompletionCallback& callback, 353 const net::CompletionCallback& callback,
230 net::HttpRequestHeaders* headers) { 354 net::HttpRequestHeaders* headers) {
231 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 355 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
232 profile_, extension_info_map_.get(), request, callback, headers); 356 profile_, extension_info_map_.get(), request, callback, headers);
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 #endif 573 #endif
450 return net::OK; 574 return net::OK;
451 } 575 }
452 576
453 void ChromeNetworkDelegate::OnRequestWaitStateChange( 577 void ChromeNetworkDelegate::OnRequestWaitStateChange(
454 const net::URLRequest& request, 578 const net::URLRequest& request,
455 RequestWaitState state) { 579 RequestWaitState state) {
456 if (load_time_stats_) 580 if (load_time_stats_)
457 load_time_stats_->OnRequestWaitStateChange(request, state); 581 load_time_stats_->OnRequestWaitStateChange(request, state);
458 } 582 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698