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

[chutney/master] Merge remote-tracking branch 'teor/clarify-exit-policies'
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit e647bffb7a5598147c2121d0f2a35702efd1d5f6 Merge: 984f672 0c85da6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 10:38:33 2016 -0400 Merge remote-tracking branch 'teor/clarify-exit-policies' torrc_templates/exit-v4.i | 26 ++++++++++++++++++++------ torrc_templates/exit-v6.i | 31 +++++++++++++++++-------------- 2 files changed, 37 insertions(+), 20 deletions(-)

1 0

[chutney/master] Clarify exit policies for IPv4 and IPv6, including private addresses
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 0c85da680fc3ed0492c1314b86592540ba0d424b Author: teor <teor2345(a)gmail.com> Date: Fri Apr 24 00:21:55 2015 +1000 Clarify exit policies for IPv4 and IPv6, including private addresses Allow chutney exits to exit to all private addresses. Tidy up exit policies, so each part of the policy is clearly identified. Document alternatives to work around #11264, the microdescriptor 2x /8 requirement for exits. Prepare for resolving #15353 by making sure the exit policies *should* work when localhost is the only available IP. This still requires further investigation. --- torrc_templates/exit-v4.i | 26 ++++++++++++++++++++------ torrc_templates/exit-v6.i | 31 +++++++++++++++++-------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/torrc_templates/exit-v4.i b/torrc_templates/exit-v4.i index 375164b..1c33a83 100644 --- a/torrc_templates/exit-v4.i +++ b/torrc_templates/exit-v4.i @@ -1,9 +1,19 @@ -# An exit policy that allows exiting to IPv4 localhost -#ExitPolicy accept 127.0.0.0/8:* +# 1. Allow exiting to IPv4 localhost and private networks by default +# ------------------------------------------------------------- -# An exit policy that allows exiting to the entire internet on HTTP(S) -# This may be required to work around #11264 with microdescriptors enabled +# Each IPv4 tor instance is configured with Address 127.0.0.1 by default +ExitPolicy accept 127.0.0.0/8:* + +# If you only want tor to connect to localhost, disable these lines: +# This may cause network failures in some circumstances +ExitPolicyRejectPrivate 0 +ExitPolicy accept private:* + +# 2. Optionally: Allow exiting to the entire IPv4 internet on HTTP(S) +# ------------------------------------------------------------------- + +# 2. or 3. are required to work around #11264 with microdescriptors enabled # "The core of this issue appears to be that the Exit flag code is # optimistic (just needs a /8 and 2 ports), but the microdescriptor # exit policy summary code is pessimistic (needs the entire internet)." @@ -12,6 +22,10 @@ #ExitPolicy accept *:80 #ExitPolicy accept *:443 -#ExitPolicy reject *:* -# OR +# 3. Optionally: Accept all IPv4 addresses, that is, the public internet +# ---------------------------------------------------------------------- ExitPolicy accept *:* + +# 4. Finally, reject all IPv4 addresses which haven't been permitted +# ------------------------------------------------------------------ +ExitPolicy reject *:* diff --git a/torrc_templates/exit-v6.i b/torrc_templates/exit-v6.i index 5200f3e..8ba76a3 100644 --- a/torrc_templates/exit-v6.i +++ b/torrc_templates/exit-v6.i @@ -1,18 +1,21 @@ -# An exit policy that allows exiting to IPv6 localhost -#ExitPolicy accept6 [::1]:* +# 1. Allow exiting to IPv6 localhost and private networks by default +# ------------------------------------------------------------------ IPv6Exit 1 -# An exit policy that allows exiting to the entire internet on HTTP(S) -# This may be required to work around #11264 with microdescriptors enabled -# "The core of this issue appears to be that the Exit flag code is -# optimistic (just needs a /8 [IP6?] and 2 ports), but the microdescriptor -# exit policy summary code is pessimistic (needs the entire internet)." -# An alternative is to disable microdescriptors and use regular -# descriptors, as they do not suffer from this issue. -#ExitPolicy accept6 *:80 -#ExitPolicy accept6 *:443 +# Each IPv6 tor instance is configured with Address [::1] by default +# This currently only applies to bridges +ExitPolicy accept6 [::1]:* -#ExitPolicy reject6 *:* -# OR -ExitPolicy accept6 *:* +# If you only want tor to connect to localhost, disable these lines: +# This may cause network failures in some circumstances +ExitPolicyRejectPrivate 0 +ExitPolicy accept6 private:* + +# 2. Optionally: Accept all IPv6 addresses, that is, the public internet +# ---------------------------------------------------------------------- +# ExitPolicy accept6 *:* + +# 3. Finally, reject all IPv6 addresses which haven't been permitted +# ------------------------------------------------------------------ +ExitPolicy reject6 *:*

1 0

[chutney/master] On chutney verify failure, inform user about debug mode
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 39d47297ae2a827dce95d3c6e5b41bb0b396098c Author: teor <teor2345(a)gmail.com> Date: Fri Apr 24 00:16:09 2015 +1000 On chutney verify failure, inform user about debug mode When chutney verify fails, tell the user how to activate debug mode by editing the source code. Eventually, we'll make debug mode an argument, see #15418. --- lib/chutney/TorNet.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 439aa10..99dc297 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -899,6 +899,10 @@ class Network(object): print("Verifying data transmission:") status = self._verify_traffic() print("Transmission: %s" % ("Success" if status else "Failure")) + if not status: + # TODO: allow the debug flag to be passed as an argument to + # src/test/test-network.sh and chutney + print("Set 'debug_flag = True' in Traffic.py to diagnose.") return status def _verify_traffic(self):

1 0

[chutney/master] Merge remote-tracking branch 'teor/debug-on-fail'
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 984f67249824a029f9f3b70c48e7280d9478d9cf Merge: 8e4f5cb 39d4729 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 10:36:59 2016 -0400 Merge remote-tracking branch 'teor/debug-on-fail' lib/chutney/TorNet.py | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Use the Autoconf macro AC_USE_SYSTEM_EXTENSIONS
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 94762e37b950f3ce1696c78dd4f7a89b6d05f1ac Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jun 17 13:43:25 2016 +0000 Use the Autoconf macro AC_USE_SYSTEM_EXTENSIONS The Autoconf macro AC_USE_SYSTEM_EXTENSIONS defines preprocessor macros which turn on extensions to C and POSIX. The macro also makes it easier for developers to use the extensions without needing (or forgetting) to define them manually. The macro can be safely used because it was introduced in Autoconf 2.60 and Tor requires Autoconf 2.63 and above. --- changes/bug19139 | 3 +++ configure.ac | 4 +--- m4/pc_from_ucontext.m4 | 9 +++------ src/common/backtrace.c | 3 --- src/common/compat.c | 12 ------------ src/common/compat_pthreads.c | 2 -- src/common/compat_threads.c | 2 -- src/common/crypto.c | 1 - src/common/sandbox.c | 2 -- src/common/sandbox.h | 6 ------ src/common/util.c | 4 ---- src/ext/eventdns.c | 3 --- 12 files changed, 7 insertions(+), 44 deletions(-) diff --git a/changes/bug19139 b/changes/bug19139 new file mode 100644 index 0000000..2e53d7d --- /dev/null +++ b/changes/bug19139 @@ -0,0 +1,3 @@ + o Minor features (build): + - Use the Autoconf macro AC_USE_SYSTEM_EXTENSIONS to automatically + turn on C and POSIX extensions. Closes ticket 19139. diff --git a/configure.ac b/configure.ac index 386fcdd..6d721a2 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([orconfig.h]) +AC_USE_SYSTEM_EXTENSIONS AC_CANONICAL_HOST PKG_PROG_PKG_CONFIG @@ -1552,9 +1553,6 @@ int main(int c, char **v) { puts(__FUNCTION__); }])], AC_CACHE_CHECK([whether we have extern char **environ already declared], tor_cv_have_environ_declared, AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -/* We define _GNU_SOURCE here because it is also defined in compat.c. - * Without it environ doesn't get declared. */ -#define _GNU_SOURCE #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/m4/pc_from_ucontext.m4 b/m4/pc_from_ucontext.m4 index 6bedcbb..8a9dc45 100644 --- a/m4/pc_from_ucontext.m4 +++ b/m4/pc_from_ucontext.m4 @@ -79,24 +79,21 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], if ! $pc_field_found; then # Prefer sys/ucontext.h to ucontext.h, for OS X's sake. if test "x$ac_cv_header_cygwin_signal_h" = xyes; then - AC_TRY_COMPILE([#define _GNU_SOURCE 1 - #include <cygwin/signal.h>], + AC_TRY_COMPILE([#include <cygwin/signal.h>], [ucontext_t u; return u.$pc_field == 0;], AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, How to access the PC from a struct ucontext) AC_MSG_RESULT([$pc_field]) pc_field_found=true) elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then - AC_TRY_COMPILE([#define _GNU_SOURCE 1 - #include <sys/ucontext.h>], + AC_TRY_COMPILE([#include <sys/ucontext.h>], [ucontext_t u; return u.$pc_field == 0;], AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, How to access the PC from a struct ucontext) AC_MSG_RESULT([$pc_field]) pc_field_found=true) elif test "x$ac_cv_header_ucontext_h" = xyes; then - AC_TRY_COMPILE([#define _GNU_SOURCE 1 - #include <ucontext.h>], + AC_TRY_COMPILE([#include <ucontext.h>], [ucontext_t u; return u.$pc_field == 0;], AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, How to access the PC from a struct ucontext) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 3b762b6..afdc10d 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -13,9 +13,6 @@ * detect crashes. */ -#define __USE_GNU -#define _GNU_SOURCE 1 - #include "orconfig.h" #include "compat.h" #include "util.h" diff --git a/src/common/compat.c b/src/common/compat.c index 370881b..72dffe2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -12,18 +12,6 @@ * the platform. **/ -/* This is required on rh7 to make strptime not complain. - * We also need it to make memmem get defined (where available) - */ - -/* XXXX We should just use AC_USE_SYSTEM_EXTENSIONS in our autoconf, - * and get this (and other important stuff!) automatically. Once we do that, - * make sure to also change the extern char **environ detection in - * configure.ac, because whether that is declared or not depends on whether - * we have _GNU_SOURCE defined! Maybe that means that once we take this out, - * we can also take out the configure check. */ -#define _GNU_SOURCE - #define COMPAT_PRIVATE #include "compat.h" diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 1b24cc3..1d6db34 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -10,8 +10,6 @@ * functions. */ -#define _GNU_SOURCE - #include "orconfig.h" #include <pthread.h> #include <signal.h> diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index 8f90012..9c6fa55 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -11,8 +11,6 @@ * modules.) */ -#define _GNU_SOURCE - #include "orconfig.h" #include <stdlib.h> #include "compat.h" diff --git a/src/common/crypto.c b/src/common/crypto.c index f47f5d2..d5043c3 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -56,7 +56,6 @@ ENABLE_GCC_WARNING(redundant-decls) #include <ctype.h> #endif #ifdef HAVE_UNISTD_H -#define _GNU_SOURCE #include <unistd.h> #endif #ifdef HAVE_FCNTL_H diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 4e2c5cd..94b2fc6 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -39,8 +39,6 @@ #if defined(USE_LIBSECCOMP) -#define _GNU_SOURCE - #include <sys/mman.h> #include <sys/syscall.h> #include <sys/types.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 2defd8b..c5963e3 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -39,12 +39,6 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; */ #ifdef USE_LIBSECCOMP -#ifndef __USE_GNU -#define __USE_GNU -#endif -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h> diff --git a/src/common/util.c b/src/common/util.c index 2f7cc4f..7217cdc 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -9,10 +9,6 @@ * process control. **/ -/* This is required on rh7 to make strptime not complain. - */ -#define _GNU_SOURCE - #include "orconfig.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 7046f32..f5b7723 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -50,9 +50,6 @@ #endif #endif -/* #define _POSIX_C_SOURCE 200507 */ -#define _GNU_SOURCE - #ifdef DNS_USE_CPU_CLOCK_FOR_ID #ifdef DNS_USE_OPENSSL_FOR_ID #error Multiple id options selected

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard"
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 6803b2f08165a02cac4621db10fc2e1d99b7b435 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 13:37:19 2016 +0000 Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard" This reverts commit fcb31773712f1e2adce790771f7978ba30056645. This fixes bug 19400. We are not affected by a buggy GCC 4.8.2. --- js/src/asmjs/Wasm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/src/asmjs/Wasm.h b/js/src/asmjs/Wasm.h index b0976d0..2777467 100644 --- a/js/src/asmjs/Wasm.h +++ b/js/src/asmjs/Wasm.h @@ -34,9 +34,7 @@ using mozilla::Move; // The ValType enum represents the WebAssembly "value type", which are used to // specify the type of locals and parameters. -// FIXME: uint8_t would make more sense for the underlying storage class, but -// causes miscompilations in GCC (fixed in 4.8.5 and 4.9.3). -enum class ValType +enum class ValType : uint8_t { I32, I64,

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard"
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 2fbfb9d9af2553b35ec9231f3923b3be49ab2549 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 13:38:23 2016 +0000 Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard" This reverts commit fcb31773712f1e2adce790771f7978ba30056645. This fixes bug 19400. We are not affected by a buggy GCC 4.8.2. --- js/src/asmjs/Wasm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/src/asmjs/Wasm.h b/js/src/asmjs/Wasm.h index b0976d0..2777467 100644 --- a/js/src/asmjs/Wasm.h +++ b/js/src/asmjs/Wasm.h @@ -34,9 +34,7 @@ using mozilla::Move; // The ValType enum represents the WebAssembly "value type", which are used to // specify the type of locals and parameters. -// FIXME: uint8_t would make more sense for the underlying storage class, but -// causes miscompilations in GCC (fixed in 4.8.5 and 4.9.3). -enum class ValType +enum class ValType : uint8_t { I32, I64,

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 979f170107821ca481870c01820d628e55d47913 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 08:29:48 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This works around the most problematic performance regressions brought up in bug 19276. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b2e773..e3665b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,6 +240,10 @@ pref("network.http.pipelining.max-optimistic-requests", 3); pref("security.ssl.disable_session_identifiers", true); pref("network.manage-offline-status", false); +// Disable Xrender as it causes serious performance regressions on some machines +// and is disabled in Firefox >= 47 anyway. +pref("gfx.xrender.enabled",false); + // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 7d0974ce3580b26f24f9363404e5d36cc584e254 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 08:29:48 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This works around the most problematic performance regressions brought up in bug 19276. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b2e773..e3665b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,6 +240,10 @@ pref("network.http.pipelining.max-optimistic-requests", 3); pref("security.ssl.disable_session_identifiers", true); pref("network.manage-offline-status", false); +// Disable Xrender as it causes serious performance regressions on some machines +// and is disabled in Firefox >= 47 anyway. +pref("gfx.xrender.enabled",false); + // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug18604_029_01'
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 9a63f059b9eefa910a8c74b4936623dd37e946dd Merge: a8c7662 ab35f9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 09:07:41 2016 -0400 Merge remote-tracking branch 'dgoulet/bug18604_029_01' changes/bug18604 | 4 ++++ src/or/rendservice.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)

1 0