summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/extensions/extension_proxy_api.cc180
-rw-r--r--chrome/browser/extensions/extension_proxy_api.h24
-rw-r--r--chrome/browser/extensions/extension_proxy_apitest.cc30
-rw-r--r--chrome/test/data/extensions/api_test/proxy/individual/test.js1
-rw-r--r--net/proxy/proxy_server.cc24
-rw-r--r--net/proxy/proxy_server.h6
6 files changed, 131 insertions, 134 deletions
diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc
index c905cab..f73dcc3 100644
--- a/chrome/browser/extensions/extension_proxy_api.cc
+++ b/chrome/browser/extensions/extension_proxy_api.cc
@@ -5,12 +5,13 @@
#include "chrome/browser/extensions/extension_proxy_api.h"
#include "base/string_util.h"
-#include "base/stringprintf.h"
#include "base/values.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/common/pref_names.h"
+#include "net/base/host_port_pair.h"
+#include "net/proxy/proxy_server.h"
namespace {
@@ -42,8 +43,6 @@ const char* scheme_name[] = { "*error*",
"ftp",
"socks" };
-} // namespace
-
COMPILE_ASSERT(SCHEME_MAX == SCHEME_SOCKS, SCHEME_MAX_must_equal_SCHEME_SOCKS);
COMPILE_ASSERT(arraysize(field_name) == SCHEME_MAX + 1,
field_name_array_is_wrong_size);
@@ -51,6 +50,96 @@ COMPILE_ASSERT(arraysize(scheme_name) == SCHEME_MAX + 1,
scheme_name_array_is_wrong_size);
COMPILE_ASSERT(SCHEME_ALL == 0, singleProxy_must_be_first_option);
+// Converts a proxy server description |dict| as passed by the API caller
+// (e.g. for the http proxy in the rules element) and converts it to a
+// ProxyServer. Returns true if successful.
+bool GetProxyServer(const DictionaryValue* dict,
+ net::ProxyServer::Scheme default_scheme,
+ net::ProxyServer* proxy_server) {
+ std::string scheme_string; // optional.
+ dict->GetString("scheme", &scheme_string);
+
+ net::ProxyServer::Scheme scheme =
+ net::ProxyServer::GetSchemeFromURI(scheme_string);
+ if (scheme == net::ProxyServer::SCHEME_INVALID)
+ scheme = default_scheme;
+
+ std::string host;
+ if (!dict->GetString("host", &host))
+ return false;
+
+ int port; // optional.
+ if (!dict->GetInteger("port", &port))
+ port = net::ProxyServer::GetDefaultPortForScheme(scheme);
+
+ *proxy_server = net::ProxyServer(scheme, net::HostPortPair(host, port));
+
+ return true;
+}
+
+// Converts a proxy "rules" element passed by the API caller into a proxy
+// configuration string that can be used by the proxy subsystem (see
+// proxy_config.h). Returns true if successful.
+bool GetProxyRules(DictionaryValue* proxy_rules, std::string* out) {
+ if (!proxy_rules)
+ return false;
+
+ // Local data into which the parameters will be parsed. has_proxy describes
+ // whether a setting was found for the scheme; proxy_dict holds the
+ // DictionaryValues which in turn contain proxy server descriptions, and
+ // proxy_server holds ProxyServer structs containing those descriptions.
+ bool has_proxy[SCHEME_MAX + 1];
+ DictionaryValue* proxy_dict[SCHEME_MAX + 1];
+ net::ProxyServer proxy_server[SCHEME_MAX + 1];
+
+ // Looking for all possible proxy types is inefficient if we have a
+ // singleProxy that will supersede per-URL proxies, but it's worth it to keep
+ // the code simple and extensible.
+ for (size_t i = 0; i <= SCHEME_MAX; ++i) {
+ has_proxy[i] = proxy_rules->GetDictionary(field_name[i], &proxy_dict[i]);
+ if (has_proxy[i]) {
+ net::ProxyServer::Scheme default_scheme =
+ (i != SCHEME_SOCKS) ? net::ProxyServer::SCHEME_HTTP
+ : net::ProxyServer::SCHEME_SOCKS5;
+ if (!GetProxyServer(proxy_dict[i], default_scheme, &proxy_server[i]))
+ return false;
+ }
+ }
+
+ // Handle case that only singleProxy is specified.
+ if (has_proxy[SCHEME_ALL]) {
+ for (size_t i = 1; i <= SCHEME_MAX; ++i) {
+ if (has_proxy[i]) {
+ LOG(ERROR) << "Proxy rule for " << field_name[SCHEME_ALL] << " and "
+ << field_name[i] << " cannot be set at the same time.";
+ return false;
+ }
+ }
+ *out = proxy_server[SCHEME_ALL].ToURI();
+ return true;
+ }
+
+ // Handle case that anything but singleProxy is specified.
+
+ // Build the proxy preference string.
+ std::string proxy_pref;
+ for (size_t i = 1; i <= SCHEME_MAX; ++i) {
+ if (has_proxy[i]) {
+ // http=foopy:4010;ftp=socks://foopy2:80
+ if (!proxy_pref.empty())
+ proxy_pref.append(";");
+ proxy_pref.append(scheme_name[i]);
+ proxy_pref.append("=");
+ proxy_pref.append(proxy_server[i].ToURI());
+ }
+ }
+
+ *out = proxy_pref;
+ return true;
+}
+
+} // namespace
+
void ProxySettingsFunction::ApplyPreference(const char* pref_path,
Value* pref_value,
bool incognito) {
@@ -144,90 +233,11 @@ bool UseCustomProxySettingsFunction::RunImpl() {
return true;
}
-bool UseCustomProxySettingsFunction::GetProxyServer(
- const DictionaryValue* dict, ProxyServer* proxy_server) {
- dict->GetString("scheme", &proxy_server->scheme);
- EXTENSION_FUNCTION_VALIDATE(dict->GetString("host", &proxy_server->host));
- dict->GetInteger("port", &proxy_server->port);
- return true;
-}
-
-bool UseCustomProxySettingsFunction::GetProxyRules(
- DictionaryValue* proxy_rules,
- std::string* out) {
- if (!proxy_rules)
- return false;
-
- // Local data into which the parameters will be parsed. has_proxy describes
- // whether a setting was found for the scheme; proxy_dict holds the
- // DictionaryValues which in turn contain proxy server descriptions, and
- // proxy_server holds ProxyServer structs containing those descriptions.
- bool has_proxy[SCHEME_MAX + 1];
- DictionaryValue* proxy_dict[SCHEME_MAX + 1];
- ProxyServer proxy_server[SCHEME_MAX + 1];
-
- // Looking for all possible proxy types is inefficient if we have a
- // singleProxy that will supersede per-URL proxies, but it's worth it to keep
- // the code simple and extensible.
- for (size_t i = 0; i <= SCHEME_MAX; ++i) {
- has_proxy[i] = proxy_rules->GetDictionary(field_name[i], &proxy_dict[i]);
- if (has_proxy[i]) {
- if (!GetProxyServer(proxy_dict[i], &proxy_server[i]))
- return false;
- }
- }
-
- // Handle case that only singleProxy is specified.
- if (has_proxy[SCHEME_ALL]) {
- for (size_t i = 1; i <= SCHEME_MAX; ++i) {
- if (has_proxy[i]) {
- LOG(ERROR) << "Proxy rule for " << field_name[SCHEME_ALL] << " and "
- << field_name[i] << " cannot be set at the same time.";
- return false;
- }
- }
- if (!proxy_server[SCHEME_ALL].scheme.empty())
- LOG(WARNING) << "Ignoring scheme attribute from proxy server.";
- // Build the proxy preference string.
- std::string proxy_pref;
- proxy_pref.append(proxy_server[SCHEME_ALL].host);
- if (proxy_server[SCHEME_ALL].port != ProxyServer::INVALID_PORT) {
- proxy_pref.append(":");
- proxy_pref.append(base::StringPrintf("%d",
- proxy_server[SCHEME_ALL].port));
- }
- *out = proxy_pref;
- return true;
- }
-
- // Handle case the anything but singleProxy is specified.
-
- // Build the proxy preference string.
- std::string proxy_pref;
- for (size_t i = 1; i <= SCHEME_MAX; ++i) {
- if (has_proxy[i]) {
- // http=foopy:4010;ftp=socks://foopy2:80
- if (!proxy_pref.empty())
- proxy_pref.append(";");
- proxy_pref.append(scheme_name[i]);
- proxy_pref.append("=");
- proxy_pref.append(proxy_server[i].scheme);
- proxy_pref.append("://");
- proxy_pref.append(proxy_server[i].host);
- if (proxy_server[i].port != ProxyServer::INVALID_PORT) {
- proxy_pref.append(":");
- proxy_pref.append(base::StringPrintf("%d", proxy_server[i].port));
- }
- }
- }
-
- *out = proxy_pref;
- return true;
-}
-
bool RemoveCustomProxySettingsFunction::RunImpl() {
bool incognito = false;
- args_->GetBoolean(0, &incognito);
+ if (HasOptionalArgument(0)) {
+ EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &incognito));
+ }
RemovePreference(prefs::kProxy, incognito);
return true;
diff --git a/chrome/browser/extensions/extension_proxy_api.h b/chrome/browser/extensions/extension_proxy_api.h
index ee98813..ab6f9c9 100644
--- a/chrome/browser/extensions/extension_proxy_api.h
+++ b/chrome/browser/extensions/extension_proxy_api.h
@@ -28,30 +28,6 @@ class UseCustomProxySettingsFunction : public ProxySettingsFunction {
virtual bool RunImpl();
DECLARE_EXTENSION_FUNCTION_NAME("experimental.proxy.useCustomProxySettings")
-
- private:
- // Temporary data container to pass structured elements between functions.
- struct ProxyServer {
- enum {
- INVALID_PORT = -1
- };
- ProxyServer() : scheme("http"), host(""), port(INVALID_PORT) {}
-
- // The scheme of the proxy URI itself.
- std::string scheme;
- std::string host;
- int port;
- };
-
- // Converts a proxy server description |dict| as passed by the API caller
- // (e.g. for the http proxy in the rules element) and converts it to a
- // ProxyServer. Returns true if successful.
- bool GetProxyServer(const DictionaryValue* dict, ProxyServer* proxy_server);
-
- // Converts a proxy "rules" element passed by the API caller into a proxy
- // configuration string that can be used by the proxy subsystem (see
- // proxy_config.h). Returns true if successful.
- bool GetProxyRules(DictionaryValue* proxy_rules, std::string* out);
};
class RemoveCustomProxySettingsFunction : public ProxySettingsFunction {
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc
index 44856dd..b07e2cb 100644
--- a/chrome/browser/extensions/extension_proxy_apitest.cc
+++ b/chrome/browser/extensions/extension_proxy_apitest.cc
@@ -147,9 +147,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) {
PrefService* pref_service = browser()->profile()->GetPrefs();
ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
- "http=http://1.1.1.1;"
- "https=socks://2.2.2.2;"
- "ftp=http://3.3.3.3:9000;"
+ "http=1.1.1.1:80;" // http:// is pruned.
+ "https=2.2.2.2:80;" // http:// is pruned.
+ "ftp=3.3.3.3:9000;" // http:// is pruned.
"socks=socks4://4.4.4.4:9090",
kNoPac,
pref_service);
@@ -157,9 +157,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) {
// Now check the incognito preferences.
pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
- "http=http://1.1.1.1;"
- "https=socks://2.2.2.2;"
- "ftp=http://3.3.3.3:9000;"
+ "http=1.1.1.1:80;"
+ "https=2.2.2.2:80;"
+ "ftp=3.3.3.3:9000;"
"socks=socks4://4.4.4.4:9090",
kNoPac,
pref_service);
@@ -181,9 +181,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
// Now check the incognito preferences.
pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
- "http=http://1.1.1.1;"
- "https=socks://2.2.2.2;"
- "ftp=http://3.3.3.3:9000;"
+ "http=1.1.1.1:80;"
+ "https=socks5://2.2.2.2:1080;" // socks5 equals socks.
+ "ftp=3.3.3.3:9000;"
"socks=socks4://4.4.4.4:9090",
kNoPac,
pref_service);
@@ -201,9 +201,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
PrefService* pref_service = browser()->profile()->GetPrefs();
ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
- "http=http://1.1.1.1;"
- "https=socks://2.2.2.2;"
- "ftp=http://3.3.3.3:9000;"
+ "http=1.1.1.1:80;"
+ "https=socks5://2.2.2.2:1080;"
+ "ftp=3.3.3.3:9000;"
"socks=socks4://4.4.4.4:9090",
kNoPac,
pref_service);
@@ -211,9 +211,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
// Now check the incognito preferences.
pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
- "http=http://5.5.5.5;"
- "https=socks://6.6.6.6;"
- "ftp=http://7.7.7.7:9000;"
+ "http=5.5.5.5:80;"
+ "https=socks5://6.6.6.6:1080;"
+ "ftp=7.7.7.7:9000;"
"socks=socks4://8.8.8.8:9090",
kNoPac,
pref_service);
diff --git a/chrome/test/data/extensions/api_test/proxy/individual/test.js b/chrome/test/data/extensions/api_test/proxy/individual/test.js
index bf71d52c..ca675b5 100644
--- a/chrome/test/data/extensions/api_test/proxy/individual/test.js
+++ b/chrome/test/data/extensions/api_test/proxy/individual/test.js
@@ -11,7 +11,6 @@ chrome.test.runTests([
host: "1.1.1.1"
};
var httpsProxy = {
- scheme: "socks",
host: "2.2.2.2"
};
var ftpProxy = {
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
index 0bcf89c..eb160dc 100644
--- a/net/proxy/proxy_server.cc
+++ b/net/proxy/proxy_server.cc
@@ -15,11 +15,12 @@ namespace net {
namespace {
-// Parse the proxy type from a PAC string, to a ProxyServer::Scheme.
+// Parses the proxy type from a PAC string, to a ProxyServer::Scheme.
// This mapping is case-insensitive. If no type could be matched
// returns SCHEME_INVALID.
-ProxyServer::Scheme GetSchemeFromPacType(std::string::const_iterator begin,
- std::string::const_iterator end) {
+ProxyServer::Scheme GetSchemeFromPacTypeInternal(
+ std::string::const_iterator begin,
+ std::string::const_iterator end) {
if (LowerCaseEqualsASCII(begin, end, "proxy"))
return ProxyServer::SCHEME_HTTP;
if (LowerCaseEqualsASCII(begin, end, "socks")) {
@@ -40,11 +41,11 @@ ProxyServer::Scheme GetSchemeFromPacType(std::string::const_iterator begin,
return ProxyServer::SCHEME_INVALID;
}
-// Parse the proxy scheme from a URL-like representation, to a
-// ProxyServer::Scheme. This corresponds with the values used in
+// Parses the proxy scheme from a URL-like representation, to a
+// ProxyServer::Scheme. This corresponds with the values used in
// ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
-ProxyServer::Scheme GetSchemeFromURI(std::string::const_iterator begin,
- std::string::const_iterator end) {
+ProxyServer::Scheme GetSchemeFromURIInternal(std::string::const_iterator begin,
+ std::string::const_iterator end) {
if (LowerCaseEqualsASCII(begin, end, "http"))
return ProxyServer::SCHEME_HTTP;
if (LowerCaseEqualsASCII(begin, end, "socks4"))
@@ -110,7 +111,7 @@ ProxyServer ProxyServer::FromURI(std::string::const_iterator begin,
(end - colon) >= 3 &&
*(colon + 1) == '/' &&
*(colon + 2) == '/') {
- scheme = GetSchemeFromURI(begin, colon);
+ scheme = GetSchemeFromURIInternal(begin, colon);
begin = colon + 3; // Skip past the "://"
}
@@ -161,7 +162,7 @@ ProxyServer ProxyServer::FromPacString(std::string::const_iterator begin,
}
// Everything to the left of the space is the scheme.
- Scheme scheme = GetSchemeFromPacType(begin, space);
+ Scheme scheme = GetSchemeFromPacTypeInternal(begin, space);
// And everything to the right of the space is the
// <host>[":" <port>].
@@ -204,6 +205,11 @@ int ProxyServer::GetDefaultPortForScheme(Scheme scheme) {
}
// static
+ProxyServer::Scheme ProxyServer::GetSchemeFromURI(const std::string& scheme) {
+ return GetSchemeFromURIInternal(scheme.begin(), scheme.end());
+}
+
+// static
ProxyServer ProxyServer::FromSchemeHostAndPort(
Scheme scheme,
std::string::const_iterator begin,
diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h
index 3786ddb..3167252 100644
--- a/net/proxy/proxy_server.h
+++ b/net/proxy/proxy_server.h
@@ -128,6 +128,12 @@ class ProxyServer {
// scheme. Returns -1 if unknown.
static int GetDefaultPortForScheme(Scheme scheme);
+ // Parses the proxy scheme from a URL-like representation, to a
+ // ProxyServer::Scheme. This corresponds with the values used in
+ // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
+ // |scheme| can be one of http, https, socks, socks4, socks5, direct.
+ static Scheme GetSchemeFromURI(const std::string& scheme);
+
bool operator==(const ProxyServer& other) const {
return scheme_ == other.scheme_ &&
host_port_pair_.Equals(other.host_port_pair_);
generated by cgit v1.1 at 2025-05-19 19:36:02 +0000