June 2011 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 50e4c98a5acb6d10203cc943a336abb7715414cf Merge: 14c0251 de069f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:18:03 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2748 | 10 ++++++++++ src/or/rendcommon.c | 13 ++++--------- 2 files changed, 14 insertions(+), 9 deletions(-)

1 0

[tor/master] Remove dead code from rend_cache_lookup_v2_desc_as_dir
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit c90097e74a21ef70d9df2ab70e5b211d7a26dc6d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Mar 13 21:10:32 2011 -0700 Remove dead code from rend_cache_lookup_v2_desc_as_dir hid_serv_responsible_for_desc_id's return value is never negative, and there is no need to search through the consensus to find out whether we are responsible for a descriptor ID before we look in our cache for a descriptor. --- changes/bug2748 | 5 +++++ src/or/rendcommon.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/changes/bug2748 b/changes/bug2748 new file mode 100644 index 0000000..647000d --- /dev/null +++ b/changes/bug2748 @@ -0,0 +1,5 @@ + o Minor bugfixes + - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes + part of bug 2748; bugfix on 0.2.0.10-alpha. + + diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index d6f5443..ff3a401 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1008,13 +1008,6 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc) safe_str(desc_id)); return -1; } - /* Determine if we are responsible. */ - if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) { - log_info(LD_REND, "Could not answer fetch request for v2 descriptor; " - "either we are no hidden service directory, or we are " - "not responsible for the requested ID."); - return -1; - } /* Lookup descriptor and return. */ e = digestmap_get(rend_cache_v2_dir, desc_id_digest); if (e) {

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit de069f5ea73a4fe841df27d85c28c0d79ad2c13e Merge: b79d50d 96b929e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:16:48 2011 -0400 Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2 changes/bug2748 | 10 ++++++++++ src/or/rendcommon.c | 13 ++++--------- 2 files changed, 14 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.2] Log malformed HS descriptor requests at the proper level
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 96b929e743dc68f706f374c3448ed27c54a9cead Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 14 01:11:30 2011 -0700 Log malformed HS descriptor requests at the proper level This log message should be a 'protocol warning', not a 'warning'. --- changes/bug2748 | 5 +++++ src/or/rendcommon.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug2748 b/changes/bug2748 index 647000d..b522560 100644 --- a/changes/bug2748 +++ b/changes/bug2748 @@ -1,5 +1,10 @@ o Minor bugfixes - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes part of bug 2748; bugfix on 0.2.0.10-alpha. + - Log malformed requests for rendezvous descriptors as protocol + warnings, not warnings. Also, use a more informative log + message in case someone sees it at log level warning without + prior info-level messages. Fixes the other part of bug 2748; + bugfix on 0.2.0.10-alpha. diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index ff3a401..9acc641 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1004,8 +1004,10 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc) tor_assert(rend_cache_v2_dir); if (base32_decode(desc_id_digest, DIGEST_LEN, desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) { - log_warn(LD_REND, "Descriptor ID contains illegal characters: %s", - safe_str(desc_id)); + log_fn(LOG_PROTOCOL_WARN, LD_REND, + "Rejecting v2 rendezvous descriptor request -- descriptor ID " + "contains illegal characters: %s", + safe_str(desc_id)); return -1; } /* Lookup descriptor and return. */

1 0

[tor/maint-0.2.2] Remove dead code from rend_cache_lookup_v2_desc_as_dir
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit c90097e74a21ef70d9df2ab70e5b211d7a26dc6d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Mar 13 21:10:32 2011 -0700 Remove dead code from rend_cache_lookup_v2_desc_as_dir hid_serv_responsible_for_desc_id's return value is never negative, and there is no need to search through the consensus to find out whether we are responsible for a descriptor ID before we look in our cache for a descriptor. --- changes/bug2748 | 5 +++++ src/or/rendcommon.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/changes/bug2748 b/changes/bug2748 new file mode 100644 index 0000000..647000d --- /dev/null +++ b/changes/bug2748 @@ -0,0 +1,5 @@ + o Minor bugfixes + - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes + part of bug 2748; bugfix on 0.2.0.10-alpha. + + diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index d6f5443..ff3a401 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1008,13 +1008,6 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc) safe_str(desc_id)); return -1; } - /* Determine if we are responsible. */ - if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) { - log_info(LD_REND, "Could not answer fetch request for v2 descriptor; " - "either we are no hidden service directory, or we are " - "not responsible for the requested ID."); - return -1; - } /* Lookup descriptor and return. */ e = digestmap_get(rend_cache_v2_dir, desc_id_digest); if (e) {

1 0

[tor/master] Use an autobool for UseBridges_
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 14c0251d95d9d86f4dba1d7d2da16661f1a87012 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:17:15 2011 -0400 Use an autobool for UseBridges_ --- src/or/config.c | 11 +++-------- src/or/or.h | 11 ++++++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 124dcb9..d663336 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -387,7 +387,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - VAR("UseBridges", STRING, UseBridges_, "auto"), + VAR("UseBridges", AUTOBOOL, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), @@ -3308,17 +3308,12 @@ options_validate(or_options_t *old_options, or_options_t *options, "of the Internet, so they must not set Reachable*Addresses " "or FascistFirewall."); - /* XXX023 use autobool instead. */ - if (!strcmp(options->UseBridges_, "auto")) { + if (options->UseBridges_ == -1) { options->UseBridges = (options->Bridges && !server_mode(options) && !options->EntryNodes); - } else if (!strcmp(options->UseBridges_, "0")) { - options->UseBridges = 0; - } else if (!strcmp(options->UseBridges_, "1")) { - options->UseBridges = 1; } else { - REJECT("UseBridges must be 0, 1, or auto"); + options->UseBridges = options->UseBridges_; } if (options->UseBridges && diff --git a/src/or/or.h b/src/or/or.h index 1b4cdb8..b4000ad 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2646,11 +2646,12 @@ typedef struct { * when doing so. */ char *BridgePassword; - /** Whether we should start all circuits with a bridge. "1" means strictly - * yes, "0" means strictly no, and "auto" means that we do iff any bridges - * are configured, we are not running a server and have not specified a list - * of entry nodes. */ - char *UseBridges_; + /** Whether we should start all circuits with a bridge. This is an + * "autobool": 1 means strictly yes, 0 means strictly no, and -1 means that + * we do iff any bridges are configured, we are not running a server and + * have not specified a list of entry nodes. Don't use this value directly; + * use <b>UseBridges</b> instead. */ + int UseBridges_; /** Effective value of UseBridges. Will be set equally for UseBridges set to * 1 or 0, but for 'auto' it will be set to 1 iff any bridges are * configured, we are not running a server and have not specified a list of

1 0

[tor/master] Update man page for new UseBridges tristate behaviour.
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111 Author: anonym <anonym(a)lavabit.com> Date: Mon May 30 23:52:02 2011 +0200 Update man page for new UseBridges tristate behaviour. --- doc/tor.1.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1815a8d..8aa32e8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -708,10 +708,14 @@ The following options are useful only for clients (that is, if from the configured bridge authorities when feasible. It will fall back to a direct request if the authority responds with a 404. (Default: 0) -**UseBridges** **0**|**1**:: - When set, Tor will fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**|**auto**:: + Make Tor fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - guards. (Default: 0) + guards. If the option is 1, bridges must be used and if no bridges are + configured Tor will not make any connections until a bridge is configured; + if it's "auto", Tor will use bridges if any are configured, otherwise it + will connect directly to the Tor network; if it's 0, bridges are not used + at all. (Defaults to auto) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 13ec1bf5c2d5195789eaa0a002d021c9693a3b71 Merge: 587cc31 b79d50d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 10:47:35 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2355 | 8 ++++++++ doc/tor.1.txt | 10 +++++++--- src/or/config.c | 19 +++++++++++++++---- src/or/or.h | 12 +++++++++++- 4 files changed, 41 insertions(+), 8 deletions(-) diff --cc src/or/config.c index 988998e,44cecf3..124dcb9 --- a/src/or/config.c +++ b/src/or/config.c @@@ -387,9 -376,8 +387,9 @@@ static config_var_t _option_vars[] = V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), + V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"),

1 0

[tor/master] Changes file for bug2355.
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit b79d50dfcc77013329b2fbfd4a84af29a5965b27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:49:16 2011 -0400 Changes file for bug2355. --- changes/bug2355 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug2355 b/changes/bug2355 new file mode 100644 index 0000000..ee0ae4b --- /dev/null +++ b/changes/bug2355 @@ -0,0 +1,8 @@ + o Major features: + - If "UseBridges 1" is set and no bridges are configured, Tor will + now refuse to build any circuits until some bridges are set. + If "UseBridges auto" is set, Tor will use bridges if they are + configured and we are not running as a server, but otherwise + will make circuits as usual. The new default is "auto". Patch + by anonym. +

1 0

[tor/master] Add an "auto" option to UseBridges
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 507c1257a4d9c629fefc2adbad8db73607749734 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:32:38 2011 -0400 Add an "auto" option to UseBridges UseBridges 1 now means "connect only to bridges; if you know no bridges, don't make connections." UseBridges auto means "Use bridges if they are known, and we have no EntryNodes set, and we aren't a server." UseBridges 0 means "don't use bridges." --- src/or/config.c | 19 +++++++++++++++---- src/or/or.h | 12 +++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 6635cac..44cecf3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -376,7 +376,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), @@ -3232,6 +3232,19 @@ options_validate(or_options_t *old_options, or_options_t *options, "of the Internet, so they must not set Reachable*Addresses " "or FascistFirewall."); + /* XXX023 use autobool instead. */ + if (!strcmp(options->UseBridges_, "auto")) { + options->UseBridges = (options->Bridges && + !server_mode(options) && + !options->EntryNodes); + } else if (!strcmp(options->UseBridges_, "0")) { + options->UseBridges = 0; + } else if (!strcmp(options->UseBridges_, "1")) { + options->UseBridges = 1; + } else { + REJECT("UseBridges must be 0, 1, or auto"); + } + if (options->UseBridges && server_mode(options)) REJECT("Servers must be able to freely connect to the rest " @@ -3566,10 +3579,8 @@ options_validate(or_options_t *old_options, or_options_t *options, if (validate_dir_authorities(options, old_options) < 0) REJECT("Directory authority line did not parse. See logs for details."); - if (options->UseBridges && !options->Bridges) - REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) - REJECT("If you set UseBridges, you must set TunnelDirConns."); + REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..456dce2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,7 +2480,17 @@ typedef struct { * when doing so. */ char *BridgePassword; - int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ + /** Whether we should start all circuits with a bridge. "1" means strictly + * yes, "0" means strictly no, and "auto" means that we do iff any bridges + * are configured, we are not running a server and have not specified a list + * of entry nodes. */ + char *UseBridges_; + /** Effective value of UseBridges. Will be set equally for UseBridges set to + * 1 or 0, but for 'auto' it will be set to 1 iff any bridges are + * configured, we are not running a server and have not specified a list of + * entry nodes. */ + int UseBridges; + config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make

1 0