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

[tor-launcher/master] Display "Copy Tor Log" button in wizard after bootstrap error.
by brade＠torproject.org 30 Apr '13

30 Apr '13

commit f3382b7fe609b1e10993eb626b00ad792dfc087d Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 30 10:04:14 2013 -0400 Display "Copy Tor Log" button in wizard after bootstrap error. --- src/chrome/content/network-settings.js | 3 +++ src/components/tl-process.js | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index ce35a12..6123b15 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -112,6 +112,9 @@ function initDialog() cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); } + if (gTorProcessService.TorBootstrapErrorOccurred) + wizardShowCopyLogButton(); + // Use "Connect" as the finish button label (on the last wizard page).. var finishBtn = document.documentElement.getButton("finish"); if (finishBtn) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3c6ed23..1ef4d8a 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -210,6 +210,12 @@ TorProcessService.prototype = return this.mIsBootstrapDone; }, + get TorBootstrapErrorOccurred() + { + return this.mBootstrapErrorOccurred; + }, + + TorClearBootstrapError: function() { this.mLastTorWarningPhase = null; @@ -220,6 +226,7 @@ TorProcessService.prototype = // Private Member Variables //////////////////////////////////////////////// mIsTorProcessReady: false, mIsBootstrapDone: false, + mBootstrapErrorOccurred: false, mIsQuitting: false, mObsSvc: null, mProtocolSvc: null, @@ -359,6 +366,7 @@ TorProcessService.prototype = if (100 == aStatusObj.PROGRESS) { this.mIsBootstrapDone = true; + this.mBootstrapErrorOccurred = false; TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, false); } else @@ -367,6 +375,7 @@ TorProcessService.prototype = if (aStatusObj._errorOccurred) { + this.mBootstrapErrorOccurred = true; TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true); TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.WARNING);

1 0

[tor-launcher/master] Disable Username/Password when SOCKS4 is chosen.
by brade＠torproject.org 30 Apr '13

30 Apr '13

commit dbab2d6402690f2083f113a6f39c42b4b4c40575 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 30 09:39:56 2013 -0400 Disable Username/Password when SOCKS4 is chosen. --- src/chrome/content/network-settings-overlay.xul | 8 +++-- src/chrome/content/network-settings.js | 43 ++++++++++++++++++++++- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 0061d5f..64dc366 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -29,13 +29,15 @@ </hbox> </row> <row align="center"> - <label value="&torsettings.useProxy.username;" + <label id="proxyUsernameLabel" + value="&torsettings.useProxy.username;" control="proxyUsername" style="text-align:right" /> <hbox align="center"> <textbox id="proxyUsername" size="14" flex="1" placeholder="&torsettings.optional;" /> <separator orient="vertical" /> - <label value="&torsettings.useProxy.password;" + <label id="proxyPasswordLabel" + value="&torsettings.useProxy.password;" control="proxyPassword"/> <textbox id="proxyPassword" size="14" type="password" placeholder="&torsettings.optional;" /> @@ -45,7 +47,7 @@ <label value="&torsettings.useProxy.type;" control="proxyType" style="text-align:right" /> <hbox align="center"> - <menulist id="proxyType"> + <menulist id="proxyType" oncommand="onProxyTypeChange()"> <menupopup id="proxyType_menuPopup"> <menuitem label="&torsettings.useProxy.type.socks4;" value="SOCKS4"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0af6d90..ce35a12 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -311,6 +311,38 @@ function setButtonAttr(aID, aAttr, aValue) } +function enableTextBox(aID, aEnable) +{ + if (!aID) + return; + + var textbox = document.getElementById(aID); + if (textbox) + { + var label = document.getElementById(aID + "Label"); + if (aEnable) + { + if (label) + label.removeAttribute("disabled"); + + textbox.removeAttribute("disabled"); + var s = textbox.getAttribute("origPlaceholder"); + if (s) + textbox.setAttribute("placeholder", s); + } + else + { + if (label) + label.setAttribute("disabled", true); + + textbox.setAttribute("disabled", true); + textbox.setAttribute("origPlaceholder", textbox.placeholder); + textbox.removeAttribute("placeholder"); + } + } +} + + function overrideButtonLabel(aID, aLabelKey) { var btn = document.documentElement.getButton(aID); @@ -337,6 +369,15 @@ function restoreButtonLabel(aID) } +function onProxyTypeChange() +{ + var proxyType = getElemValue(kProxyTypeMenulist, null); + var mayHaveCredentials = (proxyType != "SOCKS4"); + enableTextBox(kProxyUsername, mayHaveCredentials); + enableTextBox(kProxyPassword, mayHaveCredentials); +} + + function onCancel() { if (gRestoreAfterHelpPanelID) // Is help open? @@ -423,7 +464,6 @@ function initProxySettings() { proxyType = "SOCKS4"; proxyAddrPort = reply.retVal; - // TODO: disable user and password fields. } else { @@ -474,6 +514,7 @@ function initProxySettings() setYesNoRadioValue(kWizardProxyRadioGroup, haveProxy); setElemValue(kUseProxyCheckbox, haveProxy); setElemValue(kProxyTypeMenulist, proxyType); + onProxyTypeChange(); var proxyAddr, proxyPort; if (proxyAddrPort)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Apr '13

30 Apr '13

commit 213bd66d7b2f17069abb71c7783b9248fc20b750 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 13:45:02 2013 +0000 Update translations for bridgedb --- pl/bridgedb.po | 134 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 81 insertions(+), 53 deletions(-) diff --git a/pl/bridgedb.po b/pl/bridgedb.po index f0d1ed2..583a9b8 100644 --- a/pl/bridgedb.po +++ b/pl/bridgedb.po @@ -1,73 +1,101 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. # # Translators: -# <ayurveda63(a)gmail.com>, 2012. +# JerBen <ayurveda63(a)gmail.com>, 2012 +# bogdrozd <bog.d(a)gazeta.pl>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-08-23 09:17+0000\n" -"Last-Translator: JerBen <ayurveda63(a)gmail.com>\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2013-04-30 13:45+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "To są twoje przekaźniki mostowe." +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Czym są mostki?" -#: lib/bridgedb/I18n.py:23 +#: lib/bridgedb/templates/base.html:34 +#, python-format msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Przekaźniki mostowe \"Tor bridges\" (lub \"mosty\" w skrócie) są przekaźnikami Tora, które NIE SĄ wyszczególnione w katalogu głównym. Z racji, iż nie ma pełnej, publicznej listy mostów, nawet jeżeli twój dostawca usług internetowych ISP filtruję połączenia z częścią widocznych mostów Tora, najprawdopodobniej nie będzie on w stanie wyszukać i zablokować wszystkich." +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "" -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "By użyć powyższych mostów, wejdź do zakładki Ustawienia sieciowe w Vidalii, naciśnij opcję \"mój dostawca usług internetowych ISP blokuje połączenia z siecią Tor\". Następnie dodaj każdy adres mostu pojedynczo. " +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "" -#: lib/bridgedb/I18n.py:32 +#: lib/bridgedb/templates/base.html:40 +#, python-format msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Skonfigurowanie więcej niż jednego adresu mostu, sprawi iż połączenie z siecią Tor będzie stabilniejsze w wypadku gdy jeden z mostów stanie się niedostępny." +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "" + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "" -#: lib/bridgedb/I18n.py:35 +#: lib/bridgedb/templates/base.html:49 +#, python-format msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Kolejnym sposobem na znalezienie publicznych adresów mostów jest wysłanie maila na bridges(a)torproject.org z samym dopiskiem \"get bridges\" w treści maila. By utrudnić atakującym dostęp do dużej ilości adresów mostów musisz wysłać prośbę z adresów emailowych z jednej z następujących domen:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[To jest wiadomość generowana automatycznie; prosimy na nią nie odpisywać.]" - -#: lib/bridgedb/I18n.py:43 +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "" + +#: lib/bridgedb/templates/bridges.html:10 msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Innym sposobem na odnalezienie adresów mostów jest odwiedzenie https://bridges.torproject.org/. Informacje na tej stronie zmieniają się co kilka dni, tak więc odwiedzaj ją co jakiś czas jeżeli potrzebujesz listę nowych adresów mostów." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(obecnie brak dostępnych adresów mostów)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(prośba e-mail obecnie nieobsługiwana)" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "" + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr ""

1 0

[ooni-probe/master] Make how we keep track of successful reports more robust.
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 056a24b84505d1d3f2602bc5ae55e8eea9edafba Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 29 13:42:01 2013 +0200 Make how we keep track of successful reports more robust. --- ooni/reporter.py | 12 ++++++------ ooni/tasks.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index b04b46b..732d516 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -34,7 +34,7 @@ from ooni.utils.net import BodyReceiver, StringProducer, userAgents from ooni import config -from ooni.tasks import ReportEntry, TaskTimedOut +from ooni.tasks import ReportEntry, TaskTimedOut, ReportTracker class ReporterException(Exception): pass @@ -429,13 +429,13 @@ class Report(object): been written or errbacks when no more reporters """ all_written = defer.Deferred() - self._report_write_completed = [] + report_tracker = ReportTracker(self.reporters) for reporter in self.reporters[:]: - def report_completed(result): - self._report_write_completed.append(result) - if len(self.reporters) == len(self._report_write_completed): - all_written.callback(self._report_write_completed) + def report_completed(task): + report_tracker.completed() + if report_tracker.finished(): + all_written.callback(report_tracker) report_entry_task = ReportEntry(reporter, measurement) self.reportEntryManager.schedule(report_entry_task) diff --git a/ooni/tasks.py b/ooni/tasks.py index 59a908d..428fdbf 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -129,6 +129,25 @@ class Measurement(TaskWithTimeout): d = self.netTestMethod() return d +class ReportTracker(object): + def __init__(self, reporters): + self.report_completed = 0 + self.reporters = reporters + + def finished(self): + """ + Returns true if all the tasks are done. False if not. + """ + if self.report_completed == len(self.reporters): + return True + return False + + def completed(self): + """ + Called when a new report is completed. + """ + self.report_completed += 1 + class ReportEntry(TaskWithTimeout): timeout = config.advanced.reporting_timeout

1 0

[ooni-probe/master] Merge pull request #64 from hellais/feature/task_manager
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 90d39f7e79e7c177ac31b17b32104e4550e350be Merge: 99c8c6d 056a24b Author: aagbsn <aagbsn(a)extc.org> Date: Mon Apr 29 22:15:58 2013 -0700 Merge pull request #64 from hellais/feature/task_manager Improvements to feature/task manager .travis.yml | 10 +- collector | 1 - decks/before_i_commit.testdeck | 8 +- decks/short_no_root.deck | 10 +- ooni/__init__.py | 4 +- ooni/director.py | 19 +++- ooni/errors.py | 25 ++++ ooni/geoip.py | 12 +- ooni/managers.py | 28 +++-- ooni/nettest.py | 120 +++++++++--------- ooni/oonicli.py | 74 ++++++++---- ooni/reporter.py | 187 +++++++++++++++-------------- ooni/runner.py | 241 ------------------------------------- ooni/tasks.py | 24 ++++ ooni/tests/disabled_test_utils.py | 21 ++++ ooni/tests/mocks.py | 2 +- ooni/tests/test-class-design.py | 101 ---------------- ooni/tests/test_director.py | 58 --------- ooni/tests/test_inputunit.py | 29 ----- ooni/tests/test_managers.py | 12 +- ooni/tests/test_nettest.py | 106 +++++++---------- ooni/tests/test_reporter.py | 238 ------------------------------------ ooni/tests/test_utils.py | 20 --- ooni/utils/geodata.py | 40 ++++++ ooniprobe.conf.sample | 12 ++ setup.py | 2 +- tests/test_geoip.py | 137 --------------------- 27 files changed, 430 insertions(+), 1111 deletions(-)

1 0

[ooni-probe/master] Fix import conflict
by art＠torproject.org 30 Apr '13

30 Apr '13

commit a96ceb2cb1dbc9a166e9aa792cda7e8f445cfaf1 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Apr 30 18:42:28 2013 +0800 Fix import conflict --- nettests/experimental/tls_handshake.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 5b1f656..666e961 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -39,7 +39,8 @@ from twisted.internet import defer, threads from twisted.python import usage, failure from ooni import nettest, config -from ooni.utils import log, NotRootError +from ooni.utils import log +from ooni.errors import InsufficientPrivileges ## For a way to obtain the current version of Firefox's default ciphersuite ## list, see https://trac.torproject.org/projects/tor/attachment/ticket/4744/ @@ -340,7 +341,7 @@ class HandshakeTest(nettest.NetTestCase): ## On some *nix distros, /dev/random is 0600 root:root and ## we get a permissions error when trying to read if connection.message.find("[Errno 13]"): - raise NotRootError( + raise InsufficientPrivileges( "%s" % connection.message.split("[Errno 13]", 1)[1]) elif isinstance(connection, socket_error): if connection.message.find("[Errno 101]"):

1 0

[ooni-probe/master] Merge pull request #69 from isislovecruft/feature/tls-handshake
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 875dc22d85d8391b81f6fe988f080a2cb41d65e3 Merge: 90d39f7 c07bd0e Author: aagbsn <aagbsn(a)extc.org> Date: Tue Apr 30 03:39:31 2013 -0700 Merge pull request #69 from isislovecruft/feature/tls-handshake Feature/tls handshake .gitignore | 2 + nettests/experimental/tls_handshake.py | 795 ++++++++++++++++++++++++++++++++ ooni/utils/txscapy.py | 1 + 3 files changed, 798 insertions(+), 0 deletions(-)

1 0

[ooni-probe/master] Merge pull request #76 from aagbsn/fix_import_rename
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 33ac20de5a4bb9e97f2fe8fbd081756a2022dd31 Merge: 875dc22 a96ceb2 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Apr 30 03:51:41 2013 -0700 Merge pull request #76 from aagbsn/fix_import_rename Fix import conflict nettests/experimental/tls_handshake.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[ooni-probe/master] Fix tls_handshake input processing
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 50cf01773f820354a01cdc3681cc6e03b2f0729b Author: aagbsn <aagbsn(a)extc.org> Date: Tue Apr 30 19:32:33 2013 +0800 Fix tls_handshake input processing --- nettests/experimental/tls_handshake.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 666e961..83b2868 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -133,6 +133,7 @@ class HandshakeTest(nettest.NetTestCase): requiresRoot = False usageOptions = HandshakeOptions + host = None inputFile = ['file', 'f', None, 'List of <IP>:<PORT>s to test'] #: Default SSL/TLS context method. @@ -141,7 +142,6 @@ class HandshakeTest(nettest.NetTestCase): def setUp(self, *args, **kwargs): """Set defaults for a :class:`HandshakeTest <HandshakeTest>`.""" - self.host = None self.ciphers = list() if self.localOptions: @@ -772,11 +772,9 @@ class HandshakeTest(nettest.NetTestCase): def deferMakeConnection(host): return threads.deferToThread(makeConnection, self.input) - - log.msg("Beginning handshake test for %s" % (self.input or self.host)) - if self.host and not self.input: self.input = self.splitInput(self.host) + log.msg("Beginning handshake test for %s:%s" % self.input) connection = deferMakeConnection(self.input) connection.addCallbacks(connectionSucceeded, connectionFailed,

1 0

[ooni-probe/master] Swallow the report creation failure so that it does not propagate
by art＠torproject.org 30 Apr '13

30 Apr '13

commit df06507a89a5878ede116228f3016f8ecdc58155 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Apr 30 15:00:32 2013 +0200 Swallow the report creation failure so that it does not propagate This fixes: https://trac.torproject.org/projects/tor/ticket/8803 --- ooni/reporter.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 732d516..05d59d6 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -394,7 +394,6 @@ class Report(object): for reporter in self.reporters[:]: def report_created(result): - print "CREATED REPORT %s" % reporter log.debug("Created report with %s" % reporter) self._reporters_openned += 1 are_all_openned() @@ -406,7 +405,7 @@ class Report(object): all_openned.errback(defer.fail(e)) else: are_all_openned() - return failure + return d = defer.maybeDeferred(reporter.createReport) d.addCallback(report_created)

1 0