May 2012 - tor-commits - lists.torproject.org

[tor/master] Explain TransportProxy within doc/state-contents.txt.
by nickm＠torproject.org 10 May '12

10 May '12

commit 31ed10f6c250659fbc4593f539fec5f3ef8859ee Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 14:33:11 2012 +0200 Explain TransportProxy within doc/state-contents.txt. --- doc/state-contents.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/state-contents.txt b/doc/state-contents.txt index 730e2fb..44716ef 100644 --- a/doc/state-contents.txt +++ b/doc/state-contents.txt @@ -60,10 +60,10 @@ Recognized fields are: One or more of these may be present. - The format is "transportname addr:port", to remember the address at - which a pluggable transport was listening. - - [XXXX why?] + The format is "transportname addr:port", to remember the address + at which a pluggable transport was listening. Tor bridges use + this information to spawn pluggable transport listeners in the + same IP address and TCP port even after tor client restarts. BWHistoryReadEnds (ISO time) BWHistoryReadInterval (integer, number of seconds)

1 0

[tor/master] Merge remote-tracking branch 'asn/bug5540'
by nickm＠torproject.org 10 May '12

10 May '12

commit 1cf970c3dbbdbdf2b2fb162bbeeb6890e9b6c5c4 Merge: e30a431 31ed10f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 14:24:17 2012 -0400 Merge remote-tracking branch 'asn/bug5540' doc/state-contents.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Ignore [::] when building descriptors.
by nickm＠torproject.org 10 May '12

10 May '12

commit 6b4af1071668028b367f185121688758988ff489 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 3 22:19:38 2012 +0200 Ignore [::] when building descriptors. This is how IPv6 says "0.0.0.0" and something we will have to translate into a globally reachable address before putting it in a descriptor. The fix is a short term solution until a real one is implemented. Closes #5146. --- src/or/router.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 4cdfd02..c51bb5d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1530,10 +1530,18 @@ router_rebuild_descriptor(int force) if (p->type == CONN_TYPE_OR_LISTENER && ! p->no_advertise && ! p->ipv4_only && - tor_addr_family(&p->addr) == AF_INET6 && - ! tor_addr_is_internal(&p->addr, 1)) { - ipv6_orport = p; - break; + tor_addr_family(&p->addr) == AF_INET6) { + if (! tor_addr_is_internal(&p->addr, 0)) { + ipv6_orport = p; + break; + } else { + char addrbuf[TOR_ADDR_BUF_LEN]; + log_warn(LD_CONFIG, + "Unable to use configured IPv6 address \"%s\" in a " + "descriptor. Skipping it. " + "Try specifying a globally reachable address explicitly. ", + tor_addr_to_str(addrbuf, &p->addr, sizeof(addrbuf), 1)); + } } } SMARTLIST_FOREACH_END(p); if (ipv6_orport) {

1 0

[tor/master] Merge remote-tracking branch 'linus/bug5146'
by nickm＠torproject.org 10 May '12

10 May '12

commit e30a4311e2ebf2f33eea1228e2fc08e2b96cc094 Merge: 8c09923 6b4af10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 14:07:23 2012 -0400 Merge remote-tracking branch 'linus/bug5146' src/or/router.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)

1 0

[torspec/master] Document requirement for use of TOR_PT_EXTENDED_SERVER_PORT.
by nickm＠torproject.org 10 May '12

10 May '12

commit 00e515a56bb9cb67d37a05f3697436abacd1daad Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 10 13:57:21 2012 -0400 Document requirement for use of TOR_PT_EXTENDED_SERVER_PORT. --- proposals/180-pluggable-transport.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index 307b820..e5e4ee7 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -286,9 +286,12 @@ Managed proxy interface {Server only} - "TOR_PT_EXTENDED_SERVER_PORT" -- An addr:port (probably on localhost) - that speaks the extended server protocol. (See the "The extended - ORPort protocol" section below.) + "TOR_PT_EXTENDED_SERVER_PORT" -- An <address>:<port> where tor + should be listening for connections speaking the extended + ORPort protocol (See the "The extended ORPort protocol" section + below). If tor does not support the extended ORPort protocol, + it MUST use the empty string as the value of this environment + variable. Example: TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200 "TOR_PT_ORPORT" -- Our regular ORPort in a form suitable

1 0

[ooni-probe/master] Add 2-clause BSD simplified license.
by art＠torproject.org 10 May '12

10 May '12

commit 341af8ebb6c2b0e2628b20ee4be1e80cfb133031 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu May 10 18:02:19 2012 +0200 Add 2-clause BSD simplified license. --- LICENSE | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f1a9745 --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 2012, Jacob Appelbaum, Arturo Filastò +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project.

1 0

[tor/master] Add missing CRLFs to AUTHCHALLENGE failure replies
by nickm＠torproject.org 10 May '12

10 May '12

commit f6617473700eb4b4ab30255e7176d774c38931cd Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri May 4 02:34:26 2012 +0530 Add missing CRLFs to AUTHCHALLENGE failure replies Fix #5760 --- src/or/control.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index ddfc80e..5ffe63b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2839,13 +2839,13 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strlen("SAFECOOKIE"); } else { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " - "authentication", conn); + "authentication\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } @@ -2856,7 +2856,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, decode_escaped_string(cp, len - (cp - body), &client_nonce, &client_nonce_len); if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce", + connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2870,7 +2870,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2882,7 +2882,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strspn(cp, " \t\n\r"); if (*cp != '\0' || cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command", + connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce);

1 0

[tor/master] Add changes/bug5760
by nickm＠torproject.org 10 May '12

10 May '12

commit 5bbf04dc9727de393ab1c42440124d875c79c13e Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu May 10 12:53:16 2012 +0530 Add changes/bug5760 --- changes/bug5760 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5760 b/changes/bug5760 new file mode 100644 index 0000000..a26407b --- /dev/null +++ b/changes/bug5760 @@ -0,0 +1,3 @@ + o Major bugfixes: + - End AUTHCHALLENGE error response messages with a CRLF. Fixes bug 5760; + bugfix on 0.2.3.16-alpha, and backported to maint-0.2.2

1 0

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

10 May '12

commit 8c09923f20379619adc58765a795920435a96822 Merge: 98a30da 5bbf04d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 11:50:14 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5760 | 3 +++ src/or/control.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --cc src/or/control.c index 397bb53,5ffe63b..ec0bb8a --- a/src/or/control.c +++ b/src/or/control.c @@@ -3017,10 -2870,9 +3017,10 @@@ handle_control_authchallenge(control_co if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); + tor_free(client_nonce); return -1; }

1 0

[tor/maint-0.2.2] Add missing CRLFs to AUTHCHALLENGE failure replies
by nickm＠torproject.org 10 May '12

10 May '12

commit f6617473700eb4b4ab30255e7176d774c38931cd Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri May 4 02:34:26 2012 +0530 Add missing CRLFs to AUTHCHALLENGE failure replies Fix #5760 --- src/or/control.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index ddfc80e..5ffe63b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2839,13 +2839,13 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strlen("SAFECOOKIE"); } else { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " - "authentication", conn); + "authentication\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } @@ -2856,7 +2856,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, decode_escaped_string(cp, len - (cp - body), &client_nonce, &client_nonce_len); if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce", + connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2870,7 +2870,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2882,7 +2882,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strspn(cp, " \t\n\r"); if (*cp != '\0' || cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command", + connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce);

1 0