April 2019 - tor-commits - lists.torproject.org

[tor/master] Initialize rate_limited to false in directory_get_from_hs_dir()
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 144bc5026e90421bb814f35f2b61f3ffa0d078f8 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Apr 19 09:17:29 2019 -0400 Initialize rate_limited to false in directory_get_from_hs_dir() --- src/feature/rend/rendclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 090722a4c..f84d221b1 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -469,7 +469,7 @@ directory_get_from_hs_dir(const char *desc_id, /* Automatically pick an hs dir if none given. */ if (!rs_hsdir) { - bool rate_limited; + bool rate_limited = false; /* Determine responsible dirs. Even if we can't get all we want, work with * the ones we have. If it's empty, we'll notice in hs_pick_hsdir(). */

1 0

[tor/master] Only set rate_limited in hs_pick_hsdir() if rate_limited_count or responsible_dirs_count is greater than 0
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit efde686aa537b31c7cc626b863e3e0b750975526 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Apr 19 09:21:20 2019 -0400 Only set rate_limited in hs_pick_hsdir() if rate_limited_count or responsible_dirs_count is greater than 0 --- src/feature/hs/hs_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index a14ff6a64..f9caf24f1 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1635,7 +1635,10 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str, } } SMARTLIST_FOREACH_END(dir); - rate_limited = rate_limited_count == responsible_dirs_count; + if (rate_limited_count > 0 || responsible_dirs_count > 0) { + rate_limited = rate_limited_count == responsible_dirs_count; + } + excluded_some = smartlist_len(usable_responsible_dirs) < smartlist_len(responsible_dirs);

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/935'
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 475ac11bc11e258efe916d8e53277c00e5b136b6 Merge: 6559aefc7 2ab19a48c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 23 14:11:04 2019 -0400 Merge remote-tracking branch 'tor-github/pr/935' changes/bug28269 | 7 +++++++ src/feature/hs/hs_client.c | 2 +- src/feature/hs/hs_common.c | 23 +++++++++++++++++++---- src/feature/hs/hs_common.h | 2 +- src/feature/rend/rendclient.c | 9 ++++++--- src/test/test_hs.c | 10 ++++++++++ 6 files changed, 44 insertions(+), 9 deletions(-)

1 0

[tor/master] Rename outvar to follow _out convention.
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 8bea0c2fa346b8f67e5c33a5c455d022049e34c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 23 14:14:17 2019 -0400 Rename outvar to follow _out convention. --- src/feature/hs/hs_common.c | 8 ++++---- src/feature/hs/hs_common.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index 11efe078a..d4736c286 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1590,7 +1590,7 @@ hs_purge_last_hid_serv_requests(void) * one that we should use to fetch a descriptor right now. Take into account * previous failed attempts at fetching this descriptor from HSDirs using the * string identifier req_key_str. We return whether we are rate limited - * into *is_rate_limited if it is not NULL. + * into *is_rate_limited_out if it is not NULL. * * Steals ownership of responsible_dirs. * @@ -1598,7 +1598,7 @@ hs_purge_last_hid_serv_requests(void) * NULL if no HSDirs are worth trying right now. */ routerstatus_t * hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str, - bool *is_rate_limited) + bool *is_rate_limited_out) { smartlist_t *usable_responsible_dirs = smartlist_new(); const or_options_t *options = get_options(); @@ -1665,8 +1665,8 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str, hs_lookup_last_hid_serv_request(hs_dir, req_key_str, now, 1); } - if (is_rate_limited != NULL) { - *is_rate_limited = rate_limited; + if (is_rate_limited_out != NULL) { + *is_rate_limited_out = rate_limited; } return hs_dir; diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h index fc0c39f94..3009780d9 100644 --- a/src/feature/hs/hs_common.h +++ b/src/feature/hs/hs_common.h @@ -241,7 +241,8 @@ void hs_get_responsible_hsdirs(const struct ed25519_public_key_t *blinded_pk, int use_second_hsdir_index, int for_fetching, smartlist_t *responsible_dirs); routerstatus_t *hs_pick_hsdir(smartlist_t *responsible_dirs, - const char *req_key_str, bool *is_rate_limited); + const char *req_key_str, + bool *is_rate_limited_out); time_t hs_hsdir_requery_period(const or_options_t *options); time_t hs_lookup_last_hid_serv_request(routerstatus_t *hs_dir,

1 0

[tor/master] Travis: Show stem's tor log after failure
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 9a97b5ff56fc6f29d93ee515eb7244fe4db34c66 Author: teor <teor(a)torproject.org> Date: Mon Apr 22 11:48:07 2019 +1000 Travis: Show stem's tor log after failure Closes ticket 30234. --- .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..1b04fa48f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -225,6 +225,7 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi before_cache: ## Delete all gcov files. diff --git a/changes/ticket30234 b/changes/ticket30234 new file mode 100644 index 000000000..5a0076bad --- /dev/null +++ b/changes/ticket30234 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - In Travis, show stem's tor log after failure. Closes ticket 30234.

1 0

[tor/master] Call practracker from pre-push and pre-commit hooks
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit a85cd5b41bbd71cd16a9a641e067faf4cafb313e Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Apr 19 09:46:36 2019 +0300 Call practracker from pre-push and pre-commit hooks --- scripts/git/pre-commit.git-hook | 4 ++++ scripts/git/pre-push.git-hook | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 65fa99f4c..76d13adeb 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -39,3 +39,7 @@ fi if test -e scripts/maint/checkIncludes.py; then python scripts/maint/checkIncludes.py fi + +if [ -e scripts/maint/practracker/practracker.py ]; then + python3 ./scripts/maint/practracker/practracker.py "$workdir" +fi diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index f32982934..740180d6f 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -34,6 +34,12 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then fi fi +if [ -e scripts/maint/practracker/practracker.py ]; then + if ! python3 ./scripts/maint/practracker/practracker.py "$workdir"; then + exit 1 + fi +fi + # shellcheck disable=SC2034 while read -r local_ref local_sha remote_ref remote_sha do

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/971'
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 6559aefc7b34529aac501080901c3d2923cbd2bf Merge: b0459de21 9a97b5ff5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 23 12:52:54 2019 -0400 Merge remote-tracking branch 'tor-github/pr/971' .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

1 0

[tor/master] Merge branch 'ticket30051_take2_squashed'
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit b0459de217cdc18d20754ad1495ed1da52885c81 Merge: a7599c5be 0c78811ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 23 12:51:44 2019 -0400 Merge branch 'ticket30051_take2_squashed' changes/ticket30051 | 5 +++++ scripts/git/pre-commit.git-hook | 4 ++++ scripts/git/pre-push.git-hook | 6 ++++++ 3 files changed, 15 insertions(+)

1 0

[tor/master] Add changes file
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 0c78811ceabaece8bec92cc6a9a42a7b4631cfa7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Apr 19 09:51:04 2019 +0300 Add changes file --- changes/ticket30051 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket30051 b/changes/ticket30051 new file mode 100644 index 000000000..87b6d7611 --- /dev/null +++ b/changes/ticket30051 @@ -0,0 +1,5 @@ + o Minor features (developer tooling): + - Call practracker from pre-push and pre-commit git hooks to let a + developer know if they made any code style violations in their last + commit. This should help preventing code style violations appearing + upstream. Closes ticket 30051.

1 0

[tor/master] connection_edge: Return a web page when HTTPTunnelPort is misconfigured
by nickm＠torproject.org 23 Apr '19

23 Apr '19

commit 728d20ed08122d2f34b001217faa009040fb2fee Author: teor <teor(a)torproject.org> Date: Wed Apr 17 17:58:40 2019 +1000 connection_edge: Return a web page when HTTPTunnelPort is misconfigured Return an informative web page when the HTTPTunnelPort is used as an HTTP proxy. Closes ticket 27821, patch by "eighthave". --- changes/ticket27821 | 3 +++ src/core/or/connection_edge.c | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/changes/ticket27821 b/changes/ticket27821 new file mode 100644 index 000000000..158f308fb --- /dev/null +++ b/changes/ticket27821 @@ -0,0 +1,3 @@ + o Minor features (HTTP tunnel): + - Return an informative web page when the HTTPTunnelPort is used as an + HTTP proxy. Closes ticket 27821, patch by "eighthave". diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 071a8c91e..4f7cbafe0 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2810,6 +2810,31 @@ connection_ap_process_natd(entry_connection_t *conn) return connection_ap_rewrite_and_attach_if_allowed(conn, NULL, NULL); } +static const char HTTP_CONNECT_IS_NOT_AN_HTTP_PROXY_MSG[] = + "HTTP/1.0 405 Method Not Allowed\r\n"; + "Content-Type: text/html; charset=iso-8859-1\r\n\r\n" + "<html>\n" + "<head>\n" + "<title>This is an HTTP CONNECT tunnel, not an full HTTP Proxy</title>\n" + "</head>\n" + "<body>\n" + "<h1>This is an HTTP CONNECT tunnel, not an HTTP proxy.</h1>\n" + "\n" + "It appears you have configured your web browser to use this Tor port as\n" + "an HTTP proxy.\n" + "\n" + "This is not correct: This port is configured as a CONNECT tunnel, not\n" + "an HTTP proxy. Please configure your client accordingly. You can also\n" + "use HTTPS, then the client should automatically use HTTP CONNECT." + "\n" + "\n" + "See <a href=\"https://www.torproject.org/documentation.html\">" + "https://www.torproject.org/documentation.html</a> for more " + "information.\n" + "\n" + "</body>\n" + "</html>\n"; + /** Called on an HTTP CONNECT entry connection when some bytes have arrived, * but we have not yet received a full HTTP CONNECT request. Try to parse an * HTTP CONNECT request from the connection's inbuf. On success, set up the @@ -2850,7 +2875,7 @@ connection_ap_process_http_connect(entry_connection_t *conn) tor_assert(command); tor_assert(addrport); if (strcasecmp(command, "connect")) { - errmsg = "HTTP/1.0 405 Method Not Allowed\r\n\r\n"; + errmsg = HTTP_CONNECT_IS_NOT_AN_HTTP_PROXY_MSG; goto err; }

1 0