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

[sandboxed-tor-browser/master] Remove the undocumented command line options that enable unsafe behavior.
by yawning＠torproject.org 25 Jun '17

25 Jun '17

commit 1c528cc4610f4609b3df4244e9ddacb2ef2cfda0 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Jun 25 05:01:58 2017 +0000 Remove the undocumented command line options that enable unsafe behavior. "We are not believers in buttons. Knobs are for knobs." -- Theo --- ChangeLog | 1 + .../internal/sandbox/application.go | 13 +++---------- .../sandboxed-tor-browser/internal/sandbox/x11/x11.go | 19 ++++--------------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 742153f..69b4a5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Changes in version 0.0.9 - UNRELEASED: * Fix the build being broken on Debian Jessie due to #22648. + * Remove the undocumented command line options that enable unsafe behavior. Changes in version 0.0.8 - 2017-06-19: * Bug 20776: Remove the X11 `MIT-SHM` workaround from the stub. diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 61722c1..f66c1ba 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -20,7 +20,6 @@ package sandbox import ( "bytes" - "flag" "fmt" "io/ioutil" "log" @@ -41,10 +40,7 @@ import ( const restrictedLibDir = "/usr/lib" -var ( - distributionDependentLibSearchPath []string - allowGstreamer bool -) +var distributionDependentLibSearchPath []string // RunTorBrowser launches sandboxed Tor Browser. func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (process *Process, err error) { @@ -322,10 +318,9 @@ func filterCodecs(fn string, allowFfmpeg bool) error { "libgstapp", "libgstvideo", } - if allowGstreamer && allowFfmpeg { + if allowFfmpeg { codecPrefixes = []string{} - } - if !allowFfmpeg { + } else if !allowFfmpeg { codecPrefixes = append(codecPrefixes, "libavcodec") } @@ -874,6 +869,4 @@ func init() { } distributionDependentLibSearchPath = searchPaths - - flag.BoolVar(&allowGstreamer, "allow-gstreamer", false, "Don't blacklist gstreamer libraries.") } diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go index 908bedd..15960fb 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go @@ -20,7 +20,6 @@ package x11 import ( "encoding/binary" - "flag" "fmt" "io/ioutil" "os" @@ -31,8 +30,6 @@ import ( . "cmd/sandboxed-tor-browser/internal/utils" ) -var disableX11Filter bool - const SockDir = "/tmp/.X11-unix" func craftAuthority(hugboxHostname, realDisplay string) ([]byte, error) { @@ -186,15 +183,11 @@ func (x *SandboxedX11) Socket() string { func (x *SandboxedX11) LaunchSurrogate() error { // Launch the surrogate unless disabled. - if !disableX11Filter { - Debugf("sandbox: X11: Launching surrogate") + Debugf("sandbox: X11: Launching surrogate") - var err error - if x.Surrogate, err = launchSurrogate(x.hSock, x.pSock, x.hDisplay); err != nil { - return err - } - } else { - Debugf("sandbox: X11: Direct bind-mounting X11 (UNSAFE)") + var err error + if x.Surrogate, err = launchSurrogate(x.hSock, x.pSock, x.hDisplay); err != nil { + return err } x.launched = true return nil @@ -243,7 +236,3 @@ func New(display, hostname, pSock string) (*SandboxedX11, error) { return x, nil } - -func init() { - flag.BoolVar(&disableX11Filter, "disable-X11-filter", false, "Use X11 directly (Unsafe)") -}

1 0

[tor/master] Log even more to try to debug 22719
by nickm＠torproject.org 24 Jun '17

24 Jun '17

commit acbe16a9a244d9745080ca435cc3587412920caa Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 24 13:40:02 2017 -0400 Log even more to try to debug 22719 --- src/common/compress.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/compress.c b/src/common/compress.c index 4e19080..472268a 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -575,8 +575,10 @@ tor_compress_process(tor_compress_state_t *state, *in_len == in_len_orig && *out_len == out_len_orig)) { log_warn(LD_GENERAL, - "More info on the bug: *in_len == in_len_orig == %lu, " + "More info on the bug: method == %s, finish == %d, " + " *in_len == in_len_orig == %lu, " "*out_len == out_len_orig == %lu", + compression_method_get_human_name(state->method), finish, (unsigned long)in_len_orig, (unsigned long)out_len_orig); return TOR_COMPRESS_ERROR; }

1 0

[tor/master] Add an additional log message to try to diagnose #22719
by nickm＠torproject.org 24 Jun '17

24 Jun '17

commit 6caf924605fd8c79193605e1618109db51c43967 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 24 11:27:46 2017 -0400 Add an additional log message to try to diagnose #22719 --- src/common/compress.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/compress.c b/src/common/compress.c index 7926faa..4e19080 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -574,6 +574,10 @@ tor_compress_process(tor_compress_state_t *state, if (BUG((rv == TOR_COMPRESS_OK) && *in_len == in_len_orig && *out_len == out_len_orig)) { + log_warn(LD_GENERAL, + "More info on the bug: *in_len == in_len_orig == %lu, " + "*out_len == out_len_orig == %lu", + (unsigned long)in_len_orig, (unsigned long)out_len_orig); return TOR_COMPRESS_ERROR; }

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 23 Jun '17

23 Jun '17

commit 4f77dbb66a5a29d3f34d481b12e7f8d28aaffac6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 23 21:50:03 2017 +0000 Update translations for tor-browser-manual --- hy/hy.po | 2 +- sv/sv.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hy/hy.po b/hy/hy.po index 5cf2f99..e03415f 100644 --- a/hy/hy.po +++ b/hy/hy.po @@ -1,5 +1,5 @@ # Translators: -# Hrach Mkrtchyan <mhrach87(a)gmail.com>, 2016 +# Հրաչ Սոսի Մկրտչյան <mhrach87(a)gmail.com>, 2016 # Tor Project <support-team-private(a)lists.torproject.org>, 2016 # Sarkis Andreyan <sarkis.andreyan(a)gmail.com>, 2017 msgid "" diff --git a/sv/sv.po b/sv/sv.po index 3105325..8d630a0 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -2,7 +2,7 @@ # cryptohead <cryptohead(a)gmail.com>, 2016 # Alexandra <alexandra_fischer90(a)hotmail.com>, 2016 # WinterFairy <winterfairy(a)riseup.net>, 2016 -# Jonatan Nyberg <jonatan(a)autistici.org>, 2016 +# Jony <tralang(a)onenetbeyond.org>, 2016 # Daniel Sjöberg <sjbrg(a)protonmail.com>, 2016 # Yoga Andersson <yoga.andersson(a)gmail.com>, 2016 # Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016

1 0

[tor/master] config: Fix duplicate error message for nonlocal SocksPorts.
by nickm＠torproject.org 23 Jun '17

23 Jun '17

commit 28344b74babe762089ff702450ad2b418ae25b33 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 22 00:28:31 2017 +0000 config: Fix duplicate error message for nonlocal SocksPorts. If `validate_only` is true, then just validate the configuration without warning about it. This way, we only emit warnings when the listener is actually opened. (Otherwise, every time we parse the config we will might re-warn and we would need to keep state; whereas the listeners are only opened once.) * FIXES #4019. --- src/or/config.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7d2ebbd..a1bd835 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6251,8 +6251,9 @@ port_cfg_free(port_cfg_t *port) /** Warn for every port in <b>ports</b> of type <b>listener_type</b> that is * on a publicly routable address. */ static void -warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname, - int listener_type) +warn_nonlocal_client_ports(const smartlist_t *ports, + const char *portname, + const int listener_type) { SMARTLIST_FOREACH_BEGIN(ports, const port_cfg_t *, port) { if (port->type != listener_type) @@ -6936,7 +6937,8 @@ parse_ports(or_options_t *options, int validate_only, options->SocksPort_lines, "Socks", CONN_TYPE_AP_LISTENER, "127.0.0.1", 9050, - CL_PORT_WARN_NONLOCAL|CL_PORT_TAKES_HOSTNAMES|gw_flag) < 0) { + ((validate_only ? 0 : CL_PORT_WARN_NONLOCAL) + | CL_PORT_TAKES_HOSTNAMES | gw_flag)) < 0) { *msg = tor_strdup("Invalid SocksPort configuration"); goto err; }

1 0

[tor/master] Add changes file for bug4019.
by nickm＠torproject.org 23 Jun '17

23 Jun '17

commit 424c4586df8edf33d249f3bc1614f07e293b6fe0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 23 18:31:16 2017 +0000 Add changes file for bug4019. --- changes/bug4019 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug4019 b/changes/bug4019 new file mode 100644 index 0000000..fef736f --- /dev/null +++ b/changes/bug4019 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Remove duplicate log messages regarding opening non-local SocksPorts + upon parsing config and opening listeners at startup. Fixes bug 4019; + bugfix on tor-0.2.3.3-alpha.

1 0

[tor/master] Merge remote-tracking branch 'isis/bug4019'
by nickm＠torproject.org 23 Jun '17

23 Jun '17

commit 89d0261eb5abe75e798a120793df5df64a7c770f Merge: 80360ed 424c458 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 23 14:38:20 2017 -0400 Merge remote-tracking branch 'isis/bug4019' changes/bug4019 | 4 ++++ src/or/config.c | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-)

1 0

[stem/master] Test notice not provided when pyflakes/pycodestyle unavailable
by atagar＠torproject.org 23 Jun '17

23 Jun '17

commit 4e88f0aede7ce0c34ae78f0181474e37ddd409e0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 22 10:46:46 2017 -0700 Test notice not provided when pyflakes/pycodestyle unavailable Earlier refactoring left an 'if task' check that always evaluated to true, causing us to never display a notice when these checks were unavailable. --- run_tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/run_tests.py b/run_tests.py index add359e..802a6b4 100755 --- a/run_tests.py +++ b/run_tests.py @@ -298,15 +298,15 @@ def main(): static_check_issues = {} for task in (test.task.PYFLAKES_TASK, test.task.PYCODESTYLE_TASK): - if task: - task.join() + if not task.is_available and task.unavailable_msg: + println(task.unavailable_msg, ERROR) + else: + task.join() # no-op if these haven't been run if task.result: for path, issues in task.result.items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) - elif not task.is_available and task.unavailable_msg: - println(task.unavailable_msg, ERROR) _print_static_issues(static_check_issues)

1 0

[stem/master] Drop integ target prereqs
by atagar＠torproject.org 23 Jun '17

23 Jun '17

commit e72da89f4ddee0ca1345fcb7b8b993edef2f35c5 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 21 10:47:58 2017 -0700 Drop integ target prereqs We only had a prereq for a single target, and it was for versions which have been obsolete for years. Might as well simply drop this. --- run_tests.py | 22 ---------------------- stem/version.py | 5 +++++ test/settings.cfg | 5 ----- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/run_tests.py b/run_tests.py index 61f526d..add359e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -38,7 +38,6 @@ CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', 'test.unit_tests': '', 'test.integ_tests': '', - 'target.prereq': {}, 'target.torrc': {}, }) @@ -257,20 +256,7 @@ def main(): test.output.print_divider('INTEGRATION TESTS', True) integ_runner = test.runner.get_runner() - # Determine targets we don't meet the prereqs for. Warnings are given about - # these at the end of the test run so they're more noticeable. - - skipped_targets = {} - for target in args.run_targets: - # check if we meet this target's tor version prerequisites - - target_prereq = CONFIG['target.prereq'].get(target) - - if target_prereq and test.tor_version() < stem.version.Requirement[target_prereq]: - skipped_targets[target] = target_prereq - continue - error_tracker.set_category(target) try: @@ -309,14 +295,6 @@ def main(): break - if skipped_targets: - println() - - for target, req_version in skipped_targets.items(): - println('Unable to run target %s, this requires tor version %s' % (target, req_version), ERROR) - - println() - static_check_issues = {} for task in (test.task.PYFLAKES_TASK, test.task.PYCODESTYLE_TASK): diff --git a/stem/version.py b/stem/version.py index 6eb9485..b8960a5 100644 --- a/stem/version.py +++ b/stem/version.py @@ -26,6 +26,11 @@ easily parsed and compared, for instance... Enumerations for the version requirements of features. + .. deprecated:: 1.6.0 + Requirement entries belonging to tor versions which have been obsolete for + at least six months will be removed when we break backward compatibility + in the 2.x stem release. + ===================================== =========== Requirement Description ===================================== =========== diff --git a/test/settings.cfg b/test/settings.cfg index 7ccd733..4854c24 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -75,11 +75,6 @@ target.description RUN_SCOOKIE => Configuration with a control socket and authe target.description RUN_PTRACE => Configuration with an open control port and 'DisableDebuggerAttachment 0' target.description RUN_ALL => Runs integration tests for all connection configurations. -# Version that we need to run the target. These need to match an enumeration of -# stem.version.Requirement. - -target.prereq RUN_PTRACE => TORRC_DISABLE_DEBUGGER_ATTACHMENT - # Torrc configuration options included with the target. Having this option set # means that each of these targets will have a dedicated integration test run.

1 0

[stem/master] Move munin-tor link back
by atagar＠torproject.org 23 Jun '17

23 Jun '17

commit c4b13bc9215510ed4d81ef1ecaa69a297f472cee Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 23 10:56:04 2017 -0700 Move munin-tor link back Prior maintainer transferred ownership of the prior repo so swapping the link back. --- docs/tutorials/double_double_toil_and_trouble.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 2104ed9..68b412f 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -65,7 +65,7 @@ Applications `Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve Stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf…>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/tree/task-6232/pyentropy.py>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/tree/task-7241/first_pass.py>`_. `Onion Box <https://github.com/ralphwetzel/theonionbox>`_ Web dashboard for relay operation. `check_tor <http://anonscm.debian.org/gitweb/?p=users/lunar/check_tor.git;a=blob;f=chec…>`_ Nagios check to verify that a relay is participating in the Tor network. -`munin-tor <https://github.com/daftaupe/munin-plugins-tor>`_ Plugin to provide Munin graphs. +`munin-tor <https://github.com/daftaupe/munin-tor>`_ Plugin to provide Munin graphs. `tbbscraper <https://github.com/zackw/tbbscraper/blob/master/collector/lib/controller/co…>`_ Automated website scraper over Tor. `torIRC <https://gist.github.com/torifier/f1a7c1ac7b6b003cd9e1c187df2c5347>`_ IRC-like chat client using Tor hidden services. `exit-funding <https://github.com/torservers/exit-funding>`_ Script to estimate how much exit relays have been used.

1 0