May 2013 - tor-commits - lists.torproject.org

[tor/master] Check the return value of memchr().
by nickm＠torproject.org 14 May '13

14 May '13

commit 88a780d8990622bfc0faa3b5299d0c21012f2c41 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon May 13 12:32:01 2013 -0700 Check the return value of memchr(). For quality-of-implementation in munge_extrainfo_into_routerinfo(). See #8791 --- src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 4878268..75f7af9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1572,7 +1572,8 @@ munge_extrainfo_into_routerinfo(const char *ri_body, if (!(cp = tor_memstr(ei_body, ei_len, kwd))) continue; ++cp; - eol = memchr(cp, '\n', ei_len - (cp-ei_body)); + if (!(eol = memchr(cp, '\n', ei_len - (cp-ei_body)))) + continue; memcpy(outp, cp, eol-cp+1); outp += eol-cp+1; }

1 0

[tor/master] Changes file for bug8791
by nickm＠torproject.org 14 May '13

14 May '13

commit d8f5c5b88d55c1d8893212663a7c2878f9c0c8b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 12:26:26 2013 -0400 Changes file for bug8791 --- changes/bug8791 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug8791 b/changes/bug8791 new file mode 100644 index 0000000..0a65e28 --- /dev/null +++ b/changes/bug8791 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - In the function munge_extrainfo_into_routerinfo(), check the return + value of memchr(). This would have been a serious issue if we ever + passed a non-extrainfo to munge_extrainfo_into_routerinfo. Fixes + bug 8791; bugfix on 0.2.0.6-alpha. Patch from Arlo Breault.

1 0

[ooni-probe/master] Merge branch 'fix_pcap_filename'
by art＠torproject.org 14 May '13

14 May '13

commit ea4cf26068195e30caf62be695f5febfc2b46d47 Merge: 5856e93 b96afa0 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 14 17:48:43 2013 +0200 Merge branch 'fix_pcap_filename' * fix_pcap_filename: Fix import error for pushFilenameStack Set pcap name for each NetTest, and use consistent timestamps. ooni/config.py | 23 ++++------------------- ooni/director.py | 22 +++++++++++++--------- ooni/nettest.py | 5 ++--- ooni/otime.py | 2 ++ 4 files changed, 21 insertions(+), 31 deletions(-) diff --cc ooni/nettest.py index f31488e,cd8ab05..6bbb99e --- a/ooni/nettest.py +++ b/ooni/nettest.py @@@ -7,11 -7,9 +7,10 @@@ from twisted.python import usage, refle from ooni import geoip from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, geodata +from ooni.utils import log, checkForRoot +from ooni import geoip from ooni import config - from ooni import otime - + import time from ooni import errors as e from inspect import getmembers

1 0

[ooni-probe/master] Set pcap name for each NetTest, and use consistent timestamps.
by art＠torproject.org 14 May '13

14 May '13

commit 9fc621ad23abf7ec9c8344741d2f2ba401d78b5c Author: aagbsn <aagbsn(a)extc.org> Date: Fri May 3 13:38:02 2013 +0800 Set pcap name for each NetTest, and use consistent timestamps. --- ooni/config.py | 23 ++++------------------- ooni/director.py | 20 ++++++++++++-------- ooni/nettest.py | 5 ++--- ooni/otime.py | 2 ++ 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/ooni/config.py b/ooni/config.py index 671f80f..103ace7 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -122,22 +122,7 @@ if not resume_filename: with open(resume_filename, 'w+') as f: pass -def generatePcapFilename(cmd_line_options=None): - if not cmd_line_options: - cmd_line_options = {} - - if 'pcapfile' in cmd_line_options: - pcap_filename = cmd_line_options['pcapfile'] - else: - if 'test' in cmd_line_options: - test_filename = os.path.basename(cmd_line_options['test']) - elif 'testdeck' in cmd_line_options: - test_filename = os.path.basename(cmd_line_options['testdeck']) - else: - test_filename = '' - - test_name = '.'.join(test_filename.split(".")[:-1]) - frm_str = "report_%s_" + otime.timestamp() + ".%s" - pcap_filename = frm_str % (test_name, "pcap") - - return pcap_filename +def generatePcapFilename(testDetails): + test_name, start_time = testDetails['test_name'], testDetails['start_time'] + start_time = otime.epochToTimestamp(start_time) + return "report-%s-%s.%s" % (test_name, start_time, "pcap") diff --git a/ooni/director.py b/ooni/director.py index 7ad99a9..93134af 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -86,14 +86,10 @@ class Director(object): # This deferred is fired once all the measurements and their reporting # tasks are completed. self.allTestsDone = defer.Deferred() + self.sniffer = None @defer.inlineCallbacks def start(self): - if config.privacy.includepcap: - log.msg("Starting") - if not config.reports.pcap: - config.reports.pcap = config.generatePcapFilename() - self.startSniffing() if config.advanced.start_tor: log.msg("Starting Tor...") @@ -192,6 +188,13 @@ class Director(object): _: #XXX very dirty hack """ + + if config.privacy.includepcap: + log.msg("Starting") + if not config.reports.pcap: + config.reports.pcap = config.generatePcapFilename(net_test_loader.testDetails) + self.startSniffing() + report = Report(reporters, self.reportEntryManager) net_test = NetTest(net_test_loader, report) @@ -228,9 +231,10 @@ class Director(object): print "Renaming files with such name..." pushFilenameStack(config.reports.pcap) - sniffer = ScapySniffer(config.reports.pcap) - config.scapyFactory.registerProtocol(sniffer) - + if self.sniffer: + config.scapyFactory.unRegisterProtocol(self.sniffer) + self.sniffer = ScapySniffer(config.reports.pcap) + config.scapyFactory.registerProtocol(self.sniffer) def startTor(self): """ Starts Tor diff --git a/ooni/nettest.py b/ooni/nettest.py index 50c0cf0..cd8ab05 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -9,8 +9,7 @@ from ooni import geoip from ooni.tasks import Measurement from ooni.utils import log, checkForRoot, geodata from ooni import config -from ooni import otime - +import time from ooni import errors as e from inspect import getmembers @@ -69,7 +68,7 @@ class NetTestLoader(object): or ('countrycode' not in client_geodata): client_geodata['countrycode'] = None - test_details = {'start_time': otime.utcTimeNow(), + test_details = {'start_time': time.time(), 'probe_asn': client_geodata['asn'], 'probe_cc': client_geodata['countrycode'], 'probe_ip': client_geodata['ip'], diff --git a/ooni/otime.py b/ooni/otime.py index 84758eb..0446d4d 100644 --- a/ooni/otime.py +++ b/ooni/otime.py @@ -87,3 +87,5 @@ def timestamp(t=None): ISO8601 = "%Y-%m-%dT%H%M%SZ" return t.strftime(ISO8601) +def epochToTimestamp(seconds): + return timestamp(datetime.utcfromtimestamp(seconds))

1 0

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 14 May '13

14 May '13

commit f5fd154d8f34447f513664deb39fd7bd12363741 Merge: ea4cf26 80c99cb Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 14 17:50:27 2013 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: Add Dominic Hamon's nettest for running tests written with other interpreters. nettests/experimental/script.py | 90 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-)

1 0

[ooni-probe/master] Fix import error for pushFilenameStack
by art＠torproject.org 14 May '13

14 May '13

commit b96afa0c86bbae5df3681bccf6fe8fe86059d985 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 14 17:48:37 2013 +0200 Fix import error for pushFilenameStack --- ooni/director.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 93134af..4e04222 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -7,7 +7,7 @@ from ooni import config from ooni import geoip from ooni.managers import ReportEntryManager, MeasurementManager from ooni.reporter import Report -from ooni.utils import log, checkForRoot +from ooni.utils import log, checkForRoot, pushFilenameStack from ooni.utils.net import randomFreePort from ooni.nettest import NetTest from ooni import errors

1 0

[stem/master] Re-enabling test_event_handling
by atagar＠torproject.org 14 May '13

14 May '13

commit ffd7274c8bc97557d4027257b958b388911cb429 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 14 08:30:54 2013 -0700 Re-enabling test_event_handling Oops, I confused this test with another. I bumped the timeouts on test_reattaching_listeners rather than this... https://gitweb.torproject.org/stem.git/commitdiff/a5f8168 Re-enabling the test with similar timeouts to see if jenkins is still happy. However, this is definitely still code stink indicating that we need to do something smarter for these tests. --- test/integ/control/controller.py | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index f0b94a9..2f4c413 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -108,14 +108,6 @@ class TestController(unittest.TestCase): them. Then remove the listeners. """ - # TODO: This test relies on the timing of BW events which has proved to - # be unreliable on our jenkins host (probably related to system load). - # This occures even with sizable sleeps so this test needs to be disabled - # until we can come up with a test that doesn't rely on event timing. - - test.runner.skip(self, "(presently unreliable)") - return - if test.runner.require_control(self): return @@ -139,11 +131,11 @@ class TestController(unittest.TestCase): # BW events occure at the rate of one per second, so wait a bit to let # some accumulate. - event_notice1.wait(2) + event_notice1.wait(4) self.assertTrue(len(event_buffer1) >= 1) event_notice1.clear() - event_notice2.wait(2) + event_notice2.wait(4) self.assertTrue(len(event_buffer2) >= 1) event_notice2.clear() @@ -153,10 +145,10 @@ class TestController(unittest.TestCase): buffer2_size = len(event_buffer2) - event_notice1.wait(2) + event_notice1.wait(4) self.assertTrue(len(event_buffer1) >= 2) - event_notice2.wait(2) + event_notice2.wait(4) self.assertEqual(buffer2_size, len(event_buffer2)) for event in event_buffer1:

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 14 May '13

14 May '13

commit c214b640878e0bc158e0c19a1351003df4e52b8f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 15:16:17 2013 +0000 Update translations for tails-greeter_completed --- lv/lv.po | 55 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index 4fdfa63..2c89050 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -4,55 +4,58 @@ # # Translators: # Ojars Balcers <ojars.balcers(a)gmail.com>, 2012 +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-04-29 08:26+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2013-05-14 15:07+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" +"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 -#: ../GdmGreeter/persistencewindow.py:128 +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Pārsūtīt" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" msgstr "Pieteikšanās" -#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" msgstr "Sveicināti Tails" -#: ../glade/persistencewindow.glade.h:3 +#: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" msgstr "Vai lietot pastāvību?" -#: ../glade/persistencewindow.glade.h:4 +#: ../glade/persistencewindow.glade.h:5 msgid "Yes" msgstr "Jā" -#: ../glade/persistencewindow.glade.h:5 +#: ../glade/persistencewindow.glade.h:6 msgid "No" msgstr "Nē" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "Passphrase:" msgstr "Ieejas frāze:" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" msgstr "Tikai-lasāms?" -#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 -#: ../glade/langpanel.glade.h:1 -msgid " " -msgstr " " - #: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "Aplama ieejas frāze. Lūdzu mēģiniet vēlreiz." + +#: ../glade/persistencewindow.glade.h:10 msgid "More options?" msgstr "Vairāk iespēju?" @@ -74,6 +77,10 @@ msgstr "Parole:" msgid "Verify Password:" msgstr "Verificēt paroli:" +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "Paroles nesakrīt" + #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" msgstr "Windows kamuflāža" @@ -88,22 +95,22 @@ msgstr "Šī iespēja padara Tails izskatā līdzīgākus Microsoft Windows XP. msgid "Activate Microsoft Windows XP Camouflage" msgstr "Aktivēt Microsoft Windows XP kamuflāžu" +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" msgstr "Valoda" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "Variants" +msgstr "Lokalizācija" #: ../glade/langpanel.glade.h:4 msgid "Layout" msgstr "Izkārtojums" -#: ../GdmGreeter/optionswindow.py:68 -msgid "Passwords do not match" -msgstr "Paroles nesakrīt" - #: ../GdmGreeter/persistence.py:59 #, python-format msgid "" @@ -127,10 +134,6 @@ msgid "" "%(stderr)s" msgstr "live-persist nesekmīgs, norādītais kods %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../GdmGreeter/persistencewindow.py:94 -msgid "Wrong passphrase. Please try again." -msgstr "Aplama ieejas frāze. Lūdzu mēģiniet vēlreiz." - #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 14 May '13

14 May '13

commit 3a88ff381dc49e91db3853332a0e8844158726c2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 15:16:14 2013 +0000 Update translations for tails-greeter --- lv/lv.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index 9a6229a..2c89050 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -4,13 +4,14 @@ # # Translators: # Ojars Balcers <ojars.balcers(a)gmail.com>, 2012 +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-05-13 08:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-14 15:07+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 msgid "Forward" -msgstr "" +msgstr "Pārsūtīt" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" @@ -104,7 +105,7 @@ msgstr "Valoda" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "Variants" +msgstr "Lokalizācija" #: ../glade/langpanel.glade.h:4 msgid "Layout"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 14 May '13

14 May '13

commit 436d610dcab02af5c079ec35275137b7bd2d2c57 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 15:15:24 2013 +0000 Update translations for vidalia_completed --- lv/vidalia_lv.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index aef1900..7d96f2d 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,9 +6,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: translations(a)vidalia-project.net\n" +"PO-Revision-Date: 2013-05-14 15:10+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" +"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0