November 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Do some cleaning up
by art＠torproject.org 10 Nov '12

10 Nov '12

commit bae19b558fcfa618778dea948e292c393ab49ed8 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 21:40:22 2012 +0100 Do some cleaning up * Remove Readme.md file * Update TODO with lists of tickets * Remove no longer used unittests --- README.md | 108 ++++++++++++++---------------------------- TODO | 105 +++------------------------------------- tests/assets/ipports.txt | 2 - tests/assets/urllist.txt | 3 - tests/legacy/test_plugins.py | 40 --------------- tests/legacy/test_tests.py | 45 ----------------- tests/test_worker.py | 29 ----------- 7 files changed, 43 insertions(+), 289 deletions(-) diff --git a/README.md b/README.md index 4837275..137386a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ooni-probe - Open Observatory of Network Interference +# ooniprobe - Open Observatory of Network Interference "The Net interprets censorship as damage and routes around it." - John Gilmore; TIME magazine (6 December 1993) @@ -15,103 +15,65 @@ To run OONI-probe without having to install it you must tell python that it can import modules from the root of ooni-probe, as well as initialize the included submodules. -From the root directory of the repo (.../ooni-probe/), initialize the submodules by doing: +## Getting started - $ git submodule init && git submodule update +Requirements: -Next, you will need to tell Python that OONI is part of its path: + * Git: http://git-scm.com/book/en/Getting-Started-Installing-Git + * Python >= 2.6: http://www.python.org/download/releases/ + * pip: http://www.pip-installer.org/en/latest/ - $ export PYTHONPATH=$PYTHONPATH:`pwd` +On debian based systems these can be installed with: -Then to see what tests are available: + apt-get install git-core python python-pip python-dev - $ cd ooni - $ python ooniprobe.py +The python dependencies required for running ooniprobe are: -If you see some errors see INSTALL to install the missing dependencies. + * Twisted + * Scapy >= 2.2.0 + * txtorcon -To list the help for a specific test: +They can be installed from the requirements.txt with: - $ python ooniprobe.py httpt --help + pip install -r requirements.txt -## Virtualenv way (Recommended) +You are highly recommended to do so from inside of a virtual environment, since +pip does not download the packages via SSL and you will need to install it +system wide. - virtualenv2 ENV/ - source ENV/bin/activate - pip install twisted Scapy pyyaml +This will require you to have installed virtualenv. -The setup.py script of pyOpenSSL has some issues and it is therefore -recommended to install it system wide with: + apt-get install python-virtualenv - sudo pip install pyOpenSSL +To create a new virtual environment do -Note: be sure to do this over a secure network since pip does not by default -use SSL... + virtualenv env -To install the most up to date scapy version (requires mercurial): +Then install OONI with: - pip install hg+http://hg.secdev.org/scapy + pip install -r requirements.txt +## Running some tests -# More details +To see the possible command line options run: -With the belief that unfettered access to information is a intrinsic human right, -OONI seeks to observe levels of surveillance, censorship, and network discrimination -in order for people worldwide to have a clearer understanding of the ways in -which their access to information is filtered. + ./bin/ooniprobe --help -The end goal of OONI is to collect data which can show an accurate -topology of network interference and censorship. Through this topology, it will be -possible to see what the internet looks like from nearly any location, including -what sites are censored, or have been tampered with, and by whom. We're calling -it filternet. +For interesting tests to run look in the nettests/core/ directory. -OONI uses open methodologies and the data will be provided in raw -format to allow any researcher to indipendently draw their conclusions -from the results OONI tests. +To run a test you can do so with: -There are currently projects aimed at measuring censorship in one -way or another but they either use non open methodologies or their -tools are not open sources. OONI aims at filling up this gap by -creating the first open source framework for developing network -tests and collecting data on censorship. + ./bin/ooniprobe -o report_file_name path/to/test.py -OONI revolves around three major concepts: Assets, Tests and -Reports. +Normally tests take options, you can see them with: -## Assets + ./bin/ooniprobe -o report_file_name path/to/test.py --help -Assets are the inputs used inside Tests to detect censorship events. -These can be URL lists, keywords, ip addresses, packets or any kind -of set of data. -In the python specific implementation this is represented as a python -iterable object. This means that the Testing framework will be able -to iterate through every element in the Asset. +## Configuration -## Tests +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. -This is the core of OONI. These are the actual tests that will be run -using as input (if an input is required) the Assets. -Tests can be summarized as an experiment and a control. The control -represents the expected result and the experiment is the network operation -being performed on the live network. If the experiment does not match up -with the control then a censorship event had occured. -OONI probe provides some useful functionality to the application developer -that may be useful when developing censorship detection tests. For example -it is possible to make a request over the Tor network easily or use a fast -and flexible non-blocking HTTP client implementation. - -## Reports - -This is the data that is collected from the test. OONI probe provides a -flexible means of storing results and uploading this data to a remote -server or a flat file. - -The Test developer should include in the report as much data as possible -and can contain raw packet dumps as well as structured synthetic results. - -In future on top of ooni-probe Reports it will be possible to develop -flexible post-processing tools to allow data-visualization guru's to -properly visualize and contextualize the resulting data. diff --git a/TODO b/TODO index b8524f3..6a989fd 100644 --- a/TODO +++ b/TODO @@ -1,108 +1,19 @@ -This is a list of things to be done on ooni-probe. +You can find things that need to be fixed by running from the root of the project: -Once you have completed something you should add a brief note to this file -stating what you have done under the item. If you discover needed tasks, feel -free to add them, but also keep in mind that OONI is mostly using the Tor Trac -instance, and the main ticket for OONI which all tests should be organized -under is here: + grep -rn XXX * - https://trac.torproject.org/projects/tor/ticket/5869 +# The full list of tickets related to OONI can be found by doing this query on trac: -New things to test ------------------- + https://trac.torproject.org/projects/tor/query?status=accepted&status=assig… -* Some of the tests still give errors. This is top priority. +# Things related to the OONIB can be found with this query: -* The submit-patch script is still a bit janky, and could use - some sprucing up. + https://trac.torproject.org/projects/tor/query?status=accepted&status=assig… -* The Makefile that I made to serve a quick check for whether or not the tests - are broken could use some more tests added to it. One thing is that some - tests take certain types of input files, others take none at all, and - nowhere is this presented to someone trying to run a test. So, the informing - users/testers bit can be worked on, and the testing. Obviously we're going - to want something more robust that a 20 LOC Makefile pretty fast. +# Tests that still need to be implemented can be found with: -Finalization of API design --------------------------- + https://trac.torproject.org/projects/tor/query?status=accepted&status=assig… -* The nettest.TestCase should have an interface. - I know that there is a push away from using zope.interfaces, but I think - it is actually *highly* necessary for ensuring that subclasses implement - the required functions, and also that they do not improperly override - necessary functions, for them to run. - Personally, I am quite annoyed when I subclass a class from Twisted and - override a public method, and it breaks things (when nothing in their - documentation informed me that it would break things) and I have to spend - half an hour digging through their code to figure out precisely what is - needed externally from the function I'm overriding. Others should not have - to do this with our code. -* The nettest.TestCase should have a twisted.python.usage.Options subclass and - interface as well, even if the instantiation of that subclass is handled by - the ooni.oonicli or the ooni.runner. There is more functionality to - usage.Options that we should expose than merely "optParameters", for - instance the "coerceOptions" parameter validation methods, or the - "postOptions" configuration. - -New things to develop ---------------------- - -These are either components specific to the new refactor of ooni -or that we haven't yet figured out how they should work. - -* Finish implementing the backend collection code. - - o PCAP READER/WRITER: - This should be quite simple...see scapy.all.wrpcap and - scapy.all.rdpcap. However, we have been warned by other projects that - this does *not* scale well. For example, see: - https://github.com/isislovecruft/switzerland/blob/master/switzerland/client… - Which is a circular ring buffer specifically for libpcap, to avoid kernel - buffer overflows due to a high number of incoming packets. I expect this - to only be an issue on substantially high-bandwidth nodes...though that - is what we'll be dealing with when we deploy on Mlab. - - o PCAP UPLOADER: - This also sounds simple, and is, until you begin to deal with things like - persistence. What we really need is rsync, written in python, or at least - some cross-platform implementation. I (Isis speaking) am the current - maintainer of pyrsync, BUT DO NOT USE PYRSYNC. It is only an - implementation of the rsync *algorithm* for diffs, it is not rsync the - program. Also, it is BROKEN AND I DO NOT MAINTAIN IT. If you want to - maintain it, please take it off my hands. - -* Useability: - - o UNITTESTS. Pronto. - - o DOCUMENTATION. If you found something that confused you, or still - confuses you, and you couldn't find the answer within fifteen seconds, - then that thing is not well documented. Make it better, or at least mark - it with an "XXX document me!" tag. - -* Persistence: - - o We need some type of scheduler/cron thing which will background the tests - so that they don't take up a terminal, and can be configured to run - certain tests at timed intervals. - - o The Reporter will probably need to be updated to handle knowing when *a - test* has completed, but that the scheduler is still running. - -Migrate code from old ---------------------- - -Migrate all the interesting parts of the old code to the new. This is mostly -finished, but there still are things in the /old-to-be-ported directory which -might be of use. At this point, because we have gone through several version -of the API design, many of them are entirely unusable, and merely the general -idea remains. - -It's important to make the new code asych and based on Twisted. It should -respect the design goals of the new ooni-probe model. Also, importing new, -non-standard libraries should be discussed first, if the new test is to be -used in the core of OONI (packaging scapy and twisted already makes our -codebase quite large). diff --git a/tests/assets/ipports.txt b/tests/assets/ipports.txt deleted file mode 100644 index ade757f..0000000 --- a/tests/assets/ipports.txt +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1:80 -8.8.8.8:53 diff --git a/tests/assets/urllist.txt b/tests/assets/urllist.txt deleted file mode 100644 index dc38e22..0000000 --- a/tests/assets/urllist.txt +++ /dev/null @@ -1,3 +0,0 @@ -http://google.com/ -http://127.0.0.1/ -http://dio.it/ diff --git a/tests/legacy/test_plugins.py b/tests/legacy/test_plugins.py deleted file mode 100644 index 26bee51..0000000 --- a/tests/legacy/test_plugins.py +++ /dev/null @@ -1,40 +0,0 @@ -from twisted.internet import defer, reactor -from twisted.trial import unittest - -from ooni.ooniprobe import retrieve_plugoo, runTest, Options -from ooni.plugoo import work, tests - -def asset_file(filename): - import os - file_dir = os.path.normpath(os.path.join(__file__, '..')) - return os.path.join(file_dir, 'assets', filename) - -class PluginsTestCase(unittest.TestCase): - def test_plugin_blocking(self): - suboptions = {'asset': asset_file('urllist.txt')} - runTest('blocking', suboptions, Options(), reactor) - return - - def test_plugin_tcpconnect(self): - suboptions = {'asset': asset_file('ipports.txt')} - runTest('tcpconnect', suboptions, Options(), reactor) - return - - - def test_plugin_captivep(self): - runTest('blocking', None, Options(), reactor) - return - - - def test_plugin_httphost(self): - suboptions = {'asset': asset_file('urllist.txt')} - runTest('httphost', suboptions, Options(), reactor) - return - - - def test_plugin_httpt(self): - suboptions = {'urls': asset_file('urllist.txt')} - runTest('httpt', suboptions, Options(), reactor) - return - - diff --git a/tests/legacy/test_tests.py b/tests/legacy/test_tests.py deleted file mode 100644 index dc89b98..0000000 --- a/tests/legacy/test_tests.py +++ /dev/null @@ -1,45 +0,0 @@ -from twisted.internet import defer -from twisted.trial import unittest - -from ooni.plugoo import work, tests - -class TestsTestCase(unittest.TestCase): - def setUp(self): - class dummyReport: - def __call__(self, *args, **kw): - pass - self.dummyreport = dummyReport() - self.callbackResults = None - self.errbackResults = None - - def _callback(self, *args, **kw): - #print args, kw - self.callbackResults = args, kw - - def _errback(self, *args, **kw): - pass - - @defer.inlineCallbacks - def test_fallThrough(self): - """ - This tests to make sure that what is returned from the experiment - method falls all the way through to control and finish. - """ - test_dict = {"hello": "world"} - class DummyTest(tests.OONITest): - blocking = False - def experiment(self, args): - def bla(a): - print a - return test_dict - d2 = defer.Deferred() - d2.addCallback(bla) - from twisted.internet import reactor - reactor.callLater(0.1, d2.callback, None) - return d2 - - test = DummyTest(None, None, self.dummyreport) - yield test.startTest(None).addCallback(self._callback) - self.assertEqual(self.callbackResults[0][0]['return_value'], test_dict) - return - diff --git a/tests/test_worker.py b/tests/test_worker.py deleted file mode 100644 index 3222f65..0000000 --- a/tests/test_worker.py +++ /dev/null @@ -1,29 +0,0 @@ -from twisted.trial import unittest - -from ooni.plugoo import work, tests - -class WorkerTestCase(unittest.TestCase): - def testWorkGenerator(self): - class DummyTest: - assets = {} - dummytest = DummyTest() - asset = [] - for i in range(10): - asset.append(i) - dummytest.assets['asset'] = asset - wgen = work.WorkGenerator(dummytest) - - for j, x in enumerate(wgen): - pass - self.assertEqual(i, j) - - def testNoAssets(self): - class DummyTest: - assets = {'asset': None} - dummytest = DummyTest() - wgen = work.WorkGenerator(dummytest) - i = 0 - for j in wgen: - i += 1 - self.assertEqual(i, 1) -

1 0

r25869: {website} Replace stem's PathSupport idea with usability improvements (website/trunk/getinvolved/en)
by Damian Johnson 10 Nov '12

10 Nov '12

Author: atagar Date: 2012-11-10 20:36:53 +0000 (Sat, 10 Nov 2012) New Revision: 25869 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Replace stem's PathSupport idea with usability improvements As Ravi discovered during the last GSoC application phase our PathSupport idea is too poorly defined to make a good GSoC (or GSoC-like) project. Replacing it with far better defined tasks for improving stem's usability. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-10 19:34:04 UTC (rev 25868) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-10 20:36:53 UTC (rev 25869) @@ -557,7 +557,7 @@ Project Ideas: - <a href="#stemPathsupport">Stem PathSupport Capabilities</a> + <a href="#stemUsability">Stem Usability Improvements</a> <a id="project-metrics"></a> @@ -847,6 +847,59 @@ href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/190-shared-s…">190</a>. </li> + <a id="stemUsability"></a> + <li> + Stem Usability Improvements + + Priority: Medium + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Damian (atagar) + + <a href="https://stem.readthedocs.org/en/latest/index.html">Stem</a> is a + python controller library for tor. Like it's predecessor, <a + href="#project-torctl">TorCtl</a>, it uses tor's <a + href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt">control + protocol</a> to help developers program against the tor process, enabling + them to build things similar to <a href="#project-vidalia">Vidalia</a> and + <a href="#project-arm">arm</a>. + + + + While TorCtl provided a fine first draft for this sort of functionality, + it has not proved to be extensible nor maintainable. Stem is a rewrite of + TorCtl with a heavy focus on testing, documentation, and providing a + developer friendly API. + + + + Stem is very nearly feature complete but presently has no users. We + want to change that prior to making our first release for a couple + reasons... + + + <ul> + <li>Make sure that we have a reasonably good API, and improve the rough + edges that hurt its usability.</li> + <li>Provide examples for how stem can be used.</li> + </ul> + + + This project involves several tasks... + + + <ol> + <li>Move stem's site to Tor's website (<a href="https://trac.torproject.org/projects/tor/ticket/7324">ticket</a>)</li> + <li>Set up Piwik for our site (<a href="https://trac.torproject.org/projects/tor/ticket/7424">ticket</a>)</li> + <li>Come up with a better, more developer friendly "Module Overview" for our documentation (<a href="https://stem.readthedocs.org/en/latest/api/control.html">example page</a>). For instance, it would be nice to provide interlinking between the overview and the classes/methods that it lists. This will probably involve asking for help from the <a href="http://sphinx-doc.org/">Sphinx user list</a>.</li> + <li>Finally get your hands dirty using stem. We want to expand stem's <a href="https://stem.readthedocs.org/en/latest/tutorial.html">tutorial page</a> with more examples. To do this you'll want to both brainstorm some of your own and contact the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/">tor-dev@ email list</a> to solicit ideas. This last step is pretty open ended, so go nuts with whatever you think will improve stem's usability!</li> + </ol> + </li> + +  <!-- <a id="orbot-userInterface"></a>

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit bff4ced4b271bdcf25acd24a7e9215ed9ae9336a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 20:15:20 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index fe0a73b..1d2e38c 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-11-10 19:44+0000\n" +"PO-Revision-Date: 2012-11-10 20:14+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -655,7 +655,7 @@ msgstr "Comores" msgctxt "CountryInfo" msgid "Congo, The Democratic Republic of the" -msgstr "Congo, República Democrática del" +msgstr "República Democrática del Congo" msgctxt "CountryInfo" msgid "Congo" @@ -691,7 +691,7 @@ msgstr "Dinamarca" msgctxt "CountryInfo" msgid "Djibouti" -msgstr "Djibutí" +msgstr "Yibuti (Djibouti)" msgctxt "CountryInfo" msgid "Dominica" @@ -803,11 +803,11 @@ msgstr "Jordania" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "Kazajhstán" +msgstr "Kazajstán" msgctxt "CountryInfo" msgid "Kenya" -msgstr "Kenya" +msgstr "Kenia" msgctxt "CountryInfo" msgid "Kiribati"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 6d17e718db99324fba0b8cc675cec72c883512e4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 20:15:17 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index fe0a73b..1d2e38c 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-11-10 19:44+0000\n" +"PO-Revision-Date: 2012-11-10 20:14+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -655,7 +655,7 @@ msgstr "Comores" msgctxt "CountryInfo" msgid "Congo, The Democratic Republic of the" -msgstr "Congo, República Democrática del" +msgstr "República Democrática del Congo" msgctxt "CountryInfo" msgid "Congo" @@ -691,7 +691,7 @@ msgstr "Dinamarca" msgctxt "CountryInfo" msgid "Djibouti" -msgstr "Djibutí" +msgstr "Yibuti (Djibouti)" msgctxt "CountryInfo" msgid "Dominica" @@ -803,11 +803,11 @@ msgstr "Jordania" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "Kazajhstán" +msgstr "Kazajstán" msgctxt "CountryInfo" msgid "Kenya" -msgstr "Kenya" +msgstr "Kenia" msgctxt "CountryInfo" msgid "Kiribati"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit a0072933275cabcd693f5d82bfcfa90af8897fa5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 19:45:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 283293f..fe0a73b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-11-10 18:59+0000\n" +"PO-Revision-Date: 2012-11-10 19:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -484,13 +484,13 @@ msgstr "ControlSocket (socket de dominio Unix) no está conectado." msgctxt "ControlPasswordInputDialog" msgid "Problem connecting to Tor" -msgstr "Problema al conectar a Tor" +msgstr "Hubo un problema al conectar a Tor" msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "Vidalia puede intentar reiniciar Tor por usted. Haciendolo cerrará todas las conexiones actualmente activas a través de su proceso de Tor." +msgstr "Vidalia puede intentar reiniciar Tor por usted. Haciéndolo cerrará todas las conexiones actualmente activas a través de su proceso Tor." msgctxt "ControlPasswordInputDialog" msgid "" @@ -507,7 +507,7 @@ msgstr "Tendrá que detener el proceso de Tor antes de que Vidalia pueda volver msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "ControlSocket ( no esta conectada." +msgstr "ControlSocket no está conectado." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" @@ -515,7 +515,7 @@ msgstr "Error enviando comando de control. [%1]" msgctxt "ControlSocket" msgid "Socket disconnected while attempting to read a line of data." -msgstr "Conexión desconectada mientras se trataba de leer una línea de información." +msgstr "ControlSocket se desconectó al intentar leer una línea de datos." msgctxt "ControlSocket" msgid "Invalid control reply. [%1]" @@ -551,7 +551,7 @@ msgstr "Australia" msgctxt "CountryInfo" msgid "Azerbaijan" -msgstr "Azerbaidzhán" +msgstr "Azerbaiyán" msgctxt "CountryInfo" msgid "Bahamas" @@ -559,7 +559,7 @@ msgstr "Bahamas" msgctxt "CountryInfo" msgid "Bangladesh" -msgstr "Bangladesh" +msgstr "Bangladés" msgctxt "CountryInfo" msgid "Barbados" @@ -615,7 +615,7 @@ msgstr "Burundi" msgctxt "CountryInfo" msgid "Cambodia" -msgstr "Cambodia" +msgstr "Camboya" msgctxt "CountryInfo" msgid "Cameroon"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 7071faf2a91ffbb1f41e4b726656eff11a1b96f5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 19:45:19 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 283293f..fe0a73b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-11-10 18:59+0000\n" +"PO-Revision-Date: 2012-11-10 19:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -484,13 +484,13 @@ msgstr "ControlSocket (socket de dominio Unix) no está conectado." msgctxt "ControlPasswordInputDialog" msgid "Problem connecting to Tor" -msgstr "Problema al conectar a Tor" +msgstr "Hubo un problema al conectar a Tor" msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "Vidalia puede intentar reiniciar Tor por usted. Haciendolo cerrará todas las conexiones actualmente activas a través de su proceso de Tor." +msgstr "Vidalia puede intentar reiniciar Tor por usted. Haciéndolo cerrará todas las conexiones actualmente activas a través de su proceso Tor." msgctxt "ControlPasswordInputDialog" msgid "" @@ -507,7 +507,7 @@ msgstr "Tendrá que detener el proceso de Tor antes de que Vidalia pueda volver msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "ControlSocket ( no esta conectada." +msgstr "ControlSocket no está conectado." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" @@ -515,7 +515,7 @@ msgstr "Error enviando comando de control. [%1]" msgctxt "ControlSocket" msgid "Socket disconnected while attempting to read a line of data." -msgstr "Conexión desconectada mientras se trataba de leer una línea de información." +msgstr "ControlSocket se desconectó al intentar leer una línea de datos." msgctxt "ControlSocket" msgid "Invalid control reply. [%1]" @@ -551,7 +551,7 @@ msgstr "Australia" msgctxt "CountryInfo" msgid "Azerbaijan" -msgstr "Azerbaidzhán" +msgstr "Azerbaiyán" msgctxt "CountryInfo" msgid "Bahamas" @@ -559,7 +559,7 @@ msgstr "Bahamas" msgctxt "CountryInfo" msgid "Bangladesh" -msgstr "Bangladesh" +msgstr "Bangladés" msgctxt "CountryInfo" msgid "Barbados" @@ -615,7 +615,7 @@ msgstr "Burundi" msgctxt "CountryInfo" msgid "Cambodia" -msgstr "Cambodia" +msgstr "Camboya" msgctxt "CountryInfo" msgid "Cameroon"

1 0

r25868: {website} Replacing TorBirdy project idea with an updated counterpart (website/trunk/getinvolved/en)
by Damian Johnson 10 Nov '12

10 Nov '12

Author: atagar Date: 2012-11-10 19:34:04 +0000 (Sat, 10 Nov 2012) New Revision: 25868 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Replacing TorBirdy project idea with an updated counterpart Dropping the 'torbutton for thunderbird' project idea since it is now... well, implemented. Replacing the entry with a project that Sukhbir would like to mentor. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-09 20:49:30 UTC (rev 25867) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-10 19:34:04 UTC (rev 25868) @@ -482,11 +482,6 @@ as well</a>. - - Project Ideas: - <a href="#torbuttonForThunderbird">Torbutton equivalent for Thunderbird</a> - - <a id="project-obfsproxy"></a> <h3><a href="https://gitweb.torproject.org/obfsproxy.git/tree/HEAD:/doc">Obfsproxy</a> (<a href="https://gitweb.torproject.org/obfsproxy.git">code</a>, <a @@ -1341,24 +1336,59 @@ </li> --> - <a id="torbuttonForThunderbird"></a> + <a id="improveTorbirdy"></a> <li> - Torbutton equivalent for Thunderbird + Improving TorBirdy - Priority: Medium + Priority: High Effort Level: High - Skill Level: High + Skill Level: Medium to High - Likely Mentors: Jake + Likely Mentors: Sukhbir, Jacob - We're hearing from an increasing number of users that they want to use - Thunderbird with Tor. However, there are plenty of application-level - concerns, for example, by default Thunderbird will put your hostname in - the outgoing mail that it sends. At some point we should start a new - push to build a Thunderbird extension similar to Torbutton. + TorBirdy is Torbutton for Thunderbird, Icedove and related Mozilla mail + clients. + + TorBirdy is under active development and is available from <a + href="https://trac.torproject.org/projects/tor/wiki/torbirdy">our wiki</a> + and <a + href="https://addons.mozilla.org/en-US/thunderbird/addon/torbirdy/">mozilla's + addons site</a>. + + + + The goal of this project is to improve TorBirdy by: + + + <ul> + <li> + Writing a Thunderbird patch to plug known leaks. We have already <a + href="https://bugzilla.mozilla.org/show_bug.cgi?id=776397">submitted a + patch to Thunderbird</a> but we anticipate there will be much more work + required before it is accepted, possibly involving rewriting the entire + patch; this appears trivial, but it is not, as we are proposing a + completely new privacy-safe message-ID header generation algorithm for + Thunderbird. + </li> + <li> + Implementing a JavaScript HTTP proxy (see the <a + href="https://trac.torproject.org/projects/tor/ticket/6958">ticket</a>) + </li> + <li> + Auditing TorBirdy for leaks and for use with other add-ons (as an + example see its <a + href="https://trac.torproject.org/projects/tor/ticket/6319">ticket</a>) + </li> + </ul> + + + A student undertaking this project should have some C++ and JavaScript + development experience. Previous experience with Firefox/Thunderbird + extension development is a plus, but not required. + </li> <a id="usabilityTesting"></a>

1 0

[ooni-probe/master] Add test_name to the report
by art＠torproject.org 10 Nov '12

10 Nov '12

commit a511a8b36c85c0535c6019fbc1081fd5e6235379 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 20:23:22 2012 +0100 Add test_name to the report Remove simple test --- nettests/simpletest.py | 27 --------------------------- ooni/config.py | 2 +- ooni/reporter.py | 15 +++++---------- ooni/runner.py | 10 +++++----- 4 files changed, 11 insertions(+), 43 deletions(-) diff --git a/nettests/simpletest.py b/nettests/simpletest.py deleted file mode 100644 index d72c00c..0000000 --- a/nettests/simpletest.py +++ /dev/null @@ -1,27 +0,0 @@ -#-*- coding: utf-8 -*- -"""Contains classes for testing the basic functionality of oonicli.""" - -from ooni import nettest - -class SimpleTest(nettest.NetTestCase): - """ - A very simple test which prints integers, for testing that oonicli is - working correctly. - """ - inputs = range(0, 20) - optParameters = [['asset', 'a', None, 'Asset file'], - ['controlserver', 'c', 'google.com', - 'Specify the control server'], - ['resume', 'r', 0, 'Resume at this index'], - ['other', 'o', None, 'Other arguments']] - def test_foo(self): - """Test that tests are working.""" - print "Running %s with %s" % ("test_foo", self.input) - self.report['test_foo'] = 'Antani' - self.report['shared'] = "sblinda" - - def test_f4oo(self): - """Test that tests are working.""" - print "Running %s with %s" % ("test_f4oo", self.input) - self.report['test_f4oo'] = 'Antani' - self.report['shared'] = "sblinda2" diff --git a/ooni/config.py b/ooni/config.py index cec9146..a2ce917 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- # -# :authors: Arturo "hellais" Filastò <art(a)fuffa.org> +# :authors: Arturo Filastò # :licence: see LICENSE import os diff --git a/ooni/reporter.py b/ooni/reporter.py index 33b4675..5d29d54 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -95,15 +95,11 @@ class OONIBReporter(object): self.backend_url = backend_url def _newReportCreated(self, data): - #log.debug("Got this as result: %s" % data) - print "Got this as result: %s" % data - + log.debug("Got this as result: %s" % data) return data def _processResponseBody(self, response, body_cb): - #log.debug("Got response %s" % response) - print "Got response %s" % response - + log.debug("Got response %s" % response) done = defer.Deferred() response.deliverBody(BodyReceiver(done)) done.addCallback(body_cb) @@ -111,8 +107,6 @@ class OONIBReporter(object): def newReport(self, test_name, test_version): url = self.backend_url + '/new' - print "Creating report via url %s" % url - software_version = '0.0.1' request = {'software_name': 'ooni-probe', @@ -120,7 +114,7 @@ class OONIBReporter(object): 'test_name': test_name, 'test_version': test_version, 'progress': 0} - #log.debug("Creating report via url %s" % url) + log.debug("Creating report via url %s" % url) bodyProducer = StringProducer(json.dumps(request)) d = self.agent.request("POST", url, bodyProducer=bodyProducer) d.addCallback(self._processResponseBody, self._newReportCreated) @@ -211,7 +205,7 @@ class OReporter(YamlReporter): } self.writeReportEntry(test_details) - def testDone(self, test): + def testDone(self, test, test_name): test_report = dict(test.report) # XXX the scapy test has an example of how @@ -225,6 +219,7 @@ class OReporter(YamlReporter): test_runtime = test_started - time.time() report = {'input': test_input, + 'test_name': test_name, 'test_started': test_started, 'report': test_report} self.writeReportEntry(report) diff --git a/ooni/runner.py b/ooni/runner.py index d03f6c6..1affb15 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -153,10 +153,10 @@ def loadTestsAndOptions(classes, cmd_line_options): def runTestWithInput(test_class, test_method, test_input, oreporter): log.debug("Running %s with %s" % (test_method, test_input)) - def test_done(result, test_instance): - oreporter.testDone(test_instance) + def test_done(result, test_instance, test_name): + oreporter.testDone(test_instance, test_name) - def test_error(error, test_instance): + def test_error(error, test_instance, test_name): log.err("%s\n" % error) test_instance = test_class() @@ -169,8 +169,8 @@ def runTestWithInput(test_class, test_method, test_input, oreporter): test_instance.setUp() test = getattr(test_instance, test_method) d = defer.maybeDeferred(test) - d.addCallback(test_done, test_instance) - d.addErrback(test_error, test_instance) + d.addCallback(test_done, test_instance, test_method) + d.addErrback(test_error, test_instance, test_method) log.debug("returning %s input" % test_method) return d

1 0

[ooni-probe/master] Port TCP Connect test
by art＠torproject.org 10 Nov '12

10 Nov '12

commit de6751c9761f0590ff114f5a44b0cc5a6a4ea092 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 20:21:05 2012 +0100 Port TCP Connect test --- nettests/core/tcpconnect.py | 46 +++++++++++++++++++++++++ to-be-ported/old-api/tcpconnect.py | 65 ------------------------------------ 2 files changed, 46 insertions(+), 65 deletions(-) diff --git a/nettests/core/tcpconnect.py b/nettests/core/tcpconnect.py new file mode 100644 index 0000000..4d1e0fc --- /dev/null +++ b/nettests/core/tcpconnect.py @@ -0,0 +1,46 @@ +# -*- encoding: utf-8 -*- +from twisted.internet.protocol import Factory, Protocol +from twisted.internet.endpoints import TCP4ClientEndpoint + +from twisted.internet.error import ConnectionRefusedError +from twisted.internet.error import TCPTimedOutError + +from ooni import nettest +from ooni.utils import log + +class TCPFactory(Factory): + def buildProtocol(self, addr): + return Protocol() + +class TCPConnectTest(nettest.NetTestCase): + name = "TCP Connect" + author = "Arturo Filastò" + version = "0.1" + + inputFile = ['file', 'f', None, + 'File containing the IP:PORT combinations to be tested, one per line'] + + def test_connect(self): + """ + This test performs a TCP connection to the remote host on the specified port. + the report will contains the string 'success' if the test has + succeeded, or the reason for the failure if it has failed. + """ + host, port = self.input.split(":") + def connectionSuccess(protocol): + protocol.transport.loseConnection() + log.debug("Got a connection to %s" % self.input) + self.report["connection"] = 'success' + + def connectionFailed(failure): + failure.trap(ConnectionRefusedError, TCPTimedOutError) + log.debug("Unable to connect to %s" % self.input) + self.report["connection"] = str(failure.value) + + from twisted.internet import reactor + point = TCP4ClientEndpoint(reactor, host, int(port)) + d = point.connect(TCPFactory()) + d.addCallback(connectionSuccess) + d.addErrback(connectionFailed) + return d + diff --git a/to-be-ported/old-api/tcpconnect.py b/to-be-ported/old-api/tcpconnect.py deleted file mode 100644 index 7758a9e..0000000 --- a/to-be-ported/old-api/tcpconnect.py +++ /dev/null @@ -1,65 +0,0 @@ -""" -This is a self genrated test created by scaffolding.py. -you will need to fill it up with all your necessities. -Safe hacking :). -""" -from zope.interface import implements -from twisted.python import usage -from twisted.plugin import IPlugin -from twisted.internet.protocol import Factory, Protocol -from twisted.internet.endpoints import TCP4ClientEndpoint - -from ooni.plugoo.interface import ITest -from ooni.plugoo.tests import OONITest -from ooni.plugoo.assets import Asset -from ooni.utils import log - -class tcpconnectArgs(usage.Options): - optParameters = [['asset', 'a', None, 'File containing IP:PORT combinations, one per line.'], - ['resume', 'r', 0, 'Resume at this index']] - -class tcpconnectTest(OONITest): - implements(IPlugin, ITest) - - shortName = "tcpconnect" - description = "tcpconnect" - requirements = None - options = tcpconnectArgs - blocking = False - - def experiment(self, args): - try: - host, port = args['asset'].split(':') - except: - raise Exception("Error in parsing asset. Wrong format?") - class DummyFactory(Factory): - def buildProtocol(self, addr): - return Protocol() - - def gotProtocol(p): - p.transport.loseConnection() - log.msg("Got a connection!") - log.msg(str(p)) - return {'result': True, 'target': [host, port]} - - def gotError(err): - log.msg("Had error :(") - log.msg(err) - return {'result': False, 'target': [host, port]} - - # What you return here gets handed as input to control - point = TCP4ClientEndpoint(self.reactor, host, int(port)) - d = point.connect(DummyFactory()) - d.addCallback(gotProtocol) - d.addErrback(gotError) - return d - - def load_assets(self): - if self.local_options: - return {'asset': Asset(self.local_options['asset'])} - else: - return {} - -# We need to instantiate it otherwise getPlugins does not detect it -# XXX Find a way to load plugins without instantiating them. -#tcpconnect = tcpconnectTest(None, None, None)

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 6b1a175b3ca7e97bdb1be5c0a06e9dffe03ddd9f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 19:15:20 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 600cc26..283293f 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-11-10 17:43+0000\n" +"PO-Revision-Date: 2012-11-10 18:59+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -490,24 +490,24 @@ msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "Vidalia puede intentar reiniciar Tor por usted. Si lo hace, se cerrarán todas las conexiones activas a través de su proceso de Tor." +msgstr "Vidalia puede intentar reiniciar Tor por usted. Haciendolo cerrará todas las conexiones actualmente activas a través de su proceso de Tor." msgctxt "ControlPasswordInputDialog" msgid "" "Tor is already running, but Vidalia can't connect to it.\n" "\n" "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." -msgstr "Tor se está ejecutando, pero Vidalia no puede conectarse a él. \n\nEsto puede ocurrir cuando alguna otra cosa (como otro activo proceso de Vidalia, o un proceso de Vidalia que se colgó) lanzado Tor." +msgstr "Tor se está ejecutando, pero Vidalia no puede conectarse a él.\n\nEsto puede ocurrir si Tor fue iniciado de alguna otra forma (como otro proceso activo de Vidalia, o un proceso de Vidalia que se colgó)." msgctxt "ControlPasswordInputDialog" msgid "" "You will need to shut down the Tor process before Vidalia can launch a new " "one." -msgstr "Usted tendrá que detener el proceso antes de Tor Vidalia puede iniciar uno nuevo." +msgstr "Tendrá que detener el proceso de Tor antes de que Vidalia pueda volver a iniciarlo." msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "La conexión de control no esta conectada." +msgstr "ControlSocket ( no esta conectada." msgctxt "ControlSocket" msgid "Error sending control command. [%1]"

1 0