mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

session: allow user to isolate pac script and proxy bypass rules

Browse source
This commit is contained in:
Robo 2016-01-11 03:55:56 +05:30
parent 9a707b7c69
commit be50ca2653
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_session.cc
View file

@ -114,15 +114,15 @@ struct Converter<net::ProxyConfig> {
static bool FromV8(v8::Isolate* isolate, static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val, v8::Local<v8::Value> val,
net::ProxyConfig* out) { net::ProxyConfig* out) {
std::string proxy; mate::Dictionary options;
if (!ConvertFromV8(isolate, val, &proxy)) if (!ConvertFromV8(isolate, val, &options))
return false; return false;
auto pac_url = GURL(proxy); GURL pac_url;
if (pac_url.is_valid()) { std::string rules;
if (options.Get("pacScript", &pac_url))
out->set_pac_url(pac_url); out->set_pac_url(pac_url);
} else { else if (options.Get("proxyRules", &rules))
out->proxy_rules().ParseFromString(proxy); out->proxy_rules().ParseFromString(rules);
}
return true; return true;
} }
}; };

10
docs/api/session.md
View file

@ -181,15 +181,13 @@ Clears the data of web storages.
#### `ses.setProxy(config, callback)` #### `ses.setProxy(config, callback)`
* `config` String * `config` Object
* `pacScript` String - The URL associated with the PAC file.
* `proxyRules` String - Rules indicating which proxies to use.
* `callback` Function - Called when operation is done. * `callback` Function - Called when operation is done.
If `config` is a PAC url, it is used directly otherwise
`config` is parsed based on the following rules indicating which
proxies to use for the session.
``` ```
config = scheme-proxies[";"<scheme-proxies>] proxyRules = scheme-proxies[";"<scheme-proxies>]
scheme-proxies = [<url-scheme>"="]<proxy-uri-list> scheme-proxies = [<url-scheme>"="]<proxy-uri-list>
url-scheme = "http" | "https" | "ftp" | "socks" url-scheme = "http" | "https" | "ftp" | "socks"
proxy-uri-list = <proxy-uri>[","<proxy-uri-list>] proxy-uri-list = <proxy-uri>[","<proxy-uri-list>]