Whenever proxy configurations contain socks and http/https/ftp proxies, socks...

net/proxy/proxy_config_unittest.cc

 // Copyright (c) 2009 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_config.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 static void ExpectProxyServerEquals(const char* expectation,
@@ skipping 31 matching lines @@
   EXPECT_FALSE(config2.Equals(config1));
 
   config1.pac_url = GURL("http://wpad/wpad.dat");
 
   EXPECT_TRUE(config1.Equals(config2));
   EXPECT_TRUE(config2.Equals(config1));
 
   // Test |ProxyConfig::proxy_rules|.
 
   config2.proxy_rules.type = net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY;
-  config2.proxy_rules.single_proxy = net::ProxyServer::FromURI("myproxy:80");
+  config2.proxy_rules.single_proxy =
+      net::ProxyServer::FromURI("myproxy:80", net::ProxyServer::SCHEME_HTTP);
 
   EXPECT_FALSE(config1.Equals(config2));
   EXPECT_FALSE(config2.Equals(config1));
 
   config1.proxy_rules.type = net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY;
-  config1.proxy_rules.single_proxy = net::ProxyServer::FromURI("myproxy:100");
+  config1.proxy_rules.single_proxy =
+      net::ProxyServer::FromURI("myproxy:100", net::ProxyServer::SCHEME_HTTP);
 
   EXPECT_FALSE(config1.Equals(config2));
   EXPECT_FALSE(config2.Equals(config1));
 
-  config1.proxy_rules.single_proxy = net::ProxyServer::FromURI("myproxy");
+  config1.proxy_rules.single_proxy =
+      net::ProxyServer::FromURI("myproxy", net::ProxyServer::SCHEME_HTTP);
 
   EXPECT_TRUE(config1.Equals(config2));
   EXPECT_TRUE(config2.Equals(config1));
 
   // Test |ProxyConfig::proxy_bypass|.
 
   config2.proxy_bypass.push_back("*.google.com");
 
   EXPECT_FALSE(config1.Equals(config2));
   EXPECT_FALSE(config2.Equals(config1));
@@ skipping 18 matching lines @@
 
 TEST(ProxyConfigTest, ParseProxyRules) {
   const struct {
     const char* proxy_rules;
 
     net::ProxyConfig::ProxyRules::Type type;
     const char* single_proxy;
     const char* proxy_for_http;
     const char* proxy_for_https;
     const char* proxy_for_ftp;
+    const char* socks_proxy;
   } tests[] = {
     // One HTTP proxy for all schemes.
     {
       "myproxy:80",
 
       net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY,
       "myproxy:80",
       NULL,
       NULL,
       NULL,
+      NULL,
     },
 
     // Only specify a proxy server for "http://" urls.
     {
       "http=myproxy:80",
 
       net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
       NULL,
       "myproxy:80",
       NULL,
       NULL,
+      NULL,
     },
 
     // Specify an HTTP proxy for "ftp://" and a SOCKS proxy for "https://" urls.
     {
       "ftp=ftp-proxy ; https=socks4://foopy",
 
       net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
       NULL,
       NULL,
       "socks4://foopy:1080",
       "ftp-proxy:80",
+      NULL,
     },
 
     // Give a scheme-specific proxy as well as a non-scheme specific.
     // The first entry "foopy" takes precedance marking this list as
     // TYPE_SINGLE_PROXY.
     {
       "foopy ; ftp=ftp-proxy",
 
       net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY,
       "foopy:80",
       NULL,
       NULL,
       NULL,
+      NULL,
     },
 
     // Give a scheme-specific proxy as well as a non-scheme specific.
     // The first entry "ftp=ftp-proxy" takes precedance marking this list as
     // TYPE_PROXY_PER_SCHEME.
     {
       "ftp=ftp-proxy ; foopy",
 
       net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
       NULL,
       NULL,
       NULL,
       "ftp-proxy:80",
+      NULL,
     },
 
     // Include duplicate entries -- last one wins.
     {
       "ftp=ftp1 ; ftp=ftp2 ; ftp=ftp3",
 
       net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
       NULL,
       NULL,
       NULL,
       "ftp3:80",
+      NULL,
     },
 
-    // Only socks proxy present, others being blank.
-    {  // NOLINT
+    // Only SOCKS proxy present, others being blank.
+    {
       "socks=foopy",
 
-      net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY,
-      "socks4://foopy:1080",
+      net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
       NULL,
       NULL,
       NULL,
+      NULL,
+      "socks4://foopy:1080",
+      },
+
+    // SOCKS proxy present along with other proxies too
+    {
+      "http=httpproxy ; https=httpsproxy ; ftp=ftpproxy ; socks=foopy ",
+
+      net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
+      NULL,
+      "httpproxy:80",
+      "httpsproxy:80",
+      "ftpproxy:80",
+      "socks4://foopy:1080",
     },
 
+    // SOCKS proxy (with modifier) present along with some proxies
+    // (FTP being blank)
+    {
+      "http=httpproxy ; https=httpsproxy ; socks=socks5://foopy ",
+
+      net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
+      NULL,
+      "httpproxy:80",
+      "httpsproxy:80",
+      NULL,
+      "socks5://foopy:1080",
+      },
+
     // Include unsupported schemes -- they are discarded.
     {
       "crazy=foopy ; foo=bar ; https=myhttpsproxy",
 
       net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
       NULL,
       NULL,
       "myhttpsproxy:80",
       NULL,
+      NULL,
     },
   };
 
   net::ProxyConfig config;
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     config.proxy_rules.ParseFromString(tests[i].proxy_rules);
 
     EXPECT_EQ(tests[i].type, config.proxy_rules.type);
     ExpectProxyServerEquals(tests[i].single_proxy,
                             config.proxy_rules.single_proxy);
     ExpectProxyServerEquals(tests[i].proxy_for_http,
                             config.proxy_rules.proxy_for_http);
     ExpectProxyServerEquals(tests[i].proxy_for_https,
                             config.proxy_rules.proxy_for_https);
     ExpectProxyServerEquals(tests[i].proxy_for_ftp,
                             config.proxy_rules.proxy_for_ftp);
+    ExpectProxyServerEquals(tests[i].socks_proxy,
+                            config.proxy_rules.socks_proxy);
   }
 }
 
 TEST(ProxyConfigTest, ParseProxyBypassList) {
   struct bypass_test {
     const char* proxy_bypass_input;
     const char* flattened_output;
   };
 
   const struct {
@@ skipping 15 matching lines @@
   };
 
   net::ProxyConfig config;
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     config.ParseNoProxyList(tests[i].proxy_bypass_input);
     EXPECT_EQ(tests[i].flattened_output,
               net::FlattenProxyBypass(config.proxy_bypass));
   }
 }