January 2015 - tor-commits - lists.torproject.org

[tor/master] Drop assumption that get_torrc_fname() can't return NULL.
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit 14dedff0abd8b6b9c1c2766fe0ce5844c77d58ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 16:29:52 2015 -0500 Drop assumption that get_torrc_fname() can't return NULL. --- src/or/config.c | 18 +++++++++++------- src/or/control.c | 6 ++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d966ee0..543d7fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4147,14 +4147,14 @@ find_torrc_filename(config_line_t *cmd_arg, char *fn = NULL; if (!defaults_file) fn = expand_filename("~/.torrc"); - if (fn && file_status(fn) == FN_FILE) { + if (fn && (file_status(fn) == FN_FILE || dflt == NULL)) { fname = fn; } else { tor_free(fn); - fname = tor_strdup(dflt); + fname = dflt ? tor_strdup(dflt) : NULL; } #else - fname = tor_strdup(dflt); + fname = dflt ? tor_strdup(dflt) : NULL; #endif } } @@ -4179,14 +4179,15 @@ load_torrc_from_disk(config_line_t *cmd_arg, int defaults_file) fname = find_torrc_filename(cmd_arg, defaults_file, &using_default_torrc, &ignore_missing_torrc); - tor_assert(fname); - log_debug(LD_CONFIG, "Opening config file \"%s\"", fname); + + log_debug(LD_CONFIG, "Opening config file \"%s\"", fname?fname:"<NULL>"); tor_free(*fname_var); *fname_var = fname; /* Open config file */ - if (file_status(fname) != FN_FILE || + if (fname == NULL || + file_status(fname) != FN_FILE || !(cf = read_file_to_str(fname,0,NULL))) { if (using_default_torrc == 1 || ignore_missing_torrc) { if (!defaults_file) @@ -4475,7 +4476,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, return err; } -/** Return the location for our configuration file. +/** Return the location for our configuration file. May return NULL. */ const char * get_torrc_fname(int defaults_fname) @@ -6434,6 +6435,9 @@ write_configuration_file(const char *fname, const or_options_t *options) char *old_val=NULL, *new_val=NULL, *new_conf=NULL; int rename_old = 0, r; + if (!fname) + return -1; + tor_assert(fname); switch (file_status(fname)) { diff --git a/src/or/control.c b/src/or/control.c index 3dbaa1b..21d2e09 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1439,9 +1439,11 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); } else if (!strcmp(question, "config-file")) { - *answer = tor_strdup(get_torrc_fname(0)); + if (get_torrc_fname(0)) + *answer = tor_strdup(get_torrc_fname(0)); } else if (!strcmp(question, "config-defaults-file")) { - *answer = tor_strdup(get_torrc_fname(1)); + if (get_torrc_fname(1)) + *answer = tor_strdup(get_torrc_fname(1)); } else if (!strcmp(question, "config-text")) { *answer = options_dump(get_options(), OPTIONS_DUMP_MINIMAL); } else if (!strcmp(question, "info/names")) {

1 0

[tor/master] changes suggested by weasel
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit 31838bd7833b231e818fed7c1774cee8bd6ca4d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 16 11:46:20 2015 -0500 changes suggested by weasel --- src/or/config.c | 2 -- src/or/control.c | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5bd5ff4..b9a567b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6441,8 +6441,6 @@ write_configuration_file(const char *fname, const or_options_t *options) if (!fname) return -1; - tor_assert(fname); - switch (file_status(fname)) { case FN_FILE: old_val = read_file_to_str(fname, 0, NULL); diff --git a/src/or/control.c b/src/or/control.c index 21d2e09..a569c96 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1439,11 +1439,13 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); } else if (!strcmp(question, "config-file")) { - if (get_torrc_fname(0)) - *answer = tor_strdup(get_torrc_fname(0)); + const char *a = get_torrc_fname(0); + if (a) + *answer = tor_strdup(a); } else if (!strcmp(question, "config-defaults-file")) { - if (get_torrc_fname(1)) - *answer = tor_strdup(get_torrc_fname(1)); + const char *a = get_torrc_fname(1); + if (a) + *answer = tor_strdup(a); } else if (!strcmp(question, "config-text")) { *answer = options_dump(get_options(), OPTIONS_DUMP_MINIMAL); } else if (!strcmp(question, "info/names")) {

1 0

[tor/master] New option "--disable-system-torrc" to not read torrc from etc
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit 6bb31cba1286e843ac7d32a24a9424587bc29623 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 17:07:01 2015 -0500 New option "--disable-system-torrc" to not read torrc from etc Implements 13037. --- changes/ticket13037 | 4 ++++ configure.ac | 7 +++++++ src/or/config.c | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/changes/ticket13037 b/changes/ticket13037 new file mode 100644 index 0000000..24c4100 --- /dev/null +++ b/changes/ticket13037 @@ -0,0 +1,4 @@ + o Minor features (build): + - New --disable-system-torrc compile-time option to prevent Tor from + looking for a system-wide torrc or torrc-defaults tile. Resolves + ticket 13037. diff --git a/configure.ac b/configure.ac index 2c92a6c..920a12f 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,8 @@ AC_ARG_ENABLE(unittests, AS_HELP_STRING(--disable-unittests, [Don't build unit tests for Tor. Risky!])) AC_ARG_ENABLE(coverage, AS_HELP_STRING(--enable-coverage, [Enable coverage support in the unit-test build])) +AC_ARG_ENABLE(system-torrc, + AS_HELP_STRING(--disable-system-torrc, [Don't look for a system-wide torrc file])) AM_CONDITIONAL(UNITTESTS_ENABLED, test x$enable_unittests != xno) AM_CONDITIONAL(COVERAGE_ENABLED, test x$enable_coverage = xyes) @@ -56,6 +58,11 @@ if test "$enable_static_tor" = "yes"; then CFLAGS="$CFLAGS -static" fi +if test "$enable_system_torrc" = "no"; then + AC_DEFINE(DISABLE_SYSTEM_TORRC, 1, + [Defined if we're not going to look for a torrc in SYSCONF]) +fi + if test x$enable_buf_freelists = xyes; then AC_DEFINE(ENABLE_BUF_FREELISTS, 1, [Defined if we try to use freelists for buffer RAM chunks]) diff --git a/src/or/config.c b/src/or/config.c index 543d7fa..5bd5ff4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4013,7 +4013,10 @@ get_windows_conf_root(void) static const char * get_default_conf_file(int defaults_file) { -#ifdef _WIN32 +#ifdef DISABLE_SYSTEM_TORRC + (void) defaults_file; + return NULL; +#elif defined(_WIN32) if (defaults_file) { static char defaults_path[MAX_PATH+1]; tor_snprintf(defaults_path, MAX_PATH, "%s\\torrc-defaults",

1 0

[tor/master] changes file for 9396005428c40cf7ef9f1e6ae1d725f3155391f5
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit ffa4ed8d3dea0ffdde2369b1feb24bc3a9b6c101 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 16 11:47:49 2015 -0500 changes file for 9396005428c40cf7ef9f1e6ae1d725f3155391f5 --- changes/remove-bad-fp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/remove-bad-fp b/changes/remove-bad-fp new file mode 100644 index 0000000..a07e3ba --- /dev/null +++ b/changes/remove-bad-fp @@ -0,0 +1,4 @@ + + o Removed features: + - Remove a test for a long-defunct broken directory server. +

1 0

[tor/master] Merge remote-tracking branch 'public/ticket13037'
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit 63765399eb844adfa877a288e655eb281ac8c988 Merge: 5aa55a1 ffa4ed8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 18 16:07:08 2015 -0500 Merge remote-tracking branch 'public/ticket13037' Conflicts: src/or/config.c changes/remove-bad-fp | 4 ++++ changes/ticket13037 | 4 ++++ configure.ac | 7 +++++++ src/or/config.c | 32 ++++++++++++++------------------ src/or/control.c | 8 ++++++-- 5 files changed, 35 insertions(+), 20 deletions(-) diff --cc src/or/config.c index 1995cb7,b9a567b..64bc54b --- a/src/or/config.c +++ b/src/or/config.c @@@ -4178,22 -4148,16 +4181,22 @@@ find_torrc_filename(config_line_t *cmd_ } else { #ifndef _WIN32 char *fn = NULL; - if (!defaults_file) + if (!defaults_file) { fn = expand_filename("~/.torrc"); - if (fn && (file_status(fn) == FN_FILE || dflt == NULL)) { - fname = fn; + } + if (fn) { + file_status_t hmst = file_status(fn); - if (hmst == FN_FILE || hmst == FN_EMPTY) { ++ if (hmst == FN_FILE || hmst == FN_EMPTY || dflt == NULL) { + fname = fn; + } else { + tor_free(fn); + fname = tor_strdup(dflt); + } } else { - fname = tor_strdup(dflt); - tor_free(fn); + fname = dflt ? tor_strdup(dflt) : NULL; } #else - fname = tor_strdup(dflt); + fname = dflt ? tor_strdup(dflt) : NULL; #endif } } @@@ -4216,20 -4180,17 +4219,20 @@@ load_torrc_from_disk(config_line_t *cmd int ignore_missing_torrc = 0; char **fname_var = defaults_file ? &torrc_defaults_fname : &torrc_fname; - fname = find_torrc_filename(cmd_arg, defaults_file, - &using_default_torrc, &ignore_missing_torrc); - + if (*fname_var == NULL) { + fname = find_torrc_filename(cmd_arg, defaults_file, + &using_default_torrc, &ignore_missing_torrc); - tor_assert(fname); + tor_free(*fname_var); + *fname_var = fname; + } else { + fname = *fname_var; + } - log_debug(LD_CONFIG, "Opening config file \"%s\"", fname); + log_debug(LD_CONFIG, "Opening config file \"%s\"", fname?fname:"<NULL>"); - tor_free(*fname_var); - *fname_var = fname; - /* Open config file */ - file_status_t st = file_status(fname); - if (!(st == FN_FILE || st == FN_EMPTY) || ++ file_status_t st = fname ? file_status(fname) : FN_EMPTY; + if (fname == NULL || - file_status(fname) != FN_FILE || ++ !(st == FN_FILE || st == FN_EMPTY) || !(cf = read_file_to_str(fname,0,NULL))) { if (using_default_torrc == 1 || ignore_missing_torrc) { if (!defaults_file) @@@ -6559,12 -6438,11 +6554,13 @@@ write_configuration_file(const char *fn char *old_val=NULL, *new_val=NULL, *new_conf=NULL; int rename_old = 0, r; - tor_assert(fname); + if (!fname) + return -1; switch (file_status(fname)) { + /* create backups of old config files, even if they're empty */ case FN_FILE: + case FN_EMPTY: old_val = read_file_to_str(fname, 0, NULL); if (!old_val || strcmpstart(old_val, GENERATED_FILE_PREFIX)) { rename_old = 1; diff --cc src/or/control.c index 9ff71c9,a569c96..00cb431 --- a/src/or/control.c +++ b/src/or/control.c @@@ -1438,12 -1438,14 +1438,16 @@@ getinfo_helper_misc(control_connection_ (void) conn; if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); + } else if (!strcmp(question, "bw-event-cache")) { + *answer = get_bw_samples(); } else if (!strcmp(question, "config-file")) { - *answer = tor_strdup(get_torrc_fname(0)); + const char *a = get_torrc_fname(0); + if (a) + *answer = tor_strdup(a); } else if (!strcmp(question, "config-defaults-file")) { - *answer = tor_strdup(get_torrc_fname(1)); + const char *a = get_torrc_fname(1); + if (a) + *answer = tor_strdup(a); } else if (!strcmp(question, "config-text")) { *answer = options_dump(get_options(), OPTIONS_DUMP_MINIMAL); } else if (!strcmp(question, "info/names")) {

1 0

[tor/master] Remove the unused rend_cache_entry_t->received field.
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit 5aa55a1369dbcb849f1290291c48054f25cdd623 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 18 15:53:06 2015 -0500 Remove the unused rend_cache_entry_t->received field. (Patch from arma, commit message from nick.) Closes #14222. --- src/or/or.h | 1 - src/or/rendcommon.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 7568fc1..f821d0b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4897,7 +4897,6 @@ typedef struct rend_service_descriptor_t { /** A cached rendezvous descriptor. */ typedef struct rend_cache_entry_t { size_t len; /**< Length of desc */ - time_t received; /**< When was the descriptor received? */ time_t last_served; /**< When did we last write this one to somebody? * (HSDir only) */ char *desc; /**< Service descriptor */ diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 82202b9..866f4fb 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1058,7 +1058,6 @@ rend_cache_store_v2_desc_as_dir(const char *desc) if (e && !strcmp(desc, e->desc)) { log_info(LD_REND, "We already have this service descriptor with desc " "ID %s.", safe_str(desc_id_base32)); - e->received = time(NULL); goto skip; } /* Store received descriptor. */ @@ -1075,7 +1074,6 @@ rend_cache_store_v2_desc_as_dir(const char *desc) rend_service_descriptor_free(e->parsed); tor_free(e->desc); } - e->received = time(NULL); e->parsed = parsed; e->desc = tor_strndup(current_desc, encoded_size); e->len = encoded_size; @@ -1265,7 +1263,6 @@ rend_cache_store_v2_desc_as_client(const char *desc, rend_service_descriptor_free(e->parsed); tor_free(e->desc); } - e->received = time(NULL); e->parsed = parsed; e->desc = tor_malloc_zero(encoded_size + 1); strlcpy(e->desc, desc, encoded_size + 1);

1 0

[tor/master] Do not replace a HS descriptor with a different replica of itself
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit 9407040c592184e05e45a3c1a00739c2dd302288 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 18 15:39:12 2015 -0500 Do not replace a HS descriptor with a different replica of itself This fixes a bug where we'd fetch different replicas of the same descriptor for a down hidden service over and over, until we got lucky and fetched the same replica twice in a row. Fixes bug 14219; bugfix on 0.2.0.10-alpha. (Patch from Roger; commit message and changes file by Nick.) --- changes/bug14219 | 6 ++++++ src/or/rendcommon.c | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/changes/bug14219 b/changes/bug14219 new file mode 100644 index 0000000..9d845db --- /dev/null +++ b/changes/bug14219 @@ -0,0 +1,6 @@ + o Minor bugfixes (hidden services): + + - When fetching a hidden service descriptor for a down service that we + recently up, do not keep refetching until we try the same replica twice + in a row. Fixes bug 14219; bugfix on 0.2.0.10-alpha. + diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index a664b5d..3d2b706 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1146,19 +1146,12 @@ rend_cache_store_v2_desc_as_client(const char *desc, /* Do we already have a newer descriptor? */ tor_snprintf(key, sizeof(key), "2%s", service_id); e = (rend_cache_entry_t*) strmap_get_lc(rend_cache, key); - if (e && e->parsed->timestamp > parsed->timestamp) { - log_info(LD_REND, "We already have a newer service descriptor for " + if (e && e->parsed->timestamp >= parsed->timestamp) { + log_info(LD_REND, "We already have a new enough service descriptor for " "service ID %s with the same desc ID and version.", safe_str_client(service_id)); goto okay; } - /* Do we already have this descriptor? */ - if (e && !strcmp(desc, e->desc)) { - log_info(LD_REND,"We already have this service descriptor %s.", - safe_str_client(service_id)); - e->received = time(NULL); - goto okay; - } if (!e) { e = tor_malloc_zero(sizeof(rend_cache_entry_t)); strmap_set_lc(rend_cache, key, e);

1 0

[tor/master] Merge remote-tracking branch 'public/bug14219_025'
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit fae72a8d0a749a99b9b518c2234aeb5c30552f69 Merge: efdac2a 9407040 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 18 15:41:13 2015 -0500 Merge remote-tracking branch 'public/bug14219_025' changes/bug14219 | 6 ++++++ src/or/rendcommon.c | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-)

1 0

[tor/master] Increase limit for status vote download size by a factor of 5.
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit ceb6dee4652567fd503e5ceb9345354efd935a1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 18 15:25:29 2015 -0500 Increase limit for status vote download size by a factor of 5. We've started to hit the limit here. We introduced the limit in 0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way to not actually do the behavior this permits. See #14267 for a ticket about fixing that. --- changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug14261 b/changes/bug14261 new file mode 100644 index 0000000..1260ccb --- /dev/null +++ b/changes/bug14261 @@ -0,0 +1,5 @@ + O Minor bugfixes (directory authority): + - Allow directory authorities to fetch more data from one + another if they find themselves missing lots of votes. + Previously, they had been bumping against the 10 MB queued + data limit. Fixes bug 14261. Bugfix on 0.1.2.5-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index 298271f..50863d0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2183,12 +2183,15 @@ connection_dir_reached_eof(dir_connection_t *conn) */ #define MAX_DIRECTORY_OBJECT_SIZE (10*(1<<20)) +#define MAX_VOTE_DL_SIZE (MAX_DIRECTORY_OBJECT_SIZE * 5) + /** Read handler for directory connections. (That's connections to * directory servers and connections at directory servers.) */ int connection_dir_process_inbuf(dir_connection_t *conn) { + size_t max_size; tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); @@ -2207,7 +2210,11 @@ connection_dir_process_inbuf(dir_connection_t *conn) return 0; } - if (connection_get_inbuf_len(TO_CONN(conn)) > MAX_DIRECTORY_OBJECT_SIZE) { + max_size = + (TO_CONN(conn)->purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) ? + MAX_VOTE_DL_SIZE : MAX_DIRECTORY_OBJECT_SIZE; + + if (connection_get_inbuf_len(TO_CONN(conn)) > max_size) { log_warn(LD_HTTP, "Too much data received from directory connection: " "denial of service attempt, or you need to upgrade?"); connection_mark_for_close(TO_CONN(conn));

1 0

[tor/master] Merge remote-tracking branch 'public/bug14261_025'
by nickm＠torproject.org 18 Jan '15

18 Jan '15

commit efdac2a68cb17de7c163a9abba05269888aacb88 Merge: 79e12da ceb6dee Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 18 15:28:35 2015 -0500 Merge remote-tracking branch 'public/bug14261_025' Conflicts: src/or/directory.c changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --cc src/or/directory.c index 7b40200,50863d0..4f24f84 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -2225,11 -2210,13 +2228,15 @@@ connection_dir_process_inbuf(dir_connec return 0; } - if (connection_get_inbuf_len(TO_CONN(conn)) > MAX_DIRECTORY_OBJECT_SIZE) { + max_size = + (TO_CONN(conn)->purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) ? + MAX_VOTE_DL_SIZE : MAX_DIRECTORY_OBJECT_SIZE; + + if (connection_get_inbuf_len(TO_CONN(conn)) > max_size) { - log_warn(LD_HTTP, "Too much data received from directory connection: " - "denial of service attempt, or you need to upgrade?"); + log_warn(LD_HTTP, + "Too much data received from directory connection (%s): " + "denial of service attempt, or you need to upgrade?", + conn->base_.address); connection_mark_for_close(TO_CONN(conn)); return -1; }

1 0