| 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..5532bd7b1c7ac885a7a7a99b263aaa82352dd0e8 100644
|
| --- a/chrome/browser/net/chrome_network_delegate.cc
|
| +++ b/chrome/browser/net/chrome_network_delegate.cc
|
| @@ -10,12 +10,14 @@
|
| #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/url_blacklist_manager.h"
|
| #include "chrome/browser/prefs/pref_member.h"
|
| #include "chrome/browser/task_manager/task_manager.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "content/browser/browser_thread.h"
|
| #include "net/base/host_port_pair.h"
|
| #include "net/base/net_errors.h"
|
| +#include "net/base/net_log.h"
|
| #include "net/http/http_request_headers.h"
|
| #include "net/http/http_response_headers.h"
|
| #include "net/url_request/url_request.h"
|
| @@ -43,12 +45,14 @@ void ForwardProxyErrors(net::URLRequest* request,
|
| ChromeNetworkDelegate::ChromeNetworkDelegate(
|
| ExtensionEventRouterForwarder* event_router,
|
| ExtensionInfoMap* extension_info_map,
|
| + const policy::URLBlacklistManager* url_blacklist_manager,
|
| void* profile,
|
| BooleanPrefMember* enable_referrers)
|
| : event_router_(event_router),
|
| profile_(profile),
|
| extension_info_map_(extension_info_map),
|
| - enable_referrers_(enable_referrers) {
|
| + enable_referrers_(enable_referrers),
|
| + url_blacklist_manager_(url_blacklist_manager) {
|
| DCHECK(event_router);
|
| DCHECK(enable_referrers);
|
| }
|
| @@ -68,6 +72,19 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
| net::URLRequest* request,
|
| net::CompletionCallback* callback,
|
| GURL* new_url) {
|
| + // TODO(joaodasilva): This prevents extensions from seeing URLs that are
|
| + // blocked. However, an extension might redirect the request to another URL,
|
| + // which is not blocked.
|
| + if (url_blacklist_manager_ &&
|
| + url_blacklist_manager_->IsURLBlocked(request->url())) {
|
| + // URL access blocked by policy.
|
| + scoped_refptr<net::NetLog::EventParameters> params;
|
| + params = new net::NetLogStringParameter("url", request->url().spec());
|
| + request->net_log().AddEvent(
|
| + net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params);
|
| + return net::ERR_NETWORK_ACCESS_DENIED;
|
| + }
|
| +
|
| if (!enable_referrers_->GetValue())
|
| request->set_referrer(std::string());
|
| return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
|
|
|