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

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: Updated version with improvements and new mechanism. 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 "base/logging.h" 7 #include "base/logging.h"
8 #include "base/base_paths.h" 8 #include "base/base_paths.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/browser/api/prefs/pref_member.h" 10 #include "chrome/browser/api/prefs/pref_member.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/content_settings/cookie_settings.h" 12 #include "chrome/browser/content_settings/cookie_settings.h"
13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 13 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
15 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 15 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
16 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 16 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
17 #include "chrome/browser/extensions/event_router_forwarder.h" 17 #include "chrome/browser/extensions/event_router_forwarder.h"
18 #include "chrome/browser/extensions/extension_info_map.h" 18 #include "chrome/browser/extensions/extension_info_map.h"
19 #include "chrome/browser/extensions/extension_process_manager.h" 19 #include "chrome/browser/extensions/extension_process_manager.h"
20 #include "chrome/browser/google/google_util.h"
20 #include "chrome/browser/net/load_time_stats.h" 21 #include "chrome/browser/net/load_time_stats.h"
21 #include "chrome/browser/performance_monitor/performance_monitor.h" 22 #include "chrome/browser/performance_monitor/performance_monitor.h"
22 #include "chrome/browser/prefs/pref_service.h" 23 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profiles/profile_manager.h" 24 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/browser/task_manager/task_manager.h" 25 #include "chrome/browser/task_manager/task_manager.h"
25 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
26 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
27 #include "content/public/browser/browser_thread.h" 28 #include "content/public/browser/browser_thread.h"
28 #include "content/public/browser/render_view_host.h" 29 #include "content/public/browser/render_view_host.h"
29 #include "content/public/browser/resource_request_info.h" 30 #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()) { 81 switch (request->status().error()) {
81 case net::ERR_PROXY_AUTH_UNSUPPORTED: 82 case net::ERR_PROXY_AUTH_UNSUPPORTED:
82 case net::ERR_PROXY_CONNECTION_FAILED: 83 case net::ERR_PROXY_CONNECTION_FAILED:
83 case net::ERR_TUNNEL_CONNECTION_FAILED: 84 case net::ERR_TUNNEL_CONNECTION_FAILED:
84 extensions::ProxyEventRouter::GetInstance()->OnProxyError( 85 extensions::ProxyEventRouter::GetInstance()->OnProxyError(
85 event_router, profile, request->status().error()); 86 event_router, profile, request->status().error());
86 } 87 }
87 } 88 }
88 } 89 }
89 90
91 void ForceGoogleSafeSearchCallbackWrapper(
92 const net::CompletionCallback& callback,
93 net::URLRequest* request,
94 GURL* new_url,
95 int rv) {
96 if (rv == net::OK && new_url->is_empty())
97 ChromeNetworkDelegate::ForceGoogleSafeSearch(request, new_url);
98 callback.Run(rv);
99 }
100
90 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; 101 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE };
91 102
92 // Notifies the ExtensionProcessManager that a request has started or stopped 103 // Notifies the ExtensionProcessManager that a request has started or stopped
93 // for a particular RenderView. 104 // for a particular RenderView.
94 void NotifyEPMRequestStatus(RequestStatus status, 105 void NotifyEPMRequestStatus(RequestStatus status,
95 void* profile_id, 106 void* profile_id,
96 int process_id, 107 int process_id,
97 int render_view_id) { 108 int render_view_id) {
98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 109 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
99 Profile* profile = reinterpret_cast<Profile*>(profile_id); 110 Profile* profile = reinterpret_cast<Profile*>(profile_id);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 150
140 ChromeNetworkDelegate::ChromeNetworkDelegate( 151 ChromeNetworkDelegate::ChromeNetworkDelegate(
141 extensions::EventRouterForwarder* event_router, 152 extensions::EventRouterForwarder* event_router,
142 ExtensionInfoMap* extension_info_map, 153 ExtensionInfoMap* extension_info_map,
143 const policy::URLBlacklistManager* url_blacklist_manager, 154 const policy::URLBlacklistManager* url_blacklist_manager,
144 const ManagedModeURLFilter* managed_mode_url_filter, 155 const ManagedModeURLFilter* managed_mode_url_filter,
145 void* profile, 156 void* profile,
146 CookieSettings* cookie_settings, 157 CookieSettings* cookie_settings,
147 BooleanPrefMember* enable_referrers, 158 BooleanPrefMember* enable_referrers,
148 BooleanPrefMember* enable_do_not_track, 159 BooleanPrefMember* enable_do_not_track,
160 BooleanPrefMember* force_google_safesearch,
149 chrome_browser_net::LoadTimeStats* load_time_stats) 161 chrome_browser_net::LoadTimeStats* load_time_stats)
150 : event_router_(event_router), 162 : event_router_(event_router),
151 profile_(profile), 163 profile_(profile),
152 cookie_settings_(cookie_settings), 164 cookie_settings_(cookie_settings),
153 extension_info_map_(extension_info_map), 165 extension_info_map_(extension_info_map),
154 enable_referrers_(enable_referrers), 166 enable_referrers_(enable_referrers),
155 enable_do_not_track_(enable_do_not_track), 167 enable_do_not_track_(enable_do_not_track),
168 force_google_safesearch_(force_google_safesearch),
156 url_blacklist_manager_(url_blacklist_manager), 169 url_blacklist_manager_(url_blacklist_manager),
157 managed_mode_url_filter_(managed_mode_url_filter), 170 managed_mode_url_filter_(managed_mode_url_filter),
158 load_time_stats_(load_time_stats) { 171 load_time_stats_(load_time_stats) {
159 DCHECK(event_router); 172 DCHECK(event_router);
160 DCHECK(enable_referrers); 173 DCHECK(enable_referrers);
161 DCHECK(!profile || cookie_settings); 174 DCHECK(!profile || cookie_settings);
162 } 175 }
163 176
164 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 177 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
165 178
166 // static 179 // static
167 void ChromeNetworkDelegate::NeverThrottleRequests() { 180 void ChromeNetworkDelegate::NeverThrottleRequests() {
168 g_never_throttle_requests_ = true; 181 g_never_throttle_requests_ = true;
169 } 182 }
170 183
171 // static 184 // static
172 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 185 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
173 BooleanPrefMember* enable_referrers, 186 BooleanPrefMember* enable_referrers,
174 BooleanPrefMember* enable_do_not_track, 187 BooleanPrefMember* enable_do_not_track,
188 BooleanPrefMember* force_google_safesearch,
175 PrefService* pref_service) { 189 PrefService* pref_service) {
176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 190 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
177 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); 191 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL);
178 enable_referrers->MoveToThread(BrowserThread::IO); 192 enable_referrers->MoveToThread(BrowserThread::IO);
179 if (enable_do_not_track) { 193 if (enable_do_not_track) {
180 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); 194 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL);
181 enable_do_not_track->MoveToThread(BrowserThread::IO); 195 enable_do_not_track->MoveToThread(BrowserThread::IO);
182 } 196 }
197 if (force_google_safesearch) {
198 force_google_safesearch->Init(prefs::kForceSafeSearch, pref_service, NULL);
199 force_google_safesearch->MoveToThread(BrowserThread::IO);
200 }
183 } 201 }
184 202
185 // static 203 // static
186 void ChromeNetworkDelegate::AllowAccessToAllFiles() { 204 void ChromeNetworkDelegate::AllowAccessToAllFiles() {
187 g_allow_file_access_ = true; 205 g_allow_file_access_ = true;
188 } 206 }
189 207
208 // static
209 void ChromeNetworkDelegate::ForceGoogleSafeSearch(net::URLRequest* request,
210 GURL* new_url) {
211 // Force SafeSearch.
212 const bool is_search_url = google_util::IsGoogleSearchUrl(
213 request->url().spec());
214 const bool is_homepage_url = google_util::IsGoogleHomePageUrl(
215 request->url().spec());
216 if (is_search_url || is_homepage_url) {
217 std::string query = request->url().query();
218 std::string single_parameters = chrome::kSafeSearchParameters;
219 std::string multiple_parameters = "&"+single_parameters;
Bernhard Bauer 2012/10/17 15:23:54 Nit: space before and after operators like "+"
Sergiu 2012/10/19 08:40:55 Done.
220 std::string append_parameters;
221
222 if (is_homepage_url && query.empty())
223 append_parameters = single_parameters;
224 else
225 append_parameters = multiple_parameters;
226 // Make sure that our parameters are either the only ones
227 // or have a & before them so that we don't accept &bogussafe=active.
228 if (query == chrome::kSafeSearchParameters ||
229 query.rfind(multiple_parameters) != std::string::npos)
230 return;
Bernhard Bauer 2012/10/17 15:23:54 Nit: newline please.
Sergiu 2012/10/19 08:40:55 Done.
231 // Add this parameter at the end of this query since it will override the
232 // other parameters.
233 query.append(append_parameters);
234
235 GURL::Replacements replacements;
236 replacements.SetQueryStr(query);
237 *new_url = request->url().ReplaceComponents(replacements);
238 }
239 }
240
190 int ChromeNetworkDelegate::OnBeforeURLRequest( 241 int ChromeNetworkDelegate::OnBeforeURLRequest(
191 net::URLRequest* request, 242 net::URLRequest* request,
192 const net::CompletionCallback& callback, 243 const net::CompletionCallback& callback,
193 GURL* new_url) { 244 GURL* new_url) {
194 #if defined(ENABLE_CONFIGURATION_POLICY) 245 #if defined(ENABLE_CONFIGURATION_POLICY)
195 // TODO(joaodasilva): This prevents extensions from seeing URLs that are 246 // TODO(joaodasilva): This prevents extensions from seeing URLs that are
196 // blocked. However, an extension might redirect the request to another URL, 247 // blocked. However, an extension might redirect the request to another URL,
197 // which is not blocked. 248 // which is not blocked.
198 if (url_blacklist_manager_ && 249 if (url_blacklist_manager_ &&
199 url_blacklist_manager_->IsURLBlocked(request->url())) { 250 url_blacklist_manager_->IsURLBlocked(request->url())) {
(...skipping 13 matching lines...) Expand all
213 return net::ERR_NETWORK_ACCESS_DENIED; 264 return net::ERR_NETWORK_ACCESS_DENIED;
214 } 265 }
215 #endif 266 #endif
216 267
217 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 268 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
218 269
219 if (!enable_referrers_->GetValue()) 270 if (!enable_referrers_->GetValue())
220 request->set_referrer(std::string()); 271 request->set_referrer(std::string());
221 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) 272 if (enable_do_not_track_ && enable_do_not_track_->GetValue())
222 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); 273 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
274
275 if (force_google_safesearch_ && force_google_safesearch_->GetValue()) {
276 net::CompletionCallback wrapped_callback =
277 base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
278 callback,
279 base::Unretained(request),
280 base::Unretained(new_url));
281
282 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
283 profile_, extension_info_map_.get(), request, wrapped_callback,
284 new_url);
285
286 if (rv == net::OK && new_url->is_empty()) {
287 ForceGoogleSafeSearch(request, new_url);
288 return net::OK;
289 }
290
291 return rv;
292 }
293
223 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 294 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
224 profile_, extension_info_map_.get(), request, callback, new_url); 295 profile_, extension_info_map_.get(), request, callback, new_url);
225 } 296 }
226 297
227 int ChromeNetworkDelegate::OnBeforeSendHeaders( 298 int ChromeNetworkDelegate::OnBeforeSendHeaders(
228 net::URLRequest* request, 299 net::URLRequest* request,
229 const net::CompletionCallback& callback, 300 const net::CompletionCallback& callback,
230 net::HttpRequestHeaders* headers) { 301 net::HttpRequestHeaders* headers) {
231 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 302 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
232 profile_, extension_info_map_.get(), request, callback, headers); 303 profile_, extension_info_map_.get(), request, callback, headers);
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 #endif 520 #endif
450 return net::OK; 521 return net::OK;
451 } 522 }
452 523
453 void ChromeNetworkDelegate::OnRequestWaitStateChange( 524 void ChromeNetworkDelegate::OnRequestWaitStateChange(
454 const net::URLRequest& request, 525 const net::URLRequest& request,
455 RequestWaitState state) { 526 RequestWaitState state) {
456 if (load_time_stats_) 527 if (load_time_stats_)
457 load_time_stats_->OnRequestWaitStateChange(request, state); 528 load_time_stats_->OnRequestWaitStateChange(request, state);
458 } 529 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698