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

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

12 Nov '12

commit ca0c4185bead7e9a2f1501c1b0ab46e6b4c53094 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 17:15:21 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 fc37e34..b6910a1 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-12 15:19+0000\n" +"PO-Revision-Date: 2012-11-12 17: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" @@ -2561,11 +2561,11 @@ msgstr "'%1' no es un número de puerto válido." msgctxt "NetworkPage" msgid "Check if your local network requires a proxy to access the Internet" -msgstr "Marque si su red local requiere de un proxy para acceder a Internet" +msgstr "Marque si su red local requiere de un proxy para acceder a internet" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" -msgstr "Uso un proxy para acceder a Internet" +msgstr "Uso un proxy para acceder a internet" msgctxt "NetworkPage" msgid "Proxy Settings" @@ -2573,7 +2573,7 @@ msgstr "Configuración de Proxy" msgctxt "NetworkPage" msgid "Username:" -msgstr "Nombre de Usuario:" +msgstr "Nombre de usuario:" msgctxt "NetworkPage" msgid "Password:" @@ -2585,7 +2585,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Active para conectarse solamente con repetidores que usen puertos permitidos por la configuración de su cortafuegos" +msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por la configuración de su cortafuegos" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports"

1 0

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

12 Nov '12

commit d630754cc8499a0acfaedc8894c042cafc33bbb1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 17:15:18 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 fc37e34..b6910a1 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-12 15:19+0000\n" +"PO-Revision-Date: 2012-11-12 17: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" @@ -2561,11 +2561,11 @@ msgstr "'%1' no es un número de puerto válido." msgctxt "NetworkPage" msgid "Check if your local network requires a proxy to access the Internet" -msgstr "Marque si su red local requiere de un proxy para acceder a Internet" +msgstr "Marque si su red local requiere de un proxy para acceder a internet" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" -msgstr "Uso un proxy para acceder a Internet" +msgstr "Uso un proxy para acceder a internet" msgctxt "NetworkPage" msgid "Proxy Settings" @@ -2573,7 +2573,7 @@ msgstr "Configuración de Proxy" msgctxt "NetworkPage" msgid "Username:" -msgstr "Nombre de Usuario:" +msgstr "Nombre de usuario:" msgctxt "NetworkPage" msgid "Password:" @@ -2585,7 +2585,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Active para conectarse solamente con repetidores que usen puertos permitidos por la configuración de su cortafuegos" +msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por la configuración de su cortafuegos" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports"

1 0

r25876: {website} Typo fix Correction spotted by gsathya. (website/trunk/getinvolved/en)
by Damian Johnson 12 Nov '12

12 Nov '12

Author: atagar Date: 2012-11-12 17:08:02 +0000 (Mon, 12 Nov 2012) New Revision: 25876 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Typo fix Correction spotted by gsathya. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-12 17:01:57 UTC (rev 25875) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-12 17:08:02 UTC (rev 25876) @@ -77,7 +77,7 @@ The program runs from January 2 through April 2, 2013. Like GSoC the - program involves a stipend so, if you're a women interested in fighting + program involves a stipend so, if you're a woman interested in fighting surveillance and censorship around the world then let us know!

1 0

r25875: {website} Adding a section for the Outreach Program for Women Summary (website/trunk/getinvolved/en)
by Damian Johnson 12 Nov '12

12 Nov '12

Author: atagar Date: 2012-11-12 17:01:57 +0000 (Mon, 12 Nov 2012) New Revision: 25875 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding a section for the Outreach Program for Women Summary on how to apply for the OPW. Improvements welcome. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-12 16:11:20 UTC (rev 25874) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-12 17:01:57 UTC (rev 25875) @@ -64,6 +64,35 @@ You are using Tor!" in any language.</li> </ol> + <a id="opw"></a> + <h2><a class="anchor" href="#OPW">Outreach Program for Women</a></h2> + + + Several organisations, including Tor, are taking part in the <a + href="https://live.gnome.org/OutreachProgramForWomen">2013 Outreach Program + for Women</a>. This is a mentoring program similar to <a + href="https://www.google-melange.com/gsoc/homepage/google/gsoc2012">Google + Summer of Code</a> targeted at getting more women involved in open source. + + + + The program runs from January 2 through April 2, 2013. Like GSoC the + program involves a stipend so, if you're a women interested in fighting + surveillance and censorship around the world then let us know! + + + + To apply... + + + <ol> + <li>Read up on the <a href="https://live.gnome.org/OutreachProgramForWomen">outreach program</a>.</li> + <li>Look over our projects and task ideas below. If nothing there strikes your fancy then feel free to make one of your own.</li> + <li>Join the <a href="https://www.torproject.org/about/contact.html.en#irc">#tor-dev irc channel</a> and introduce yourself!</li> + <li>Contact the maintainer of the project that you're interested in contributing to, and talk with them about how to get started. Maintainers are listed in the table below. Note that you need to submit a patch or contribute in some way before you can apply to the program.</li> + <li><a href="https://live.gnome.org/OutreachProgramForWomen#Send_in_an_Application">Send your application</a> to opw-list(a)gnome.org. Please be available and responsive throughout the application period so we can work with you on improving it.</li> + </ol> + <a id="Projects"></a> <h2><a class="anchor" href="#Projects">Projects</a></h2>

1 0

[tor-design-2012/master] Add discussion of guard nodes
by sjm217＠torproject.org 12 Nov '12

12 Nov '12

commit 68b71f66af84ef4262fc8b4cd841cdf7ed86f222 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Mon Nov 12 16:47:45 2012 +0000 Add discussion of guard nodes --- todo | 2 +- tor-design-2012.tex | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/todo b/todo index 8ec58e3..3c4e430 100644 --- a/todo +++ b/todo @@ -18,7 +18,7 @@ ITEMS: o Faster first-hop circuit establishment with CREATE_FAST o Cell queueing and scheduling. . Integrate content from the second blog post [steven] - - guard nodes + o guard nodes - Bridges, censorship resistance, and pluggable transports - Changes and complexities in our path selection algorithms o stream isolation diff --git a/tor-design-2012.tex b/tor-design-2012.tex index be4beb4..d163891 100644 --- a/tor-design-2012.tex +++ b/tor-design-2012.tex @@ -1871,15 +1871,44 @@ an adversary can run multiple ORs, and can persuade the directory servers that those ORs are trustworthy and independent, then occasionally some user will choose one of those ORs for the start and another as the end of a circuit. If -an adversary controls $m>1$ of $N$ nodes, he can correlate at -most $\left(\frac{m}{N}\right)^2$ of the traffic---although an +an adversary controls $m$ bandwidth out of the total network +bandwidth $N$, he can correlate approximately +$\left(\frac{m}{N}\right)^2$ of the circuits---although an adversary could still attract a disproportionately large amount of traffic by running an OR with a permissive exit policy, or by degrading the reliability of other routers. -% Running a hostile exit should get its own graf. -NM +If the path chosen for each circuit was chosen independently of +the paths chosen for previous circuits, the probability that +each circuit will be compromised would be equal. Therefore, even +if there is only a small probability that any individual circuit +is compromised, if a user creates many circuits, over time the +probability that at least one circuit will be compromised could +be quite large. Since compromising only a fraction of a user's +circuits (perhaps even just one) will likely be enough to +compromise a user's anonymity, the security offered by such a +system could be quite poor. + +Therefore Tor adopts ``guard nodes'' (sometimes called ``helper +nodes'') where each user choses a few nodes to act as that +user's entry point to the network, and keeps this selection the +same for as long as enough of the chosen guards remain +operational. This approach doesn't affect the probability that a +user's first circuit will be compromised, but if a user has +chosen honest guards their future circuits will remain safe. A +user which has chosen a dishonest guard however will have a +large proportion of their circuits compromised. An adversary +still is able to compromise $\left(\frac{m}{N}\right)^2$ of the +circuits but the use of guard nodes concentrates these +compromised circuits over a small group of users. Since we +assume that compromising a few circuits is only marginally +better for user security than compromising them all, guard nodes +improves the average security of the network. % The above paragraph needs more discussion of why guard nodes exist. -NM +% Believed done -SJM + +% Running a hostile exit should get its own graf. -NM \emph{Introduce timing into messages.} This is simply a stronger version of passive timing attacks already discussed earlier.

1 0

[tor-design-2012/master] Fix LaTeX errors and add a default make target (the PDF version)
by sjm217＠torproject.org 12 Nov '12

12 Nov '12

commit a77b70b6640eca5739dc93995dbc1bb3f30e2111 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Sun Nov 11 21:20:46 2012 +0000 Fix LaTeX errors and add a default make target (the PDF version) --- Makefile | 4 ++++ tor-design-2012.tex | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d7725ab..efbc840 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +all: tor-design-2012.pdf + cell-struct.eps: cell-struct.fig fig2dev -L eps $< $@ interaction.eps: interaction.fig @@ -19,3 +21,5 @@ tor-design-2012.pdf: cell-struct.pdf interaction.pdf tor-design-2012.bib tor-des bibtex tor-design-2012 pdflatex tor-design-2012.tex pdflatex tor-design-2012.tex + +.PHONY: all diff --git a/tor-design-2012.tex b/tor-design-2012.tex index 4e02485..be4beb4 100644 --- a/tor-design-2012.tex +++ b/tor-design-2012.tex @@ -6,6 +6,7 @@ %\usepackage{times} \usepackage{url} \usepackage{graphics} +\usepackage{prettyref} \usepackage{amsmath} \usepackage{epsfig} @@ -719,7 +720,7 @@ that a relay begin has succeeded), \emph{relay extend} and acknowledge), \emph{relay truncate} and \emph{relay truncated} (to tear down only part of the circuit, and to acknowledge), \emph{relay sendme} (used for congestion control), -\empl{relay resolve} and \emph{relay resolved} (used for +\emph{relay resolve} and \emph{relay resolved} (used for anonymous DNS), and \emph{relay drop} (used to implement long-range dummies). We @@ -949,7 +950,7 @@ anyway; \cite{TAP} has more details. As an optimization, Alice client may sent an \emph{create\_fast} cell in place of her first \emph{create} cell: instead of sending an encrypted $g^x$ value, she simply sends a random value $x$, Bob replies with a -\emph{created_fast} cell containing a random value $y$, and they base their +\emph{created\_fast} cell containing a random value $y$, and they base their shared keys on $H(x|y)$. This handshake saves the expense of RSA and Diffie-Hellman, but provides no authentication, integrity, confidentiality or forward secrecy on its own: it relies on the TLS protocol that Alice and Bob

1 0

r25874: {website} Only listing project ideas with mentors As theatened on tor- (website/trunk/getinvolved/en)
by Damian Johnson 12 Nov '12

12 Nov '12

Author: atagar Date: 2012-11-12 16:11:20 +0000 (Mon, 12 Nov 2012) New Revision: 25874 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Only listing project ideas with mentors As theatened on tor-assistants@ I'm trimming our volunteer page's task listing to only include things with an engaged mentor. The listing has grown stale which is confusing to newcomers. Some projects are done, and others reflect plans that are a year out of date. My devious scheme was that if I required some effort from mentors to keep task ideas around then we'd only get buy in for those that were really still relevant. Looks like it worked - we're down to three. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-12 02:40:11 UTC (rev 25873) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-12 16:11:20 UTC (rev 25874) @@ -327,6 +327,7 @@ extents, but the chief architects are Nick Mathewson and Roger Dingledine. +  <a id="project-jtor"></a> <h3><a href="https://github.com/brl/JTor/wiki">JTor</a> (<a @@ -359,11 +361,13 @@ being worked on by Erinn Clark. +  <a id="project-tails"></a> <h3><a href="https://tails.boum.org/">The Amnesic Incognito Live System</a> (<a @@ -379,6 +383,7 @@ and still under very active development. +  <a id="project-torsocks"></a> <h3><a href="http://code.google.com/p/torsocks/">Torsocks</a> (<a @@ -430,11 +436,13 @@ pushing the project forward. +  <a id="project-arm"></a> <h3><a href="http://www.atagar.com/arm/">Arm</a> (<a @@ -516,12 +524,14 @@ block Tor. +  <a id="project-thandy"></a> <h3>Thandy (<a @@ -742,6 +752,62 @@ <ol> + <a id="improveTorbirdy"></a> + <li> + Improving TorBirdy + + Priority: High + + Effort Level: High + + Skill Level: Medium to High + + Likely Mentors: Sukhbir, Jacob + + 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="stemUsability"></a> <li> @@ -1014,6 +1087,7 @@ </li> --> +  +  +  +  +   +  <a id="metricsSearch"></a> <li> @@ -1413,61 +1498,7 @@ </li> --> - <a id="improveTorbirdy"></a> - <li> - Improving TorBirdy - - Priority: High - - Effort Level: High - - Skill Level: Medium to High - - Likely Mentors: Sukhbir, Jacob - - 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> - +   +   +   +  <li> Bring up new ideas!

1 0

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

12 Nov '12

commit a266e18e67bf82f92e846b766ecd78ea7208e3f3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 15:45:24 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index d17a69f..fc37e34 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-12 14:20+0000\n" +"PO-Revision-Date: 2012-11-12 15:19+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" @@ -2593,7 +2593,7 @@ msgstr "Mi cortafuegos sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings" -msgstr "Configuración del Cortafuegos" +msgstr "Configuración del Cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:"

1 0

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

12 Nov '12

commit 2dbe0485dac9249ccca26792e0d69a45fea57e2b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 15:45:22 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index d17a69f..fc37e34 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-12 14:20+0000\n" +"PO-Revision-Date: 2012-11-12 15:19+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" @@ -2593,7 +2593,7 @@ msgstr "Mi cortafuegos sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings" -msgstr "Configuración del Cortafuegos" +msgstr "Configuración del Cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:"

1 0

[ooni-probe/master] Refactor captive portal test to run tests in threads
by art＠torproject.org 12 Nov '12

12 Nov '12

commit cfab60ab130742152e5dfb96450e4d625a4da1a8 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 16:31:25 2012 +0100 Refactor captive portal test to run tests in threads --- nettests/core/captiveportal.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nettests/core/captiveportal.py b/nettests/core/captiveportal.py index 66779bb..be8da27 100644 --- a/nettests/core/captiveportal.py +++ b/nettests/core/captiveportal.py @@ -37,6 +37,9 @@ import string import urllib2 from urlparse import urlparse +from twisted.python import usage +from twisted.internet import defer, threads + from ooni import nettest from ooni.templates import httpt from ooni.utils import net @@ -52,7 +55,8 @@ except ImportError: __plugoo__ = "captiveportal" __desc__ = "Captive portal detection test" -optParameters = [['asset', 'a', None, 'Asset file'], +class UsageOptions(usage.Options): + optParameters = [['asset', 'a', None, 'Asset file'], ['experiment-url', 'e', 'http://google.com/', 'Experiment URL'], ['user-agent', 'u', random.choice(net.userAgents), 'User agent for HTTP requests'] @@ -66,8 +70,9 @@ class CaptivePortal(nettest.NetTestCase): name = "captivep" description = "Captive Portal Test" - version = '0.1' - author = "Isis LoveCruft <isis(a)torproject.org>" + version = '0.2' + author = "Isis Lovecruft" + usageOptions = UsageOptions def http_fetch(self, url, headers={}): """ @@ -424,8 +429,6 @@ class CaptivePortal(nettest.NetTestCase): Google Chrome resolves three 10-byte random hostnames. """ subtest = "Google Chrome DNS-based" - - log.msg("") log.msg("Running the Google Chrome DNS-based captive portal test...") gmatch, google_dns_result = self.compare_random_hostnames(3, 10) @@ -600,6 +603,7 @@ class CaptivePortal(nettest.NetTestCase): self.report['result'] = False + @defer.inlineCallbacks def test_captive_portal(self): """ Runs the CaptivePortal(Test). @@ -625,15 +629,15 @@ class CaptivePortal(nettest.NetTestCase): log.msg("") log.msg("Running vendor tests...") - self.report['vendor_tests'] = self.run_vendor_tests() + self.report['vendor_tests'] = yield threads.deferToThread(self.run_vendor_tests) log.msg("") log.msg("Running vendor DNS-based tests...") - self.report['vendor_dns_tests'] = self.run_vendor_dns_tests() + self.report['vendor_dns_tests'] = yield threads.deferToThread(self.run_vendor_dns_tests) log.msg("") log.msg("Checking that DNS requests are not being tampered...") - self.report['check0x20'] = self.check_0x20_to_auth_ns('ooni.nu') + self.report['check0x20'] = yield threads.deferToThread(self.check_0x20_to_auth_ns, 'ooni.nu') log.msg("") log.msg("Captive portal test finished!")

1 0