September 2018 - tor-commits - lists.torproject.org

[tor/master] Always include socket rebinding code
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit d8157097b42b6377d0cd83c758efce5825df83f2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jul 17 13:04:06 2018 +0000 Always include socket rebinding code --- src/core/mainloop/connection.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index aeaff3784..47a93e43a 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -146,10 +146,11 @@ * EADDRINUSE. * 2) If so, it will close the appropriate old listener connection and * 3) Attempts bind()'ing the new listener socket again. + * + * Just to be safe, we are enabling listener rebind code on all platforms, + * to account for unexpected cases where it may be needed. */ -#if defined(__linux__) || defined(_WIN32) #define ENABLE_LISTENER_REBIND -#endif static connection_t *connection_listener_new( const struct sockaddr *listensockaddr,

1 0

[tor/master] Pick random ports in test_rebind.py
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 4811869d7a603dfb6cc9881bb5aae9815ceab4e5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jul 21 12:13:58 2018 +0300 Pick random ports in test_rebind.py --- src/test/test_rebind.py | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 4a132411b..9472d5cef 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -5,10 +5,11 @@ import subprocess import socket import os import time +import random def try_connecting_to_socksport(): socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if socks_socket.connect_ex(('127.0.0.1', 9052)): + if socks_socket.connect_ex(('127.0.0.1', socks_port)): tor_process.terminate() print('FAIL') sys.exit('Cannot connect to SOCKSPort') @@ -20,14 +21,34 @@ def wait_for_log(s): if s in l: return +def pick_random_port(): + port = 0 + random.seed() + + for i in xrange(8): + port = random.randint(10000, 60000) + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + if s.connect_ex(('127.0.0.1', port)) == 0: + s.close() + else: + break + + return port + +control_port = pick_random_port() +socks_port = pick_random_port() + +assert control_port != 0 +assert socks_port != 0 + if not os.path.exists(sys.argv[1]): sys.exit('ERROR: cannot find tor at %s' % sys.argv[1]) tor_path = sys.argv[1] tor_process = subprocess.Popen([tor_path, - '-ControlPort', '127.0.0.1:9053', - '-SOCKSPort', '127.0.0.1:9052', + '-ControlPort', '127.0.0.1:{}'.format(control_port), + '-SOCKSPort', '127.0.0.1:{}'.format(socks_port), '-FetchServerDescriptors', '0'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -43,18 +64,18 @@ wait_for_log('Opened Control listener on') try_connecting_to_socksport() control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -if control_socket.connect_ex(('127.0.0.1', 9053)): +if control_socket.connect_ex(('127.0.0.1', control_port)): tor_process.terminate() print('FAIL') sys.exit('Cannot connect to ControlPort') control_socket.sendall('AUTHENTICATE \r\n') -control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:9052\r\n') +control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port)) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:9052\r\n') +control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port)) wait_for_log('Opened Socks listener') try_connecting_to_socksport()

1 0

[tor/master] Update/fix CI build
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 5a11670fcaad0a58de48425ba80510effbe35628 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Aug 5 16:27:49 2018 +0300 Update/fix CI build Update integration test to Python 3 --- src/test/test_rebind.py | 14 ++++++++------ src/test/test_rebind.sh | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 9472d5cef..f02cb79b7 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -1,3 +1,5 @@ +#!/usr/bin/python3 + from __future__ import print_function import sys @@ -18,14 +20,14 @@ def try_connecting_to_socksport(): def wait_for_log(s): while True: l = tor_process.stdout.readline() - if s in l: + if s in l.decode('utf8'): return def pick_random_port(): port = 0 random.seed() - for i in xrange(8): + for i in range(8): port = random.randint(10000, 60000) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) if s.connect_ex(('127.0.0.1', port)) == 0: @@ -69,18 +71,18 @@ if control_socket.connect_ex(('127.0.0.1', control_port)): print('FAIL') sys.exit('Cannot connect to ControlPort') -control_socket.sendall('AUTHENTICATE \r\n') -control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port)) +control_socket.sendall('AUTHENTICATE \r\n'.encode('utf8')) +control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('utf8')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port)) +control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('utf8')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SIGNAL HALT\r\n') +control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8')) time.sleep(0.1) print('OK') diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 47f38afc4..2e18f9c97 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + exitcode=0 "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" || exitcode=1

1 0

[tor/master] Disable test_rebind.sh on Windows
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit d30e47fd4e1ff01171319ef9b955a7495510a768 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Aug 18 16:29:46 2018 +0300 Disable test_rebind.sh on Windows --- src/test/test_rebind.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 2e18f9c97..a81f1b569 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -2,6 +2,14 @@ set -x +UNAME_OS=`uname -s | cut -d_ -f1` +if test "$UNAME_OS" = 'CYGWIN' || \ + test "$UNAME_OS" = 'MSYS' || \ + test "$UNAME_OS" = 'MINGW'; then + echo "This test is disabled on Windows CI, as it requires firewall examptions. Skipping." >&2 + exit 77 +fi + exitcode=0 "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" || exitcode=1

1 0

[tor/master] Actually, just disable test_rebind.sh on Appveyor
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 7b27d98eaea3bbbcf367fdf87b3dabbc28ca1f9c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Aug 19 21:33:18 2018 +0300 Actually, just disable test_rebind.sh on Appveyor --- src/test/test_rebind.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index a81f1b569..76eb9f2e4 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -2,12 +2,14 @@ set -x -UNAME_OS=`uname -s | cut -d_ -f1` +UNAME_OS=$(uname -s | cut -d_ -f1) if test "$UNAME_OS" = 'CYGWIN' || \ test "$UNAME_OS" = 'MSYS' || \ test "$UNAME_OS" = 'MINGW'; then - echo "This test is disabled on Windows CI, as it requires firewall examptions. Skipping." >&2 - exit 77 + if test "$APPVEYOR" = 'True'; then + echo "This test is disabled on Windows CI, as it requires firewall examptions. Skipping." >&2 + exit 77 + fi fi exitcode=0

1 0

[tor/master] Merge branch 'pr278_squashed'
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 62743912bcbacc1bd918b60a80f3394647d2ef91 Merge: 0dbd4fe30 7b27d98ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 09:06:35 2018 -0400 Merge branch 'pr278_squashed' changes/bug17873 | 6 + src/app/config/config.c | 16 +-- src/core/mainloop/connection.c | 247 ++++++++++++++++++++++++++++++----------- src/core/mainloop/connection.h | 14 ++- src/core/mainloop/main.c | 2 +- src/test/include.am | 3 + src/test/test_rebind.py | 89 +++++++++++++++ src/test/test_rebind.sh | 19 ++++ 8 files changed, 314 insertions(+), 82 deletions(-)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Sep '18

12 Sep '18

commit 0fdb1a4f27d2230e596e0d02cd4c78d6aef22008 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 12 12:18:52 2018 +0000 Update translations for support-portal --- contents+id.po | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contents+id.po b/contents+id.po index 46ad9dab8..91e7ebd16 100644 --- a/contents+id.po +++ b/contents+id.po @@ -2541,6 +2541,13 @@ msgid "" "href=\"https://www.facebook.com/notes/protect-the-graph/making-connections-" "to-facebook-more-secure/1526085754298237/\">Facebook</a>." msgstr "" +"Layanan Onion juga diandalkan untuk layanan percakapan dan berbagi berkas " +"bebas-metadata, interaksi yang aman antar jurnalis dengan sumber-sumbernya " +"seperti dengan <a " +"href=\"https://securedrop.org/\">SecureDrop</a>atau<a " +"href=\"https://onionshare.org/\">OnionShare</a>, pembaruan perangkat " +"lunak yang lebih aman, dan cara yang lebih aman untuk mencapai situs web " +"populer seperti </a>Facebook</a>." #: http//localhost/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -2840,6 +2847,13 @@ msgid "" "href=\"https://www.torproject.org/download/download-easy.html.en#mac\">macOS" " (OS X)</a>." msgstr "" +"Peramban Tor saat ini tersedia untuk <a " +"href=\"https://www.torproject.org/download/download-" +"easy.html.en#windows\">Windows</a>,<a " +"href=\"https://www.torproject.org/download/download-" +"easy.html.en#linux\">Linux</a> dan <a " +"href=\"https://www.torproject.org/download/download-easy.html.en#mac\">MacOS" +" (OSX)</a>." #: http//localhost/censorship/censorship-1/ #: (content/censorship/censorship-1/contents+en.lrquestion.seo_slug)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 204a90c935dc8fe4f84c311b09e3481d67c2966d Merge: 80b13f7e1 73ba308d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:17:45 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 73ba308d3d568eac81da358c4df29fda3f32e921 Merge: affbe376f d6779a901 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:17:42 2018 -0400 Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4 .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 73ba308d3d568eac81da358c4df29fda3f32e921 Merge: affbe376f d6779a901 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:17:42 2018 -0400 Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4 .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0