- tor-commits - lists.torproject.org

r25146: {website} Add a couple extra sentences to the two design requirements (website/trunk/projects/torbrowser/design)
by Mike Perry 02 Oct '11

02 Oct '11

Author: mikeperry Date: 2011-10-02 07:42:56 +0000 (Sun, 02 Oct 2011) New Revision: 25146 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: Add a couple extra sentences to the two design requirements sections, describing their purpose. Modified: website/trunk/projects/torbrowser/design/index.html.en =================================================================== --- website/trunk/projects/torbrowser/design/index.html.en 2011-10-01 15:43:17 UTC (rev 25145) +++ website/trunk/projects/torbrowser/design/index.html.en 2011-10-02 07:42:56 UTC (rev 25146) @@ -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">Sep 29 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2555242">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. Priv acy 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-Domain Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Domain 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. Click -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="id2555242"></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">Sep 29 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2974058">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. Priv acy 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-Domain Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Domain 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. Click -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="id2974058"></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>, @@ -191,7 +191,9 @@ The security requirements are primarily concerned with ensuring the safe use of Tor. Violations in these properties typically result in serious risk for -the user in terms of immediate deanonymization and/or observability. +the user in terms of immediate deanonymization and/or observability. With +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 @@ -210,8 +212,10 @@ </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> 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 on another site without their knowledge or explicit consent. +the ability for a user's activity on one site to be linked with their activity +on another site without their knowledge or explicit consent. With respect to +platform support, privacy requirements are the set of properties that cause us +to prefer one platform over another. </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Cross-Domain Identifier Unlinkability</strong></span><p> @@ -367,13 +371,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="id2561771"></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="id2980587"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> Tor Browser should optionally 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="id2587990"></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="id3006806"></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. @@ -439,7 +443,7 @@ into specific types of state. An exmaple of this simplifcation can be seen in Figure 1. - </p><div class="figure"><a id="id2543955"></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="id2962771"></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 domain might simplify the privacy @@ -760,11 +764,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="id2573074"></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="id2991890"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> All linkable identifiers and browser state should be cleared by this feature. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2588627"></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="id3007443"></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 tabs is done as a precaution to @@ -865,7 +869,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="id2555211"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2581163"></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="id2587402"></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="id2974027"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2999979"></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="id3006218"></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

[torbutton/master] Bug #4058: Fix yet more issues with links opening in new tabs
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit c725da03ecc54934eb52582a785ccedd4c012b4b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 1 20:39:06 2011 -0700 Bug #4058: Fix yet more issues with links opening in new tabs Fix is to only clear window.name for top-level windows, and to ignore frames/iframes. --- src/chrome/content/torbutton.js | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index decc37c..a9b8b59 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -4375,14 +4375,17 @@ function torbutton_hookdoc(win, doc, state_change, referrer) { // The about:blank check handles the 'name' attribute of framesets, which // get set before the referer is set on the channel. if ((!referrer || referrer.spec == "") && win.location != "about:blank") { - win.name = ""; - win.window.name = ""; + if (win.top == win.window) { + // Only reset if we're the top-level window + torbutton_log(4, "Resetting window.name: "+win.name+" for "+win.location); + win.name = ""; + win.window.name = ""; + } } } catch(e) { torbutton_log(4, "Failed to reset window.name: "+e) } - var js_enabled = m_tb_prefs.getBoolPref("javascript.enabled"); // No need to hook js if tor is off

1 0

[torbutton/master] Bug 4161: This time, I really mean it.
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit 5aa7d8f6e79a596b145e7c34f1a51500a445475c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 1 20:38:04 2011 -0700 Bug 4161: This time, I really mean it. It's really, really fixed and nothing can possibly ever go wrong again. --- src/chrome/content/torbutton.js | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3150516..decc37c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3869,21 +3869,21 @@ function torbutton_do_startup() .getService(Components.interfaces.nsIEnvironment); if (environ.exists("TOR_SOCKS_PORT")) { - torprefs.setIntPref('socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + m_tb_prefs.setIntPref('extensions.torbutton.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); if (m_tb_tbb) { m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); } } else { - torprefs.setIntPref('socks_port', 9050); + m_tb_prefs.setIntPref('extensions.torbutton.socks_port', 9050); } if (environ.exists("TOR_SOCKS_HOST")) { - torprefs.setCharPref('socks_host', environ.get("TOR_SOCKS_HOST")); + m_tb_prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST")); if (m_tb_tbb) { - m_tb_prefs.setIntPref('network.proxy.socks', parseInt(environ.get("TOR_SOCKS_HOST"))); + m_tb_prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); } } else { - torprefs.setCharPref('socks_host', '127.0.0.1'); + m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); } m_tb_prefs.setBoolPref("extensions.torbutton.startup", false);

1 0

[torbutton/master] Bug 4161 ctd: Really fix it this time.
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit 95edaab964434d32e2026f9f7232e3788cae894b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 1 18:44:34 2011 -0700 Bug 4161 ctd: Really fix it this time. The previous patch threw an exception, and I was testing the wrong XPI.. --- src/chrome/content/torbutton.js | 43 +++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index aad6f89..3150516 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -752,28 +752,6 @@ function torbutton_init_prefs() { torprefs.setIntPref('https_port', proxy_port); torprefs.setIntPref('ftp_port', proxy_port); } - - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - - if (environ.exists("TOR_SOCKS_PORT")) { - torprefs.setIntPref('socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - if (m_tb_tbb) { - m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - } - } else { - torprefs.setIntPref('socks_port', 9050); - } - - if (environ.exists("TOR_SOCKS_HOST")) { - torprefs.setCharPref('socks_host', environ.get("TOR_SOCKS_HOST")); - if (m_tb_tbb) { - m_tb_prefs.setIntPref('network.proxy.socks', parseInt(environ.get("TOR_SOCKS_HOST"))); - } - } else { - torprefs.setCharPref('socks_host', '127.0.0.1'); - } - } torbutton_log(1, 'http_port='+torprefs.getIntPref('http_port')); @@ -3887,6 +3865,27 @@ function torbutton_do_startup() torbutton_new_google_cookie(); } + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_SOCKS_PORT")) { + torprefs.setIntPref('socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + if (m_tb_tbb) { + m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + } + } else { + torprefs.setIntPref('socks_port', 9050); + } + + if (environ.exists("TOR_SOCKS_HOST")) { + torprefs.setCharPref('socks_host', environ.get("TOR_SOCKS_HOST")); + if (m_tb_tbb) { + m_tb_prefs.setIntPref('network.proxy.socks', parseInt(environ.get("TOR_SOCKS_HOST"))); + } + } else { + torprefs.setCharPref('socks_host', '127.0.0.1'); + } + m_tb_prefs.setBoolPref("extensions.torbutton.startup", false); } }

1 0

[torbutton/master] Bug 4161: TBB version check fails with SocksPort auto
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit 398bd5795765fc3567ff65e07657fa396d5b06dc Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 1 16:19:53 2011 -0700 Bug 4161: TBB version check fails with SocksPort auto The fix is to set the network.proxy prefs if this is TBB. We also add the version check to the codepath that restores torbutton state, just in case there is another regression. --- src/chrome/content/torbutton.js | 43 ++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a884ba2..aad6f89 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -758,12 +758,18 @@ function torbutton_init_prefs() { if (environ.exists("TOR_SOCKS_PORT")) { torprefs.setIntPref('socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + if (m_tb_tbb) { + m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + } } else { torprefs.setIntPref('socks_port', 9050); } if (environ.exists("TOR_SOCKS_HOST")) { torprefs.setCharPref('socks_host', environ.get("TOR_SOCKS_HOST")); + if (m_tb_tbb) { + m_tb_prefs.setIntPref('network.proxy.socks', parseInt(environ.get("TOR_SOCKS_HOST"))); + } } else { torprefs.setCharPref('socks_host', '127.0.0.1'); } @@ -2824,6 +2830,25 @@ function torbutton_tag_new_browser(browser, tor_tag, no_plugins) { } } +function torbutton_do_versioncheck() { + if (m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { + var is_updated = torbutton_check_version(); + var locale = m_tb_prefs.getCharPref("general.useragent.locale"); + if (is_updated == 0) { + // In an ideal world, we'd just check for hasUserValue, but we can't do + // that, because we set browser.startup.homepage to have a user value already... + m_tb_prefs.setCharPref("browser.startup.homepage", + "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=0"); + } else if (is_updated == 1) { + var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); + if (homepage.indexOf("https://check.torproject.org/") == 0) { + m_tb_prefs.setCharPref("browser.startup.homepage", + "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=1"); + } + } + } +} + function torbutton_reload_homepage() { var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", Components.interfaces.nsIPrefLocalizedString).data; @@ -2889,22 +2914,7 @@ function torbutton_set_launch_state(state, session_restore) { // Load our homepage again. We just killed it via the toggle. if (!session_restore) { - if (m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { - var is_updated = torbutton_check_version(); - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); - if (is_updated == 0) { - // In an ideal world, we'd just check for hasUserValue, but we can't do - // that, because we set browser.startup.homepage to have a user value already... - m_tb_prefs.setCharPref("browser.startup.homepage", - "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=0"); - } else if (is_updated == 1) { - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); - if (homepage.indexOf("https://check.torproject.org/") == 0) { - m_tb_prefs.setCharPref("browser.startup.homepage", - "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=1"); - } - } - } + torbutton_do_versioncheck(); torbutton_reload_homepage(); } } else { @@ -2918,6 +2928,7 @@ function torbutton_set_launch_state(state, session_restore) { // Load our homepage again. We just killed it via the toggle. if (!session_restore) { + torbutton_do_version_check(); torbutton_reload_homepage(); } }

1 0

[torbutton/master] Properly use nsIPrefLocalizedString in torbutton_get_general_useragent_locale()
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit 84e8dbc93a59c5d60e472628f1fbfc45713fe569 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Sat Oct 1 18:11:30 2011 +0200 Properly use nsIPrefLocalizedString in torbutton_get_general_useragent_locale() Replace the custom dereferencing of the stringbundle by the proper usage of nsIPrefLocalizedString. --- src/chrome/content/torbutton.js | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8511fc0..a884ba2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1238,15 +1238,8 @@ function torbutton_set_timezone(mode, startup) { function torbutton_get_general_useragent_locale() { try { - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); - if (locale != "chrome://global/locale/intl.properties") { - return locale; - } - - var bundle = Components.classes["@mozilla.org/intl/stringbundle;1"] - .getService(Components.interfaces.nsIStringBundleService); - var stringbundle = bundle.createBundle(locale); - return stringbundle.GetStringFromName("general.useragent.locale"); + return m_tb_prefs.getComplexValue("general.useragent.locale", + Components.interfaces.nsIPrefLocalizedString).data; } catch(err) { torbutton_log(4, "Error while getting general.useragent.locale:" + err); return 'en-US';

1 0

[torbutton/master] Bug #3686: Fix loading of localized system homepage
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit 90cbb9f0a744d5070c5ddfef7672714b72e085c7 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Sat Oct 1 17:55:28 2011 +0200 Bug #3686: Fix loading of localized system homepage On Debian and Tails, default homepage is more than just a string preference as it is internationalized using nsIPrefLocalizedString. --- src/chrome/content/torbutton.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3f9a64d..8511fc0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2831,6 +2831,12 @@ function torbutton_tag_new_browser(browser, tor_tag, no_plugins) { } } +function torbutton_reload_homepage() { + var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", + Components.interfaces.nsIPrefLocalizedString).data; + gBrowser.loadURI(homepage, null, null); +} + function torbutton_set_launch_state(state, session_restore) { if (!m_tb_wasinited) torbutton_init(); var no_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins"); @@ -2906,8 +2912,7 @@ function torbutton_set_launch_state(state, session_restore) { } } } - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); - gBrowser.loadURI(homepage, null, null); + torbutton_reload_homepage(); } } else { torbutton_log(3, "Leaving tor disabled"); @@ -2920,8 +2925,7 @@ function torbutton_set_launch_state(state, session_restore) { // Load our homepage again. We just killed it via the toggle. if (!session_restore) { - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); - gBrowser.loadURI(homepage, null, null); + torbutton_reload_homepage(); } } }

1 0

r25145: {website} patch some oddities for windows users on download-easy. (in website/trunk: css download/en)
by Andrew Lewman 01 Oct '11

01 Oct '11

Author: phobos Date: 2011-10-01 15:43:17 +0000 (Sat, 01 Oct 2011) New Revision: 25145 Modified: website/trunk/css/ie7-and-down.css website/trunk/css/layout.css website/trunk/download/en/download-easy.wml Log: patch some oddities for windows users on download-easy. Modified: website/trunk/css/ie7-and-down.css =================================================================== --- website/trunk/css/ie7-and-down.css 2011-10-01 00:05:29 UTC (rev 25144) +++ website/trunk/css/ie7-and-down.css 2011-10-01 15:43:17 UTC (rev 25145) @@ -83,7 +83,7 @@ } .dbox.dl { - margin: 0px 0px 20px 20px; + margin: 0px 0px 20px 0px; } .dbox.dsmall { @@ -101,6 +101,10 @@ table h2 { margin-bottom: -4px; padding-bottom: 0;} +.desc { + width: 420px; + } + /*#footer .signup { width: 82px; font-size: 0; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-10-01 00:05:29 UTC (rev 25144) +++ website/trunk/css/layout.css 2011-10-01 15:43:17 UTC (rev 25145) @@ -641,9 +641,9 @@ .easy { width: 710px; - height: 241px; background: url(../images/easy-bg.png) repeat-x scroll left 85px; margin-bottom: 10px; + padding-bottom: 15px; } .easy .package h2, @@ -654,7 +654,7 @@ } .easy .package h2 { - font-size: 30px; + font-size: 28px; font-weight: normal; padding-top: 10px; padding-bottom: 5px; @@ -711,8 +711,9 @@ .easy.linux, .easy.mac { border: 1px solid #885CA4; - border-radius: 10px; - } + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; } .open { display: block; @@ -1082,7 +1083,7 @@ } .dbox.dl input.amount { - width: 120px; + width: 110px; } .dbox.donate { Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-10-01 00:05:29 UTC (rev 25144) +++ website/trunk/download/en/download-easy.wml 2011-10-01 15:43:17 UTC (rev 25145) @@ -44,9 +44,11 @@ (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <h2>Tor Browser Bundle for Windows</h2> - <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <div class="desc"> + <h2>Tor Browser Bundle for Windows</h2> + <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> </div> </div> @@ -63,9 +65,11 @@ (<a class="mac-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <h2>Tor Browser Bundle for Mac</h2> - <em>Version <version-torbrowserbundleosx> - OS X</em> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <div class="desc"> + <h2>Tor Browser Bundle for Mac</h2> + <em>Version <version-torbrowserbundleosx> - OS X</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> </div> </div> @@ -82,9 +86,11 @@ (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <h2>Tor Browser Bundle for Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <div class="desc"> + <h2>Tor Browser Bundle for Linux</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div>

1 0

[torbutton/master] Bug #4016: Resize window on "New Identity"
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit b5e0eda6d90883dd00c476dc1a63f32e8b6214e3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 20:58:16 2011 -0700 Bug #4016: Resize window on "New Identity" --- src/chrome/content/torbutton.js | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d7ef88..3f9a64d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1529,6 +1529,9 @@ function torbutton_new_identity() { } } + // gBrowser should always be here. + torbutton_set_window_size(gBrowser.contentWindow); + torbutton_log(3, "New identity successful"); } @@ -3191,6 +3194,8 @@ function torbutton_regen_google_cookie() { if (!m_tb_hidden_browser) { torbutton_init_hidden_browser(); } + // XXX: This is might be forbidden according to + // https://bugzilla.mozilla.org/show_bug.cgi?id=608628 m_tb_hidden_browser.addProgressListener(torbutton_google_cookie_regen_listener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);

1 0

[bridgedb/master] 4056-cleanDatabase has wrong function name
by arma＠torproject.org 01 Oct '11

01 Oct '11

commit fc8ec9789cd8d38d80448877f689ecf086cddf9f Author: aagbsn <aagbsn(a)extc.org> Date: Mon Sep 19 16:10:06 2011 -0700 4056-cleanDatabase has wrong function name Call the correct function name. cleanWarnedBridges() renamed to cleanWarnedEmails() --- lib/bridgedb/Dist.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 030c7fa..bbff9f1 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -296,7 +296,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): db = bridgedb.Storage.getDB() try: db.cleanEmailedBridges(time.time()-MAX_EMAIL_RATE) - db.cleanWarnedBridges(time.time()-MAX_EMAIL_RATE) + db.cleanWarnedEmails(time.time()-MAX_EMAIL_RATE) except: db.rollback() raise

1 0