[tor-commits] [tor/master] Add a warning for using HTTPProxy with no other proxy.

[nickm at torproject.org]

commit f4fccee4d25b0de2780468b6f3b5b3b18d03945c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 15:21:41 2012 -0400

    Add a warning for using HTTPProxy with no other proxy.
    
    From what I can tell, this configuration is usually a mistake, and
    leads people to think that all their traffic is getting proxied when
    in fact practically none of it is.  Resolves the issue behind "bug"
    4663.
---
 changes/bug4663 |    5 +++++
 src/or/config.c |    9 +++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/changes/bug4663 b/changes/bug4663
new file mode 100644
index 0000000..f720ff5
--- /dev/null
+++ b/changes/bug4663
@@ -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.
diff --git a/src/or/config.c b/src/or/config.c
index 09fcf00..782a6e9 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -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;