- tor-commits - lists.torproject.org

[goptlib/master] Use spec.torproject.org permalinks where possible.
by dcf＠torproject.org 14 Mar '16

14 Mar '16

commit 1df99a25f79ac9088cf8500a190cbdaf7a641b50 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 14 10:24:15 2016 -0700 Use spec.torproject.org permalinks where possible. --- README | 2 +- pt.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index c4ca377..7139b9e 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ goptlib is a library for writing Tor pluggable transports in Go. -https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt +https://spec.torproject.org/pt-spec https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-cont… https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-aut… diff --git a/pt.go b/pt.go index a838308..28e5bb7 100644 --- a/pt.go +++ b/pt.go @@ -117,7 +117,7 @@ // the example programs dummy-client and dummy-server. // // Tor pluggable transports specification: -// https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt. +// https://spec.torproject.org/pt-spec // // Extended ORPort: // https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-cont….

1 0

[nyx/master] Fix curses flickering
by atagar＠torproject.org 14 Mar '16

14 Mar '16

commit df0fc05f405e3fbffe0acb28d276e5ef27f5af3e Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 14 10:09:05 2016 -0700 Fix curses flickering Commit 6f91af2 fixed an issue where we froze when viewing the connections page after first starting, but at the expense of making our whole interface flicker. This is most noticeable when pressing 'm' to browse the menu. Can't say I'm entirely clear what's up. The connection panel had its own thread outside the draw loop so I wouldn't expect it to cause this sort of disruption, though due to the GIL that's of course possible. Oh well - doing this in the tracker is just better all around... * no more curses flickering * connection panel can be viewed right away * code's more elegant --- nyx/panel/connection.py | 9 --------- nyx/tracker.py | 28 +++++++++++++--------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 7e19a02..e3124d9 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -407,15 +407,6 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): self._update() self.redraw(True) - - # If this is our first run then fill in our fingerprint tracker. This - # requires fetching all the router status entries which takes a few - # seconds, so best done when we're finished with the rest of the first - # iteration to hide the lag. - - if last_ran == -1: - nyx.tracker.get_consensus_tracker().update(tor_controller().get_network_statuses([])) - last_ran = time.time() def get_help(self): diff --git a/nyx/tracker.py b/nyx/tracker.py index a772ff9..662f965 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -29,7 +29,6 @@ Background tasks for gathering information about the tor process. +- stop - stops further work by the daemon ConsensusTracker - performant lookups for consensus related information - |- update - updates the consensus information we're based on |- get_relay_nickname - provides the nickname for a given relay |- get_relay_fingerprints - provides relays running at a location +- get_relay_address - provides the address a relay is running at @@ -815,25 +814,24 @@ class ConsensusTracker(object): def _new_consensus_event(self, event): self.update(event.desc) - def update(self, router_status_entries): + def _task(self, process_pid, process_name): """ - Updates our cache with the given router status entries. - - :param list router_status_entries: router status entries to populate our cache with + If this is our first run then populate our cache. """ - new_fingerprint_cache = {} - new_address_cache = {} - new_nickname_cache = {} + if not self._fingerprint_cache: + new_fingerprint_cache = {} + new_address_cache = {} + new_nickname_cache = {} - for desc in router_status_entries: - new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) - new_nickname_cache[desc.fingerprint] = desc.nickname if desc.nickname else 'Unnamed' + for desc in tor_controller().get_network_statuses([]): + new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) + new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) + new_nickname_cache[desc.fingerprint] = desc.nickname if desc.nickname else 'Unnamed' - self._fingerprint_cache = new_fingerprint_cache - self._address_cache = new_address_cache - self._nickname_cache = new_nickname_cache + self._fingerprint_cache = new_fingerprint_cache + self._address_cache = new_address_cache + self._nickname_cache = new_nickname_cache def get_relay_nickname(self, fingerprint): """

1 0

[tor/master] When using open() to make sure we created a dir, close the fd afterwards
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit 36ad65a7d1709deeb4bc1ae3e994a30c3e7bf789 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 13:02:50 2016 -0400 When using open() to make sure we created a dir, close the fd afterwards Found by coverity. Not in any released Tor. Fixes CID 1355640. Also, don't check for fd correctness with assert(fd). You need to assert (fd >= 0). --- src/common/util.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b435511..e8be91f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2114,7 +2114,10 @@ check_private_dir(const char *dirname, cpd_check_t check, * permissions on the directory will be checked again below.*/ fd = open(sandbox_intern_string(dirname), O_NOFOLLOW); - if ( fd == -1 ) return -1; + if (fd == -1) + return -1; + else + close(fd); } else if (!(check & CPD_CHECK)) { log_warn(LD_FS, "Directory %s does not exist.", dirname); @@ -2126,7 +2129,7 @@ check_private_dir(const char *dirname, cpd_check_t check, return 0; } - tor_assert(fd); + tor_assert(fd >= 0); //f = tor_strdup(dirname); //clean_name_for_stat(f);

1 0

[tor/master] Merge remote-tracking branch 'public/bug16248_027'
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit a64be7eaa9add3ac147447faae77906bbafd1b0a Merge: d8b93b3 307b863 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 12:53:57 2016 -0400 Merge remote-tracking branch 'public/bug16248_027' changes/bug16248 | 8 ++++++++ src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-)

1 0

[tor/master] Add comments to connection_check_event().
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit 307b863556e34f0f1575c8c7ea1dd79e07eff16c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index f91049b..f17fc90 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -567,14 +567,24 @@ connection_is_reading(connection_t *conn) (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); } +/** Check whether conn is correct in having (or not having) a + * read/write event (passed in ev</b). On success, return 0. On failure, + * log a warning and return -1. */ static int connection_check_event(connection_t *conn, struct event *ev) { int bad; if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + /* DNS requests which we launch through the dnsserv.c module do not have + * any underlying socket or any underlying linked connection, so they + * shouldn't have any attached events either. + */ bad = ev != NULL; } else { + /* Everytyhing else should have an underlying socket, or a linked + * connection (which is also tracked with a read_event/write_event pair). + */ bad = ev == NULL; }

1 0

[tor/master] Change behavior on missing/present event to warn instead of asserting.
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit 91d7cf50c6cb6eb1e2dc2b4a8eab489c10a759a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 ++++++++ src/or/main.c | 49 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/changes/bug16248 b/changes/bug16248 new file mode 100644 index 0000000..399b709 --- /dev/null +++ b/changes/bug16248 @@ -0,0 +1,8 @@ + o Major bugfixes (dns proxy mode, crash): + - Avoid crashing when running as a DNS proxy. Closes bug 16248; bugfix on + 0.2.0.1-alpha. Patch from 'cypherpunks'. + + o Minor features (bug-resistance): + - Make Tor survive errors involving connections without a corresponding + event object. Previously we'd fail with an assertion; now we produce a + log message. Related to bug 16248. diff --git a/src/or/main.c b/src/or/main.c index 3fb80e1..f91049b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -567,6 +567,35 @@ connection_is_reading(connection_t *conn) (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); } +static int +connection_check_event(connection_t *conn, struct event *ev) +{ + int bad; + + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + bad = ev != NULL; + } else { + bad = ev == NULL; + } + + if (bad) { + log_warn(LD_BUG, "Event missing on connection %p [%s;%s]. " + "socket=%d. linked=%d. " + "is_dns_request=%d. Marked_for_close=%s:%d", + conn, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state), + (int)conn->s, (int)conn->linked, + (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + conn->marked_for_close_file ? conn->marked_for_close_file : "-", + conn->marked_for_close + ); + log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); + return -1; + } + return 0; +} + /** Tell the main loop to stop notifying conn of any read events. */ MOCK_IMPL(void, connection_stop_reading,(connection_t *conn)) @@ -578,14 +607,10 @@ connection_stop_reading,(connection_t *conn)) return; }); - /* if dummy conn then no socket and no event, nothing to do here */ - if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { - tor_assert(!conn->read_event); + if (connection_check_event(conn, conn->read_event) < 0) { return; } - tor_assert(conn->read_event); - if (conn->linked) { conn->reading_from_linked_conn = 0; connection_stop_reading_from_linked_conn(conn); @@ -609,14 +634,10 @@ connection_start_reading,(connection_t *conn)) return; }); - /* if dummy conn then no socket and no event, nothing to do here */ - if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { - tor_assert(!conn->read_event); + if (connection_check_event(conn, conn->read_event) < 0) { return; } - tor_assert(conn->read_event); - if (conn->linked) { conn->reading_from_linked_conn = 1; if (connection_should_read_from_linked_conn(conn)) @@ -655,7 +676,9 @@ connection_stop_writing,(connection_t *conn)) return; }); - tor_assert(conn->write_event); + if (connection_check_event(conn, conn->write_event) < 0) { + return; + } if (conn->linked) { conn->writing_to_linked_conn = 0; @@ -681,7 +704,9 @@ connection_start_writing,(connection_t *conn)) return; }); - tor_assert(conn->write_event); + if (connection_check_event(conn, conn->write_event) < 0) { + return; + } if (conn->linked) { conn->writing_to_linked_conn = 1;

1 0

[tor/master] If we start/stop reading on a dnsserv connection, don't assert.
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit e79da62645925f3286deb21740bbe91de9dafacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 534a6ac..3fb80e1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -578,6 +578,12 @@ connection_stop_reading,(connection_t *conn)) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) { @@ -603,6 +609,12 @@ connection_start_reading,(connection_t *conn)) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) {

1 0

[tor/master] hs: Do not close desc fetch conn. if we can't pick an HSDir
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit d8b93b31a044be12778f9d7dcd9e4dd666db85e0 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Mar 14 11:00:46 2016 -0400 hs: Do not close desc fetch conn. if we can't pick an HSDir Launching 7 descriptor fetches makes a connection to each HSDir that is 6 and the seventh one fails to pick an HSDir because they are all being used already so it was killing all pending connections at once. Fixes #15937 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug15937 | 7 +++++++ src/or/rendclient.c | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug15937 b/changes/bug15937 new file mode 100644 index 0000000..6c73fa4 --- /dev/null +++ b/changes/bug15937 @@ -0,0 +1,7 @@ + o Minor bug fix (hidden service client): + - Seven very fast consecutive requests to the same .onion address + triggers 7 descriptor fetches. The first six each pick a directory + (there are 6 overall) and the seventh one wasn't able to pick one + which was triggering a close on all current directory connections. It + has been fixed by not closing them if we have pending directory fetch. + Fixes #15937; Bugfix on tor-0.2.7.1-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 7e1b0e1..609c45c 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -892,7 +892,6 @@ rend_client_fetch_v2_desc(rend_data_t *query, smartlist_t *hsdirs) void rend_client_refetch_v2_renddesc(rend_data_t *rend_query) { - int ret; rend_cache_entry_t *e = NULL; tor_assert(rend_query); @@ -912,11 +911,10 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) log_debug(LD_REND, "Fetching v2 rendezvous descriptor for service %s", safe_str_client(rend_query->onion_address)); - ret = rend_client_fetch_v2_desc(rend_query, NULL); - if (ret <= 0) { - /* Close pending connections on error or if no hsdir can be found. */ - rend_client_desc_trynow(rend_query->onion_address); - } + rend_client_fetch_v2_desc(rend_query, NULL); + /* We don't need to look the error code because either on failure or + * success, the necessary steps to continue the HS connection will be + * triggered once the descriptor arrives or if all fetch failed. */ return; }

1 0

[tor-browser-spec/master] Bug 18406: Make sure MAR signatures are check before releasing
by gk＠torproject.org 14 Mar '16

14 Mar '16

commit 375032ad951e43c4f6043a9c8120282c0e6b1a6c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 14 14:28:31 2016 +0000 Bug 18406: Make sure MAR signatures are check before releasing --- processes/ReleaseProcess | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 97d0f28..86172d5 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -132,8 +132,14 @@ # Don't forget to link to Mozilla's security advisories if this is a security # update, or Nadim will yell at you. +#. Check whether the MAR files got properly signed + # Point SIGNMAR to your signmar binary + # Point LD_LIBRARY_PATH to your mar-tools directory + cd tor-browser-bundle/gitian/$TORBROWSER_VERSION + ../../tools/marsigning_check.sh + cd .. + #. Update and upload new update responses for the updater - cd tor-browser-bundle/gitian # IMPORTANT: Copy the signed MAR files back before creating the update # responses! make update_responses # (or update_responses-alpha, update_responses-beta)

1 0

[tor-browser-spec/master] Make sure the release date gets updated during release
by gk＠torproject.org 14 Mar '16

14 Mar '16

commit c6fa8f197cc6f0df0a78a9d1df9b7a0c98eaec11 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 14 14:11:55 2016 +0000 Make sure the release date gets updated during release --- processes/ReleaseProcess | 1 + 1 file changed, 1 insertion(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 5346fb4..97d0f28 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -119,6 +119,7 @@ torsocks git pull origin # Update `version-win32-stable` as well if we include a new stable tor # version. See: #14152. + # Update the release data (via releasedate-torbrowserbundle*). See: #8968. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim ./include/versions.wmi ./projects/torbrowser/RecommendedTBBVersions

1 0