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

[tor/release-0.2.2] Add changes file for bug3393
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit e70e8367c9bb3ff04645454e9dfe694ac6762dc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 13:45:12 2011 -0400 Add changes file for bug3393 --- changes/bug3393 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug3393 b/changes/bug3393 new file mode 100644 index 0000000..677bcb7 --- /dev/null +++ b/changes/bug3393 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug when using ControlSocketsGroupWritable with User. The + directory's group would be checked against the current group, not + the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix + on Tor 0.2.2.26-beta. \ No newline at end of file

1 0

[tor/release-0.2.2] Make send_control_event_impl's behaviour sane
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 227896e447625b0718690d7228f1239a0fc399d1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 16 03:39:37 2011 -0700 Make send_control_event_impl's behaviour sane --- changes/fix-connection_printf_to_buf | 7 ++++++- src/or/control.c | 33 +++++++++------------------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/changes/fix-connection_printf_to_buf b/changes/fix-connection_printf_to_buf index b6fa092..e191eac 100644 --- a/changes/fix-connection_printf_to_buf +++ b/changes/fix-connection_printf_to_buf @@ -6,5 +6,10 @@ CRLF or (b) the resulting string is over 1023 characters long or (c) the format string does not end with CRLF ''and'' the resulting string is 1021 characters long or longer. Bugfix on - 0.1.1.9-alpha; fixes bug 3407. + 0.1.1.9-alpha; fixes part of bug 3407. + + - Make send_control_event_impl's behaviour sane. Its callers + expect it to always emit a CRLF at the end of the string; it + might emit extra control characters as well. Bugfix on + 0.1.1.9-alpha; fixes another part of bug 3407. diff --git a/src/or/control.c b/src/or/control.c index 2170a9b..e7d2044 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -602,43 +602,28 @@ send_control_event_string(uint16_t event, event_format_t which, /** Helper for send_control_event and control_event_status: * Send an event to all v1 controllers that are listening for code * event. The event's body is created by the printf-style format in - * format, and other arguments as provided. - * - * Currently the length of the message is limited to 10064 (including the - * ending \\r\\n\\0). */ + * format, and other arguments as provided. */ static void send_control_event_impl(uint16_t event, event_format_t which, const char *format, va_list ap) { - /* This is just a little longer than the longest allowed log message */ -#define SEND_CONTROL1_EVENT_BUFFERSIZE 10064 - int r; - char buf[SEND_CONTROL1_EVENT_BUFFERSIZE]; - size_t len; + char *buf = NULL; + int len; - r = tor_vsnprintf(buf, sizeof(buf), format, ap); - if (r<0) { + len = tor_vasprintf(&buf, format, ap); + if (len < 0) { log_warn(LD_BUG, "Unable to format event for controller."); return; } - len = strlen(buf); - if (fast_memcmp("\r\n\0", buf+len-2, 3)) { - /* if it is not properly terminated, do it now */ - buf[SEND_CONTROL1_EVENT_BUFFERSIZE-1] = '\0'; - buf[SEND_CONTROL1_EVENT_BUFFERSIZE-2] = '\n'; - buf[SEND_CONTROL1_EVENT_BUFFERSIZE-3] = '\r'; - } - send_control_event_string(event, which|ALL_FORMATS, buf); + + tor_free(buf); } /** Send an event to all v1 controllers that are listening for code * event. The event's body is created by the printf-style format in - * format, and other arguments as provided. - * - * Currently the length of the message is limited to 10064 (including the - * ending \\n\\r\\0. */ + * format, and other arguments as provided. */ static void send_control_event(uint16_t event, event_format_t which, const char *format, ...)

1 0

[tor/release-0.2.2] Abandon rendezvous circuits on SIGNAL NEWNYM
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 010b8dd4f6e8e3c3d2e44ff589ff61cbf64b952a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 9 19:56:40 2011 -0700 Abandon rendezvous circuits on SIGNAL NEWNYM --- changes/abandon-rend-circs-on-newnym | 8 ++++++++ src/or/circuituse.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/abandon-rend-circs-on-newnym b/changes/abandon-rend-circs-on-newnym new file mode 100644 index 0000000..67cb2dc --- /dev/null +++ b/changes/abandon-rend-circs-on-newnym @@ -0,0 +1,8 @@ + o Security fixes: + - Don't attach new streams to old rendezvous circuits after SIGNAL + NEWNYM. Previously, we would keep using an existing rendezvous + circuit if it remained open (i.e. if it were kept open by a + long-lived stream or if a new stream were attached to it before + Tor could notice that it was old and no longer in use and close + it). Bugfix on 0.1.1.15-rc; fixes bug 3375. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 41c1899..48fc198 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -59,7 +59,8 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn, return 0; } - if (purpose == CIRCUIT_PURPOSE_C_GENERAL) + if (purpose == CIRCUIT_PURPOSE_C_GENERAL || + purpose == CIRCUIT_PURPOSE_C_REND_JOINED) if (circ->timestamp_dirty && circ->timestamp_dirty+get_options()->MaxCircuitDirtiness <= now) return 0;

1 0

[tor/release-0.2.2] log when we finish ssl handshake and move to renegotiation
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 64bfbcb918a59edf8e7167954171f311d032fc4b Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 17 03:31:59 2011 -0400 log when we finish ssl handshake and move to renegotiation debug-level since it will be quite common. logged at both client and server side. this step should help us track what's going on with people filtering tor connections by our ssl habits. --- src/or/connection_or.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index ed174c9..c019f65 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -929,13 +929,16 @@ connection_tls_continue_handshake(or_connection_t *conn) if (! tor_tls_used_v1_handshake(conn->tls)) { if (!tor_tls_is_server(conn->tls)) { if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) { - // log_notice(LD_OR,"Done. state was TLS_HANDSHAKING."); + log_debug(LD_OR, "Done with initial SSL handshake (client-side). " + "Requesting renegotiation."); conn->_base.state = OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING; goto again; } // log_notice(LD_OR,"Done. state was %d.", conn->_base.state); } else { /* improved handshake, but not a client. */ + log_debug(LD_OR, "Done with initial SSL handshake (server-side). " + "Expecting renegotiation."); tor_tls_set_renegotiate_callback(conn->tls, connection_or_tls_renegotiated_cb, conn);

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit a25c0a5bf81768c4d4f6fe377cea48f47333a8c8 Merge: e70e836 e470f6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 13:46:10 2011 -0400 Merge remote-tracking branch 'public/bug3369' into maint-0.2.2 changes/bug3369 | 4 ++++ src/or/dnsserv.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.2] Make connection_printf_to_buf's behaviour sane
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 68cd0a9abeab126b3d954f060d922fd71cb945f7 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 15 21:16:44 2011 -0700 Make connection_printf_to_buf's behaviour sane --- changes/fix-connection_printf_to_buf | 10 ++++++++++ src/or/control.c | 29 +++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/changes/fix-connection_printf_to_buf b/changes/fix-connection_printf_to_buf new file mode 100644 index 0000000..b6fa092 --- /dev/null +++ b/changes/fix-connection_printf_to_buf @@ -0,0 +1,10 @@ + * Code simplifications and refactoring: + + - Make connection_printf_to_buf's behaviour sane. Its callers + expect it to emit a CRLF iff the format string ends with CRLF; + it actually emits a CRLF iff (a) the format string ends with + CRLF or (b) the resulting string is over 1023 characters long or + (c) the format string does not end with CRLF ''and'' the + resulting string is 1021 characters long or longer. Bugfix on + 0.1.1.9-alpha; fixes bug 3407. + diff --git a/src/or/control.c b/src/or/control.c index 5d2d135..2308cd6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -481,33 +481,26 @@ decode_escaped_string(const char *start, size_t in_len_max, } /** Acts like sprintf, but writes its formatted string to the end of - * conn-\>outbuf. The message may be truncated if it is too long, - * but it will always end with a CRLF sequence. - * - * Currently the length of the message is limited to 1024 (including the - * ending CR LF NUL ("\\r\\n\\0"). */ + * conn-\>outbuf. */ static void connection_printf_to_buf(control_connection_t *conn, const char *format, ...) { -#define CONNECTION_PRINTF_TO_BUF_BUFFERSIZE 1024 va_list ap; - char buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE]; - int r; - size_t len; + char *buf = NULL; + int len; + va_start(ap,format); - r = tor_vsnprintf(buf, sizeof(buf), format, ap); + len = tor_vasprintf(&buf, format, ap); va_end(ap); - if (r<0) { + + if (len < 0) { log_warn(LD_BUG, "Unable to format string for controller."); return; } - len = strlen(buf); - if (fast_memcmp("\r\n\0", buf+len-2, 3)) { - buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE-1] = '\0'; - buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE-2] = '\n'; - buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE-3] = '\r'; - } - connection_write_to_buf(buf, len, TO_CONN(conn)); + + connection_write_to_buf(buf, (size_t)len, TO_CONN(conn)); + + tor_free(buf); } /** Write all of the open control ports to ControlPortWriteToFile */

1 0

[tor/release-0.2.2] Fix comment typo
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 70785f87bb47e481053719f2a514bf0598c62b2d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 16 02:57:58 2011 -0700 Fix comment typo --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 2308cd6..2170a9b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -98,7 +98,7 @@ static int disable_log_messages = 0; static int authentication_cookie_is_set = 0; /** If authentication_cookie_is_set, a secret cookie that we've stored to disk * and which we're using to authenticate controllers. (If the controller can - * read it off disk, it has permission to connect. */ + * read it off disk, it has permission to connect.) */ static char authentication_cookie[AUTHENTICATION_COOKIE_LEN]; /** A sufficiently large size to record the last bootstrap phase string. */

1 0

[tor/release-0.2.2] Revert "Add an "auto" option to UseBridges"
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 3b41551b61a604b555891ecc7cb6f8bbde65d128 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:45:53 2011 -0400 Revert "Add an "auto" option to UseBridges" This reverts commit 507c1257a4d9c629fefc2adbad8db73607749734. --- src/or/config.c | 19 ++++--------------- src/or/or.h | 12 +----------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8ab23a3..e0ecab2 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"), - VAR("UseBridges", STRING, UseBridges_, "auto"), + V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), @@ -3234,19 +3234,6 @@ 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 " @@ -3581,8 +3568,10 @@ 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("TunnelDirConns set to 0 only works with UseBridges set to 0"); + REJECT("If you set UseBridges, you must set TunnelDirConns."); 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 456dce2..97fecd1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,17 +2480,7 @@ 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_; - /** 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; - + int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make

1 0

[tor/release-0.2.2] Revert "Update man page for new UseBridges tristate behaviour."
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit cabb16caa9afb95ce0bfbda0d7784f71e4c153a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:45:23 2011 -0400 Revert "Update man page for new UseBridges tristate behaviour." This reverts commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111. --- doc/tor.1.txt | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8aa32e8..1815a8d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -708,14 +708,10 @@ 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**|**auto**:: - Make Tor fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**:: + When set, Tor will fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - 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) + guards. (Default: 0) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 85d4c290d79264d334baa9e5c8fdf3b06d0b3d79 Merge: 209229f 010b8dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 15:24:23 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/abandon-rend-circs-on-newnym | 8 ++++++++ src/or/circuituse.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0