April 2014 - tor-commits - lists.torproject.org

[tor/master] New --disable-seccomp option to turn off support for seccomp.
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit 904dd436b58a63d430d09038a2d0edcc1133798f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 11:11:11 2014 -0400 New --disable-seccomp option to turn off support for seccomp. Fixes 11628. --- changes/bug11628 | 4 ++++ configure.ac | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug11628 b/changes/bug11628 new file mode 100644 index 0000000..b93e1f4 --- /dev/null +++ b/changes/bug11628 @@ -0,0 +1,4 @@ + o Minor features: + - The configure script has a --disable-seccomp option to turn off + support for libseccomp on systems that have it, in case it (or + Tor's use of it) is broken. Resolves ticket 11628. diff --git a/configure.ac b/configure.ac index edfe2f8..8b5e853 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,9 @@ AC_ARG_ENABLE(bufferevents, AC_ARG_ENABLE(tool-name-check, AS_HELP_STRING(--disable-tool-name-check, check for sanely named toolchain when cross-compiling)) +AC_ARG_ENABLE(seccomp, + AS_HELP_STRING(--disable-seccomp, do not attempt to use libseccomp)) + dnl check for the correct "ar" when cross-compiling AN_MAKEVAR([AR], [AC_PROG_AR]) AN_PROGRAM([ar], [AC_PROG_AR]) @@ -726,8 +729,10 @@ fi dnl ============================================================ dnl Check for libseccomp -AC_CHECK_HEADERS([seccomp.h]) -AC_SEARCH_LIBS(seccomp_init, [seccomp]) +if test "x$enable_seccomp" != "xno"; then + AC_CHECK_HEADERS([seccomp.h]) + AC_SEARCH_LIBS(seccomp_init, [seccomp]) +fi dnl ============================================================ dnl We need an implementation of curve25519.

1 0

[tor/master] Merge remote-tracking branch 'public/bug11628'
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit f43fee8f8f194af475932f5312b2e538770d3c94 Merge: 14efaa0 904dd43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 17:21:15 2014 -0400 Merge remote-tracking branch 'public/bug11628' changes/bug11628 | 4 ++++ configure.ac | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 30 Apr '14

30 Apr '14

commit 5ebcb97ebe273503b6df86e4ce80476bf3f485e5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 30 21:15:09 2014 +0000 Update translations for torcheck --- lt/torcheck.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/torcheck.po b/lt/torcheck.po index 78dc8c6..c490c46 100644 --- a/lt/torcheck.po +++ b/lt/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-30 20:43+0000\n" +"PO-Revision-Date: 2014-04-30 21:00+0000\n" "Last-Translator: Saulė Papečkytė <saule.papeckyte(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "" +msgstr "Sveikiname. Ši naršyklė sukonfigūruota naudoti Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -56,10 +56,10 @@ msgid "Your IP address appears to be: " msgstr "Jūsų IP adresas rodomas kaip:" msgid "Are you using Tor?" -msgstr "" +msgstr "Ar naudojate Tor?" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "Šis puslapis taipogi prieinamas šiomis kalbomis:" msgid "For more information about this exit relay, see:" msgstr "" @@ -76,7 +76,7 @@ msgid "Go" msgstr "" msgid "Short User Manual" -msgstr "" +msgstr "Trumpas Naudojimo Vadovas" msgid "Donate to Support Tor" msgstr ""

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 30 Apr '14

30 Apr '14

commit a5cedbdc189ddf98c6946c8f947293db2fcf1d24 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 30 20:45:11 2014 +0000 Update translations for torcheck --- lt/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lt/torcheck.po b/lt/torcheck.po index 14f6e18..78dc8c6 100644 --- a/lt/torcheck.po +++ b/lt/torcheck.po @@ -2,12 +2,13 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Saulė Papečkytė <saule.papeckyte(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 08:22+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-30 20:43+0000\n" +"Last-Translator: Saulė Papečkytė <saule.papeckyte(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgid "" msgstr "" msgid "Sorry. You are not using Tor." -msgstr "" +msgstr "Atsiprašome. Jūs nesinaudojate Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -44,7 +45,7 @@ msgid "" msgstr "" msgid "Sorry, your query failed or an unexpected response was received." -msgstr "" +msgstr "Atsiprašome, nepavyko patenkinti jūsų užklausos arba buvo gautas nenumatytas atsakas." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -52,7 +53,7 @@ msgid "" msgstr "" msgid "Your IP address appears to be: " -msgstr "" +msgstr "Jūsų IP adresas rodomas kaip:" msgid "Are you using Tor?" msgstr ""

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 30 Apr '14

30 Apr '14

commit e641ad438960a4531d182cb0e88f3c3dc0f701db Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 30 20:15:46 2014 +0000 Update translations for torbutton-browserproperties_completed --- lt/browser.properties | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lt/browser.properties b/lt/browser.properties new file mode 100644 index 0000000..618a5f1 --- /dev/null +++ b/lt/browser.properties @@ -0,0 +1,13 @@ +# Default home page +browser.startup.homepage=apie:tor + +# Spell checker dictionary +spellchecker.dictionary=anglu_JAV + +# Default search engine +browser.search.defaultenginename=Pradinis puslapis + +# Search engine order (order displayed in the search bar dropdown) +browser.search.order.1=Pradinis puslapis +browser.search.order.2=TūptTūptPirmyn +browser.search.order.3=Google

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 30 Apr '14

30 Apr '14

commit fb35b56cfb8c2ab8b16876816f00eb01f69bb781 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 30 20:15:43 2014 +0000 Update translations for torbutton-browserproperties --- lt/browser.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/browser.properties b/lt/browser.properties index 295a03a..618a5f1 100644 --- a/lt/browser.properties +++ b/lt/browser.properties @@ -1,13 +1,13 @@ # Default home page -browser.startup.homepage=about:tor +browser.startup.homepage=apie:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=anglu_JAV # Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Pradinis puslapis # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo +browser.search.order.1=Pradinis puslapis +browser.search.order.2=TūptTūptPirmyn browser.search.order.3=Google

1 0

[oonib/master] Verify the sha 256 sum of the zlib package.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit d60d0ccff97699724c6c9cff6bd202272df9225f Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 23 15:50:39 2014 +0200 Verify the sha 256 sum of the zlib package. --- scripts/build_tor2web_tor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh index 80880bc..b510c51 100755 --- a/scripts/build_tor2web_tor.sh +++ b/scripts/build_tor2web_tor.sh @@ -5,7 +5,7 @@ OPENSSL_VERSION=1.0.1e LIBEVENT_VERSION=2.0.21-stable ZLIB_VERSION=1.2.8 TOR_VERSION=0.2.4.20 -ZLIB_MD5=44d667c142d7cda120332623eab69f40 +ZLIB_SHA256=36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d SCRIPT_ROOT=`pwd` @@ -70,7 +70,7 @@ cd libevent-$LIBEVENT_VERSION # set up zlib cd $SCRIPT_ROOT -echo "$ZLIB_MD5 zlib-$ZLIB_VERSION.tar.gz" | md5sum -c +echo "$ZLIB_SHA256 zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c if [ $? -ne 0 ]; then exit ;fi tar xfz zlib-$ZLIB_VERSION.tar.gz

1 0

[oonib/master] Set Content-Disposition in RandomPage HTTP Helper
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 5e3bb398741fa9d9400115a41be3d69b0b0dae72 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 23 15:44:49 2014 +0200 Set Content-Disposition in RandomPage HTTP Helper Fixes: https://github.com/TheTorProject/ooni-probe/issues/305 --- oonib/oonibackend.py | 3 --- oonib/runner.py | 4 ++-- oonib/testhelpers/http_helpers.py | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index a6654b8..3e6598c 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -7,10 +7,7 @@ # In here we start all the test helpers that are required by ooniprobe and # start the report collector -from twisted.application import internet -from twisted.internet import reactor from twisted.application import internet, service -from twisted.application.service import Application from twisted.names import dns from cyclone import web diff --git a/oonib/runner.py b/oonib/runner.py index fb5d090..c8fafa1 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -20,7 +20,7 @@ from twisted.python.runtime import platformType from txtorcon import TCPHiddenServiceEndpoint, TorConfig from txtorcon import launch_tor -from oonib.report.api import reportAPI +from oonib.report.api import reportAPI from oonib.api import ooniBackend, ooniBouncer from oonib.config import config @@ -79,7 +79,7 @@ else: def startTor(self, torconfig): def updates(prog, tag, summary): print("%d%%: %s" % (prog, summary)) - + torconfig.SocksPort = config.main.socks_port if config.main.tor2webmode: torconfig.Tor2webMode = 1 diff --git a/oonib/testhelpers/http_helpers.py b/oonib/testhelpers/http_helpers.py index 8f09326..6c3e123 100644 --- a/oonib/testhelpers/http_helpers.py +++ b/oonib/testhelpers/http_helpers.py @@ -13,6 +13,8 @@ from cyclone.web import RequestHandler, Application from twisted.protocols import policies, basic from twisted.web.http import Request +from oonib import randomStr + class SimpleHTTPChannel(basic.LineReceiver, policies.TimeoutMixin): """ This is a simplified version of twisted.web.http.HTTPChannel to overcome @@ -140,6 +142,7 @@ class HTTPRandomPage(HTTPTrapAll): return data def all(self, length, keyword): + self.set_header('Content-Disposition', 'attachment; filename="%s.txt"' % randomStr(10)) length = 100 if length > 100000: length = 100000

1 0

[oonib/master] Escape all strings before writing them to the log file.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit f40f3c530e25d10eeef9bb3e9c36c6c8c23bfded Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 23 16:29:00 2014 +0200 Escape all strings before writing them to the log file. This fixes: https://github.com/TheTorProject/ooni-probe/issues/302 for the backend --- oonib/log.py | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/oonib/log.py b/oonib/log.py index 8229446..7a6e4cb 100644 --- a/oonib/log.py +++ b/oonib/log.py @@ -6,8 +6,9 @@ Twisted logger for the ooni backend system. """ -import sys import os +import sys +import codecs import logging import traceback @@ -19,10 +20,33 @@ from twisted.python.logfile import DailyLogFile from oonib import otime from oonib.config import config -## Get rid of the annoying "No route found for -## IPv6 destination warnings": +# Get rid of the annoying "No route found for +# IPv6 destination warnings": logging.getLogger("scapy.runtime").setLevel(logging.ERROR) + +def log_encode(logmsg): + """ + I encode logmsg (a str or unicode) as printable ASCII. Each case + gets a distinct prefix, so that people differentiate a unicode + from a utf-8-encoded-byte-string or binary gunk that would + otherwise result in the same final output. + """ + if isinstance(logmsg, unicode): + return codecs.encode(logmsg, 'unicode_escape') + elif isinstance(logmsg, str): + try: + unicodelogmsg = logmsg.decode('utf-8') + except UnicodeDecodeError: + return codecs.encode(logmsg, 'string_escape') + else: + return codecs.encode(unicodelogmsg, 'unicode_escape') + else: + raise Exception("I accept only a unicode object or a string, " + "not a %s object like %r" % (type(logmsg), + repr(logmsg))) + + class LogWithNoPrefix(txlog.FileLogObserver): def emit(self, eventDict): text = txlog.textFromEventDict(eventDict) @@ -32,6 +56,7 @@ class LogWithNoPrefix(txlog.FileLogObserver): util.untilConcludes(self.write, "%s\n" % text) util.untilConcludes(self.flush) # Hoorj! + def start(application_name="oonib"): daily_logfile = None @@ -52,21 +77,27 @@ def start(application_name="oonib"): txlog.startLoggingWithObserver(LogWithNoPrefix(sys.stdout).emit) txlog.addObserver(txlog.FileLogObserver(daily_logfile).emit) + def stop(): print "Stopping OONI" + def msg(msg, *arg, **kw): - print "%s" % msg + print "%s" % log_encode(msg) + def debug(msg, *arg, **kw): if config.main.debug: - print "[D] %s" % msg + print "[D] %s" % log_encode(msg) + def warn(msg, *arg, **kw): - print "[W] %s" % msg + print "[W] %s" % log_encode(msg) + def err(msg, *arg, **kw): - print "[!] %s" % msg + print "[!] %s" % log_encode(msg) + def exception(error): """ @@ -79,6 +110,7 @@ def exception(error): exc_type, exc_value, exc_traceback = sys.exc_info() traceback.print_exception(exc_type, exc_value, exc_traceback) + class LoggerFactory(object): """ This is a logger factory to be used by oonib @@ -91,4 +123,3 @@ class LoggerFactory(object): def stop(self): txlog.msg("Stopping OONIB") -

1 0

[oonib/master] Merge pull request #43 from TheTorProject/fix/issue_g
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 72a86dee6fc2d147271380e9fc3e9627cbe169c1 Merge: 7b35b7f 5e3bb39 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Apr 30 19:02:29 2014 +0200 Merge pull request #43 from TheTorProject/fix/issue_g Set Content-Disposition in RandomPage HTTP Helper oonib/oonibackend.py | 3 --- oonib/runner.py | 4 ++-- oonib/testhelpers/http_helpers.py | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-)

1 0