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

Unified Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 7747018: Introduced the URLBlacklistManager, and wired it to various places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewed, rebased Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 41cedf3124f7bb0a00bdfb92fd451a2737bb8d83..e51d3a31e4f434528b6a5299ac0436d30397c9c4 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/extensions/extension_info_map.h"
#include "chrome/browser/extensions/extension_proxy_api.h"
#include "chrome/browser/extensions/extension_webrequest_api.h"
+#include "chrome/browser/policy/host_blacklist_manager.h"
#include "chrome/browser/prefs/pref_member.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/common/pref_names.h"
@@ -43,11 +44,13 @@ void ForwardProxyErrors(net::URLRequest* request,
ChromeNetworkDelegate::ChromeNetworkDelegate(
ExtensionEventRouterForwarder* event_router,
ExtensionInfoMap* extension_info_map,
+ policy::HostBlacklistManager* host_blacklist_manager,
void* profile,
BooleanPrefMember* enable_referrers)
: event_router_(event_router),
profile_(profile),
extension_info_map_(extension_info_map),
+ host_blacklist_manager_(host_blacklist_manager),
enable_referrers_(enable_referrers) {
DCHECK(event_router);
DCHECK(enable_referrers);
@@ -68,6 +71,13 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
net::URLRequest* request,
net::CompletionCallback* callback,
GURL* new_url) {
+ if (host_blacklist_manager_.get() &&
+ host_blacklist_manager_->ShouldBlockRequest(request->url())) {
+ // URL access blocked by policy.
+ // TODO(joaodasilva): this error code isn't quite correct
willchan no longer on Chromium 2011/08/26 11:40:21 This error code is wrong. Maybe ERR_ACCESS_DENIED
Joao da Silva 2011/08/29 11:24:25 This error was chosen because it's the same that i
willchan no longer on Chromium 2011/09/01 00:49:33 I think the correct way to handle this is to use E
+ return net::ERR_EMPTY_RESPONSE;
+ }
+
if (!enable_referrers_->GetValue())
request->set_referrer(std::string());
return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(

Powered by Google App Engine
This is Rietveld 408576698