tor-commits July 2013

tor-commits@lists.torproject.org

19 participants
1044 discussions

[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] 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

[ooni-probe/master] update links to nettests which has been moved to data.
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 0a2c19197c23d0b7187c379d518b25459d083f78 Author: Johannes Fürmann <johannes(a)weltraumpflege.org> Date: Mon Jun 24 19:38:55 2013 +0300 update links to nettests which has been moved to data. --- docs/source/index.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 43ad1fe..07737b9 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -39,9 +39,9 @@ Core ooniprobe Tests -------------------- The source for `Content blocking tests -<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/blocking>`_ +<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/block…>`_ and `Traffic Manipulation tests -<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/blocking>`_ +<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/block…>`_ can be found in the nettests/blocking and nettests/manipulation directories respectively. @@ -77,17 +77,17 @@ being experimented with. You can find these in: * `nettests/experimental - <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/experiment…>`_ + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/exper…>`_ Tests that don't do a measurement but are useful for scanning can be found in: * `nettests/scanning - <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/scanning>`_ + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/scann…>`_ Tests that involve running third party tools may be found in: * `nettests/third_party - <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/third_party>`_ + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/third…>`_ oonib *****

1 0

[ooni-probe/master] Merge pull request #124 from waaaaargh/master
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 117ee8ef4aa675505e2856900dadb6c6fd3fa265 Merge: ede4751 7695773 Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Jun 24 16:19:30 2013 -0700 Merge pull request #124 from waaaaargh/master Update links to nettest tree in documentation docs/source/index.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[ooni-probe/master] update link names as well
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 76957738e81661e9728a5a2bc50db0678defdeaa Author: Johannes Fürmann <johannes(a)weltraumpflege.org> Date: Mon Jun 24 18:40:40 2013 +0200 update link names as well --- docs/source/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 07737b9..b74799c 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -76,17 +76,17 @@ being experimented with. You can find these in: - * `nettests/experimental + * `data/nettests/experimental <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/exper…>`_ Tests that don't do a measurement but are useful for scanning can be found in: - * `nettests/scanning + * `data/nettests/scanning <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/scann…>`_ Tests that involve running third party tools may be found in: - * `nettests/third_party + * `data/nettests/third_party <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/third…>`_ oonib

1 0

[ooni-probe/master] Update the README.md with bridge instructions.
by art＠torproject.org 04 Jul '13

04 Jul '13

commit 67af973e168b9796dd31f1bbccb0333d46c8171e Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 4 14:57:04 2013 +0200 Update the README.md with bridge instructions. --- README.md | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6da4680..11cf5af 100644 --- a/README.md +++ b/README.md @@ -105,14 +105,14 @@ Basic system requirements: On Debian or Ubuntu GNU/Linux based systems these can be installed with: ``` -sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump +sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb obfsproxy tcpdump ``` Other packages that may be of interest: ``` libdumbnet1 python-dumbnet python-libpcap python-pypcap python-pcapy python-dnspython -python-virtualenv virtualenvwrapper tor tor-geoipdb +python-virtualenv virtualenvwrapper tor tor-geoipdb obfsproxy ``` The Python dependencies required for running ooniprobe are: @@ -132,6 +132,12 @@ Install the latest version of Tor for your platform: [Download Tor](https://www.torproject.org/download/download.html) +## (Optional) Install obfsproxy + +Install the latest version of obfsproxy for your platform. + +[Download Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) + ## Configurating a virtual environment You are highly recommended to install python packages from inside of a virtual @@ -281,6 +287,18 @@ By default ooniprobe will not include personal identifying information in the test result, nor create a pcap file. This behavior can be personalized by editing your ooniprobe.conf configuration file. +## Bridges and obfsproxy bridges + +ooniprobe submits reports to oonib report collectors through Tor to a hidden +service endpoint. By default, ooniprobe uses the installed system Tor, but can +also be configured to launch Tor (see the advanced.start_tor option in +ooniprobe.conf), and ooniprobe supports bridges (and obfsproxy bridges, if +obfsproxy is installed). The tor.bridges option in ooniprobe.conf sets the path +to a file that should contain a set of "bridge" lines (of the same format as +used in torrc, and as returned by https://bridges.torproject.org). If obfsproxy +bridges are to be used, the path to the obfsproxy binary must be configured. +See option advanced.obfsproxy_binary, in ooniprobe.conf. + ## Setting capabilities on your virtualenv python binary If your distributation supports capabilities you can avoid needing to run OONI as root:

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] 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 #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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2013