UI now controls Observatory enablement + anonymity

pde · pde · commit e7baaa36703c · 2011-07-06T16:34:21.000-07:00
diff --git a/src/chrome/content/observatory-preferences.js b/src/chrome/content/observatory-preferences.js
@@ -13,14 +13,27 @@ obsprefs = ssl_observatory.prefs;
 const pref_prefix = "extensions.ssl_observatory.";
 
 function observatory_prefs_init(doc) {
+  // Is the Observatory on?
   var enabled = obsprefs.getBoolPref("extensions.https_everywhere._observatory_prefs.enabled");
   document.getElementById("use-observatory").checked = enabled;
   set_observatory_configurability(enabled);
-  // If the observatory is not yet on, and Tor is not available, the initial
-  // option is to turn it on /without/ Tor
-  if ((!ssl_observatory.torbutton_installed) && !enabled) {
-      var nonanon_radio = document.getElementById("ssl-obs-nonanon");
-      doc.getElementById("ssl-obs-how").selectedItem = nonanon_radio;
+
+  // More complicated: is it anonymised by Tor?
+  var obs_how = doc.getElementById("ssl-obs-how");
+  var anon_radio = document.getElementById("ssl-obs-anon");
+  var nonanon_radio = document.getElementById("ssl-obs-nonanon");
+  var anon = !obsprefs.getBoolPref(
+            "extensions.https_everywhere._observatory_prefs.use_custom_proxy");
+
+  // first set the radios to match the current settings variables
+  obs_how.selectedItem = (anon) ? anon_radio : nonanon_radio;
+
+  // But if the user hasn't turned the observatory on, 
+  // the default should be something maximally sensible 
+  var torbutton = ssl_observatory.torbutton_installed;
+  if (!enabled) {
+    set_obs_anon(torbutton);
+    obs_how.selectedItem = (torbutton) ? anon_radio : nonanon_radio;
   }
   //scale_title_logo();
 }
@@ -32,9 +45,6 @@ function popup_done() {
   window.close();
 }
 
-function enable_observatory() {
-  obsprefs.setBoolPref("extensions.https_everywhere._observatory_prefs.enabled", true);
-}
 
 function scale_title_logo() {
   // The image is naturally 500x207, but if it's shrunk we don't want it 
@@ -85,6 +95,16 @@ function recursive_set(node, attrib, value) {
     recursive_set(node.childNodes[i], attrib, value)
 }
 
+// called from the popup
+
+function set_obs_anon(val) {
+  obsprefs.setBoolPref( "extensions.https_everywhere._observatory_prefs.use_custom_proxy", !val);
+}
+function enable_observatory() {
+  obsprefs.setBoolPref("extensions.https_everywhere._observatory_prefs.enabled", true);
+}
+
+// called from within the prefs window, we have more work to do:
 function toggle_enabled() {
   var checkbox = document.getElementById("use-observatory");
   var use_obs = checkbox.checked;
diff --git a/src/chrome/content/observatory-preferences.xul b/src/chrome/content/observatory-preferences.xul
@@ -28,17 +28,21 @@
       <separator class="thin" />
       <commandset>
         <command id="toggle-enabled" oncommand="toggle_enabled()" />
+        <command id="use-obs-anon" oncommand="set_obs_anon(true)" />
+        <command id="use-obs-nonanon" oncommand="set_obs_anon(false)" />
       </commandset>
       <checkbox label="&ssl-observatory.prefs.use;" id="use-observatory"
                 command="toggle-enabled" style="font-size:1.5em;"/>
       <separator class="thin"/>
         <radiogroup style="margin-left:3em;" id="ssl-obs-how">
-          <radio label="&ssl-observatory.prefs.anonymous;" selected="true" 
+          <radio label="&ssl-observatory.prefs.anonymous;" 
                  tooltiptext="&ssl-observatory.prefs.anonymous_tooltip;"
                  alt_label="&ssl-observatory.prefs.anonymous_unavailable;"
+                 command="use-obs-anon" 
                  class="ssl-obs-conf" id="ssl-obs-anon"/>
           <radio label="&ssl-observatory.prefs.nonanon;" 
                  tooltiptext="&ssl-observatory.prefs.nonanon_tooltip;"
+                 command="use-obs-nonanon"
                  class="ssl-obs-conf" id="ssl-obs-nonanon"/>
         </radiogroup>
       <separator class="thin"/>
diff --git a/src/chrome/locale/en/ssl-observatory.dtd b/src/chrome/locale/en/ssl-observatory.dtd
@@ -29,14 +29,14 @@ intrusive corporate network:">
 intrusive corporate network that monitors your browsing with a TLS proxy
 and a private root Certificate Authority.  If enabled on such a network,
 this option might publish evidence of which https:// domains were being
-visited through the proxy, because of the unique certificates it would
+visited through that proxy, because of the unique certificates it would
 produce.  So we leave it off by default.">
 
 <!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
 "Check certificates using Tor for anonymity (requires Torbutton)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"This option requires Torbutton to be installed">
+"This option requires Tor and Torbutton to be installed">
 
 <!ENTITY ssl-observatory.prefs.asn 
 'If you see a suspicious certificate, report which ISP you were connected to'>
@@ -54,7 +54,8 @@ lets us warn you about insecure connections or attacks on your browser.">
 
 <!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
-somebody visited that site, but will not know who or what page they looked at.">
+somebody visited that site, but will not know who or what page they looked at.
+Mouseover the options for further details:">
 
 <!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -1,5 +1,5 @@
 // SSl Observatory preferences
-pref("extensions.https_everywhere._observatory_prefs.enabled",true);
+pref("extensions.https_everywhere._observatory_prefs.enabled",false);
 
 // "testing" currently means send unecessary fingerprints and other test-suite
 // type stuff
