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

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 04 Jul '13

04 Jul '13

commit e5b196047f8044cdbe4b5928bb697d9e65264b5f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 4 16:15:36 2013 +0000 Update translations for vidalia_help --- fr/running.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fr/running.po b/fr/running.po index bcc31da..f730d58 100644 --- a/fr/running.po +++ b/fr/running.po @@ -1,13 +1,14 @@ # # Translators: +# Gatien Bovyn <gatien.bovyn(a)hotmail.com>, 2013 # runasand <runa.sandvik(a)gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-04 16:00+0000\n" +"Last-Translator: Gatien Bovyn <gatien.bovyn(a)hotmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/running.html:16 msgid "Running Tor" -msgstr "Faire fonctionner Tor" +msgstr "Lancer Tor" #. type: Content of: <html><body><p> #: en/running.html:20 @@ -67,7 +68,7 @@ msgid "" "telling you what went wrong. You can also look at your <a " "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." -msgstr "Si Vidalia ne peut pas démarrer Tor, l'application affichera un message d'erreur indiquant ce qui n'a pas fonctionné. Vous pouvez également consulter <a href=\"log.html\">le journal des messages</a> pour voir si Tor a émis plus d'information sur ce qui ne s'est pas correctement déroulé." +msgstr "Si Vidalia ne peut pas démarrer Tor, il affichera un message d'erreur indiquant ce qui n'a pas fonctionné. Vous pouvez également consulter <a href=\"log.html\">le journal des messages</a> pour voir si Tor a émis plus d'information sur ce qui ne s'est pas correctement déroulé." #. type: Content of: <html><body><p> #: en/running.html:43 @@ -84,7 +85,7 @@ msgstr "Sélectionnez <i>Arrêt</i> depuis le menu de barre des tâches Vidalia msgid "" "Vidalia's tray icon will change from a green onion to a gray onion with a " "red X when Tor has stopped." -msgstr "L'icône de barre de tâche Vidalia passera d'un oignon vert à un oignon avec un X rouge lorsque Tor se sera arrêté." +msgstr "L'icône de barre de tâche Vidalia passera d'un oignon vert à un oignon gris avec un X rouge lorsque Tor se sera arrêté." #. type: Content of: <html><body><p> #: en/running.html:51 @@ -111,7 +112,7 @@ msgid "" "Vidalia tells you about the status of Tor by displaying an icon in your " "system tray or dock area. The following table shows the different states " "indicated by an icon in your system's notification area:" -msgstr "Vidalia vous renseigne sur l'état de Tor en affichant une icône dans votre barre des tâches. La table suivante indique les différents états indiqués par cette icône:" +msgstr "Vidalia vous renseigne sur l'état de Tor en affichant une icône dans votre barre des tâches. Le tableau suivant indique les différents états de cette icône :" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:69 @@ -124,7 +125,7 @@ msgstr "Tor est arrêté. Sélectionnez <i>Démarrer</i> depuis le menu Vidalia msgid "" "Tor is starting up. You can check the <a href=\"log.html\">message log</a> " "for status information about Tor while it is starting." -msgstr "Tor est en cours de démarrage. Vous pouvez consultez <a href=\"log.html\">le journal des évènements</a> pour obtenir une information sur l'état de Tor au cours de son démarrage." +msgstr "Tor est en cours de démarrage. Vous pouvez consulter <a href=\"log.html\">le journal des évènements</a> pour obtenir une information sur l'état de Tor au cours de son démarrage." #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:84

1 0

[ooni-probe/master] Check for root once at startup
by art＠torproject.org 04 Jul '13

04 Jul '13

commit af02edbe6c1495e1cda07676ca24054a32d9ae9d Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 30 19:00:42 2013 +0200 Check for root once at startup --- ooni/director.py | 10 +--------- ooni/oonicli.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index a44ee57..2c48bb0 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -6,7 +6,7 @@ import re from ooni import geoip from ooni.managers import ReportEntryManager, MeasurementManager from ooni.reporter import Report -from ooni.utils import log, checkForRoot, pushFilenameStack +from ooni.utils import log, pushFilenameStack from ooni.utils.net import randomFreePort from ooni.nettest import NetTest, getNetTestInformation from ooni.settings import config @@ -238,14 +238,6 @@ class Director(object): available. """ from ooni.utils.txscapy import ScapyFactory, ScapySniffer - try: - checkForRoot() - except errors.InsufficientPrivileges: - log.err("Includepcap options requires root priviledges to run") - log.err("you should run ooniprobe as root or disable the options in ooniprobe.conf") - reactor.stop() - sys.exit(1) - config.scapyFactory = ScapyFactory(config.advanced.interface) if os.path.exists(config.reports.pcap): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 218ec2e..32fc762 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -17,7 +17,7 @@ from ooni.director import Director from ooni.reporter import YAMLReporter, OONIBReporter from ooni.nettest import NetTestLoader, MissingRequiredOption -from ooni.utils import log +from ooni.utils import log, checkForRoot class Options(usage.Options): synopsis = """%s [options] [path to test].py @@ -109,6 +109,15 @@ def runWithDirector(): config.read_config_file() log.start(global_options['logfile']) + + if config.privacy.includepcap: + try: + checkForRoot() + except errors.InsufficientPrivileges: + log.err("Insufficient Privileges to capture packets." + " See ooniprobe.conf privacy.includepcap") + sys.exit(2) + # contains (test_cases, options, cmd_line_options) test_list = [] if global_options['no-collector']:

1 0

[ooni-probe/master] Merge pull request #130 from aagbsn/fix/set_pcap_name_per_nettest
by art＠torproject.org 04 Jul '13

04 Jul '13

commit d979704a85e0d848b0eb3233520bc64261bb1afc Merge: 34f8f80 af02edb Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jul 4 06:22:33 2013 -0700 Merge pull request #130 from aagbsn/fix/set_pcap_name_per_nettest Fix/set pcap name per nettest ooni/director.py | 10 +--------- ooni/oonicli.py | 11 ++++++++++- ooni/settings.py | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-)

1 0

[ooni-probe/master] Fix method generatePcapFilename
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 4cd589b64d64a83a6349524483e9edc5d3feec39 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 30 17:56:05 2013 +0200 Fix method generatePcapFilename --- ooni/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/settings.py b/ooni/settings.py index 077197b..227eb34 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -82,7 +82,7 @@ class OConfig(object): pass self.set_paths() - def generatePcapFilename(testDetails): + def generatePcapFilename(self, 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")

1 0

[ooni-probe/master] Fix reference to global_options
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 7218d0ca09911ee513e9b1e07b95d3c9ffcf71e0 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 30 17:52:56 2013 +0200 Fix reference to global_options --- ooni/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/settings.py b/ooni/settings.py index 6c8a9a3..077197b 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -40,7 +40,7 @@ class OConfig(object): self.reports_directory = os.path.join(self.ooni_home, 'reports') if self.global_options.get('configfile'): - config_file = global_options['configfile'] + config_file = self.global_options['configfile'] else: config_file = os.path.join('~', '.ooni', 'ooniprobe.conf') self.config_file = expanduser(config_file)

1 0

[ooni-probe/master] Merge pull request #127 from aagbsn/feature/document_how_ooni_uses_bridges
by art＠torproject.org 04 Jul '13

04 Jul '13

commit f7d1077e9be04ca66ced8f209d6a258d2c4a6d5e Merge: 117ee8e 67af973 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jul 4 06:08:33 2013 -0700 Merge pull request #127 from aagbsn/feature/document_how_ooni_uses_bridges Feature/document how ooni uses bridges README.md | 22 ++++++++++++++++++++-- ooni/director.py | 23 +++++++++++------------ ooni/settings.py | 16 ++++------------ 3 files changed, 35 insertions(+), 26 deletions(-)

1 0

[ooni-probe/master] Add details about why we use Tor Hidden Services for reporting
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 678428c6b80da0c5a24189677ea266494204d90c Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jul 4 14:53:02 2013 +0200 Add details about why we use Tor Hidden Services for reporting Related to: https://github.com/TheTorProject/ooni-probe/issues/107 --- docs/source/architecture.rst | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/source/architecture.rst b/docs/source/architecture.rst index cb50402..ac1e7ae 100644 --- a/docs/source/architecture.rst +++ b/docs/source/architecture.rst @@ -83,6 +83,46 @@ Currently the level of concurrency for tests is implemented inside of this. Such feature will be something that will be controllable via the ooniprobe API. +Why Tor Hidden Services? +........................ + +We chose to use Tor Hidden Services as the means of exposing a backend +reporting system for the following reasons: + +Easy addressing +_______________ + +Using Tor Hidden Service allows us to have a globally unique identifier to be +passed to the ooni-probe clients. This identifier does not need to change even +if we decide to migrate the collector backend to a different machine (all we +have to do is copy the private key to the new box). + +It also allows people to run a collector backend if they do not have a public +IP address (if they are behing NAT for example). + +Security +________ + +Tor Hidden Services give us for free and with little thought end to end +encryption and authentication. Once the address for the collector has been +transmitted to the probe you do not need to do any extra authenticatication, because +the address is self authenticating. + +Possible drawbacks +__________________ + +Supporting Tor Hidden Services as the only system for reporting means a +ooni-probe user is required to have Tor working to be able to submit reports to +a collector. In some cases this is not possible, because the user is in a +country where Tor is censored and they do not have any Tor bridges available. + +Latency is also a big issue in Tor Hidden Services and this can make the +reporting process very long especially if the users network is not very good. + +For these reasons we plan to support in the future also non Tor HS based +reporting to oonib. +Currently this can easily be achieved by simply using tor2web.org. + Standardization ...............

1 0

[ooni-probe/master] Merge pull request #126 from hellais/docs/tor-hs-motivations
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 34f8f809820d6d5a0bbf726a8a9bf63d71dff219 Merge: f7d1077 678428c Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 4 06:15:33 2013 -0700 Merge pull request #126 from hellais/docs/tor-hs-motivations Add details about why we use Tor Hidden Services for reporting docs/source/architecture.rst | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)

1 0

[ooni-probe/master] Set pcap name for each NetTest.
by art＠torproject.org 04 Jul '13

04 Jul '13

commit cb21e983ccce8c8f44f95b98da8bd1c01d7905f4 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 30 17:26:49 2013 +0200 Set pcap name for each NetTest. --- ooni/director.py | 23 +++++++++++------------ ooni/settings.py | 16 ++++------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 55ed8e7..a44ee57 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -116,12 +116,6 @@ class Director(object): def start(self): self.netTests = self.getNetTests() - if config.privacy.includepcap: - log.msg("Starting") - if not config.reports.pcap: - config.generate_pcap_filename() - self.startSniffing() - if config.advanced.start_tor: log.msg("Starting Tor...") yield self.startTor() @@ -217,6 +211,12 @@ class Director(object): net_test_loader: an instance of :class:ooni.nettest.NetTestLoader """ + + if config.privacy.includepcap: + 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) @@ -233,7 +233,6 @@ class Director(object): self.netTestDone(net_test) - def startSniffing(self): """ Start sniffing with Scapy. Exits if required privileges (root) are not available. @@ -242,23 +241,23 @@ class Director(object): try: checkForRoot() except errors.InsufficientPrivileges: - print "[!] Includepcap options requires root priviledges to run" - print " you should run ooniprobe as root or disable the options in ooniprobe.conf" + log.err("Includepcap options requires root priviledges to run") + log.err("you should run ooniprobe as root or disable the options in ooniprobe.conf") reactor.stop() sys.exit(1) - print "Starting sniffer" config.scapyFactory = ScapyFactory(config.advanced.interface) if os.path.exists(config.reports.pcap): - print "Report PCAP already exists with filename %s" % config.reports.pcap - print "Renaming files with such name..." + log.msg("Report PCAP already exists with filename %s" % config.reports.pcap) + log.msg("Renaming files with such name...") pushFilenameStack(config.reports.pcap) if self.sniffer: config.scapyFactory.unRegisterProtocol(self.sniffer) self.sniffer = ScapySniffer(config.reports.pcap) config.scapyFactory.registerProtocol(self.sniffer) + log.msg("Starting packet capture to: %s" % config.reports.pcap) def startTor(self): """ Starts Tor diff --git a/ooni/settings.py b/ooni/settings.py index 846fc10..6c8a9a3 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -82,17 +82,9 @@ class OConfig(object): pass self.set_paths() - def generate_pcap_filename(): - if self.global_options.get('pcapfile'): - self.reports.pcap = self.global_options['pcapfile'] - else: - if self.global_options.get('test'): - test_filename = os.path.basename(self.global_options['test']) - else: - test_filename = os.path.basename(self.global_options['testdeck']) - - test_name = '.'.join(test_filename.split(".")[:-1]) - frm_str = "report_%s_"+otime.timestamp()+".%s" - self.reports.pcap = frm_str % (test_name, "pcap") + 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") config = OConfig()

1 0

[ooni-probe/master] Add step to install virtualbox
by art＠torproject.org 04 Jul '13

04 Jul '13

commit ede4751899994fde449b47691dd20ff1f0d42604 Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Jun 24 16:47:33 2013 +0300 Add step to install virtualbox --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6da4680..bf1506e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ network data that will assist you with your endeavors! ## Getting started with ooniprobe is easy (with Vagrant) -0) [Install Vagrant](http://downloads.vagrantup.com/) +0) [Install Vagrant](http://downloads.vagrantup.com/) and [Install Virtualbox](https://www.virtualbox.org/wiki/Downloads) 0.1)

1 0