nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug4663'

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-13 17:01:53 -04:00
commit e5beb82e04
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug4663 Normal file
View File

@ -0,0 +1,5 @@
o Minor features:
- Warn the user when HTTPProxy, but no other proxy type, is
configured. This can cause surprising behavior: it doesn't send
all of Tor's traffic over the HTTPProxy--it sends unencrypted
directory traffic only. Resolves ticket 4663.

9
src/or/config.c
View File

@ -3889,6 +3889,15 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("You have configured more than one proxy type. "
"(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)");
/* Check if the proxies will give surprising behavior. */
if (options->HTTPProxy && !(options->Socks4Proxy ||
options->Socks5Proxy ||
options->HTTPSProxy)) {
log_warn(LD_CONFIG, "HTTPProxy configured, but no SOCKS proxy or "
"HTTPS proxy configured. Watch out: this configuration will "
"proxy unencrypted directory connections only.");
}
if (options->Socks5ProxyUsername) {
size_t len;