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

[tor/master] Correctly set entry->is_dir_cache when adding an entry guard for the first time
by nickm＠torproject.org 01 Mar '13

01 Mar '13

commit 8b26766a6672f71a83c13dec18abd62658f6a6fc Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Mar 1 01:59:25 2013 -0800 Correctly set entry->is_dir_cache when adding an entry guard for the first time (Second part of a bug8367 fix. -NM) --- src/or/entrynodes.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index e89eabc..5d356b6 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -381,6 +381,8 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, memcpy(entry->identity, node->identity, DIGEST_LEN); entry->is_dir_cache = node_is_dir(node) && node->rs && node->rs->version_supports_microdesc_cache; + if (get_options()->UseBridges && node_is_a_configured_bridge(node)) + entry->is_dir_cache = 1; /* Choose expiry time smudged over the past month. The goal here * is to a) spread out when Tor clients rotate their guards, so they

1 0

[tor/master] Fix bootstrapping with bridges by making is_dir_cache is set on them.
by nickm＠torproject.org 01 Mar '13

01 Mar '13

commit c0b1f05fe717ab30dc344c8ea3c32022725dcf2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 17:20:46 2013 -0500 Fix bootstrapping with bridges by making is_dir_cache is set on them. This fixes bug 8367, introduced in d7089ff228227259137b5a8b. Not in any released Tor. --- src/or/entrynodes.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 51c3a56..e89eabc 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -133,6 +133,8 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node, if (node) { int is_dir = node_is_dir(node) && node->rs && node->rs->version_supports_microdesc_cache; + if (options->UseBridges && node_is_a_configured_bridge(node)) + is_dir = 1; if (e->is_dir_cache != is_dir) { e->is_dir_cache = is_dir; changed = 1; @@ -354,6 +356,8 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, } entry->is_dir_cache = node->rs && node->rs->version_supports_microdesc_cache; + if (get_options()->UseBridges && node_is_a_configured_bridge(node)) + entry->is_dir_cache = 1; return NULL; } } else if (!for_directory) {

1 0

[tor/master] Merge branch 'bug8367_v2'
by nickm＠torproject.org 01 Mar '13

01 Mar '13

commit dc4ccfdbe22a48cea888179c8a1c6c671885b022 Merge: c72d58c 8b26766 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 09:33:15 2013 -0500 Merge branch 'bug8367_v2' src/or/entrynodes.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 01 Mar '13

01 Mar '13

commit 4c41042ac99e790aa3a8f46d61dbf785d168f45c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 1 13:46:16 2013 +0000 Update translations for torbirdy_completed --- nb/torbirdy.dtd | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd new file mode 100644 index 0000000..3dc83c1 --- /dev/null +++ b/nb/torbirdy.dtd @@ -0,0 +1,53 @@ +<!ENTITY torbirdy.accountprefs.title "Kontoinnstillinger"> +<!ENTITY torbirdy.accountprefs.startup.label "Hent nye meldinger ved oppstart"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "Hent nye meldinger hver"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutter"> +<!ENTITY torbirdy.accountprefs.cancel.button "Avbryt"> +<!ENTITY torbirdy.accountprefs.save.button "Lagre"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Innstillinger"> +<!ENTITY torbirdy.prefs.save.button "Lagre"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Avbryt"> +<!ENTITY torbirdy.prefs.extra2.button "Test innstillinger"> +<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy innstillinger"> +<!ENTITY torbirdy.prefs.privacy.label "Personvern Innstillinger"> +<!ENTITY torbirdy.prefs.recommended.text "Bruk de anbefalte proxyinnstillingene for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Velg en anonymiseringstjeneste"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Bruk egendefinerte proxyinnstillinger"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS-vert:"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "Port:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Transparent Torification"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Global"> +<!ENTITY torbirdy.prefs.imap.label "Aktiver støtte for push e-post til IMAP-kontoer [standard: deaktivert]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "Velg sist brukte e-postmappe ved oppstart [standard: deaktivert, velger Lokale Mapper]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Ikke sett Thunderbirds tidssone til UTC [standard: sett til UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Sett mottakernøkkel inn i krypterte meldinger [standard: ikke sett inn] "> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av e-post hvis Enigmail er aktivert [standard: ikke bekreft]"> +<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Aktiver Thunderbirds automatiske konfigureringshjelp [standard: deaktivert]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.account_specific "Kontospesifikt"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "Velg en konto:"> + +<!ENTITY torbirdy.panel.usetor.label "Bruk Tor Onion Router"> +<!ENTITY torbirdy.panel.usejondo.label "Bruk JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Bruk Whonix"> +<!ENTITY torbirdy.panel.preferences.label "Åpne TorBirdy Innstillinger"> + +<!ENTITY torbirdy.firstrun.title "Førstegangskjøring av TorBirdy">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 01 Mar '13

01 Mar '13

commit 3401b23210318a17e771f6942f40b969b2c64fff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 1 13:46:11 2013 +0000 Update translations for torbirdy --- nb/torbirdy.dtd | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd new file mode 100644 index 0000000..3dc83c1 --- /dev/null +++ b/nb/torbirdy.dtd @@ -0,0 +1,53 @@ +<!ENTITY torbirdy.accountprefs.title "Kontoinnstillinger"> +<!ENTITY torbirdy.accountprefs.startup.label "Hent nye meldinger ved oppstart"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "Hent nye meldinger hver"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutter"> +<!ENTITY torbirdy.accountprefs.cancel.button "Avbryt"> +<!ENTITY torbirdy.accountprefs.save.button "Lagre"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Innstillinger"> +<!ENTITY torbirdy.prefs.save.button "Lagre"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Avbryt"> +<!ENTITY torbirdy.prefs.extra2.button "Test innstillinger"> +<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy innstillinger"> +<!ENTITY torbirdy.prefs.privacy.label "Personvern Innstillinger"> +<!ENTITY torbirdy.prefs.recommended.text "Bruk de anbefalte proxyinnstillingene for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Velg en anonymiseringstjeneste"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Bruk egendefinerte proxyinnstillinger"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS-vert:"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "Port:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Transparent Torification"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Global"> +<!ENTITY torbirdy.prefs.imap.label "Aktiver støtte for push e-post til IMAP-kontoer [standard: deaktivert]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "Velg sist brukte e-postmappe ved oppstart [standard: deaktivert, velger Lokale Mapper]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Ikke sett Thunderbirds tidssone til UTC [standard: sett til UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Sett mottakernøkkel inn i krypterte meldinger [standard: ikke sett inn] "> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av e-post hvis Enigmail er aktivert [standard: ikke bekreft]"> +<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Aktiver Thunderbirds automatiske konfigureringshjelp [standard: deaktivert]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.account_specific "Kontospesifikt"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "Velg en konto:"> + +<!ENTITY torbirdy.panel.usetor.label "Bruk Tor Onion Router"> +<!ENTITY torbirdy.panel.usejondo.label "Bruk JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Bruk Whonix"> +<!ENTITY torbirdy.panel.preferences.label "Åpne TorBirdy Innstillinger"> + +<!ENTITY torbirdy.firstrun.title "Førstegangskjøring av TorBirdy">

1 0

[ooni-probe/master] Refactor logic for importing scapy related functions
by art＠torproject.org 01 Mar '13

01 Mar '13

commit b32d6fd187e78539e2f9c4415f478a2da80d7a0f Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 15:57:35 2013 +0100 Refactor logic for importing scapy related functions * Make scapy related requirements less strict * Always print out a useful error message when something goes wrong (cherry picked from commit 77b2f6e7206f5a1bb1531fb2416eaf36675b098b) --- ooni/utils/net.py | 2 +- ooni/utils/txscapy.py | 54 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 49f9998..67a98c2 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -7,7 +7,7 @@ from twisted.internet import protocol, defer from twisted.internet import threads, reactor from twisted.web.iweb import IBodyProducer -from ooni.utils import log, txscapy +from ooni.utils import log #if sys.platform.system() == 'Windows': # import _winreg as winreg diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 0e805e7..84e69a6 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -14,24 +14,50 @@ from scapy.config import conf from ooni.utils import log from ooni import config -try: - conf.use_pcap = True - conf.use_dnet = True +class LibraryNotInstalledError(Exception): + pass - from scapy.all import PcapWriter - from scapy.arch import pcapdnet +def pcapdnet_installed(): + """ + Checks to see if libdnet or libpcap are installed and set the according + variables. - config.pcap_dnet = True - from scapy.all import Gen, SetGen, MTU + Returns: -except ImportError, e: - log.err("pypcap or dnet not installed. " - "Certain tests may not work.") + True + if pypcap and libdnet are installed - config.pcap_dnet = False - conf.use_pcap = False - conf.use_dnet = False + False + if one of the two is absent + """ + try: + conf.use_pcap = True + conf.use_dnet = True + from scapy.arch import pcapdnet + + config.pcap_dnet = True + + except ImportError: + log.err("pypcap or dnet not installed. " + "Certain tests may not work.") + + config.pcap_dnet = False + conf.use_pcap = False + conf.use_dnet = False + + # This is required for unix systems that are different than linux (OSX for + # example) since scapy explicitly wants pcap and libdnet installed for it + # to work. + try: + from scapy.arch import pcapdnet + except ImportError: + log.err("Your platform requires to having libdnet and libpcap installed.") + raise LibraryNotInstalledError + +if pcapdnet_installed(): + from scapy.all import PcapWriter +else: class DummyPcapWriter: def __init__(self, pcap_filename, *arg, **kw): log.err("Initializing DummyPcapWriter. We will not actually write to a pcapfile") @@ -41,7 +67,7 @@ except ImportError, e: PcapWriter = DummyPcapWriter - from scapy.all import Gen, SetGen, MTU +from scapy.all import Gen, SetGen, MTU def getNetworksFromRoutes(): """ Return a list of networks from the routing table """

1 0

[ooni-probe/master] Update before_i_commit script to make it work
by art＠torproject.org 01 Mar '13

01 Mar '13

commit f55d95074fa2cd5e0e962d6be90fab29d9c82709 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 15:57:05 2013 +0100 Update before_i_commit script to make it work (cherry picked from commit 9cdf5596c8f16cac819afdaf1b9b537b36f796a6) --- decks/before_i_commit.testdeck | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck index f177a64..24f62d7 100644 --- a/decks/before_i_commit.testdeck +++ b/decks/before_i_commit.testdeck @@ -1,4 +1,5 @@ - options: + no-default-reporter: false collector: null help: 0 logfile: reports/before_i_commit.log @@ -7,6 +8,7 @@ subargs: [] test: nettests/manipulation/captiveportal.py - options: + no-default-reporter: false collector: null help: 0 logfile: reports/before_i_commit.log @@ -15,14 +17,16 @@ subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] test: nettests/blocking/dnsconsistency.py - options: + no-default-reporter: false collector: null help: 0 logfile: reports/before_i_commit.log pcapfile: null reportfile: reports/http_host.yamloo - subargs: [-b, 'http://93.95.227.200', -c, 'http://nkvphnp3p6agi5qq.onion', -f, example_inputs/http_host_file.txt] + subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] test: nettests/manipulation/http_host.py - options: + no-default-reporter: false collector: null help: 0 logfile: reports/before_i_commit.log

1 0

[ooni-probe/master] Return something in txscapy
by art＠torproject.org 01 Mar '13

01 Mar '13

commit de1c529ef81aac1912ce281840b801cd7cae5be7 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 28 16:46:51 2013 +0100 Return something in txscapy --- ooni/utils/txscapy.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 84e69a6..87c0b4a 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -54,6 +54,8 @@ def pcapdnet_installed(): log.err("Your platform requires to having libdnet and libpcap installed.") raise LibraryNotInstalledError + return config.pcap_dnet + if pcapdnet_installed(): from scapy.all import PcapWriter

1 0

[ooni-probe/master] Flatten the reporter keys
by art＠torproject.org 01 Mar '13

01 Mar '13

commit 0860d9d913de2755b58c461cb579c81be4dff075 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 28 15:48:41 2013 +0100 Flatten the reporter keys This makes it so that reports do not present one level of nesting. * Update example parser script to reflect changes in report format --- ooni/reporter.py | 15 ++++++--------- scripts/example_parser.py | 5 ++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 728c3f5..1f6c3e6 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -183,15 +183,12 @@ class OReporter(object): else: test_input = test.input - test_started = test._start_time - test_runtime = time.time() - test_started - - report = {'input': test_input, - 'test_name': test_name, - 'test_started': test_started, - 'test_runtime': test_runtime, - 'report': test_report} - return defer.maybeDeferred(self.writeReportEntry, report) + test_report['input'] = test_input + test_report['test_name'] = test_name + test_report['test_started'] = test._start_time + test_report['test_runtime'] = time.time() - test._start_time + + return defer.maybeDeferred(self.writeReportEntry, test_report) class YAMLReporter(OReporter): """ diff --git a/scripts/example_parser.py b/scripts/example_parser.py index 050312b..85722ff 100644 --- a/scripts/example_parser.py +++ b/scripts/example_parser.py @@ -1,5 +1,6 @@ # This is an example of how to parse ooniprobe reports +from pprint import pprint import yaml import sys print "Opening %s" % sys.argv[1] @@ -15,8 +16,6 @@ print "Test name: %s" % report_header['test_name'] print "Test version: %s" % report_header['test_version'] for report_entry in yamloo: - print "Test: %s" % report_entry['test_name'] - print "Input: %s" % report_entry['input'] - print "Report: %s" % report_entry['report'] + pprint(report_entry) f.close()

1 0

[ooni-probe/master] Merge pull request #57 from hellais/bugfix/imports_and_before_i_commit
by art＠torproject.org 01 Mar '13

01 Mar '13

commit 4486a3bf2720c37d26ad7aaa5c7f8ff27ced6d20 Merge: 6f16d8c de1c529 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Feb 28 08:21:09 2013 -0800 Merge pull request #57 from hellais/bugfix/imports_and_before_i_commit Bugfix/imports and before i commit decks/before_i_commit.testdeck | 6 +++- ooni/utils/net.py | 2 +- ooni/utils/txscapy.py | 56 ++++++++++++++++++++++++++++++---------- 3 files changed, 48 insertions(+), 16 deletions(-)

1 0