October 2015 - tor-commits - lists.torproject.org

[tor/master] Add hidserv-stats filname to our sandbox filter
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Oct 15 13:38:12 2015 -0400 Add hidserv-stats filname to our sandbox filter Fixes #17354 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug17354 b/changes/bug17354 new file mode 100644 index 0000000..53da007 --- /dev/null +++ b/changes/bug17354 @@ -0,0 +1,4 @@ + o Minor bugfixes (sandbox): + - Add the "hidserv-stats" filename to our sandbox filter for the + HiddenServiceStatistics option to work properly. Fixes bug 17354; + bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/src/or/main.c b/src/or/main.c index e539222..df0cd1b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3018,6 +3018,7 @@ sandbox_init_filter(void) RENAME_SUFFIX2("stats", "exit-stats", ".tmp"); RENAME_SUFFIX2("stats", "buffer-stats", ".tmp"); RENAME_SUFFIX2("stats", "conn-stats", ".tmp"); + RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp"); RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp");

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 7e7683b254f8124e0115c9112488e47bff2b1d22 Merge: a5ed8b1 2ec5e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 13:56:41 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7 changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit a8a26ca30eae38fb47dd06392a65a8e8291ec2d0 Merge: ab3826f 7e7683b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 13:56:53 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.2.7] Add hidserv-stats filname to our sandbox filter
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Oct 15 13:38:12 2015 -0400 Add hidserv-stats filname to our sandbox filter Fixes #17354 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug17354 b/changes/bug17354 new file mode 100644 index 0000000..53da007 --- /dev/null +++ b/changes/bug17354 @@ -0,0 +1,4 @@ + o Minor bugfixes (sandbox): + - Add the "hidserv-stats" filename to our sandbox filter for the + HiddenServiceStatistics option to work properly. Fixes bug 17354; + bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/src/or/main.c b/src/or/main.c index e539222..df0cd1b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3018,6 +3018,7 @@ sandbox_init_filter(void) RENAME_SUFFIX2("stats", "exit-stats", ".tmp"); RENAME_SUFFIX2("stats", "buffer-stats", ".tmp"); RENAME_SUFFIX2("stats", "conn-stats", ".tmp"); + RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp"); RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp");

1 0

[tor/maint-0.2.7] Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 7e7683b254f8124e0115c9112488e47bff2b1d22 Merge: a5ed8b1 2ec5e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 13:56:41 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7 changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.2.6] Add hidserv-stats filname to our sandbox filter
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Oct 15 13:38:12 2015 -0400 Add hidserv-stats filname to our sandbox filter Fixes #17354 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug17354 b/changes/bug17354 new file mode 100644 index 0000000..53da007 --- /dev/null +++ b/changes/bug17354 @@ -0,0 +1,4 @@ + o Minor bugfixes (sandbox): + - Add the "hidserv-stats" filename to our sandbox filter for the + HiddenServiceStatistics option to work properly. Fixes bug 17354; + bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/src/or/main.c b/src/or/main.c index e539222..df0cd1b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3018,6 +3018,7 @@ sandbox_init_filter(void) RENAME_SUFFIX2("stats", "exit-stats", ".tmp"); RENAME_SUFFIX2("stats", "buffer-stats", ".tmp"); RENAME_SUFFIX2("stats", "conn-stats", ".tmp"); + RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp"); RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp");

1 0

[webwml/master] Add yes-we-own-this-website token for google. Will remove later.
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 3388ecccf1e303a24fdb6f92c19a106f6bed67ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 12:04:02 2015 -0400 Add yes-we-own-this-website token for google. Will remove later. --- googlec8083ab726611228.html | 1 + 1 file changed, 1 insertion(+) diff --git a/googlec8083ab726611228.html b/googlec8083ab726611228.html new file mode 100644 index 0000000..43178ba --- /dev/null +++ b/googlec8083ab726611228.html @@ -0,0 +1 @@ +google-site-verification: googlec8083ab726611228.html \ No newline at end of file

1 0

[chutney/master] If chutney repeatedly sends no bytes, stop trying
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit df6ad20619893ca974d5515cf94f4c67e7a7cd08 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Oct 6 16:17:09 2015 +1100 If chutney repeatedly sends no bytes, stop trying This only seems to happen when all external network interfaces are down. But Tor should still work using 127.0.0.1. This requires further investigation. Investigatory changes for #15353. --- lib/chutney/Traffic.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 3796205..76f16e4 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -200,6 +200,7 @@ class Source(Peer): self.inbuf = '' self.proxy = proxy self.repetitions = repetitions + self._sent_no_bytes = 0 # sanity checks if len(self.data) == 0: self.repetitions = 0 @@ -283,8 +284,16 @@ class Source(Peer): raise # sometimes, this debug statement prints 0 # it should print length of the data sent - # but the code works regardless of this error - debug("successfully sent (bytes=%d)" % n) + # but the code works as long as this doesn't keep on happening + if n > 0: + debug("successfully sent (bytes=%d)" % n) + self._sent_no_bytes = 0 + else: + debug("BUG: sent no bytes") + self._sent_no_bytes += 1 + if self._sent_no_bytes >= 10000: + print("Send no data %d times. Stalled." % (self._sent_no_bytes)) + sys.exit(-1) self.outbuf = self.outbuf[n:] if self.state == self.CONNECTING_THROUGH_PROXY: return 1 # Keep us around.

1 0

[chutney/master] fixup #15353 - Sleep when transmitting bytes temporarily fails
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 42e7bd4c53e3a84ddae3d5900017753b32e998df Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Oct 9 06:25:01 2015 +1100 fixup #15353 - Sleep when transmitting bytes temporarily fails When we fail to send bytes, sleep for 1 second before retrying. This avoids trying a few thousand times a second. --- lib/chutney/Traffic.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 76f16e4..7d61759 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -27,6 +27,7 @@ import socket import select import struct import errno +import time # Set debug_flag=True in order to debug this program or to get hints # about what's going wrong in your system. @@ -291,9 +292,10 @@ class Source(Peer): else: debug("BUG: sent no bytes") self._sent_no_bytes += 1 - if self._sent_no_bytes >= 10000: + if self._sent_no_bytes >= 10: print("Send no data %d times. Stalled." % (self._sent_no_bytes)) sys.exit(-1) + time.sleep(1) self.outbuf = self.outbuf[n:] if self.state == self.CONNECTING_THROUGH_PROXY: return 1 # Keep us around.

1 0

[tor/master] Fix compilation of sandbox.[ch] under musl-libc
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit a5ed8b1667156384483c12eb4f98d511c6dd2bd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:35:45 2015 -0400 Fix compilation of sandbox.[ch] under musl-libc Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347. --- changes/bug17347 | 4 ++++ src/common/sandbox.c | 2 +- src/common/sandbox.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug17347 b/changes/bug17347 new file mode 100644 index 0000000..487b132 --- /dev/null +++ b/changes/bug17347 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compilation of sandbox.c with musl-libc. + Fixes bug 17347; bugfix on 0.2.5.1-alpha. + Patch from 'jamestk'. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 161eab7..b995762 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -48,7 +48,7 @@ #include <sys/epoll.h> #include <sys/prctl.h> #include <linux/futex.h> -#include <bits/signum.h> +#include <sys/file.h> #include <stdarg.h> #include <seccomp.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 36d25d6..21d517f 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; #ifndef __USE_GNU #define __USE_GNU #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h>

1 0