Enable (optional) blocking of webrequests in case a PAC script cannot be fetched or is invalid.

net/proxy/proxy_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_service.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 534 matching lines @@
 
 int ProxyService::TryToCompleteSynchronously(const GURL& url,
                                              ProxyInfo* result) {
   DCHECK_NE(STATE_NONE, current_state_);
 
   if (current_state_ != STATE_READY)
     return ERR_IO_PENDING;  // Still initializing.
 
   DCHECK_NE(config_.id(), ProxyConfig::INVALID_ID);
 
+  if (config_.block_everything())
+    return ERR_PROXY_CONNECTION_FAILED;

[eroman, 2011/04/26 21:47:17]

Should use a more specific error code here.

[battre, 2011/04/27 17:02:58]

Done.

+
   if (config_.HasAutomaticSettings())
     return ERR_IO_PENDING;  // Must submit the request to the proxy resolver.
 
   // Use the manual proxy settings.
   config_.proxy_rules().Apply(url, result);
   result->config_id_ = config_.id();
   return OK;
 }
 
 ProxyService::~ProxyService() {
@@ skipping 70 matching lines @@
     OnProxyConfigChanged(config, availability);
 }
 
 void ProxyService::OnInitProxyResolverComplete(int result) {
   DCHECK_EQ(STATE_WAITING_FOR_INIT_PROXY_RESOLVER, current_state_);
   DCHECK(init_proxy_resolver_.get());
   DCHECK(fetched_config_.HasAutomaticSettings());
   init_proxy_resolver_.reset();
 
   if (result != OK) {
-    VLOG(1) << "Failed configuring with PAC script, falling-back to manual "
-               "proxy servers.";
-    config_ = fetched_config_;
-    config_.ClearAutomaticSettings();
+    if (fetched_config_.pac_mandatory()) {
+      VLOG(1) << "Failed configuring with mandatory PAC script, blocking all "
+                 "traffic.";
+      config_ = fetched_config_;
+      config_.set_block_everything(true);
+    } else {
+      VLOG(1) << "Failed configuring with PAC script, falling-back to manual "
+                 "proxy servers.";
+      config_ = fetched_config_;
+      config_.ClearAutomaticSettings();
+    }
   }
 
   config_.set_id(fetched_config_.id());
 
   // Resume any requests which we had to defer until the PAC script was
   // downloaded.
   SetReady();
 }
 
 int ProxyService::ReconsiderProxyAfterError(const GURL& url,
@@ skipping 57 matching lines @@
           make_scoped_refptr(new NetLogStringParameter(
               "pac_string", result->ToPacString())));
     }
     result->DeprioritizeBadProxies(proxy_retry_info_);
   } else {
     net_log.AddEvent(
         NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
         make_scoped_refptr(new NetLogIntegerParameter(
             "net_error", result_code)));
 
-    // Fall-back to direct when the proxy resolver fails. This corresponds
-    // with a javascript runtime error in the PAC script.
-    //
-    // This implicit fall-back to direct matches Firefox 3.5 and
-    // Internet Explorer 8. For more information, see:
-    //
-    // http://www.chromium.org/developers/design-documents/proxy-settings-fallback
-    result->UseDirect();
-    result_code = OK;
+    if (!config_.pac_mandatory()) {
+      // Fall-back to direct when the proxy resolver fails. This corresponds
+      // with a javascript runtime error in the PAC script.
+      //
+      // This implicit fall-back to direct matches Firefox 3.5 and
+      // Internet Explorer 8. For more information, see:
+      //
+      // http://www.chromium.org/developers/design-documents/proxy-settings-fallback
+      result->UseDirect();
+      result_code = OK;
+    } else {
+      result_code = ERR_PROXY_CONNECTION_FAILED;

[eroman, 2011/04/26 21:47:17]

Use a more specific error code.

[battre, 2011/04/27 17:02:58]

Done.

+    }
   }
 
   net_log.EndEvent(NetLog::TYPE_PROXY_SERVICE, NULL);
   return result_code;
 }
 
 void ProxyService::SetProxyScriptFetcher(
     ProxyScriptFetcher* proxy_script_fetcher) {
   DCHECK(CalledOnValidThread());
   State previous_state = ResetProxyConfig(false);
@@ skipping 229 matching lines @@
     OnCompletion(result_);
   }
 }
 
 void SyncProxyServiceHelper::OnCompletion(int rv) {
   result_ = rv;
   event_.Signal();
 }
 
 }  // namespace net