March 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.7] If we start/stop reading on a dnsserv connection, don't assert.
by andrea＠torproject.org 29 Mar '16

29 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/maint-0.2.7] Add comments to connection_check_event().
by andrea＠torproject.org 29 Mar '16

29 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/maint-0.2.7] Change behavior on missing/present event to warn instead of asserting.
by andrea＠torproject.org 29 Mar '16

29 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/maint-0.2.7] Merge branch 'bug16248_027' into maint-0.2.7
by andrea＠torproject.org 29 Mar '16

29 Mar '16

commit 1218d731d1f3c1944a22bba45ef2f6a0853eba5c Merge: e1e62f9 307b863 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 29 14:33:45 2016 +0000 Merge branch 'bug16248_027' into maint-0.2.7 changes/bug16248 | 8 ++++++++ src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-)

1 0

[tor-browser-bundle/master] Bumping gitian-builder tag for nightlies
by gk＠torproject.org 29 Mar '16

29 Mar '16

commit c4b552948a6471a1bc36e5cfcce6a0e7d74a999f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 29 12:26:41 2016 +0000 Bumping gitian-builder tag for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ae38daf..fe94a04 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -46,7 +46,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1s GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Bug 18127: Add LXC support for building with Debian guest VMs
by gk＠torproject.org 29 Mar '16

29 Mar '16

commit 4d625212a6689ebd1b291c5450096aeedad94e28 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 7 12:59:46 2016 +0100 Bug 18127: Add LXC support for building with Debian guest VMs --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/make-vms.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 28bd006..d5aaec4 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -15,6 +15,7 @@ packages: - "libxml2-utils" - "sqlite3" - "python-lxml" +- "rsync" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 0643e6b..cecc390 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -149,7 +149,7 @@ script: | # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . - mkdir vcversioner-1.14.1.1-py2.6.egg + mkdir vcversioner-1.14.1.1-py2.7.egg $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..554cc27 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,13 +25,20 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch.qcow2 ]; + if [ ! -f ./base-$dist-$arch ]; then if [ "z$USE_LXC" = "z1" ]; then export LXC_SUITE=$dist export LXC_ARCH=$arch - ./bin/make-base-vm --suite $dist --lxc --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --lxc --arch $arch + fi else if [ "$dist" = "wheezy" ]; then

1 0

[tor-browser-bundle/master] Bug 18127: use $GITIAN_TAG in fetch-inputs.sh
by gk＠torproject.org 29 Mar '16

29 Mar '16

commit 9e1ff5bf59a07f9a4277d75e2331c47f297a6921 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 16 19:30:02 2016 +0100 Bug 18127: use $GITIAN_TAG in fetch-inputs.sh --- gitian/fetch-inputs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 5aed842..7c9daee 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -243,8 +243,7 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-3 -git merge origin/tor-browser-builder-3 +git checkout "$GITIAN_TAG" cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/master] Bug 18127: install debian-archive-keyring on Ubuntu
by gk＠torproject.org 29 Mar '16

29 Mar '16

commit 1bc9c54d1eb82b3da499d49fe9c54e0675b0001b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 1 12:39:33 2016 +0100 Bug 18127: install debian-archive-keyring on Ubuntu The Debian keyring is required by debootstrap when generating a Debian chroot. --- gitian/check-prerequisites.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..6b88a90 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring" exit 1 fi else

1 0

[tor/master] dir auths only give Guard if they're giving Stable
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit c4208ef65f58836670dab286bad0289259582124 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Mar 24 15:00:01 2016 -0400 dir auths only give Guard if they're giving Stable This change allows us to simplify path selection for clients, and it should have minimal effect in practice since >99% of Guards already have the Stable flag. Implements ticket 18624. --- changes/feature18624 | 7 +++++++ src/or/dirserv.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/feature18624 b/changes/feature18624 new file mode 100644 index 0000000..a3be90f --- /dev/null +++ b/changes/feature18624 @@ -0,0 +1,7 @@ + o Minor features: + - Directory authorities now only give the Guard flag to a relay if + they are also giving it the Stable flag. This change allows us to + simplify path selection for clients, and it should have minimal + effect in practice since >99% of Guards already have the Stable + flag. Implements ticket 18624. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a045f3a..f012b7b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2200,7 +2200,7 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, rs->is_valid = node->is_valid; - if (node->is_fast && + if (node->is_fast && node->is_stable && ((options->AuthDirGuardBWGuarantee && routerbw_kb >= options->AuthDirGuardBWGuarantee/1000) || routerbw_kb >= MIN(guard_bandwidth_including_exits_kb,

1 0

[tor/master] Merge remote-tracking branch 'arma/feature18624'
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit 4e76b206b5fac18805a5cb2c3440dd367bd3b92d Merge: e1f4d95 c4208ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 29 08:06:21 2016 -0400 Merge remote-tracking branch 'arma/feature18624' changes/feature18624 | 7 +++++++ src/or/dirserv.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0