- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug3216_v2' into maint-0.2.2
by nickm＠torproject.org 31 May '11

31 May '11

commit e035cea0318add5cf8ed8d8f1c518a26434cbeda Merge: d35a555 0e1fad6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 16:12:53 2011 -0400 Merge branch 'bug3216_v2' into maint-0.2.2 changes/bug3216 | 4 ++++ src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-)

1 0

[tor/master] Don't try to build descriptors when router_get_advertised_or_port()==0
by nickm＠torproject.org 31 May '11

31 May '11

commit 0e1fad648d22923d7455b94734df36585b8f624f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 24 11:55:08 2011 -0400 Don't try to build descriptors when router_get_advertised_or_port()==0 The previous attempt was incomplete: it told us not to publish a descriptor, but didn't stop us from generating one. Now we treat an absent OR port the same as not knowing our address. (This means that when we _do_ get an OR port, we need to mark the descriptor dirty.) More attempt to fix bug3216. --- src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 3 ++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 4d3e897..a0330e9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1949,37 +1949,40 @@ retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns) { or_options_t *options = get_options(); + int retval = 0; + const uint16_t old_or_port = router_get_advertised_or_port(options); + const uint16_t old_dir_port = router_get_advertised_dir_port(options); if (retry_listeners(CONN_TYPE_OR_LISTENER, options->ORListenAddress, options->ORPort, "0.0.0.0", replaced_conns, new_conns, options->ClientOnly, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_DIR_LISTENER, options->DirListenAddress, options->DirPort, "0.0.0.0", replaced_conns, new_conns, options->ClientOnly, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_LISTENER, options->SocksListenAddress, options->SocksPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_TRANS_LISTENER, options->TransListenAddress, options->TransPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_NATD_LISTENER, options->NATDListenAddress, options->NATDPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_DNS_LISTENER, options->DNSListenAddress, options->DNSPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_CONTROL_LISTENER, options->ControlListenAddress, options->ControlPort, "127.0.0.1", @@ -1993,7 +1996,16 @@ retry_all_listeners(smartlist_t *replaced_conns, AF_UNIX)<0) return -1; - return 0; + if (old_or_port != router_get_advertised_or_port(options) || + old_dir_port != router_get_advertised_dir_port(options)) { + /* Our chosen ORPort or DirPort is not what it used to be: the + * descriptor we had (if any) should be regenerated. (We won't + * automatically notice this because of changes in the option, + * since the value could be "auto".) */ + mark_my_descriptor_dirty("Chosen Or/DirPort changed"); + } + + return retval; } /** Return 1 if we should apply rate limiting to <b>conn</b>, diff --git a/src/or/router.c b/src/or/router.c index 464cba0..5fd7b06 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1423,7 +1423,8 @@ router_rebuild_descriptor(int force) if (desc_clean_since && !force) return 0; - if (router_pick_published_address(options, &addr) < 0) { + if (router_pick_published_address(options, &addr) < 0 || + router_get_advertised_or_port(options) == 0) { /* Stop trying to rebuild our descriptor every second. We'll * learn that it's time to try again when ip_address_changed() * marks it dirty. */

1 0

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

31 May '11

commit d0e7c545bacb45921569bf2236cc49d510530af4 Merge: d274f53 e035cea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 16:14:45 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3216 | 4 ++++ src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.2] Don't try to build descriptors when router_get_advertised_or_port()==0
by nickm＠torproject.org 31 May '11

31 May '11

commit 0e1fad648d22923d7455b94734df36585b8f624f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 24 11:55:08 2011 -0400 Don't try to build descriptors when router_get_advertised_or_port()==0 The previous attempt was incomplete: it told us not to publish a descriptor, but didn't stop us from generating one. Now we treat an absent OR port the same as not knowing our address. (This means that when we _do_ get an OR port, we need to mark the descriptor dirty.) More attempt to fix bug3216. --- src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 3 ++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 4d3e897..a0330e9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1949,37 +1949,40 @@ retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns) { or_options_t *options = get_options(); + int retval = 0; + const uint16_t old_or_port = router_get_advertised_or_port(options); + const uint16_t old_dir_port = router_get_advertised_dir_port(options); if (retry_listeners(CONN_TYPE_OR_LISTENER, options->ORListenAddress, options->ORPort, "0.0.0.0", replaced_conns, new_conns, options->ClientOnly, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_DIR_LISTENER, options->DirListenAddress, options->DirPort, "0.0.0.0", replaced_conns, new_conns, options->ClientOnly, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_LISTENER, options->SocksListenAddress, options->SocksPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_TRANS_LISTENER, options->TransListenAddress, options->TransPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_NATD_LISTENER, options->NATDListenAddress, options->NATDPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_AP_DNS_LISTENER, options->DNSListenAddress, options->DNSPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) - return -1; + retval = -1; if (retry_listeners(CONN_TYPE_CONTROL_LISTENER, options->ControlListenAddress, options->ControlPort, "127.0.0.1", @@ -1993,7 +1996,16 @@ retry_all_listeners(smartlist_t *replaced_conns, AF_UNIX)<0) return -1; - return 0; + if (old_or_port != router_get_advertised_or_port(options) || + old_dir_port != router_get_advertised_dir_port(options)) { + /* Our chosen ORPort or DirPort is not what it used to be: the + * descriptor we had (if any) should be regenerated. (We won't + * automatically notice this because of changes in the option, + * since the value could be "auto".) */ + mark_my_descriptor_dirty("Chosen Or/DirPort changed"); + } + + return retval; } /** Return 1 if we should apply rate limiting to <b>conn</b>, diff --git a/src/or/router.c b/src/or/router.c index 464cba0..5fd7b06 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1423,7 +1423,8 @@ router_rebuild_descriptor(int force) if (desc_clean_since && !force) return 0; - if (router_pick_published_address(options, &addr) < 0) { + if (router_pick_published_address(options, &addr) < 0 || + router_get_advertised_or_port(options) == 0) { /* Stop trying to rebuild our descriptor every second. We'll * learn that it's time to try again when ip_address_changed() * marks it dirty. */

1 0

[tor/maint-0.2.2] Don't build descriptors if ORPort auto is set and we have no OR listener
by nickm＠torproject.org 31 May '11

31 May '11

commit 95ac3ea5946f723ddab474fe229a872669aee47f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 21:42:35 2011 -0400 Don't build descriptors if ORPort auto is set and we have no OR listener This situation can happen easily if you set 'ORPort auto' and 'AccountingMax'. Doing so means that when you have no ORPort, you won't be able to set an ORPort in a descriptor, so instead you would just generate lots of invalid descriptors, freaking out all the time. Possible fix for 3216; fix on 0.2.2.26-beta. --- changes/bug3216 | 4 ++++ src/or/router.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug3216 b/changes/bug3216 new file mode 100644 index 0000000..599b5e1 --- /dev/null +++ b/changes/bug3216 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Don't try to build descriptors if "ORPort auto" is set and we + don't know our actual ORPort yet. Fix for bug 3216; bugfix on + 0.2.2.26-beta. diff --git a/src/or/router.c b/src/or/router.c index 184715b..464cba0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -802,6 +802,8 @@ decide_to_advertise_dirport(or_options_t *options, uint16_t dir_port) return 0; if (!check_whether_dirport_reachable()) return 0; + if (!router_get_advertised_dir_port(options)) + return 0; /* Section two: reasons to publish or not publish that the user * might find surprising. These are generally config options that @@ -1136,6 +1138,8 @@ decide_if_publishable_server(void) return 0; if (authdir_mode(options)) return 1; + if (!router_get_advertised_or_port(options)) + return 0; return check_whether_orport_reachable(); }

1 0

[tor/maint-0.2.2] Merge branch 'bug3216_v2' into maint-0.2.2
by nickm＠torproject.org 31 May '11

31 May '11

commit e035cea0318add5cf8ed8d8f1c518a26434cbeda Merge: d35a555 0e1fad6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 16:12:53 2011 -0400 Merge branch 'bug3216_v2' into maint-0.2.2 changes/bug3216 | 4 ++++ src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-)

1 0

[tor/master] Warn when two hs use the same directory
by nickm＠torproject.org 31 May '11

31 May '11

commit ca538290af507833c7cd5df7f663507c3540448d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun May 29 00:54:59 2011 +0200 Warn when two hs use the same directory This simple implementation has a few issues, but it should do for 0.2.2.x. We will want to revisit this later and make it smarter. --- changes/bug3289 | 5 +++++ src/or/rendservice.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/changes/bug3289 b/changes/bug3289 new file mode 100644 index 0000000..c469796 --- /dev/null +++ b/changes/bug3289 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Warn when the user configures two HiddenServiceDir lines that point + to the same directory. Bugfix on 0.0.6 (the version introducing + HiddenServiceDir); fixes bug 3289. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index edcf59d..a10e43f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -181,6 +181,31 @@ rend_add_service(rend_service_t *service) log_warn(LD_CONFIG, "Hidden service with no ports configured; ignoring."); rend_service_free(service); } else { + int dupe = 0; + /* XXX This duplicate check has two problems: + * + * a) It's O(n^2), but the same comment from the bottom of + * rend_config_services() should apply. + * + * b) We only compare directory paths as strings, so we can't + * detect two distinct paths that specify the same directory + * (which can arise from symlinks, case-insensitivity, bind + * mounts, etc.). + * + * It also can't detect that two separate Tor instances are trying + * to use the same HiddenServiceDir; for that, we would need a + * lock file. But this is enough to detect a simple mistake that + * at least one person has actually made. + */ + SMARTLIST_FOREACH(rend_service_list, rend_service_t*, ptr, + dupe = dupe || + !strcmp(ptr->directory, service->directory)); + if (dupe) { + log_warn(LD_REND, "Another hidden service is already configured for " + "directory %s, ignoring.", service->directory); + rend_service_free(service); + return; + } smartlist_add(rend_service_list, service); log_debug(LD_REND,"Configuring service with directory \"%s\"", service->directory);

1 0

[tor/master] minor cleanups while reviewing 3216
by nickm＠torproject.org 31 May '11

31 May '11

commit f118dc80e0ef2eeb62ae52ed107af3384e2a1afd Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 30 15:31:06 2011 -0400 minor cleanups while reviewing 3216 --- src/or/config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1179255..f97e9b1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -211,7 +211,7 @@ static config_var_t _option_vars[] = { V(ControlPortFileGroupReadable,BOOL, "0"), V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), - V(ControlSocketsGroupWritable, BOOL, "0"), + V(ControlSocketsGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -2064,6 +2064,7 @@ get_assigned_option(config_format_t *fmt, void *options, escape_val = 0; break; } + /* fall through */ case CONFIG_TYPE_INTERVAL: case CONFIG_TYPE_UINT: /* This means every or_options_t uint or bool element

1 0

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

31 May '11

commit d274f539e5ae8ffe50f2bb364c3a3b64e3920e9c Merge: fa1d472 d35a555 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 15:51:46 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3289 | 5 +++++ src/or/config.c | 3 ++- src/or/rendservice.c | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --cc src/or/config.c index 4c7fa6d,f97e9b1..07053a1 --- a/src/or/config.c +++ b/src/or/config.c @@@ -2124,8 -2064,8 +2124,9 @@@ get_assigned_option(config_format_t *fm escape_val = 0; break; } + /* fall through */ case CONFIG_TYPE_INTERVAL: + case CONFIG_TYPE_MSEC_INTERVAL: case CONFIG_TYPE_UINT: /* This means every or_options_t uint or bool element * needs to be an int. Not, say, a uint16_t or char. */

1 0

[tor/master] Merge branch 'bug3289' into maint-0.2.2
by nickm＠torproject.org 31 May '11

31 May '11

commit d35a555348dfccb19d7534af24d3c364372d515b Merge: f118dc8 ca53829 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 15:50:35 2011 -0400 Merge branch 'bug3289' into maint-0.2.2 changes/bug3289 | 5 +++++ src/or/rendservice.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-)

1 0