Use Android proxy's exclusion list to enable proxy bypass

net/proxy/proxy_config_service_android.cc

Index: net/proxy/proxy_config_service_android.cc
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index 4129bf24c2f958d268cddc7282e049f3836ccb68..64fcab86f493e823e3b680ad752d8885e11264f1 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -159,11 +159,26 @@ std::string GetJavaProperty(const std::string& property) {
       std::string() : ConvertJavaStringToUTF8(env, result.obj());
 }
 
-void CreateStaticProxyConfig(const std::string& host, int port,
+void CreateStaticProxyConfig(const std::string& host,
+                             int port,
+                             const std::string& exclusion_list,
                              ProxyConfig* config) {
   if (port != 0) {
     std::string rules = base::StringPrintf("%s:%d", host.c_str(), port);
     config->proxy_rules().ParseFromString(rules);
+    config->proxy_rules().bypass_rules.Clear();
+    if (!exclusion_list.empty()) {

[eroman, 2014/07/25 21:11:15]

This block is essentially equivalent to:

config->proxy_rules().bypass_rules.ParseFromString(exclusion_list);

With the caveat that ParseFromString also accepts semicolons as a separator.

Can you point me to any documentation on the android format for rules?
BypassProxyRules is most similar to the Windows proxy rules foramt, and will
interpret things in a very particular way. For instance "<local>" has special
meaning, CIDR style masks can be added, and there is a difference in meaning for
"foo.com" vs ".foo.com"

[sgurun-gerrit only, 2014/07/26 00:57:09]

Thanks. Actually this made me realize that there are some other issues to be
aware of.

Android is dropping the hidden API proxyproperties (which chrome was using
reflection to access) and providing a new Public API (that was publicisized in
l-preview sdk). Do you want me to open a bug about that?

The new API (tentative) is returning a list of hosts
public String[] getExclusionList()

My understanding is the hosts can contain "*" in bypass rules.

However this CL is relevant for support for devices using current sdk and below,
so it is still meaningful. I need to do more investigation to answer your
question about current rules 




On 2014/07/25 21:11:15, eroman wrote:

+      base::StringTokenizer tokenizer(exclusion_list, ",");
+      while (tokenizer.GetNext()) {
+        std::string token = tokenizer.token();
+        std::string pattern;
+        base::TrimWhitespaceASCII(token, base::TRIM_ALL, &pattern);
+        if (pattern.empty())
+          continue;
+        VLOG(0) << "Add bypass rules:" << pattern.c_str();
+        config->proxy_rules().bypass_rules.AddRuleFromString(pattern);
+      }
+    }
   } else {
     *config = ProxyConfig::CreateDirect();
   }
@@ -248,10 +263,11 @@ class ProxyConfigServiceAndroid::Delegate
   }
 
   // Called on the JNI thread.
-  void ProxySettingsChangedTo(const std::string& host, int port) {
+  void ProxySettingsChangedTo(const std::string& host, int port,
+                              const std::string& exclusion_list) {
     DCHECK(OnJNIThread());
     ProxyConfig proxy_config;
-    CreateStaticProxyConfig(host, port, &proxy_config);
+    CreateStaticProxyConfig(host, port, exclusion_list, &proxy_config);
     network_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(
@@ -267,9 +283,12 @@ class ProxyConfigServiceAndroid::Delegate
 
     // ProxyConfigServiceAndroid::JNIDelegate overrides.
     virtual void ProxySettingsChangedTo(JNIEnv* env, jobject jself,
-                                      jstring jhost, jint jport) OVERRIDE {
+                                      jstring jhost, jint jport,
+                                      jstring jexclusion_list) OVERRIDE {
       std::string host = ConvertJavaStringToUTF8(env, jhost);
-      delegate_->ProxySettingsChangedTo(host, jport);
+      std::string exclusion_list =
+          ConvertJavaStringToUTF8(env, jexclusion_list);
+      delegate_->ProxySettingsChangedTo(host, jport, exclusion_list);
     }
 
     virtual void ProxySettingsChanged(JNIEnv* env, jobject self) OVERRIDE {