[tor-commits] [torbutton/master] Bug 4197: Torbutton formfill blocking can't be undone

[mikeperry at torproject.org]

commit 9e2cbd2993c595abf1e67bdf887578bd086c73b5
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Thu Oct 6 14:10:08 2011 -0700

    Bug 4197: Torbutton formfill blocking can't be undone
    
    We still require a toggle, which is very difficult for TBB users. Filed #4198
    for that, as several prefs are involved, and we probably want to wait for
    bug #3100 anyways.
    
    Also, we should set signon.autoformFill to false during Tor usage regardless
    of this pref, for unlinkability. So we now do so.
---
 src/chrome/content/torbutton.js |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 8b0837e..1c76f03 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -300,6 +300,8 @@ var torbutton_unique_pref_observer =
                 torbutton_update_status(
                         m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"),
                         true);
+            // XXX: We should try to get rid of these warnings now that toggle
+            // is not supported in TBB.
             case "extensions.torbutton.disable_domstorage":
             case "extensions.torbutton.no_updates":
             case "extensions.torbutton.no_search":
@@ -1838,8 +1840,16 @@ function torbutton_update_status(mode, force_update) {
                     false, mode, changed);
             torbutton_setBoolPref("signon.rememberSignons", "remember_signons", 
                     false, mode, changed);
+        } else {
+            torbutton_setBoolPref("browser.formfill.enable", "formfill",
+                    true, mode, changed);
+            torbutton_setBoolPref("signon.rememberSignons", "remember_signons", 
+                    true, mode, changed);
         }
 
+        torbutton_setBoolPref("signon.autofillForms", "autofillForms",
+                false, mode, changed);
+
         if (m_tb_ff4) {
             if(m_tb_prefs.getBoolPref('extensions.torbutton.block_thwrite')) {
                 m_tb_prefs.setBoolPref("places.history.enabled", false);
@@ -1866,6 +1876,10 @@ function torbutton_update_status(mode, force_update) {
             torbutton_setBoolPref("signon.rememberSignons", "remember_signons", 
                     false, mode, changed);
         }
+
+        torbutton_setBoolPref("signon.autofillForms", "autofillForms",
+                true, mode, changed);
+
         if (m_tb_ff4) {
             if(m_tb_prefs.getBoolPref('extensions.torbutton.block_nthwrite')) {
                 m_tb_prefs.setBoolPref("places.history.enabled", false);