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

[ooni-probe/master] Fix bug when tests are started without the Asset argument
by art＠torproject.org 13 Mar '12

13 Mar '12

commit ab2a15e48c70ce69ade72b5b9cfeaea185049a3a Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Mar 13 16:44:10 2012 -0700 Fix bug when tests are started without the Asset argument --- ooniprobe.py | 7 +++++-- tests/bridget.py | 2 +- tests/traceroute.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ooniprobe.py b/ooniprobe.py index f2f323d..9d9c0ac 100755 --- a/ooniprobe.py +++ b/ooniprobe.py @@ -141,12 +141,15 @@ class ooni(object): except Exception, e: self.logger.error("ERR: %s" % e) - def run_test(self, test, asset): + def run_test(self, test, asset=None): """ Run a single test """ self.load_tests() - self.tests[test].module.run(self, asset) + if asset: + self.tests[test].module.run(self, asset) + else: + self.tests[test].module.run(self) if __name__ == "__main__": diff --git a/tests/bridget.py b/tests/bridget.py index 61fc8b7..da014fd 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -357,7 +357,7 @@ Log info file %s #def msg(self, severity, message): # print "[%s] %s"%(severity, message) -def run(ooni): +def run(ooni, assets=None): """ Run the test """ diff --git a/tests/traceroute.py b/tests/traceroute.py index 891d356..d84bf25 100644 --- a/tests/traceroute.py +++ b/tests/traceroute.py @@ -21,7 +21,7 @@ __desc__ = "Performs TTL walking tests" class TracerouteAsset(Asset): def __init__(self, file=None): - self = asset.__init__(self, file) + self = Asset.__init__(self, file) class Traceroute(Test):

1 0

[ooni-probe/master] Add pointer to non-ooni tests
by art＠torproject.org 13 Mar '12

13 Mar '12

commit 21c5261c849bc71ac3eb5aa1042f6062755e2599 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Mar 13 13:51:49 2012 -0700 Add pointer to non-ooni tests --- TODO | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TODO b/TODO index 803ee5b..9c2cd0a 100644 --- a/TODO +++ b/TODO @@ -23,7 +23,7 @@ effort: low, skill: low effort: medium, skill: medium * Misc scripts to detect censorship that are not written in any - version of OONI. + version of OONI (old/ooni/plugins/old_stuff_to_convert/) effort: low-medium, skill: low-medium New things to develop

1 0

[ooni-probe/master] Add some scaffolding for Squid Proxy detection test
by art＠torproject.org 13 Mar '12

13 Mar '12

commit da50bb53f05e487a00b3db2feb97ce37cf449afd Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Mar 13 13:49:30 2012 -0700 Add some scaffolding for Squid Proxy detection test --- tests/squid.py | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/tests/squid.py b/tests/squid.py new file mode 100644 index 0000000..847135e --- /dev/null +++ b/tests/squid.py @@ -0,0 +1,113 @@ +""" + Squid Proxy Detector + ******************** + +""" +import os +import httplib +import urllib2 +from urlparse import urlparse + +from plugoo import gen_headers +from plugoo.assets import Asset +from plugoo.tests import Test + +__plugoo__ = "SquidProxy" +__desc__ = "This Test aims at detecting the squid transparent proxy" + +class SquidAsset(Asset): + """ + This is the asset that should be used by the Test. It will + contain all the code responsible for parsing the asset file + and should be passed on instantiation to the test. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + + +class Squid(Test): + """ + Squid Proxy testing class. + """ + def _http_request(self, method, url, + path=None, headers=None): + """ + Perform an HTTP Request. + XXX move this function to the core OONI + code. + """ + url = urlparse(url) + host = url.netloc + + conn = httplib.HTTPConnection(host, 80) + conn.connect() + + if path is None: + path = purl.path + + conn.putrequest(method, path) + + for h in gen_headers(): + conn.putheaders(h[0], h[1]) + conn.endheaders() + + send_browser_headers(self, None, conn) + + response = conn.getresponse() + + headers = dict(response.getheaders()) + + self.headers = headers + self.data = response.read() + return True + + def invalid_request(self): + """ + This will trigger squids "Invalid Request" error. + """ + pass + + def cache_object(self): + """ + This attempts to do a GET cache_object://localhost/info on + any destination and checks to see if the response contains + is that of Squid. + """ + + pass + + def experiment(self, *a, **kw): + """ + Fill this up with the tasks that should be performed + on the "dirty" network and should be compared with the + control. + """ + + + def control(self): + """ + Fill this up with the control related code. + """ + return True + +def run(ooni): + """ + This is the function that will be called by OONI + and it is responsible for instantiating and passing + the arguments to the Test class. + """ + config = ooni.config + + # This the assets array to be passed to the run function of + # the test + assets = [TestTemplateAsset(os.path.join(config.main.assetdir, \ + "someasset.txt"))] + + # Instantiate the Test + thetest = TestTemplate(ooni) + ooni.logger.info("starting SquidProxyTest...") + # Run the test with argument assets + thetest.run(assets) + ooni.logger.info("finished.") + +

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 13 Mar '12

13 Mar '12

commit 35654eb4f7581c3936dff8d13bf3d37090bcc33d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 13 18:15:29 2012 +0000 Update translations for torcheck_completed --- fi/torcheck.po | 52 +++++++++++++++++++++------------------------------- 1 files changed, 21 insertions(+), 31 deletions(-) diff --git a/fi/torcheck.po b/fi/torcheck.po index eb0ec6c..2a066c0 100644 --- a/fi/torcheck.po +++ b/fi/torcheck.po @@ -1,14 +1,15 @@ # TorCheck gettext template -# Copyright (C) 2008 Jacob Appelbaum +# Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# <c168298(a)rppkn.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2008-04-24 20:28+PDT\n" -"PO-Revision-Date: 2012-02-14 10:00+0000\n" -"Last-Translator: morso <debris(a)riseup.net>\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2012-03-13 17:57+0000\n" +"Last-Translator: torre <c168298(a)rppkn.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,8 +23,17 @@ msgstr "Onnittelut. Selaimenne on asetettu käyttämään Toria." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " -"for further information about using Tor safely." -msgstr "Löydätte tarkempia tietoja Torin turvallisesta käytöstä <a href=\"https://www.torproject.org/\">Tor:in kotisivuilta</a>." +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "<a href=\"https://www.torproject.org/\">Torin kotisivuilla</a> on lisätietoa Torin käyttämisestä turvallisesti. Voit nyt vapaasti selata Internettiä nimettömästi." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Tor-selaimelle on saatavilla tietoturvapäivitys." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klikkaa tästä lataussivulle</a>" msgid "Sorry. You are not using Tor." msgstr "Pahoittelut. Ette käytä Tor-ohjelmaa." @@ -31,37 +41,17 @@ msgstr "Pahoittelut. Ette käytä Tor-ohjelmaa." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions" -" for configuring your Tor client</a>." -msgstr "Jos yritätte käyttää Tor-ohjelmaa, tutustukaa <a href=\"https://www.torproject.org/\">Tor:in kotisivuihin</a> ja etenkin <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">Tor-asiakasohjelman asetusohjeisiin</a>." +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Jos olet yrittämässä käyttää Tor-asiakasohjelmaa, käy <a href=\"https://www.torproject.org/\">Torin kotisivuilla</a> ja lue erityisesti <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">ohjeita Tor-asiakasohjelman konfiguroimiseen</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Pahoittelemme. Kyselynne ei onnistunut tai se tuotti odottamattoman vastauksen." msgid "" "A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For " -"other ways to test whether you are using Tor, please visit <a " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">this" -" FAQ entry</a>." -msgstr "Väliaikainen palvelukatkos estää meitä selvittämästä, onko IP-osoitteenne <a href=\"https://www.torproject.org/\">Tor</a>-linkki. Muita tapoja tarkistaa, käytättekö Toria, löydätte Usein kysyttyjen kysymysten <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">tästä kohdasta</a>." - -msgid "Additional information: " -msgstr "Lisätietoja: " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "Väliaikainen häiriö palvelussa on estänyt selvittämästä onko lähde-IP-osoitteesi <a href=\"https://www.torproject.org/\">Tor</a>-solmu." msgid "Your IP address appears to be: " msgstr "IP-osoitteenne näyttäisi olevan: " - -msgid "" -"This small script is powered by <a " -"href=\"http://exitlist.torproject.org/\">tordnsel</a>" -msgstr "Tämä pieni skripti käyttää <a href=\"http://exitlist.torproject.org/\">tordnsel:iä</a>" - -msgid "" -"You may also be interested in the <a href=\"/cgi-" -"bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" -msgstr "Teitä saattaa kiinnostaa myös <a href=\"/cgi-bin/TorBulkExitList.py\">Tor-verkon poistumislinkkien massaluettelointityökalu</a>" - -msgid "This server does not log <i>any</i> information about visitors." -msgstr "Tämä palvelin ei tallenna <i>mitään</i> tietoja kävijöistään."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 13 Mar '12

13 Mar '12

commit 3fb79bf1117ef5991d66221e9089cd6c046ca47c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 13 18:15:27 2012 +0000 Update translations for torcheck --- fi/torcheck.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fi/torcheck.po b/fi/torcheck.po index 86359b7..2a066c0 100644 --- a/fi/torcheck.po +++ b/fi/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# <c168298(a)rppkn.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 09:03+0000\n" -"Last-Translator: morso <debris(a)riseup.net>\n" +"PO-Revision-Date: 2012-03-13 17:57+0000\n" +"Last-Translator: torre <c168298(a)rppkn.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,15 +25,15 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "<a href=\"https://www.torproject.org/\">Torin kotisivuilla</a> on lisätietoa Torin käyttämisestä turvallisesti. Voit nyt vapaasti selata Internettiä nimettömästi." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Tor-selaimelle on saatavilla tietoturvapäivitys." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klikkaa tästä lataussivulle</a>" msgid "Sorry. You are not using Tor." msgstr "Pahoittelut. Ette käytä Tor-ohjelmaa." @@ -42,7 +43,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Jos olet yrittämässä käyttää Tor-asiakasohjelmaa, käy <a href=\"https://www.torproject.org/\">Torin kotisivuilla</a> ja lue erityisesti <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">ohjeita Tor-asiakasohjelman konfiguroimiseen</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Pahoittelemme. Kyselynne ei onnistunut tai se tuotti odottamattoman vastauksen." @@ -50,7 +51,7 @@ msgstr "Pahoittelemme. Kyselynne ei onnistunut tai se tuotti odottamattoman vast msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "Väliaikainen häiriö palvelussa on estänyt selvittämästä onko lähde-IP-osoitteesi <a href=\"https://www.torproject.org/\">Tor</a>-solmu." msgid "Your IP address appears to be: " msgstr "IP-osoitteenne näyttäisi olevan: "

1 0

[flashproxy/js] Remove comment referring to Adobe Flash.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 1def82ae2382c45f30831771ac1f903a0fda3dce Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 11:08:37 2012 -0700 Remove comment referring to Adobe Flash. --- flashproxy.js | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index e7d60c8..65c6ea2 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -212,12 +212,6 @@ function repr(x) proxy? We take a best-effort guess as to whether this device runs on a battery or the data transfer might be expensive. - Matching mobile User-Agents is complex; but we only need to match - those devices that can also run a recent version of Adobe Flash, - which is a subset of this list: - https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… - - Other resources: http://www.zytrax.com/tech/web/mobile_ids.html http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.…

1 0

[flashproxy/js] Move non-declaration code from flashproxy.js to embed.html.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 1278df97b2d84bc26caf113993bd8133ee26b4f0 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 09:24:07 2012 -0700 Move non-declaration code from flashproxy.js to embed.html. This is for the purpose of including flashproxy.js for testing. --- embed.html | 3 +++ flashproxy.js | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/embed.html b/embed.html index de90209..1d6f290 100644 --- a/embed.html +++ b/embed.html @@ -20,6 +20,9 @@ body { </head> <body> <script type="text/javascript" src="flashproxy.js"></script> +<script type="text/javascript"> +flashproxy_badge_insert().start(); +</script> <noscript> <a href="https://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a> </noscript> diff --git a/flashproxy.js b/flashproxy.js index 2052f5a..7bab9e9 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -119,7 +119,6 @@ function flashproxy_should_disable() function flashproxy_badge_insert() { - var fp; var e; if (flashproxy_should_disable()) { @@ -138,6 +137,3 @@ function flashproxy_badge_insert() return fp; } - -fp = flashproxy_badge_insert(); -fp.start();

1 0

[flashproxy/js] Add the beginning of a unit test program for flashproxy.js.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 41750ae520ce1f9994dc74800605d6e92d085361 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 09:57:32 2012 -0700 Add the beginning of a unit test program for flashproxy.js. I run this using Rhino, which is "apt-get install rhino" on Debian. --- Makefile | 5 ++- flashproxy-test.js | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ flashproxy.js | 5 ++ 3 files changed, 115 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 7f6e02e..0fb0c79 100644 --- a/Makefile +++ b/Makefile @@ -19,4 +19,7 @@ install: clean: rm -f $(TARGETS) -.PHONY: all clean +test: + ./flashproxy-test.js + +.PHONY: all clean test diff --git a/flashproxy-test.js b/flashproxy-test.js new file mode 100755 index 0000000..21ae756 --- /dev/null +++ b/flashproxy-test.js @@ -0,0 +1,106 @@ +#!/usr/bin/js + +/* To run this test program, install the Rhino JavaScript interpreter + (apt-get install rhino). */ + +var num_tests = 0; +var num_failed = 0; + +load("flashproxy.js"); + +function objects_equal(a, b) +{ + if (typeof a != typeof b) + return false; + if (typeof a != "object") + return a == b; + + for (var k in a) { + if (!objects_equal(a[k], b[k])) + return false; + } + for (var k in b) { + if (!objects_equal(a[k], b[k])) + return false; + } + + return true; +} + +function quote(s) +{ + return "\"" + s.replace(/([\\\"])/, "\\$1") + "\""; +} + +function maybe_quote(s) +{ + if (/[\\\"]/.test(s)) + return quote(s); + else + return s; +} + +function repr(x) +{ + if (typeof x === null) { + return "null"; + } else if (typeof x == "undefined") { + return "undefined"; + } else if (typeof x == "object") { + var elems = []; + for (var k in x) + elems.push(maybe_quote(k) + ": " + repr(x[k])); + return "{ " + elems.join(", ") + " }"; + } else if (typeof x == "string") { + return quote(x); + } else { + return x.toString(); + } +} + +function pass(test) +{ + num_tests++; + print("PASS " + repr(test)); +} + +function fail(test, expected, actual) +{ + num_tests++; + num_failed++; + print("FAIL " + repr(test) + " expected: " + repr(expected) + " actual: " + repr(actual)); +} + +function test_parse_query_string() +{ + var TESTS = [ + { qs: "", + expected: { } }, + { qs: "a=b", + expected: { a: "b" } }, + { qs: "a=b=c", + expected: { a: "b=c" } }, + { qs: "a=b&c=d", + expected: { a: "b", c: "d" } }, + { qs: "client=&relay=1.2.3.4%3A9001", + expected: { client: "", relay: "1.2.3.4:9001" } }, + ]; + + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + var actual; + + actual = parse_query_string(test.qs); + if (objects_equal(actual, test.expected)) + pass(test.qs); + else + fail(test.qs, test.expected, actual); + } +} + +test_parse_query_string(); + +if (num_failed == 0) + quit(0); +else + quit(1); diff --git a/flashproxy.js b/flashproxy.js index 7bab9e9..e4c7319 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -3,6 +3,11 @@ var DEFAULT_FACILITATOR_ADDR = { port: 9002 }; +function parse_query_string(qs) +{ + return {}; +} + function format_addr(addr) { return addr.host + ":" + addr.port;

1 0

[flashproxy/js] Add more parse_query_string test vectors.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit f884810df178f765cc783e1e89baf66aa9c4a03c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 22:21:30 2012 -0700 Add more parse_query_string test vectors. --- flashproxy-test.js | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 21ae756..e90d4b1 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -84,6 +84,29 @@ function test_parse_query_string() expected: { a: "b", c: "d" } }, { qs: "client=&relay=1.2.3.4%3A9001", expected: { client: "", relay: "1.2.3.4:9001" } }, + { qs: "a=b%26c=d", + expected: { a: "b&c=d" } }, + { qs: "a%3db=d", + expected: { "a=b": "d" } }, + { qs: "a=b+c%20d", + expected: { "a": "b c d" } }, + { qs: "a=b+c%2bd", + expected: { "a": "b c+d" } }, + { qs: "a+b=c", + expected: { "a b": "c" } }, + /* First appearance wins. */ + { qs: "a=b&c=d&a=e", + expected: { a: "b", c: "d" } }, + { qs: "a", + expected: { a: "" } }, + { qs: "=b", + expected: { "": "b" } }, + { qs: "&a=b", + expected: { "": "", a: "b" } }, + { qs: "a=b&", + expected: { "": "", a: "b" } }, + { qs: "a=b&&c=d", + expected: { "": "", a: "b", c: "d" } }, ]; for (var i = 0; i < TESTS.length; i++) {

1 0

[flashproxy/js] maybe_quote needs to quote anything that's not an identifier.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 021b7e0e23ae3621d22bad82a8ace5ce49d9a300 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 22:24:21 2012 -0700 maybe_quote needs to quote anything that's not an identifier. --- flashproxy-test.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index e90d4b1..e4a59b9 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -34,7 +34,7 @@ function quote(s) function maybe_quote(s) { - if (/[\\\"]/.test(s)) + if (!/^[a-zA-Z_]\w*$/.test(s)) return quote(s); else return s;

1 0