- tor-commits - lists.torproject.org

[flashproxy/master] Omit "127.0.0.1" in connector usage example.
by dcf＠torproject.org 20 Oct '11

20 Oct '11

commit f05fe57942bcf183615e3bc3d4b5421ac4752ed9 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 19 10:58:17 2011 -0700 Omit "127.0.0.1" in connector usage example. That address is implied if you give only a port number. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 1b616e0..fc2c4df 100644 --- a/README +++ b/README @@ -67,7 +67,7 @@ ephemeral proxies. you have to use a different port (to get through a firewall, for example), give it on the command line like this (here using port 8888): - $ python connector.py -f tor-facilitator.bamsoftware.com 127.0.0.1:9001 :8888 + $ python connector.py -f tor-facilitator.bamsoftware.com :9001 :8888 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc

1 0

r25176: {website} Fix chmod call to put its option first (website/trunk)
by Sebastian Hahn 19 Oct '11

19 Oct '11

Author: sebastian Date: 2011-10-19 05:40:15 +0000 (Wed, 19 Oct 2011) New Revision: 25176 Modified: website/trunk/publish Log: Fix chmod call to put its option first Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-10-19 04:40:12 UTC (rev 25175) +++ website/trunk/publish 2011-10-19 05:40:15 UTC (rev 25176) @@ -8,7 +8,7 @@ make -j3 # abuse the cores # don't copy over stuff with permissions that make it useless -chmod a+r * -R +chmod -R a+r * rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update"

1 0

r25175: {website} Update TBB design doc w/ an intro to the implementation sect (website/trunk/projects/torbrowser/design)
by Mike Perry 19 Oct '11

19 Oct '11

Author: mikeperry Date: 2011-10-19 04:40:12 +0000 (Wed, 19 Oct 2011) New Revision: 25175 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: Update TBB design doc w/ an intro to the implementation section and some internal hyperlinks. Modified: website/trunk/projects/torbrowser/design/index.html.en =================================================================== --- website/trunk/projects/torbrowser/design/index.html.en 2011-10-18 13:35:40 UTC (rev 25174) +++ website/trunk/projects/torbrowser/design/index.html.en 2011-10-19 04:40:12 UTC (rev 25175) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 11 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2869610">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pr ivacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Cli ck-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2869610"></a>1. Introduction</h2></div></div></div><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 19 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id3042393">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pr ivacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Cli ck-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3042393"></a>1. Introduction</h2></div></div></div><p> This document describes the <a class="link" href="#adversary" title="1.1. Adversary Model">adversary model</a>, <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">design requirements</a>, @@ -224,18 +224,22 @@ respect to platform support, security requirements are the minimum properties in order for Tor to support the use of a web client platform. - </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Proxy Obedience</strong></span><p>The browser -MUST NOT bypass Tor proxy settings for any content.</p></li><li class="listitem"><span class="command"><strong>State Separation</strong></span><p>The browser MUST NOT provide any stored state to the content window + </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="link" href="#proxy-obedience" title="3.1. Proxy Obedience"><span class="command"><strong>Proxy +Obedience</strong></span></a><p>The browser +MUST NOT bypass Tor proxy settings for any content.</p></li><li class="listitem"><a class="link" href="#state-separation" title="3.2. State Separation"><span class="command"><strong>State +Separation</strong></span></a><p>The browser MUST NOT provide any stored state to the content window from other browsers or other browsing modes, including shared state from plugins, machine identifiers, and TLS session state. -</p></li><li class="listitem"><span class="command"><strong>Disk Avoidance</strong></span><p> +</p></li><li class="listitem"><a class="link" href="#disk-avoidance" title="3.3. Disk Avoidance"><span class="command"><strong>Disk +Avoidance</strong></span></a><p> The browser MUST NOT write any information that is derived from or that reveals browsing activity to the disk, or store it in memory beyond the duration of one browsing session, unless the user has explicitly opted to store their browsing history information to disk. -</p></li><li class="listitem"><span class="command"><strong>Application Data Isolation</strong></span><p> +</p></li><li class="listitem"><a class="link" href="#app-data-isolation" title="3.4. Application Data Isolation"><span class="command"><strong>Application Data +Isolation</strong></span></a><p> The components involved in providing private browsing MUST be self-contained, or MUST provide a mechanism for rapid, complete removal of all evidence of the @@ -248,7 +252,7 @@ to permissions issues with access to swap, implementations MAY choose to leave it out of scope, and/or leave it to the user to implement encrypted swap. -</p></li><li class="listitem"><span class="command"><strong>Update Safety</strong></span><p>The browser SHOULD NOT perform unsafe updates or upgrades.</p></li></ol></div></div><div class="sect2" title="2.2. Privacy Requirements"><div class="titlepage"><div><div><h3 class="title"><a id="privacy"></a>2.2. Privacy Requirements</h3></div></div></div><p> +</p></li></ol></div></div><div class="sect2" title="2.2. Privacy Requirements"><div class="titlepage"><div><div><h3 class="title"><a id="privacy"></a>2.2. Privacy Requirements</h3></div></div></div><p> The privacy requirements are primarily concerned with reducing linkability: the ability for a user's activity on one site to be linked with their activity @@ -265,7 +269,8 @@ google.com. Implementations MAY, at their option, restrict the url bar origin to be the entire fully qualified domain name. - </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Cross-Origin Identifier Unlinkability</strong></span><p> + </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="link" href="#identifier-linkability" title="3.5. Cross-Origin Identifier Unlinkability"><span class="command"><strong>Cross-Origin +Identifier Unlinkability</strong></span></a><p> User activity on one url bar origin MUST NOT be linkable to their activity in any other url bar origin by any third party automatically or without user @@ -275,13 +280,15 @@ to sites, or due information submitted during manual link traversal. This functionality SHOULD NOT interfere with federated login in a substantial way. - </p></li><li class="listitem"><span class="command"><strong>Cross-Origin Fingerprinting Unlinkability</strong></span><p> + </p></li><li class="listitem"><a class="link" href="#fingerprinting-linkability" title="3.6. Cross-Origin Fingerprinting Unlinkability"><span class="command"><strong>Cross-Origin +Fingerprinting Unlinkability</strong></span></a><p> User activity on one url bar origin MUST NOT be linkable to their activity in any other url bar origin by any third party. This property specifically applies to linkability from fingerprinting browser behavior. - </p></li><li class="listitem"><span class="command"><strong>Long-Term Unlinkability</strong></span><p> + </p></li><li class="listitem"><a class="link" href="#new-identity" title="3.7. Long-Term Unlinkability via "New Identity" button"><span class="command"><strong>Long-Term +Unlinkability</strong></span></a><p> The browser SHOULD provide an obvious, easy way to remove all of its authentication tokens and browser state and obtain a fresh identity. @@ -385,6 +392,21 @@ their proper deployment or privacy realization. However, we will likely disable certain new features (where possible) pending analysis and audit. </p></li></ol></div></div></div><div class="sect1" title="3. Implementation"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Implementation"></a>3. Implementation</h2></div></div></div><p> + +The Implementation section is divided into subsections, each of which +corresponds to a <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">Design Requirement</a>. +Each subsection is divided into specific web technologies or properties. The +implementation is then described for that property. + + </p><p> + +In some cases, the implementation meets the design requirements in a non-ideal +way (for example, by disabling features). In rare cases, there may be no +implementation at all. Both of these cases are denoted by differentiating +between the <span class="command"><strong>Design Goal</strong></span> and the <span class="command"><strong>Implementation +Status</strong></span> for each property. Corresponding bugs in the <a class="ulink" href="https://trac.torproject.org/projects/tor/report" target="_top">Tor bug tracker</a> +are typically linked for these cases. + </p><div class="sect2" title="3.1. Proxy Obedience"><div class="titlepage"><div><div><h3 class="title"><a id="proxy-obedience"></a>3.1. Proxy Obedience</h3></div></div></div><p> Proxy obedience is assured through the following: @@ -444,13 +466,13 @@ Tor Browser State is separated from existing browser state through use of a custom Firefox profile. Furthermore, plugins are disabled, which prevents Flash cookies from leaking from a pre-existing Flash directory. - </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2901874"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id3048300"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> Tor Browser MUST (at user option) prevent all disk records of browser activity. The user should be able to optionally enable URL history and other history features if they so desire. Once we <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3100" target="_top">simplify the preferences interface</a>, we will likely just enable Private Browsing mode by default to handle this goal. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2878481"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id3052558"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> For now, Tor Browser blocks write access to the disk through Torbutton using several Firefox preferences. @@ -515,7 +537,7 @@ context-menu option to drill down into specific types of state or permissions. An example of this simplification can be seen in Figure 1. - </p><div class="figure"><a id="id2898980"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> + </p><div class="figure"><a id="id3051496"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> On the left is the standard Firefox cookie manager. On the right is a mock-up of how isolating identifiers to the URL bar origin might simplify the privacy @@ -939,11 +961,11 @@ </p></li></ol></div></div><div class="sect2" title="3.7. Long-Term Unlinkability via "New Identity" button"><div class="titlepage"><div><div><h3 class="title"><a id="new-identity"></a>3.7. Long-Term Unlinkability via "New Identity" button</h3></div></div></div><p> In order to avoid long-term linkability, we provide a "New Identity" context menu option in Torbutton. - </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2857700"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id3068567"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> All linkable identifiers and browser state MUST be cleared by this feature. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2877575"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id3057460"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> First, Torbutton disables all open tabs and windows via nsIContentPolicy blocking, and then closes each tab and window. The extra step for blocking @@ -1042,7 +1064,7 @@ This patch prevents random URLs from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps other site prefs?). - </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2889516"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2875722"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id2861148"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> + </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id3033960"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id3033967"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id3033984"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> The purpose of this section is to cover all the known ways that Tor browser security can be subverted from a penetration testing perspective. The hope

1 0

r25174: {website} fix two of the faq answers. (website/trunk/docs/en)
by Andrew Lewman 18 Oct '11

18 Oct '11

Author: phobos Date: 2011-10-18 13:35:40 +0000 (Tue, 18 Oct 2011) New Revision: 25174 Modified: website/trunk/docs/en/faq.wml Log: fix two of the faq answers. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-10-18 09:07:12 UTC (rev 25173) +++ website/trunk/docs/en/faq.wml 2011-10-18 13:35:40 UTC (rev 25174) @@ -24,8 +24,7 @@ <li><a href="#Backdoor">Is there a backdoor in Tor?</a></li> <li><a href="#DistributingTor">Can I distribute Tor on my magazine's CD?</a></li> - <li><a href="#SupportMail">How can I get an answer to my - Tor support mail?</a></li> + <li><a href="#SupportMail">How can I get support?</a></li> <li><a href="#WhySlow">Why is Tor so slow?</a></li> <li><a href="#Funding">What would The Tor Project do with more funding?</a></li> @@ -372,7 +371,7 @@ <hr> <a id="SupportMail"></a> - <h3><a class="anchor" href="#SupportMail">How can I get an answer to my Tor support mail?</a></h3> + <h3><a class="anchor" href="#SupportMail">How can I get support?</a></h3> <p>There is no official support for Tor. Your best bet is to try the following:</p> <ol> @@ -380,13 +379,13 @@ <li>Read through the <a href="<page docs/documentation>">documentation</a>.</li> <li>Read through the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk - archives</a> and - see if your question is already answered.</li> + archives</a> and see if your question is already answered.</li> <li>Join our <a href="irc://irc.oftc.net#tor">irc channel</a> and state the issue and wait for help.</li> - <li>Send an email to tor-assistants at torproject.org. These are - volunteers who may be able to help you but you may not get a response - for days.</li> + <li>Send an email to <a + href="mailto:community-support@lists.torproject.org">community-support</a>. + These are volunteers who may be able to help you but you may not + get a response for days.</li> </ol> <p>If you find your answer, please stick around on the IRC channel or the @@ -911,13 +910,14 @@ <p> Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can automatically redirect you to a more Tor-friendly search engine such as -Ixquick or Bing. +DuckDuckGo, ixquick, or Bing. </p> <hr /> <a id="GmailWarning"></a> -<h3><a class="anchor" href="#GmailWarning">Gmail warns me that my account may have been compromised.</a></h3> +<h3><a class="anchor" href="#GmailWarning">Gmail warns me that my account +may have been compromised.</a></h3> <p> Sometimes, after you've used Gmail over Tor, Google presents a

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 18 Oct '11

18 Oct '11

commit ee564478b43f322cb27dfbcdca79ae06adff75d7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 18 09:45:39 2011 +0000 Update translations for tsum --- fr/tsum.po | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/fr/tsum.po b/fr/tsum.po index 0da4d42..1a01864 100644 --- a/fr/tsum.po +++ b/fr/tsum.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-18 09:15+0000\n" +"PO-Revision-Date: 2011-10-18 09:18+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -308,9 +308,7 @@ msgstr "" #: tsum.text:103 #, no-wrap msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" -msgstr "" -"<span class=\"whitespace other\" title=\"Tab\">»Gpg</span> - keyserver " -"hkp://keys.gnupg.net - recv-keys 0x63FEE659\n" +msgstr "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" #. type: Plain text #: tsum.text:105 @@ -322,8 +320,8 @@ msgstr "Après avoir importé la clé, vérifiez que l'empreinte est correcte :" #, no-wrap msgid "\tgpg --fingerprint 0x63FEE659\n" msgstr "" -"<span class=\"whitespace other\" title=\"Tab\">»Gpg</span> - fingerprint " -"0x63FEE659\n" +"gpg --fingerprint 0x63FEE659\n" +"\n" #. type: Plain text #: tsum.text:109 @@ -341,12 +339,12 @@ msgid "" "\tuid Erinn Clark <erinn(a)double-helix.org>\n" "\tsub 2048R/EB399FD7 2003-10-16\n" msgstr "" -"<span class=\"whitespace other\" title=\"Tab\">»</span>pub 2048R/63FEE659 2003-10-16\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span> Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)torproject.org>\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)debian.org>\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)double-helix.org>\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span>sub 2048R/EB399FD7 2003-10-16\n" +"pub 2048R/63FEE659 2003-10-16\n" +" Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"uid Erinn Clark <erinn(a)torproject.org>\n" +"uid Erinn Clark <erinn(a)debian.org>\n" +"uid Erinn Clark <erinn(a)double-helix.org>\n" +"sub 2048R/EB399FD7 2003-10-16\n" #. type: Plain text #: tsum.text:118 @@ -364,8 +362,6 @@ msgid "" "\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" "US.exe\n" msgstr "" -"<span class=\"whitespace other\" title=\"Tab\">»Gpg</span> - verify tor-" -"navigateur-2.2.33-2_en-US.exe.asc Tor-browser-2.2.33-2_en-fr.exe\n" #. type: Plain text #: tsum.text:126 @@ -488,11 +484,6 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" -"**You are behind a restrictive firewall**; Pour indiquer à Tor d'utiliser " -"exclusivement le port 80 et le port 443, ouvrez le panneau de contrôle " -"Vidalia, cliquer sur \"Settings\" - paramètres - puis \"Network\" -réseau-, " -"et cocher la case *My firewall only lets me connect⏎ to certain ports* - Mon" -" firewall ne me laisse me connecter que sur certains ports\n" #. type: Plain text #: tsum.text:173 @@ -502,8 +493,6 @@ msgid "" "anti-virus program is not preventing Tor from making network\n" "connections.\n" msgstr "" -"**Your anti-virus program is blocking Tor** Assurez-vous que votre programme" -" antivirus n'empêche pas Tor de faire des connexions réseau.\n" #. type: Plain text #: tsum.text:177

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 18 Oct '11

18 Oct '11

commit defab6951478170700435d97188c8beba3937586 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 18 09:15:43 2011 +0000 Update translations for tsum --- fr/tsum.po | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fr/tsum.po b/fr/tsum.po index a8944f0..0da4d42 100644 --- a/fr/tsum.po +++ b/fr/tsum.po @@ -8,6 +8,7 @@ # <frenchy_reboss(a)hotmail.com>, 2011. # <kpplfy(a)geekmx.org>, 2011. # <pouknouki(a)gmail.com>, 2011. +# <runa.sandvik(a)gmail.com>, 2011. # <sebastien.faucou(a)univ-nantes.fr>, 2011. # <s.momo-b(a)gmail.com>, 2011. msgid "" @@ -15,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 13:08+0000\n" +"PO-Revision-Date: 2011-10-18 09:15+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -129,7 +130,7 @@ msgid "" "and start Tor." msgstr "" "Le package recommandé pour la plupart des utilisateurs est le [Package de " -"Navigation Tor] (https://www.torproject.org/projects/torbrowser.html) Ce " +"Navigation Tor](https://www.torproject.org/projects/torbrowser.html). Ce " "package contient un navigateur préconfiguré pour la navigation sécurisé sur " "internet en utilisant Tor, et ne nécessite aucune installation. Il suffit " "simplement de télécharger le package, extraire l'archive, et démarrer Tor. "

1 0

r25173: {website} Include links to the user manual (website/trunk/docs/en)
by Runa Sandvik 18 Oct '11

18 Oct '11

Author: runa Date: 2011-10-18 09:07:12 +0000 (Tue, 18 Oct 2011) New Revision: 25173 Modified: website/trunk/docs/en/short-user-manual.wml Log: Include links to the user manual Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-10-18 01:18:07 UTC (rev 25172) +++ website/trunk/docs/en/short-user-manual.wml 2011-10-18 09:07:12 UTC (rev 25173) @@ -21,6 +21,9 @@ <p>The user manual is available in the following languages:</p> <ul> + <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> + <li><a href="https://torproject.org/dist/manual/short-user-manual_hu.xhtml">Hungarian</a></li> + <li><a href="https://torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> </ul> </div>

1 0

r25172: {website} remove torbutton as a standalone project, update torbutton p (in website/trunk: en projects/en)
by Andrew Lewman 18 Oct '11

18 Oct '11

Author: phobos Date: 2011-10-18 01:18:07 +0000 (Tue, 18 Oct 2011) New Revision: 25172 Modified: website/trunk/en/index.wml website/trunk/projects/en/projects.wml Log: remove torbutton as a standalone project, update torbutton project description to point at torbrowser. try to implement ticket 4177. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-10-17 18:56:40 UTC (rev 25171) +++ website/trunk/en/index.wml 2011-10-18 01:18:07 UTC (rev 25172) @@ -105,11 +105,12 @@ <tr> <td> <div class="project"> - <a href="<page torbutton/index>"><img - src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"></a> - <h3><a href="<page torbutton/index>">Torbutton</a></h3> - <p>Torbutton is a 1-click way for Firefox users to enable - or disable Tor in Firefox.</p> + <a href="<page projects/torbrowser>"><img + src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> + <h3><a href="<page projects/torbrowser>">Tor + Browser</a></h3> + <p>Tor Browser contains everything you need to safely + browse the Internet.</p> </div> </td> <td> @@ -130,16 +131,6 @@ <h3><a href="<page projects/vidalia>">Vidalia</a></h3> <p>Vidalia is a graphical way to control and view Tor's connections and settings.</p> - </div> - </td> - <td> - <div class="project"> - <a href="<page projects/torbrowser>"><img - src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> - <h3><a href="<page projects/torbrowser>">Tor - Browser</a></h3> - <p>Tor Browser contains everything you need to safely - browse the Internet. </p> </div> </td> </tr> Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2011-10-17 18:56:40 UTC (rev 25171) +++ website/trunk/projects/en/projects.wml 2011-10-18 01:18:07 UTC (rev 25172) @@ -16,9 +16,9 @@ <tr> <td> <div class="name"><a href="<page torbutton/index>">Torbutton</a></div> -<p>Torbutton is a 1-click way for Firefox users to enable or disable -Tor in Firefox. To keep you safe, Torbutton disables many types -of active content.</p> +<p>Torbutton is integrated into <a href="<page projects/torbrowser>">Tor +Browser</a>. Torbutton disables many types of active content and threats +to your privacy when using a web browser.</p> </td> <td> <div class="name"><a href="<page projects/torbrowser>">Tor Browser Bundle</a></div>

1 0

r25171: {website} add the new cryptowars.info mirrors, update the mirrors tabl (in website/trunk: . include)
by Andrew Lewman 18 Oct '11

18 Oct '11

Author: phobos Date: 2011-10-17 18:56:40 +0000 (Mon, 17 Oct 2011) New Revision: 25171 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add the new cryptowars.info mirrors, update the mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-10-16 20:29:39 UTC (rev 25170) +++ website/trunk/include/mirrors-table.wmi 2011-10-17 18:56:40 UTC (rev 25171) @@ -52,15 +52,15 @@ <tr> - <td>EE</td> + <td>DK</td> - <td>CyberSIDE</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,23 +103,6 @@ <tr> - <td>DE</td> - - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IR</td> <td>Ninjas</td> @@ -154,23 +137,6 @@ <tr> - <td>AT</td> - - <td>FoDT.IT</td> - - <td>Up to date</td> - - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>BarkerJr</td> @@ -224,6 +190,23 @@ <td>DE</td> + <td></td> + + <td>Up to date</td> + + <td><a href="ftp://cryptowars.info/tor/">ftp</a></td> + <td><a href="http://tor-dist.cryptowars.info/">http</a></td> + <td> - </td> + <td><a href="https://tor-dist.cryptowars.info/">https</a></td> + <td> - </td> + <td> - </td> + <td><a href="rsync://cryptowars.info/tor">rsync</a></td> +</tr> + +<tr> + + <td>DE</td> + <td>factor.cc</td> <td>Up to date</td> @@ -324,23 +307,6 @@ <tr> - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>LazyTiger</td> @@ -392,6 +358,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td>Amorphis</td> @@ -409,19 +392,36 @@ <tr> - <td>DK</td> + <td>AT</td> - <td>Zentrum der Gesundheit</td> + <td>FoDT.IT</td> <td>Up to date</td> + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -445,6 +445,23 @@ <td>DE</td> + <td>torservers</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td></td> <td>Up to date</td> @@ -545,23 +562,6 @@ <tr> - <td>US</td> - - <td>Xpdm</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>INT</td> <td>CoralCDN</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-10-16 20:29:39 UTC (rev 25170) +++ website/trunk/update-mirrors.pl 2011-10-17 18:56:40 UTC (rev 25171) @@ -711,6 +711,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror046 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "rsync://cryptowars.info/tor", + ftpWebsiteMirror => "ftp://cryptowars.info/tor/", + httpDistMirror => "http://tor-dist.cryptowars.info/", + httpsDistMirror => "https://tor-dist.cryptowars.info/", + rsyncDistMirror => "rsync://cryptowars.info/tor-dist", + hiddenServiceMirror => "", } );

1 0

[stem/master] Integration tests / fixes for types.ControlMessage
by atagar＠torproject.org 18 Oct '11

18 Oct '11

commit 1b44b967e75b08d6f702ffa1507d8ad8c4980bda Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 17 09:45:43 2011 -0700 Integration tests / fixes for types.ControlMessage Adding integration tests for basic control port communication, exercising... - connection failure - bad commands - bad getinfo queries - general getinfo queries - setevent/basic event parsing This also includes fixes for a variety of issues found while testing. --- run_tests.py | 4 +- stem/types.py | 18 ++++- stem/util/system.py | 53 ++++++++---- test/integ/message.py | 234 +++++++++++++++++++++++++++++++++++++++++++++++++ test/integ/system.py | 1 - test/runner.py | 29 ++++++- 6 files changed, 314 insertions(+), 25 deletions(-) diff --git a/run_tests.py b/run_tests.py index 6d62ab3..1741892 100755 --- a/run_tests.py +++ b/run_tests.py @@ -11,6 +11,7 @@ import unittest import test.runner import test.unit.message import test.unit.version +import test.integ.message import test.integ.system from stem.util import enum, term @@ -24,7 +25,8 @@ UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctio ("stem.types.Version", test.unit.version.TestVerionFunctions), ) -INTEG_TESTS = (("stem.util.system", test.integ.system.TestSystemFunctions), +INTEG_TESTS = (("stem.types.ControlMessage", test.integ.message.TestMessageFunctions), + ("stem.util.system", test.integ.system.TestSystemFunctions), ) # Configurations that the intergration tests can be ran with. Attributs are diff --git a/stem/types.py b/stem/types.py index 2339007..818b6d3 100644 --- a/stem/types.py +++ b/stem/types.py @@ -53,14 +53,28 @@ def read_message(control_file): while True: try: line = control_file.readline() - except socket.error, exc: raise ControlSocketClosed(exc) + except AttributeError, exc: + # if the control_file has been closed then we will receive: + # AttributeError: 'NoneType' object has no attribute 'recv' + + log.log(log.WARN, "ControlSocketClosed: socket file has been closed") + raise ControlSocketClosed("socket file has been closed") + except socket.error, exc: + log.log(log.WARN, "ControlSocketClosed: received an exception (%s)" % exc) + raise ControlSocketClosed(exc) raw_content += line # Parses the tor control lines. These are of the form... # <status code><divider><content>\r\n - if len(line) < 4: + if len(line) == 0: + # if the socket is disconnected then the readline() method will provide + # empty content + + log.log(log.WARN, "ControlSocketClosed: empty socket content") + raise ControlSocketClosed("Received empty socket content.") + elif len(line) < 4: log.log(log.WARN, "ProtocolError: line too short (%s)" % line) raise ProtocolError("Badly formatted reply line: too short") elif not re.match(r'^[a-zA-Z0-9]{3}[-+ ]', line): diff --git a/stem/util/system.py b/stem/util/system.py index 746eed4..5f7e9ca 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -3,6 +3,7 @@ Helper functions for working with the underlying system. These are mostly os dependent, only working on linux, osx, and bsd. """ +import re import os import time import subprocess @@ -123,7 +124,7 @@ def get_pid(process_name, process_port = None): try: results = call("pgrep -x %s" % process_name) - if len(results) == 1 and len(results[0].split()) == 1: + if results and len(results) == 1 and len(results[0].split()) == 1: pid = results[0].strip() if pid.isdigit(): return int(pid) except IOError: pass @@ -135,7 +136,7 @@ def get_pid(process_name, process_port = None): try: results = call("pidof %s" % process_name) - if len(results) == 1 and len(results[0].split()) == 1: + if results and len(results) == 1 and len(results[0].split()) == 1: pid = results[0].strip() if pid.isdigit(): return int(pid) except IOError: pass @@ -145,12 +146,16 @@ def get_pid(process_name, process_port = None): if process_port: try: - results = call("netstat -npl | grep 127.0.0.1:%i" % process_port) + results = call("netstat -npl") - if len(results) == 1: - results = results[0].split()[6] # process field (ex. "7184/tor") - pid = results[:results.find("/")] - if pid.isdigit(): return int(pid) + # filters to results with our port (same as "grep 127.0.0.1:<port>") + if results: + results = [r for r in results if "127.0.0.1:%i" % process_port in r] + + if len(results) == 1: + results = results[0].split()[6] # process field (ex. "7184/tor") + pid = results[:results.find("/")] + if pid.isdigit(): return int(pid) except IOError: pass # attempts to resolve using ps, failing if: @@ -160,7 +165,7 @@ def get_pid(process_name, process_port = None): try: results = call("ps -o pid -C %s" % process_name) - if len(results) == 2: + if results and len(results) == 2: pid = results[1].strip() if pid.isdigit(): return int(pid) except IOError: pass @@ -175,11 +180,15 @@ def get_pid(process_name, process_port = None): if process_port: try: - results = call("sockstat -4l -P tcp -p %i | grep %s" % (process_port, process_name)) + results = call("sockstat -4l -P tcp -p %i" % process_port) - if len(results) == 1 and len(results[0].split()) == 7: - pid = results[0].split()[2] - if pid.isdigit(): return int(pid) + # filters to results with our port (same as "grep <name>") + if results: + results = [r for r in results if process_name in r] + + if len(results) == 1 and len(results[0].split()) == 7: + pid = results[0].split()[2] + if pid.isdigit(): return int(pid) except IOError: pass # attempts to resolve via a ps command that works on mac/bsd (this and lsof @@ -188,11 +197,15 @@ def get_pid(process_name, process_port = None): # - there are multiple instances try: - results = call("ps axc | egrep \" %s$\"" % process_name) + results = call("ps axc") - if len(results) == 1 and len(results[0].split()) > 0: - pid = results[0].split()[0] - if pid.isdigit(): return int(pid) + # filters to results with our port (same as "egrep ' <name>$'") + if results: + results = [r for r in results if r.endswith(" %s" % process_name)] + + if len(results) == 1 and len(results[0].split()) > 0: + pid = results[0].split()[0] + if pid.isdigit(): return int(pid) except IOError: pass # attempts to resolve via lsof, this should work on linux, mac, and bsd @@ -202,8 +215,12 @@ def get_pid(process_name, process_port = None): # - there are multiple instances using the same port on different addresses try: - port_comp = str(process_port) if process_port else "" - results = call("lsof -wnPi | egrep \"^%s.*:%s\"" % (process_name, port_comp)) + results = call("lsof -wnPi") + + # filters to results with our port (same as "egrep '^<name>.*:<port>'") + if results: + port_comp = str(process_port) if process_port else "" + results = [r for r in results if re.match("^%s.*:%s" % (process_name, port_comp), r)] # This can result in multiple entries with the same pid (from the query # itself). Checking all lines to see if they're in agreement about the pid. diff --git a/test/integ/message.py b/test/integ/message.py new file mode 100644 index 0000000..46f20d2 --- /dev/null +++ b/test/integ/message.py @@ -0,0 +1,234 @@ +""" +Integration tests for the types.ControlMessage class. +""" + +import re +import socket +import unittest + +import stem.types +import test.runner + +class TestMessageFunctions(unittest.TestCase): + """ + Exercises the 'types.ControlMessage' class with an actual tor instance. + """ + + def test_unestablished_socket(self): + """ + Checks message parsing when we have a valid but unauthenticated socket. + """ + + control_socket, control_socket_file = self._get_control_socket(False) + + # If an unauthenticated connection gets a message besides AUTHENTICATE or + # PROTOCOLINFO then tor will give an 'Authentication required.' message and + # hang up. + + control_socket_file.write("GETINFO version\r\n") + control_socket_file.flush() + + auth_required_response = stem.types.read_message(control_socket_file) + self.assertEquals("Authentication required.", str(auth_required_response)) + self.assertEquals(["Authentication required."], list(auth_required_response)) + self.assertEquals("514 Authentication required.\r\n", auth_required_response.raw_content()) + self.assertEquals([("514", " ", "Authentication required.")], auth_required_response.content()) + + # The socket's broken but doesn't realize it yet. Send another message and + # it should fail with a closed exception. + + control_socket_file.write("GETINFO version\r\n") + control_socket_file.flush() + + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + # Additional socket usage should fail, and pulling more responses will fail + # with more closed exceptions. + + control_socket_file.write("GETINFO version\r\n") + self.assertRaises(socket.error, control_socket_file.flush) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + # The socket connection is already broken so calling close shouldn't have + # an impact. + + control_socket.close() + control_socket_file.write("GETINFO version\r\n") + self.assertRaises(socket.error, control_socket_file.flush) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + # Closing the file handler, however, will cause a different type of error. + + control_socket_file.close() + control_socket_file.write("GETINFO version\r\n") + + # receives: AttributeError: 'NoneType' object has no attribute 'sendall' + self.assertRaises(AttributeError, control_socket_file.flush) + + # receives: stem.types.ControlSocketClosed: socket file has been closed + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + def test_invalid_command(self): + """ + Parses the response for a command which doesn't exist. + """ + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("blarg\r\n") + control_socket_file.flush() + + unrecognized_command_response = stem.types.read_message(control_socket_file) + self.assertEquals('Unrecognized command "blarg"', str(unrecognized_command_response)) + self.assertEquals(['Unrecognized command "blarg"'], list(unrecognized_command_response)) + self.assertEquals('510 Unrecognized command "blarg"\r\n', unrecognized_command_response.raw_content()) + self.assertEquals([('510', ' ', 'Unrecognized command "blarg"')], unrecognized_command_response.content()) + + control_socket.close() + control_socket_file.close() + + def test_invalid_getinfo(self): + """ + Parses the response for a GETINFO query which doesn't exist. + """ + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("GETINFO blarg\r\n") + control_socket_file.flush() + + unrecognized_key_response = stem.types.read_message(control_socket_file) + self.assertEquals('Unrecognized key "blarg"', str(unrecognized_key_response)) + self.assertEquals(['Unrecognized key "blarg"'], list(unrecognized_key_response)) + self.assertEquals('552 Unrecognized key "blarg"\r\n', unrecognized_key_response.raw_content()) + self.assertEquals([('552', ' ', 'Unrecognized key "blarg"')], unrecognized_key_response.content()) + + control_socket.close() + control_socket_file.close() + + def test_getinfo_config_file(self): + """ + Parses the 'GETINFO config-file' response. + """ + + runner = test.runner.get_runner() + torrc_dst = runner.get_torrc_path() + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("GETINFO config-file\r\n") + control_socket_file.flush() + + config_file_response = stem.types.read_message(control_socket_file) + self.assertEquals("config-file=%s\nOK" % torrc_dst, str(config_file_response)) + self.assertEquals(["config-file=%s" % torrc_dst, "OK"], list(config_file_response)) + self.assertEquals("250-config-file=%s\r\n250 OK\r\n" % torrc_dst, config_file_response.raw_content()) + self.assertEquals([("250", "-", "config-file=%s" % torrc_dst), ("250", " ", "OK")], config_file_response.content()) + + control_socket.close() + control_socket_file.close() + + def test_getinfo_config_text(self): + """ + Parses the 'GETINFO config-text' response. + """ + + # We can't be certain of the order, and there may be extra config-text + # entries as per... + # https://trac.torproject.org/projects/tor/ticket/2362 + # + # so we'll just check that the response is a superset of our config + + runner = test.runner.get_runner() + torrc_contents = [] + + for line in runner.get_torrc_contents().split("\n"): + line = line.strip() + + if line and not line.startswith("#"): + torrc_contents.append(line) + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("GETINFO config-text\r\n") + control_socket_file.flush() + + config_text_response = stem.types.read_message(control_socket_file) + + # the response should contain two entries, the first being a data response + self.assertEqual(2, len(list(config_text_response))) + self.assertEqual("OK", list(config_text_response)[1]) + self.assertEqual(("250", " ", "OK"), config_text_response.content()[1]) + self.assertTrue(config_text_response.raw_content().startswith("250+config-text=\r\n")) + self.assertTrue(config_text_response.raw_content().endswith("\r\n.\r\n250 OK\r\n")) + self.assertTrue(str(config_text_response).startswith("config-text=\n")) + self.assertTrue(str(config_text_response).endswith("\nOK")) + + for torrc_entry in torrc_contents: + self.assertTrue("\n%s\n" % torrc_entry in str(config_text_response)) + self.assertTrue(torrc_entry in list(config_text_response)[0]) + self.assertTrue("%s\r\n" % torrc_entry in config_text_response.raw_content()) + self.assertTrue("%s" % torrc_entry in config_text_response.content()[0][2]) + + control_socket.close() + control_socket_file.close() + + def test_bw_event(self): + """ + Issues 'SETEVENTS BW' and parses a few events. + """ + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("SETEVENTS BW\r\n") + control_socket_file.flush() + + setevents_response = stem.types.read_message(control_socket_file) + self.assertEquals("OK", str(setevents_response)) + self.assertEquals(["OK"], list(setevents_response)) + self.assertEquals("250 OK\r\n", setevents_response.raw_content()) + self.assertEquals([("250", " ", "OK")], setevents_response.content()) + + # Tor will emit a BW event once per second. Parsing three of them. + + for _ in range(3): + bw_event = stem.types.read_message(control_socket_file) + self.assertTrue(re.match("BW [0-9]+ [0-9]+", str(bw_event))) + self.assertTrue(re.match("650 BW [0-9]+ [0-9]+\r\n", bw_event.raw_content())) + self.assertEquals(("650", " "), bw_event.content()[0][:2]) + + control_socket.close() + control_socket_file.close() + + def _get_control_socket(self, authenticate = True): + """ + Provides a socket connected to the tor test instance's control port. + + Arguments: + authenticate (bool) - if True then the socket is authenticated + + Returns: + (socket.socket, file) tuple with the control socket and its file + """ + + runner = test.runner.get_runner() + + control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + control_socket.connect(("127.0.0.1", runner.get_control_port())) + control_socket_file = control_socket.makefile() + + if authenticate: + control_socket_file.write("AUTHENTICATE\r\n") + control_socket_file.flush() + + authenticate_response = stem.types.read_message(control_socket_file) + + self.assertEquals("OK", str(authenticate_response)) + self.assertEquals(["OK"], list(authenticate_response)) + self.assertEquals("250 OK\r\n", authenticate_response.raw_content()) + self.assertEquals([("250", " ", "OK")], authenticate_response.content()) + + return (control_socket, control_socket_file) + diff --git a/test/integ/system.py b/test/integ/system.py index 8661660..1fcb3d2 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -37,7 +37,6 @@ class TestSystemFunctions(unittest.TestCase): """ runner = test.runner.get_runner() - self.assertEquals(runner.get_pid(), system.get_pid("tor")) self.assertEquals(runner.get_pid(), system.get_pid("tor", runner.get_control_port())) self.assertEquals(None, system.get_pid("blarg_and_stuff")) diff --git a/test/runner.py b/test/runner.py index b3abdfa..6f76d01 100644 --- a/test/runner.py +++ b/test/runner.py @@ -5,6 +5,7 @@ Runtime context for the integration tests. import os import sys import time +import shutil import signal import tempfile import subprocess @@ -12,10 +13,11 @@ import subprocess from stem.util import term # number of seconds before we time out our attempt to start a tor instance -TOR_INIT_TIMEOUT = 60 +TOR_INIT_TIMEOUT = 90 BASIC_TORRC = """# configuration for stem integration tests DataDirectory %s +SocksPort 0 ControlPort 1111 """ @@ -57,7 +59,7 @@ class Runner: raise exc # writes our testing torrc - torrc_dst = os.path.join(self._test_dir, "torrc") + torrc_dst = self.get_torrc_path() try: sys.stdout.write(term.format(" writing torrc (%s)... " % torrc_dst, term.Color.BLUE, term.Attr.BOLD)) @@ -93,7 +95,7 @@ class Runner: if self._tor_process: self._tor_process.kill() # double check that we have a torrc to work with - torrc_dst = os.path.join(self._test_dir, "torrc") + torrc_dst = self.get_torrc_path() if not os.path.exists(torrc_dst): raise OSError("torrc doesn't exist (%s)" % torrc_dst) @@ -139,6 +141,7 @@ class Runner: self._tor_process.kill() self._tor_process.communicate() # blocks until the process is done self._tor_process = None + shutil.rmtree(self._test_dir, ignore_errors=True) sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) def get_pid(self): @@ -164,4 +167,24 @@ class Runner: # TODO: this will be fetched from torrc contents when we use custom configs return 1111 + + def get_torrc_path(self): + """ + Provides the absolute path for where our testing torrc resides. + + Returns: + str with our torrc path + """ + + return os.path.join(self._test_dir, "torrc") + + def get_torrc_contents(self): + """ + Provides the contents of our torrc. + + Returns: + str with the contents of our torrc, lines are newline separated + """ + + return self._torrc_contents

1 0