commit c6de0283fd8fe2a75312985d39e85ba8148f0c97 Author: Sukhbir Singh sukhbir@torproject.org Date: Fri May 6 16:03:40 2016 -0400
Do not set the timezone to UTC
TorBirdy was setting the timezone to UTC to prevent leaks in the date and the message-ID header. With #6314 and #6315 fixed and merged upstream, both the headers are sanitized without explicitly setting the timezone to UTC. --- chrome/content/overlay.js | 5 ----- chrome/content/preferences.js | 34 ---------------------------------- chrome/content/preferences.xul | 1 - chrome/locale/en/torbirdy.dtd | 2 -- chrome/locale/en/torbirdy.properties | 2 -- 5 files changed, 44 deletions(-)
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js index 3e8f997..f8b1051 100644 --- a/chrome/content/overlay.js +++ b/chrome/content/overlay.js @@ -23,11 +23,6 @@ prefs.setBoolPref(infoRun, false); }
- // Set the time zone to UTC if the preference is true. - if (prefs.getBoolPref("extensions.torbirdy.timezone")) { - env.set('TZ', 'UTC'); - } - // Check if we are running Whonix. var whonix = false; if (env.exists("WHONIX")) { diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 94ccb39..a31caf8 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -321,30 +321,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.prefs.setBoolPref(pub.prefBranch + 'startup_folder', false); }
- // Time zone. - // default: true - var timezone = pub.timezone.checked; - // Only update pub if required. - if (timezone === pub.prefs.getBoolPref(pub.prefBranch + 'timezone')) { - var env = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - if (timezone) { - pub.prefs.setBoolPref(pub.prefBranch + 'timezone', false); - env.set('TZ', ''); - } else { - pub.prefs.setBoolPref(pub.prefBranch + 'timezone', true); - env.set('TZ', 'UTC'); - } - - // Ask the user to restart Thunderbird. We can't do pub for the user - // because the environment variables are not reset without quitting - // Thunderbird and starting it again. - var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Components.interfaces.nsIPromptService); - prompts.alert(null, pub.strBundle.GetStringFromName("torbirdy.name"), - pub.strBundle.GetStringFromName("torbirdy.restart")); - } - // Fetch all messages for all accounts. // default: false // Only change the state if it is required. @@ -435,7 +411,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.mailAccount = document.getElementById('torbirdy-mail-accounts'); pub.imapIdle = document.getElementById('torbirdy-idle'); pub.startupFolder = document.getElementById('torbirdy-startup-folder'); - pub.timezone = document.getElementById('torbirdy-timezone'); pub.emailWizard = document.getElementById('torbirdy-email-wizard'); pub.fetchAllMails = document.getElementById('torbirdy-email-automatic'); // Enigmail. @@ -524,14 +499,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.startupFolder.checked = true; }
- // Time zone settings. - // default: true - if (pub.prefs.getBoolPref(pub.prefBranch + 'timezone')) { - pub.timezone.checked = false; - } else { - pub.timezone.checked = true; - } - // Fetch all messages for all accounts. // default: false if (pub.prefs.getBoolPref(pub.prefBranch + 'fetchall')) { @@ -618,7 +585,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.restoreDefaults = function() { // Set the values to their default state. pub.anonService.selectedIndex = 0; - pub.timezone.checked = false; pub.enigmailKeyId.checked = false; pub.enigmailConfirmEmail.checked = false; pub.emailWizard.checked = false; diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul index 10c0b59..2526f4d 100644 --- a/chrome/content/preferences.xul +++ b/chrome/content/preferences.xul @@ -99,7 +99,6 @@ <vbox> <checkbox accesskey="&torbirdy.prefs.imap.key;" id="torbirdy-idle" label="&torbirdy.prefs.imap.label;"/> <checkbox accesskey="&torbirdy.prefs.startup_folder.key;" id="torbirdy-startup-folder" label="&torbirdy.prefs.startup_folder.label;"/> - <checkbox accesskey="&torbirdy.prefs.timezone.key;" id="torbirdy-timezone" label="&torbirdy.prefs.timezone.label;"/> <checkbox accesskey="&torbirdy.prefs.emailwizard.key;" id="torbirdy-email-wizard" label="&torbirdy.prefs.emailwizard.label;"/> <checkbox accesskey="&torbirdy.prefs.automatic.key;" id="torbirdy-email-automatic" label="&torbirdy.prefs.automatic.label;" oncommand="org.torbirdy.prefs.fetchAllMessages();"/> </vbox> diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index 3e22539..d670135 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -37,8 +37,6 @@ <!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> -<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> diff --git a/chrome/locale/en/torbirdy.properties b/chrome/locale/en/torbirdy.properties index fcc69a3..2e01136 100644 --- a/chrome/locale/en/torbirdy.properties +++ b/chrome/locale/en/torbirdy.properties @@ -13,7 +13,5 @@ torbirdy.email.advanced=Please note that changing the advanced settings of TorBi torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=TorBirdy Advanced Settings
-torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. - torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy