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

[tor-browser-build/master] Fix typo in dmg filenames
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit 133ca2afddffdfad95124bfffe9850f21fabcf36 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 10:35:29 2017 +0100 Fix typo in dmg filenames --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index caf0cf4..3763b21 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -251,7 +251,7 @@ MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OU [% ELSIF c("var/osx") %] [% c('var/ddmg', { dmg_src => '"$PKG_DIR"', - dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ '_${PKG_LOCALE}.dmg', + dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] pushd "${TB_STAGE_DIR}" @@ -318,7 +318,7 @@ rm -rf $distdir/${PKG_DIR} [% ELSIF c("var/osx") %] [% c('var/ddmg', { dmg_src => tbdir, - dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ '_' _ lang _ '.dmg', + dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] pushd "[% tbdir %]"

1 0

[chutney/master] Make chutney tools work with relative paths
by teor＠torproject.org 15 Feb '17

15 Feb '17

commit 16e32cc0d71bd18da287940eaee528aa3e98c001 Author: teor <teor2345(a)gmail.com> Date: Wed Feb 15 17:18:55 2017 +1100 Make chutney tools work with relative paths This bug was introduced when we added the test scripts in #9087. Closes #21467. --- tools/bootstrap-network.sh | 7 ++++++- tools/hsaddress.sh | 5 ++++- tools/test-network.sh | 2 ++ tools/warnings.sh | 5 ++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index a2d5fa8..ea9d825 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -8,7 +8,6 @@ # and creating a new net/nodes # # Usage: -# cd YOUR-CHUTNEY-DIRECTORY # tools/bootstrap-network.sh [network-flavour] # network-flavour: one of the files in the networks directory, # (default: 'basic') @@ -18,6 +17,12 @@ VOTING_OFFSET=6 CHUTNEY=./chutney myname=$(basename "$0") +if [ ! -z "$CHUTNEY_PATH" ]; then + cd "$CHUTNEY_PATH" + # tell chutney to use the current directory + export CHUTNEY_PATH=. +fi + [ -x $CHUTNEY ] || { echo "$myname: missing $CHUTNEY"; exit 1; } [ -d networks ] || { echo "$myname: missing directory: networks"; exit 1; } flavour=basic; [ -n "$1" ] && { flavour=$1; shift; } diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh index b89fc6d..8dedc2e 100755 --- a/tools/hsaddress.sh +++ b/tools/hsaddress.sh @@ -1,13 +1,16 @@ #!/bin/bash # # Usage: -# cd YOUR-CHUTNEY-DIRECTORY # tools/hsaddress.sh [hs_node] # Output: for each HS outputs its onion address. If the argument node is # specified, it only shows the onion address of that node. # Examples: tools/hsaddress.sh # tools/hsaddress.sh 025h +if [ ! -z "$CHUTNEY_PATH" ]; then + cd "$CHUTNEY_PATH" +fi + NAME=$(basename "$0") DEST=net/nodes TARGET=hidden_service/hostname diff --git a/tools/test-network.sh b/tools/test-network.sh index beefdc3..7289126 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -188,6 +188,8 @@ if [ "$NETWORK_DRY_RUN" = true ]; then fi cd "$CHUTNEY_PATH" +# tell chutney to use the current directory +export CHUTNEY_PATH=. ./tools/bootstrap-network.sh "$NETWORK_FLAVOUR" || exit 2 # chutney starts verifying after 20 seconds, keeps on trying for 60 seconds, diff --git a/tools/warnings.sh b/tools/warnings.sh index 41c9a86..29ed3e2 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -1,7 +1,6 @@ #!/bin/bash # # Usage: -# cd YOUR-CHUTNEY-DIRECTORY # tools/warnings.sh [node] # Output: for each node outputs its warnings and the number of times that # warning has ocurred. If the argument node is specified, it only shows @@ -9,6 +8,10 @@ # Examples: tools/warnings.sh # tools/warnings.sh 000a +if [ ! -z "$CHUTNEY_PATH" ]; then + cd "$CHUTNEY_PATH" +fi + function show_warnings() { echo "${GREEN}Node `basename $1`:${NC}" sed -n 's/^.*\[warn\]//p' $1/info.log | sort | uniq -c | \

1 0

[chutney/master] Require authentication on all Tor control ports
by teor＠torproject.org 15 Feb '17

15 Feb '17

commit 84ccf71356781babfa3bb1c536ebe99d5d7e2b1b Author: teor <teor2345(a)gmail.com> Date: Wed Feb 15 13:56:49 2017 +1100 Require authentication on all Tor control ports Closes 21461, bugfix on 19765. --- torrc_templates/client.tmpl | 1 - torrc_templates/common.i | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl index e0fbad9..3aff6cb 100644 --- a/torrc_templates/client.tmpl +++ b/torrc_templates/client.tmpl @@ -1,6 +1,5 @@ ${include:common.i} SocksPort $socksport -CookieAuthentication 1 #NOTE: Setting TestingClientConsensusDownloadSchedule doesn't # help -- dl_stats.schedule is not DL_SCHED_CONSENSUS diff --git a/torrc_templates/common.i b/torrc_templates/common.i index 2776ca1..1bdc6de 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -48,3 +48,4 @@ DisableDebuggerAttachment 0 ${authorities} ControlPort $controlport +CookieAuthentication 1

1 0

[chutney/master] Create client data directories in mode 0700
by teor＠torproject.org 15 Feb '17

15 Feb '17

commit 5d98fae0db8d18f48447cf7eaaa1f2e1e3b23354 Author: teor <teor2345(a)gmail.com> Date: Wed Feb 15 14:44:20 2017 +1100 Create client data directories in mode 0700 This allows control sockets to work by default. Fixes #21464. --- lib/chutney/TorNet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 6db7ad4..ced5727 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -335,9 +335,13 @@ class LocalNodeBuilder(NodeBuilder): def _makeDataDir(self): """Create the data directory (with keys subdirectory) for this node. + + 448 is the decimal representation of the octal number 0700. Since + python2 only supports 0700 and python3 only supports 0o700, we can + use neither. """ datadir = self._env['dir'] - mkdir_p(os.path.join(datadir, 'keys')) + mkdir_p(os.path.join(datadir, 'keys'), 448) def _makeHiddenServiceDir(self): """Create the hidden service subdirectory for this node.

1 0

[chutney/master] Tidy common.i, and reorder options for readability
by teor＠torproject.org 15 Feb '17

15 Feb '17

commit 19a217c3a476bd04c1d35201251a705a47247876 Author: teor <teor2345(a)gmail.com> Date: Wed Feb 15 14:00:47 2017 +1100 Tidy common.i, and reorder options for readability No behaviour change --- torrc_templates/common.i | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/torrc_templates/common.i b/torrc_templates/common.i index 508c4ac..bca0407 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -37,17 +37,19 @@ RunAsDaemon 1 ConnLimit $connlimit Nickname $nick ShutdownWaitLength 0 +DisableDebuggerAttachment 0 + +ControlPort $controlport +# Use ControlSocket rather than ControlPort unix: to support older tors +ControlSocket ${dir}/control +CookieAuthentication 1 PidFile ${dir}/pid + Log notice file ${dir}/notice.log Log info file ${dir}/info.log # Turn this off to save space #Log debug file ${dir}/debug.log ProtocolWarnings 1 SafeLogging 0 -DisableDebuggerAttachment 0 -${authorities} -ControlPort $controlport -# Use ControlSocket rather than ControlPort unix: to support older tors -ControlSocket ${dir}/control -CookieAuthentication 1 +${authorities}

1 0

[chutney/master] Add a control socket for every tor instance
by teor＠torproject.org 15 Feb '17

15 Feb '17

commit debe1d9a88cce0fee338fbf6a457c0ea9d0ef530 Author: teor <teor2345(a)gmail.com> Date: Wed Feb 15 13:57:08 2017 +1100 Add a control socket for every tor instance Closes 21462. --- torrc_templates/common.i | 2 ++ 1 file changed, 2 insertions(+) diff --git a/torrc_templates/common.i b/torrc_templates/common.i index 1bdc6de..508c4ac 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -48,4 +48,6 @@ DisableDebuggerAttachment 0 ${authorities} ControlPort $controlport +# Use ControlSocket rather than ControlPort unix: to support older tors +ControlSocket ${dir}/control CookieAuthentication 1

1 0

[tor/master] protover: Add new version for prop224 for HSIntro/HSDir
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 3f005c0433c56a540c211c9b6be1cf45a8185bc7 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 14 10:49:28 2017 -0500 protover: Add new version for prop224 for HSIntro/HSDir Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket20656 | 3 +++ src/or/protover.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket20656 b/changes/ticket20656 new file mode 100644 index 0000000..28192e8 --- /dev/null +++ b/changes/ticket20656 @@ -0,0 +1,3 @@ + o Minor feature (protover): + - Add new protocol version for proposal 224. HSIntro now advertises + version "3-4" and HSDir version "1-2". Fixes ticket 20656. diff --git a/src/or/protover.c b/src/or/protover.c index ceaf2d5..88d549a 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -289,8 +289,8 @@ protover_get_supported_protocols(void) "Cons=1-2 " "Desc=1-2 " "DirCache=1 " - "HSDir=1 " - "HSIntro=3 " + "HSDir=1-2 " + "HSIntro=3-4 " "HSRend=1-2 " "Link=1-4 " "LinkAuth=1,3 "

1 0

[tor/master] Merge branch 'bug20894_029_v3'
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 7e469c10020f92b6aa19cb3f4316fb040d837819 Merge: dca8ae5 4c1ecd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 19:10:20 2017 -0500 Merge branch 'bug20894_029_v3' changes/bug20894 | 9 +++++++ src/common/util.c | 13 +++++++++ src/common/util.h | 1 + src/or/buffers.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- src/or/buffers.h | 5 ++++ src/test/test_buffers.c | 44 ++++++++++++++++++++++++++++++ src/test/test_util.c | 1 + 7 files changed, 132 insertions(+), 13 deletions(-)

1 0

[tor/master] fixup! Don't atoi off the end of a buffer chunk.
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 4c1ecd75830cbf43bc39b9c77ee01b3ce138e40c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 16:45:18 2017 -0500 fixup! Don't atoi off the end of a buffer chunk. Use STATIC. --- src/or/buffers.c | 4 ++-- src/or/buffers.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 537a14a..015208f 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1091,13 +1091,13 @@ buf_find_string_offset(const buf_t *buf, const char *s, size_t n) } /** - * Scan the HTTP headers in the headerlen-byte string at + * Scan the HTTP headers in the headerlen-byte memory range at * headers, looking for a "Content-Length" header. Try to set * *result_out to the numeric value of that header if possible. * Return -1 if the header was malformed, 0 if it was missing, and 1 if * it was present and well-formed. */ -/* STATIC */ int +STATIC int buf_http_find_content_length(const char *headers, size_t headerlen, size_t *result_out) { diff --git a/src/or/buffers.h b/src/or/buffers.h index 9762cf2..a9273dc 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -98,7 +98,7 @@ struct buf_t { #endif #ifdef BUFFERS_PRIVATE -int buf_http_find_content_length(const char *headers, size_t headerlen, +STATIC int buf_http_find_content_length(const char *headers, size_t headerlen, size_t *result_out); #endif

1 0

[tor/master] fixup! Don't atoi off the end of a buffer chunk.
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit ff088ea7d7eb854846a5611361f4744f9bb0ee9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 16:44:58 2017 -0500 fixup! Don't atoi off the end of a buffer chunk. Credit AFL in the changes file. --- changes/bug20894 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/bug20894 b/changes/bug20894 index 6443396..2dbf9b9 100644 --- a/changes/bug20894 +++ b/changes/bug20894 @@ -3,6 +3,7 @@ do not read off the end of the buffer. This bug was a potential remote denial-of-service attack against Tor clients and relays. A workaround was released in October 2016, which prevents this - bug from crashing Tor. This is a fix for the underlying issue, + bug from crashing Tor. This is a fix for the underlying issue, which should no longer matter (if you applied the earlier patch). - Fixes bug 20894; bugfix on 0.2.0.16-alpha. + Fixes bug 20894; bugfix on 0.2.0.16-alpha. Bug found by fuzzing + using AFL (http://lcamtuf.coredump.cx/afl/)

1 0