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

[torspec/master] Merge branch 'ticket28359_squashed'
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 43ad5143d46c68d0eff81393f6f8e55659eee902 Merge: 9d8c044 1b686ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 19 08:52:04 2018 -0500 Merge branch 'ticket28359_squashed' dir-spec.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

1 0

[torsocks/master] Update version to v2.3.0
by dgoulet＠torproject.org 19 Nov '18

19 Nov '18

commit cec4a733c081e09fb34f0aa4224ffd7b687fb310 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 19 10:42:40 2018 -0500 Update version to v2.3.0 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e90ea19..0b92bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2018-11-19 torsocks 2.3.0 + * Fix a bunch of stuff in the wrapper script, #24967 + * gethostbyaddr_r: always assign result + * log: Remove log line when logging is stopped + * gethostbyaddr_r: Don't put garbage in data->hostname + * gethostbyaddr_r: Populate h_addrtype field + * log: Avoid crash or file corruption when closing logs + * connect: Always pass .onion IP cookie to connection object + * Merge remote-tracking branch 'yawning/bug23715' + * Make torsocks always connect to the configured Tor port + * test: Make getpeername test connect to moria1 + * socks5: Always use ATYP 0x03 for CONNECT command + * Merge remote-tracking branch 'upstream/master' + * doc: Clarify the libc limitation in README + * accept4: Initialize libc symbol early + * Bug 23715: Support memfd_create(2). + * test: Detect if tor is running in test_fd_passing + * No tab in the README + * Merge remote-tracking branch 'debian/bugfix/typo-subsytem' + * Merge remote-tracking branch 'debian/bugfix/typo-catched' + * Merge remote-tracking branch 'debian/bugfix/typo-conect' + * doc: Add autogen.sh step to README + * Add a -q/--quiet to torsocks + * tests: Add a check for a running Tor + * Make cpp conditional for definition of handle_mmap match use + * utils: Add useful function for later use + * man: Some words were missing + * Remove clang warnings + * Add missing quotes to variable in torsocks.in + * Fix check_addr() to return either 0 or 1 + * Ignore stderr for getcap command + * syscall: Add seccomp, gettimeofday, clock_gettime, fork + * Fix typo: conect → connect. + * Fix typo: subsytem → subsystem. + * Fix typo: catched → caught. + 2016-10-18 torsocks 2.2.0 * Use xz for dist tarball now * Remove TODO as we use the bugtracker for those diff --git a/configure.ac b/configure.ac index f6fdb0e..3846244 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ ############################################################################## # Process this file with autoconf to produce a configure script. -AC_INIT([torsocks], [2.2.0],[dgoulet@torproject.org],[],[https://torproject.org]) +AC_INIT([torsocks], [2.3.0],[dgoulet@torproject.org],[],[https://torproject.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET # Get hostname and other information.

1 0

[torsocks/master] Fix a bunch of stuff in the wrapper script, #24967
by dgoulet＠torproject.org 19 Nov '18

19 Nov '18

commit 47b10b686e8e94fe0a2096135d4d9b195afb5267 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Tue Jan 23 10:01:17 2018 -0500 Fix a bunch of stuff in the wrapper script, #24967 --- src/bin/torsocks.in | 160 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 125 insertions(+), 35 deletions(-) diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index fe8b67a..68ec2e5 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -58,6 +58,7 @@ # Tamas Szerb <toma(a)rulez.org> # Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 # Modified by David Goulet <dgoulet(a)ev0ke.net> 2013 +# Modified by Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> 2018 prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -67,15 +68,108 @@ LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@" SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +# https://github.com/mkropat/sh-realpath +# +# Copyright (c) 2014 Michael Kropat +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +realpath() { + canonicalize_path "$(resolve_symlinks "$1")" +} + +resolve_symlinks() { + _resolve_symlinks "$1" +} + +_resolve_symlinks() { + _assert_no_path_cycles "$@" || return + + local dir_context path + path=$(readlink -- "$1") + if [ $? -eq 0 ]; then + dir_context=$(dirname -- "$1") + _resolve_symlinks "$(_prepend_dir_context_if_necessary "$dir_context" "$path")" "$@" + else + printf '%s\n' "$1" + fi +} + +_prepend_dir_context_if_necessary() { + if [ "$1" = . ]; then + printf '%s\n' "$2" + else + _prepend_path_if_relative "$1" "$2" + fi +} + +_prepend_path_if_relative() { + case "$2" in + /* ) printf '%s\n' "$2" ;; + * ) printf '%s\n' "$1/$2" ;; + esac +} + +_assert_no_path_cycles() { + local target path + + target=$1 + shift + + for path in "$@"; do + if [ "$path" = "$target" ]; then + return 1 + fi + done +} + +canonicalize_path() { + if [ -d "$1" ]; then + _canonicalize_dir_path "$1" + else + _canonicalize_file_path "$1" + fi +} + +_canonicalize_dir_path() { + (cd "$1" 2>/dev/null && pwd -P) +} + +_canonicalize_file_path() { + local dir file + dir=$(dirname -- "$1") + file=$(basename -- "$1") + (cd "$dir" 2>/dev/null && printf '%s/%s\n' "$(pwd -P)" "$file") +} + # Set @LDPRELOAD@ variable with torsocks library path. set_ld_preload () { - if [ -z "$@LDPRELOAD@" ]; then - export @LDPRELOAD@="${SHLIB}" - else - echo "$@LDPRELOAD@" | grep -q "${SHLIB}" || \ - export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" - fi + case "$@LDPRELOAD@" in + *"${SHLIB}"*) ;; + '') + export @LDPRELOAD@="${SHLIB}" + ;; + *) + export @LDPRELOAD@="${SHLIB}:$@LDPRELOAD@" + ;; + esac # OS X specific env variable case "$OSTYPE" in @@ -88,7 +182,7 @@ set_ld_preload () # Report error due to Apple's System Integrity Protection. macos_sip_error () { - echo "ERROR: $1 is located in a directory protected by Apple's System Integrity Protection." >&2 + printf "ERROR: %s is located in a directory protected by Apple's System Integrity Protection.\n" "$1" >&2 exit 1 } @@ -101,21 +195,20 @@ macos_sip_check () darwin*) # We need to figure out if Apple's System Integrity Protection is # enabled on the users' system. - if /usr/bin/csrutil status | grep -q enabled; then - local abs_app_dir=`cd "$(dirname "$app_path")" && pwd -P` - - # It seems like /usr/** (with an exception of /usr/local/**), - # /System/**, /sbin/**, and /bin/** are currently protected - # using SIP. - case "$abs_app_dir/`basename $app_path`" in - /usr/local/*) - # Must be listed before the match on /usr/* - ;; - /usr/*|/System/*|/sbin/*|/bin/*) - macos_sip_error $app_path - ;; - esac - fi + case "$(/usr/bin/csrutil status)" in + *enabled*) + # It seems like /usr/** (with an exception of /usr/local/**), + # /System/**, /sbin/**, and /bin/** are currently protected + # using SIP. + case "$(realpath "$app_path")" in + /usr/local/*) + # Must be listed before the match on /usr/* + ;; + /usr/*|/System/*|/sbin/*|/bin/*) + macos_sip_error "$app_path" + ;; + esac + esac ;; esac } @@ -124,14 +217,14 @@ macos_sip_check () tor_shell () { set_ld_preload - echo "$0: New torified shell coming right up..." + echo "New torified shell coming right up..." ${SHELL:-/bin/sh} } torify_app () { - local app_path="`which $1`" - local getcap="`PATH="$PATH:/usr/sbin:/sbin" which getcap`" + local app_path="$(command -v "$1")" + local getcap="$(PATH="$PATH:/usr/sbin:/sbin" command -v getcap)" local caps= if [ -z "$1" ]; then @@ -144,7 +237,7 @@ torify_app () # This must be before torifying because getcap uses cap_get_file(3) # via syscall(2) which breaks torsocks. if [ -n "$getcap" ]; then - caps="`$getcap $app_path 2>/dev/null`" + caps="$("$getcap" "$app_path" 2>/dev/null)" fi # Check if Apple's System Integrity Protection is enabled if the user is @@ -161,9 +254,7 @@ torify_app () echo "ERROR: $1 is setgid. torsocks will not work on a setgid executable." >&2 exit 1 elif [ -n "$caps" ]; then - echo "ERROR: $1 gains the following elevated capabilities. torsocks will \ -not work with privledged executables. -$caps" >&2 + printf "ERROR: %s gains the following elevated capabilities. torsocks will not work with privileged executables.\n%s" "$app_path" "$caps" >&2 exit 1 fi @@ -218,10 +309,9 @@ if [ $# -eq 0 ] ; then exit 1 fi -# Ensure libtorsocks exists, -if [ ! -f "$SHLIB" ]; then - echo "$0: $SHLIB does not exist! Try re-installing torsocks." - exit +if [ ! -e "$SHLIB" ]; then + echo "ERROR: $SHLIB does not exist! Try re-installing torsocks." >&2 + exit 1 fi while true; @@ -235,7 +325,7 @@ do ;; off) check_script_sourced "$1" - export @LDPRELOAD@="`echo -n $@LDPRELOAD@ | sed "s#$SHLIB *##"`" + export @LDPRELOAD@="$(printf '%s' "$@LDPRELOAD@" | sed "s#$SHLIB *##")" if [ -z "$@LDPRELOAD@" ]; then unset @LDPRELOAD@ case "$OSTYPE" in @@ -248,7 +338,7 @@ do break ;; show|sh) - echo "@LDPRELOAD@=\"$@LDPRELOAD@\"" + printf '%s="%s"\n' "@LDPRELOAD@" "$@LDPRELOAD@" break ;; -h|--help)

1 0

[torsocks/master] gethostbyaddr_r: always assign result
by dgoulet＠torproject.org 19 Nov '18

19 Nov '18

commit 446ce04bb31a023712f5ff74a6a0649606286662 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 19 10:18:04 2018 -0500 gethostbyaddr_r: always assign result Originating from: https://bugzilla.redhat.com/show_bug.cgi?id=1601259 Patch by "cHBWyJuH". Fixes #26794 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/lib/gethostbyname.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index df84e14..b1b2183 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -349,6 +349,9 @@ LIBC_GETHOSTBYNAME_R_RET_TYPE tsocks_gethostbyname_r(LIBC_GETHOSTBYNAME_R_SIG) char padding[]; } *data; + /* result must be NULL if no entry is found or if an error occurs */ + *result = NULL; + DBG("[gethostbyname_r] Requesting %s hostname", name); if (!name) { @@ -390,6 +393,9 @@ LIBC_GETHOSTBYNAME_R_RET_TYPE tsocks_gethostbyname_r(LIBC_GETHOSTBYNAME_R_SIG) he->h_length = sizeof(in_addr_t); he->h_addrtype = AF_INET; + /* Assign result as specified by the documentation */ + *result = he; + DBG("[gethostbyname_r] Hostname %s resolved to %u.%u.%u.%u", name, ip & 0XFF, (ip >> 8) & 0XFF, (ip >> 16) & 0XFF, (ip >> 24) & 0xFF);

1 0

[torsocks/master] log: Remove log line when logging is stopped
by dgoulet＠torproject.org 19 Nov '18

19 Nov '18

commit 9895fbf6af444b55f0f5bfdda71b6591be819a9d Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 23 08:35:59 2018 -0400 log: Remove log line when logging is stopped It gets really noisy with mutt. Not sure why, I expect maybe multi thread/process makes it that everytime it dies, we get that log statement. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/log.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/log.c b/src/common/log.c index 60a56f7..683a806 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -199,7 +199,6 @@ ATTR_HIDDEN void log_fd_close_notify(int fd) { if (fd >= 0 && logconfig.fp && (fd == fileno(logconfig.fp))) { - log_print("[tsocks] Log file descriptor closed. Stopping logging.\n"); log_destroy(); } }

1 0

[tor/master] Add missing library to build tor-print-ed-signing-cert.
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 3260914db06acd5a8a0b4f0e5991f8e318190dce Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Nov 17 03:29:04 2018 +0100 Add missing library to build tor-print-ed-signing-cert. To succesful compile tor-print-ed-signing-cert.exe on Windows we sometimes need to include the @TOR_LIB_GDI@ library. See: https://bugs.torproject.org/28485 --- changes/bug28485 | 3 +++ src/tools/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug28485 b/changes/bug28485 new file mode 100644 index 000000000..a8309ae21 --- /dev/null +++ b/changes/bug28485 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe + on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha. diff --git a/src/tools/include.am b/src/tools/include.am index 73ec86935..f7aa7e0d1 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@ if USE_NSS # ...

1 0

[tor/release-0.3.5] Add missing library to build tor-print-ed-signing-cert.
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 3260914db06acd5a8a0b4f0e5991f8e318190dce Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Nov 17 03:29:04 2018 +0100 Add missing library to build tor-print-ed-signing-cert. To succesful compile tor-print-ed-signing-cert.exe on Windows we sometimes need to include the @TOR_LIB_GDI@ library. See: https://bugs.torproject.org/28485 --- changes/bug28485 | 3 +++ src/tools/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug28485 b/changes/bug28485 new file mode 100644 index 000000000..a8309ae21 --- /dev/null +++ b/changes/bug28485 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe + on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha. diff --git a/src/tools/include.am b/src/tools/include.am index 73ec86935..f7aa7e0d1 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@ if USE_NSS # ...

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 2d227dcfcbf509a9fee93084425ac1e7e732185c Merge: f704c29e0 3260914db Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 19 10:18:56 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28485 | 3 +++ src/tools/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Add missing library to build tor-print-ed-signing-cert.
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 3260914db06acd5a8a0b4f0e5991f8e318190dce Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Nov 17 03:29:04 2018 +0100 Add missing library to build tor-print-ed-signing-cert. To succesful compile tor-print-ed-signing-cert.exe on Windows we sometimes need to include the @TOR_LIB_GDI@ library. See: https://bugs.torproject.org/28485 --- changes/bug28485 | 3 +++ src/tools/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug28485 b/changes/bug28485 new file mode 100644 index 000000000..a8309ae21 --- /dev/null +++ b/changes/bug28485 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe + on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha. diff --git a/src/tools/include.am b/src/tools/include.am index 73ec86935..f7aa7e0d1 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@ if USE_NSS # ...

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 8183640ada0ccef0c1f123a312b99c87269a1cae Merge: a8df39e95 3260914db Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 19 10:18:57 2018 -0500 Merge branch 'maint-0.3.5' changes/bug28485 | 3 +++ src/tools/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0