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

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: Changes suggested by comments. Created 8 years, 1 month 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 <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
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 // Returns whether a URL parameter, |first_parameter| (e.g. foo=bar), has the
96 // same key as the the |second_parameter| (e.g. foo=baz).
97 bool HasSameParameterKey(const std::string& first_parameter,
98 const std::string& second_parameter) {
99 // We set the second parameter so it must have "=" in it.
Pam (message me for reviews) 2012/10/31 13:50:35 I don't follow this comment. Is it making assumpti
Sergiu 2012/11/01 18:01:52 Rephrased it such that it is hopefully clearer now
100 DCHECK(second_parameter.find("=") != std::string::npos);
101 // Prefix for "foo=bar" is "foo=".
102 std::string parameter_prefix = second_parameter.substr(
103 0, second_parameter.find("=") + 1);
104 return StartsWithASCII(first_parameter, parameter_prefix, false);
105 }
106
107 // Examines the query and adds the necessary parameters so that SafeSearch is
battre 2012/10/31 13:16:55 nit: Examines the query parameter of a URL request
Sergiu 2012/11/01 18:01:52 Done, rephrased.
108 // active. |query| is the string to examine and the return value is the
109 // |query| string modified such that SafeSearch is active.
110 std::string AddSafeSearchParameters(const std::string& query) {
111 std::vector<std::string> new_parameters;
112 std::string safe_parameter = chrome::kSafeSearchSafeParameter;
113 std::string ssui_parameter = chrome::kSafeSearchSsuiParameter;
Pam (message me for reviews) 2012/10/31 13:50:35 Any particular reason you allocate these again, as
battre 2012/10/31 14:06:08 The strings are const char[] contants. You would i
Pam (message me for reviews) 2012/11/02 14:00:35 On 2012/10/31 14:06:08, battre wrote:
114
115 std::vector<std::string> parameters;
116 base::SplitString(query, '&', &parameters);
117
118 std::vector<std::string>::iterator it;
119 for (it = parameters.begin(); it < parameters.end(); ++it) {
120 if (!HasSameParameterKey(*it, safe_parameter) &&
121 !HasSameParameterKey(*it, ssui_parameter)) {
122 new_parameters.push_back(*it);
123 }
124 }
125
126 new_parameters.push_back(safe_parameter);
127 new_parameters.push_back(ssui_parameter);
128 return JoinString(new_parameters, '&');
129 }
130
131 // Examines |request| and if it is a request to Google Web Search
132 // it enforces that the SafeSearch query parameters are set to active.
Pam (message me for reviews) 2012/10/31 13:50:35 nit: drop "it" in "it enforces", and add a comma a
Sergiu 2012/11/01 18:01:52 Rephrased.
133 // Sets the query part of |new_url| with the new value of the parameters.
134 void ForceGoogleSafeSearch(net::URLRequest* request,
135 GURL* new_url) {
136 const bool is_search_url = google_util::IsGoogleSearchUrl(
137 request->url().spec());
138 const bool is_homepage_url = google_util::IsGoogleHomePageUrl(
139 request->url().spec());
battre 2012/10/31 13:16:55 how about moving lines 136 to 139 into google_util
Sergiu 2012/11/01 18:01:52 Done.
140 if (is_search_url || is_homepage_url) {
141 std::string query = request->url().query();
142 std::string new_query = AddSafeSearchParameters(query);
143 if (query == new_query)
144 return;
145
146 GURL::Replacements replacements;
147 replacements.SetQueryStr(new_query);
148 *new_url = request->url().ReplaceComponents(replacements);
149 }
150 }
151
152 // Gets called when the extensions finish work on the URL. If the extensions
153 // did not do a redirect (so |new_url| is empty) then we enforce the
154 // SafeSearch parameters. Otherwise we will get called again after the
155 // redirect and we enforce SafeSearch then.
156 void ForceGoogleSafeSearchCallbackWrapper(
157 const net::CompletionCallback& callback,
158 net::URLRequest* request,
159 GURL* new_url,
160 int rv) {
161 if (rv == net::OK && new_url->is_empty())
162 ForceGoogleSafeSearch(request, new_url);
163 callback.Run(rv);
164 }
165
90 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; 166 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE };
91 167
92 // Notifies the ExtensionProcessManager that a request has started or stopped 168 // Notifies the ExtensionProcessManager that a request has started or stopped
93 // for a particular RenderView. 169 // for a particular RenderView.
94 void NotifyEPMRequestStatus(RequestStatus status, 170 void NotifyEPMRequestStatus(RequestStatus status,
95 void* profile_id, 171 void* profile_id,
96 int process_id, 172 int process_id,
97 int render_view_id) { 173 int render_view_id) {
98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 174 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
99 Profile* profile = reinterpret_cast<Profile*>(profile_id); 175 Profile* profile = reinterpret_cast<Profile*>(profile_id);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 215
140 ChromeNetworkDelegate::ChromeNetworkDelegate( 216 ChromeNetworkDelegate::ChromeNetworkDelegate(
141 extensions::EventRouterForwarder* event_router, 217 extensions::EventRouterForwarder* event_router,
142 ExtensionInfoMap* extension_info_map, 218 ExtensionInfoMap* extension_info_map,
143 const policy::URLBlacklistManager* url_blacklist_manager, 219 const policy::URLBlacklistManager* url_blacklist_manager,
144 const ManagedModeURLFilter* managed_mode_url_filter, 220 const ManagedModeURLFilter* managed_mode_url_filter,
145 void* profile, 221 void* profile,
146 CookieSettings* cookie_settings, 222 CookieSettings* cookie_settings,
147 BooleanPrefMember* enable_referrers, 223 BooleanPrefMember* enable_referrers,
148 BooleanPrefMember* enable_do_not_track, 224 BooleanPrefMember* enable_do_not_track,
225 BooleanPrefMember* force_google_safe_search,
149 chrome_browser_net::LoadTimeStats* load_time_stats) 226 chrome_browser_net::LoadTimeStats* load_time_stats)
150 : event_router_(event_router), 227 : event_router_(event_router),
151 profile_(profile), 228 profile_(profile),
152 cookie_settings_(cookie_settings), 229 cookie_settings_(cookie_settings),
153 extension_info_map_(extension_info_map), 230 extension_info_map_(extension_info_map),
154 enable_referrers_(enable_referrers), 231 enable_referrers_(enable_referrers),
155 enable_do_not_track_(enable_do_not_track), 232 enable_do_not_track_(enable_do_not_track),
233 force_google_safe_search_(force_google_safe_search),
156 url_blacklist_manager_(url_blacklist_manager), 234 url_blacklist_manager_(url_blacklist_manager),
157 managed_mode_url_filter_(managed_mode_url_filter), 235 managed_mode_url_filter_(managed_mode_url_filter),
158 load_time_stats_(load_time_stats) { 236 load_time_stats_(load_time_stats) {
159 DCHECK(event_router); 237 DCHECK(event_router);
160 DCHECK(enable_referrers); 238 DCHECK(enable_referrers);
161 DCHECK(!profile || cookie_settings); 239 DCHECK(!profile || cookie_settings);
162 } 240 }
163 241
164 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 242 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
165 243
166 // static 244 // static
167 void ChromeNetworkDelegate::NeverThrottleRequests() { 245 void ChromeNetworkDelegate::NeverThrottleRequests() {
168 g_never_throttle_requests_ = true; 246 g_never_throttle_requests_ = true;
169 } 247 }
170 248
171 // static 249 // static
172 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 250 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
173 BooleanPrefMember* enable_referrers, 251 BooleanPrefMember* enable_referrers,
174 BooleanPrefMember* enable_do_not_track, 252 BooleanPrefMember* enable_do_not_track,
253 BooleanPrefMember* force_google_safe_search,
175 PrefService* pref_service) { 254 PrefService* pref_service) {
176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 255 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
177 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); 256 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL);
178 enable_referrers->MoveToThread(BrowserThread::IO); 257 enable_referrers->MoveToThread(BrowserThread::IO);
179 if (enable_do_not_track) { 258 if (enable_do_not_track) {
180 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); 259 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL);
181 enable_do_not_track->MoveToThread(BrowserThread::IO); 260 enable_do_not_track->MoveToThread(BrowserThread::IO);
182 } 261 }
262 if (force_google_safe_search) {
263 force_google_safe_search->Init(prefs::kForceSafeSearch, pref_service, NULL);
264 force_google_safe_search->MoveToThread(BrowserThread::IO);
265 }
183 } 266 }
184 267
185 // static 268 // static
186 void ChromeNetworkDelegate::AllowAccessToAllFiles() { 269 void ChromeNetworkDelegate::AllowAccessToAllFiles() {
187 g_allow_file_access_ = true; 270 g_allow_file_access_ = true;
188 } 271 }
189 272
190 int ChromeNetworkDelegate::OnBeforeURLRequest( 273 int ChromeNetworkDelegate::OnBeforeURLRequest(
191 net::URLRequest* request, 274 net::URLRequest* request,
192 const net::CompletionCallback& callback, 275 const net::CompletionCallback& callback,
(...skipping 20 matching lines...) Expand all
213 return net::ERR_NETWORK_ACCESS_DENIED; 296 return net::ERR_NETWORK_ACCESS_DENIED;
214 } 297 }
215 #endif 298 #endif
216 299
217 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 300 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
218 301
219 if (!enable_referrers_->GetValue()) 302 if (!enable_referrers_->GetValue())
220 request->set_referrer(std::string()); 303 request->set_referrer(std::string());
221 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) 304 if (enable_do_not_track_ && enable_do_not_track_->GetValue())
222 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); 305 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
223 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 306
224 profile_, extension_info_map_.get(), request, callback, new_url); 307 bool force_safe_search = force_google_safe_search_ &&
308 force_google_safe_search_->GetValue();
309
310 net::CompletionCallback wrapped_callback = callback;
311 if (force_safe_search) {
312 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
313 callback,
314 base::Unretained(request),
315 base::Unretained(new_url));
316 }
317
318 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
319 profile_, extension_info_map_.get(), request, wrapped_callback,
320 new_url);
321
322 if (force_safe_search && rv == net::OK && new_url->is_empty())
323 ForceGoogleSafeSearch(request, new_url);
324
325 return rv;
225 } 326 }
226 327
227 int ChromeNetworkDelegate::OnBeforeSendHeaders( 328 int ChromeNetworkDelegate::OnBeforeSendHeaders(
228 net::URLRequest* request, 329 net::URLRequest* request,
229 const net::CompletionCallback& callback, 330 const net::CompletionCallback& callback,
230 net::HttpRequestHeaders* headers) { 331 net::HttpRequestHeaders* headers) {
231 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 332 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
232 profile_, extension_info_map_.get(), request, callback, headers); 333 profile_, extension_info_map_.get(), request, callback, headers);
233 } 334 }
234 335
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 #endif 550 #endif
450 return net::OK; 551 return net::OK;
451 } 552 }
452 553
453 void ChromeNetworkDelegate::OnRequestWaitStateChange( 554 void ChromeNetworkDelegate::OnRequestWaitStateChange(
454 const net::URLRequest& request, 555 const net::URLRequest& request,
455 RequestWaitState state) { 556 RequestWaitState state) {
456 if (load_time_stats_) 557 if (load_time_stats_)
457 load_time_stats_->OnRequestWaitStateChange(request, state); 558 load_time_stats_->OnRequestWaitStateChange(request, state);
458 } 559 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698