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

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit 2c49a9852dd7b8241f823ea0a0c8d90581518c7d Merge: 784b29a bdd267e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 22 10:56:08 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22400_01 | 4 ++++ src/or/entrynodes.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-)

1 0

[tor/master] Use string_is_valid_hostname in SOCKS4 request parsing codepath
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit f8c98759e56d9af14c1046dc629d6f03330ac031 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 4 13:22:45 2017 +0200 Use string_is_valid_hostname in SOCKS4 request parsing codepath --- src/or/buffers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 399b591..1907d69 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1806,7 +1806,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, log_debug(LD_APP,"socks4: Everything is here. Success."); strlcpy(req->address, startaddr ? startaddr : tmpbuf, sizeof(req->address)); - if (!tor_strisprint(req->address) || strchr(req->address,'\"')) { + if (!string_is_valid_hostname(req->address)) { log_warn(LD_PROTOCOL, "Your application (using socks4 to port %d) gave Tor " "a malformed hostname: %s. Rejecting the connection.",

1 0

[tor/master] Refrain from needless SOCKS5 warning
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit 9e2f78092395d1250f08a21815ab1145409530eb Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jun 3 18:04:47 2017 +0200 Refrain from needless SOCKS5 warning --- changes/bug22461 | 4 ++++ src/or/buffers.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug22461 b/changes/bug22461 new file mode 100644 index 0000000..2fb6a02 --- /dev/null +++ b/changes/bug22461 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Refrain from needlessly warning Tor controller about passing + IP addresses as FQDNs through SOCKS5 interface. Fixes bug + 22461, bugfix on Tor 0.2.6.2-alpha. diff --git a/src/or/buffers.c b/src/or/buffers.c index 3692ed4..1df4be1 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1686,8 +1686,6 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, if (string_is_valid_ipv4_address(req->address) || string_is_valid_ipv6_address(req->address)) { - log_unsafe_socks_warning(5,req->address,req->port,safe_socks); - if (safe_socks) { socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED); return -1;

1 0

[tor/master] Don't reject SOCKS5 requests that contain IP strings
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit 7f05f896630e857ad2803e80b48924f026f66eb7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 4 13:14:55 2017 +0200 Don't reject SOCKS5 requests that contain IP strings --- changes/bug22461 | 7 ++++--- src/or/buffers.c | 8 +------- src/test/test_socks.c | 26 ++++++++++++-------------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/changes/bug22461 b/changes/bug22461 index 2fb6a02..343a2b4 100644 --- a/changes/bug22461 +++ b/changes/bug22461 @@ -1,4 +1,5 @@ o Minor bugfixes: - - Refrain from needlessly warning Tor controller about passing - IP addresses as FQDNs through SOCKS5 interface. Fixes bug - 22461, bugfix on Tor 0.2.6.2-alpha. + - Refrain from needlessly rejecting SOCKS5 requests that contain + IP address strings when SafeSocks in enabled as this prevents + user from connecting to IP address they know without relying on + DNS for resolving. Fixes bug 22461, bugfix on Tor 0.2.6.2-alpha. diff --git a/src/or/buffers.c b/src/or/buffers.c index 1df4be1..399b591 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1684,13 +1684,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, req->port = ntohs(get_uint16(data+5+len)); *drain_out = 5+len+2; - if (string_is_valid_ipv4_address(req->address) || - string_is_valid_ipv6_address(req->address)) { - if (safe_socks) { - socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED); - return -1; - } - } else if (!string_is_valid_hostname(req->address)) { + if (!string_is_valid_hostname(req->address)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); log_warn(LD_PROTOCOL, diff --git a/src/test/test_socks.c b/src/test/test_socks.c index bb1be11..ab2393c 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -229,25 +229,24 @@ test_socks_5_supported_commands(void *ptr) tt_int_op(0,OP_EQ, buf_datalen(buf)); socks_request_clear(socks); - /* SOCKS 5 Should reject RESOLVE [F0] request for IPv4 address + /* SOCKS 5 Should NOT reject RESOLVE [F0] request for IPv4 address * string if SafeSocks is enabled. */ ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\xF0\x00\x03\x07"); ADD_DATA(buf, "8.8.8.8"); - ADD_DATA(buf, "\x01\x02"); + ADD_DATA(buf, "\x11\x11"); tt_assert(fetch_from_buf_socks(buf,socks,get_options()->TestSocks,1) - == -1); + == 1); - tt_int_op(5,OP_EQ,socks->socks_version); - tt_int_op(10,OP_EQ,socks->replylen); - tt_int_op(5,OP_EQ,socks->reply[0]); - tt_int_op(SOCKS5_NOT_ALLOWED,OP_EQ,socks->reply[1]); - tt_int_op(1,OP_EQ,socks->reply[3]); + tt_str_op("8.8.8.8", OP_EQ, socks->address); + tt_int_op(4369, OP_EQ, socks->port); + + tt_int_op(0, OP_EQ, buf_datalen(buf)); socks_request_clear(socks); - /* SOCKS 5 should reject RESOLVE [F0] reject for IPv6 address + /* SOCKS 5 should NOT reject RESOLVE [F0] reject for IPv6 address * string if SafeSocks is enabled. */ ADD_DATA(buf, "\x05\x01\x00"); @@ -257,11 +256,10 @@ test_socks_5_supported_commands(void *ptr) tt_assert(fetch_from_buf_socks(buf,socks,get_options()->TestSocks,1) == -1); - tt_int_op(5,OP_EQ,socks->socks_version); - tt_int_op(10,OP_EQ,socks->replylen); - tt_int_op(5,OP_EQ,socks->reply[0]); - tt_int_op(SOCKS5_NOT_ALLOWED,OP_EQ,socks->reply[1]); - tt_int_op(1,OP_EQ,socks->reply[3]); + tt_str_op("2001:0db8:85a3:0000:0000:8a2e:0370:7334", OP_EQ, socks->address); + tt_int_op(258, OP_EQ, socks->port); + + tt_int_op(0, OP_EQ, buf_datalen(buf)); socks_request_clear(socks);

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit 34ecfeb4791432a94877531383b14b1614a77576 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 22 08:16:48 2017 -0400 whitespace fix --- src/test/test_socks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_socks.c b/src/test/test_socks.c index ab2393c..94b9464 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -241,7 +241,7 @@ test_socks_5_supported_commands(void *ptr) tt_str_op("8.8.8.8", OP_EQ, socks->address); tt_int_op(4369, OP_EQ, socks->port); - + tt_int_op(0, OP_EQ, buf_datalen(buf)); socks_request_clear(socks);

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug22461'
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit b9d8c8b1267ac4b5968b6c165d6aee27814c78aa Merge: dc9ec51 f8c9875 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 22 08:11:36 2017 -0400 Merge remote-tracking branch 'rl1987/bug22461' changes/bug22461 | 5 +++++ src/or/buffers.c | 12 ++---------- src/test/test_socks.c | 26 ++++++++++++-------------- 3 files changed, 19 insertions(+), 24 deletions(-)

1 0

[tor/master] expand changes file for bug 22461
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit ee7101a875bef078462367f48164d94b6ed86182 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 22 08:16:56 2017 -0400 expand changes file for bug 22461 --- changes/bug22461 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug22461 b/changes/bug22461 index 343a2b4..5454682 100644 --- a/changes/bug22461 +++ b/changes/bug22461 @@ -1,5 +1,7 @@ - o Minor bugfixes: - - Refrain from needlessly rejecting SOCKS5 requests that contain - IP address strings when SafeSocks in enabled as this prevents - user from connecting to IP address they know without relying on - DNS for resolving. Fixes bug 22461, bugfix on Tor 0.2.6.2-alpha. + o Minor bugfixes (client, usability): + - Refrain from needlessly rejecting SOCKS5-with-hostnames and SOCKS4a + requests that contain IP address strings, even when SafeSocks in + enabled, as this prevents user from connecting to known IP addresses + without relying on DNS for resolving. SafeSocks still rejects SOCKS + connections that connect to IP addresses when those addresses are _not_ + encoded as hostnames. Fixes bug 22461, bugfix on Tor 0.2.6.2-alpha.

1 0

[tor/master] Merge remote-tracking branch 'public/bug7890'
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit dc9ec519b51b8395a5d56b76f418f93c8734f97b Merge: 005500e 9d59769 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 22 08:04:12 2017 -0400 Merge remote-tracking branch 'public/bug7890' changes/bug7890 | 4 ++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Improve error message when all permitted Exits are down
by nickm＠torproject.org 22 Jun '17

22 Jun '17

commit 9d59769db78fd5703935291b83c52ede4b556389 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 10:59:04 2017 -0400 Improve error message when all permitted Exits are down The old "No specified non-excluded exit routers seem to be running" message was somewhat confusing. Fix for 7890. --- changes/bug7890 | 4 ++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug7890 b/changes/bug7890 new file mode 100644 index 0000000..1daec58 --- /dev/null +++ b/changes/bug7890 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Use a more comprehensible log message when telling the user they've + excluded every running exit node. Fixes bug 7890; bugfix on + 0.2.2.25-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 16cef0e..240c64b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1956,9 +1956,10 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) } if (options->ExitNodes) { log_warn(LD_CIRC, - "No specified %sexit routers seem to be running: " + "No exits in ExitNodes%s seem to be running: " "can't choose an exit.", - options->ExcludeExitNodesUnion_ ? "non-excluded " : ""); + options->ExcludeExitNodesUnion_ ? + ", except possibly those excluded by your configuration, " : ""); } return NULL; }

1 0

[webwml/staging] Remove text from jobs page
by hiro＠torproject.org 22 Jun '17

22 Jun '17

commit 14e3b1d8245aeb92fcd3c8ce9f884cf60a5b6383 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jun 22 11:10:41 2017 +0200 Remove text from jobs page --- about/en/jobs.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 37b1527..d455694 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,9 +12,9 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> - <p>At the moment, we don't have any official open positions. Please check back - soon, though! In the meantime, you may want to glance at our - <a href="<page getinvolved/volunteer>">volunteers</a> page.</p> + #<p>At the moment, we don't have any official open positions. Please check back + # soon, though! In the meantime, you may want to glance at our + #<a href="<page getinvolved/volunteer>">volunteers</a> page.</p> <p>Specifically, we're looking for the following people currently:</p> <ul>

1 0