August 2014 - tor-commits - lists.torproject.org

[tor/master] Fix return value of tor_fd_seekend.
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit 7c61d10c6c09b32a4b8acd2553aa05c4fbc06611 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 13:48:17 2014 -0400 Fix return value of tor_fd_seekend. Previously, we had documented it to return -1 or 0, when in fact lseek returns -1 or the new position in the file. This is harmless, since we were only checking for negative values when we used tor_fd_seekend. --- src/common/compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index eb9a70f..278e5c5 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -990,14 +990,14 @@ tor_fd_seekend(int fd) #ifdef _WIN32 return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #else - int rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE /* If we get an error and ESPIPE, then it's a pipe or a socket of a fifo: * no need to worry. */ if (rc < 0 && errno == ESPIPE) rc = 0; #endif - return rc; + return (rc < 0) ? -1 : 0; #endif }

1 0

[tor/master] Allow named pipes for our log files.
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit a32913d5aa816cdc41edbabf9b606b83aea6c835 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 13:45:16 2014 -0400 Allow named pipes for our log files. Closes ticket 12061. Based on a patch from "carlo von lynX" on tor-dev at https://lists.torproject.org/pipermail/tor-dev/2014-April/006705.html --- changes/bug12061 | 4 ++++ src/common/compat.c | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug12061 b/changes/bug12061 new file mode 100644 index 0000000..308417c --- /dev/null +++ b/changes/bug12061 @@ -0,0 +1,4 @@ + o Minor features: + - On unix, you can now use named pipes as the target of the Log + option, and other options that try to append to files. Closes + ticket 12061. Patch from "carlo von lynX". diff --git a/src/common/compat.c b/src/common/compat.c index c4f5987..eb9a70f 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -981,14 +981,23 @@ tor_fd_getpos(int fd) #endif } -/** Move <b>fd</b> to the end of the file. Return -1 on error, 0 on success. */ +/** Move <b>fd</b> to the end of the file. Return -1 on error, 0 on success. + * If the file is a pipe, do nothing and succeed. + **/ int tor_fd_seekend(int fd) { #ifdef _WIN32 return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #else - return lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + int rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; +#ifdef ESPIPE + /* If we get an error and ESPIPE, then it's a pipe or a socket of a fifo: + * no need to worry. */ + if (rc < 0 && errno == ESPIPE) + rc = 0; +#endif + return rc; #endif }

1 0

[tor/master] Merge remote-tracking branch 'public/bug11787'
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit fb762f6db0a363349afd83e5316daf613e27e450 Merge: c57e8da c3f04f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 13:34:02 2014 -0400 Merge remote-tracking branch 'public/bug11787' changes/bug11787 | 5 +++++ src/common/torgzip.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Warn if Tor is a relay and a HS
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit a3fe8b11663a32f1f007bd7cb0b9656825093544 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jul 21 21:16:58 2014 -0700 Warn if Tor is a relay and a HS Closes 12908; see #8742 --- changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug12908 b/changes/bug12908 new file mode 100644 index 0000000..bd6784c --- /dev/null +++ b/changes/bug12908 @@ -0,0 +1,4 @@ + o Minor features: + - Warn about attempts to run hidden services and relays in the + same process: that's probably not a good idea. Closes ticket + 12908. diff --git a/src/or/config.c b/src/or/config.c index 6bb6209..c006bc2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2563,6 +2563,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Can't use a relative path to torrc when RunAsDaemon is set."); #endif + if (server_mode(options) && options->RendConfigLines) + log_warn(LD_CONFIG, + "Tor is currently configured as a relay and a hidden service. " + "That's not very secure: you should probably run your hidden service " + "in a separate Tor process, at least -- see " + "https://trac.torproject.org/8742"); + /* XXXX require that the only port not be DirPort? */ /* XXXX require that at least one port be listened-upon. */ if (n_ports == 0 && !options->RendConfigLines)

1 0

[tor/master] Changes file for bug 11787
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit c3f04f3daa27ce61da10e9bcf12cf05b376f73ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 13:33:49 2014 -0400 Changes file for bug 11787 --- changes/bug11787 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug11787 b/changes/bug11787 new file mode 100644 index 0000000..014662d --- /dev/null +++ b/changes/bug11787 @@ -0,0 +1,5 @@ + o Minor bugfixes (directory bandwidth performance): + - Don't flush the zlib buffer aggressively when compressing + directory information for clients. This should save about 7% of + the bandwidth currently used for compressed descriptors and + microdescriptors. Fixes bug 11787; bugfix on 0.1.1.23.

1 0

[tor/master] Synchronize less frequently when compressing descriptors
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit 8ecfcf712c4e673687e4904e0a73e5c70b1a7eeb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 10:27:30 2014 -0400 Synchronize less frequently when compressing descriptors This may improve our compression ratios. fix for 11787 --- src/common/torgzip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 15451ee..239cab9 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -472,7 +472,7 @@ tor_zlib_process(tor_zlib_state_t *state, state->stream.avail_out = (unsigned int)*out_len; if (state->compress) { - err = deflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH); + err = deflate(&state->stream, finish ? Z_FINISH : Z_NO_FLUSH); } else { err = inflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH); }

1 0

[tor/master] Merge remote-tracking branch 'public/bug12908_025'
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit c57e8da4ea9cccc168bb946040350434088cb7cb Merge: d0009cb a3fe8b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 12:58:26 2014 -0400 Merge remote-tracking branch 'public/bug12908_025' changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Correctly remove extraneous space in router family lines
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit 04007448b9f318f4c3517ce173272f756a02f28c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 5 11:09:08 2014 -0400 Correctly remove extraneous space in router family lines Fixes bug 12728; bugfix on 0.2.1.7-alpha when the SPLIT_IGNORE_SPACE option was added. --- changes/bug12728 | 4 ++++ src/or/router.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug12728 b/changes/bug12728 new file mode 100644 index 0000000..ee39245 --- /dev/null +++ b/changes/bug12728 @@ -0,0 +1,4 @@ + + o Minor bugfixes: + - When generating our family list, remove spaces from around the + entries there. Fixes bug 12728; bugfix on 0.2.1.7-alpha. diff --git a/src/or/router.c b/src/or/router.c index eabd9c3..1b65f26 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1884,7 +1884,7 @@ router_rebuild_descriptor(int force) family = smartlist_new(); ri->declared_family = smartlist_new(); smartlist_split_string(family, options->MyFamily, ",", - SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); SMARTLIST_FOREACH_BEGIN(family, char *, name) { const node_t *member; if (!strcasecmp(name, options->Nickname))

1 0

[tor/master] Merge remote-tracking branch 'public/bug12728_024'
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce Merge: d28670c 0400744 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 12:44:15 2014 -0400 Merge remote-tracking branch 'public/bug12728_024' changes/bug12728 | 4 ++++ src/or/router.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix entrynodes test fails because of outdated test vectors.
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit d28670c94fb6482cfbd5117b001f076dbb9b9f41 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Aug 20 17:07:19 2014 +0300 Fix entrynodes test fails because of outdated test vectors. --- src/test/test_entrynodes.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index ede93fb..83ceea7 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -325,6 +325,19 @@ state_lines_free(smartlist_t *entry_guard_lines) smartlist_free(entry_guard_lines); } +/* Return a statically allocated string representing yesterday's date + * in ISO format. We use it so that state file items are not found to + * be outdated. */ +static const char * +get_yesterday_date_str(void) +{ + static char buf[ISO_TIME_LEN+1]; + + time_t yesterday = time(NULL) - 24*60*60; + format_iso_time(buf, yesterday); + return buf; +} + /* Tests entry_guards_parse_state(). It creates a fake Tor state with a saved entry guard and makes sure that Tor can parse it and creates the right entry node out of it. @@ -342,7 +355,7 @@ test_entry_guards_parse_state_simple(void *arg) const char *nickname = "hagbard"; const char *fpr = "B29D536DD1752D542E1FBB3C9CE4449D51298212"; const char *tor_version = "0.2.5.3-alpha-dev"; - const char *added_at = "2014-05-22 02:40:47"; + const char *added_at = get_yesterday_date_str(); const char *unlisted_since = "2014-06-08 16:16:50"; (void) arg; @@ -457,7 +470,7 @@ test_entry_guards_parse_state_pathbias(void *arg) smartlist_add_asprintf(state_line, "EntryGuardAddedBy"); smartlist_add_asprintf(state_line, "B29D536DD1752D542E1FBB3C9CE4449D51298212 0.2.5.3-alpha-dev " - "2014-05-22 02:40:47"); + "%s", get_yesterday_date_str()); smartlist_add(entry_state_lines, state_line); state_line = smartlist_new();

1 0