November 2016 - tor-commits - lists.torproject.org

[torbirdy/develop] Refactor.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit ead042821ece6420cecdd5efc40e21c4e4a9d03d Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 19:30:39 2016 +0100 Refactor. --- chrome/content/emailwizard.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index baf1ef5..ec73113 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -1,3 +1,5 @@ +Components.utils.import("resource://gre/modules/Preferences.jsm"); + if (!org) var org = {}; if (!org.torbirdy) org.torbirdy = {}; @@ -17,28 +19,26 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var serverkey = account.incomingServer.key; var protocol = account.incomingServer.type; + var pref_spec = [ + ['mail.server.%serverkey%.check_new_mail', false], + ['mail.server.%serverkey%.login_at_startup', false] + ]; + // Make sure that drafts are saved to Local Folders if it is an IMAP account. if (protocol === "imap") { - var draftFolder = 'mail.identity.%idkey%.draft_folder'; - var draftFolderPref = draftFolder.replace("%idkey%", idkey); - prefs.setCharPref(draftFolderPref, "mailbox://nobody@Local%20Folders/Drafts"); + pref_spec.push(['mail.identity.%idkey%.draft_folder', + 'mailbox://nobody@Local%20Folders/Drafts']); } - // Set check_new_mail to false. We can't do this through the account setup, so let's do it here. - var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; - var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); - prefs.setBoolPref(checkNewMailPref, false); - - // Do not check for new messages at startup. - var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; - var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); - prefs.setBoolPref(loginAtStartupPref, false); - - // Do not automatically download new messages. + // Do not automatically download new messages in POP accounts. if (protocol === "pop3") { - var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; - var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); - prefs.setBoolPref(downloadOnBiffPref, false); + pref_spec.push(['mail.server.%serverkey%.download_on_biff', false]); + } + + for each (var [pref_template, value] in pref_spec) { + var pref = pref_template.replace("%idkey%", idkey); + pref = pref.replace("%serverkey%", serverkey); + Preferences.set(pref, value); } }

1 0

[torbirdy/develop] Fix bug that prevented Thunderbird from starting
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 625f80e1f656f38784c3928cc5e62f1407d1c400 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 9 16:20:56 2015 +0530 Fix bug that prevented Thunderbird from starting --- ChangeLog | 5 +++++ components/torbirdy.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 020908e..c5b4021 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +0.1.4, 09 March 2015 + * Fix bug that prevented Thunderbird with TorBirdy 0.1.3 from starting + in profiles with more than three IMAP accounts (closes #14099, #13982, + #13722, #14007, #14130) + 0.1.3, 23 Oct 2014 * The default keyserver (hidden service) has been updated: diff --git a/components/torbirdy.js b/components/torbirdy.js index 40adadb..5867f98 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -528,9 +528,9 @@ TorBirdy.prototype = { // We need to restore the following preferences after we are uninstalled/disabled. var restorePrefs = ["draft_folder", "drafts_folder_picker_mode"]; - for (var i = 0; i < restorePrefs.length; i++) { + for (var p = 0; p < restorePrefs.length; p++) { var pref = "mail.identity.%id%.".replace("%id%", key); - var prefName = pref + restorePrefs[i]; + var prefName = pref + restorePrefs[p]; if (this.prefs.prefHasUserValue(prefName)) { var typePref = this.prefs.getPrefType(prefName); if (typePref === 32) {

1 0

[torbirdy/develop] Improve variable name.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit a229be9aef54736b38ff224b6d7283e5fade3a42 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 20:18:35 2016 +0100 Improve variable name. --- chrome/content/emailwizard.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index d5adc85..fc2d48e 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -6,7 +6,10 @@ if (!org.torbirdy) org.torbirdy = {}; if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var pub = {}; - var disableWizard = !Preferences.get("extensions.torbirdy.emailwizard", false); + var disableAutoConfiguration = false; + if (Preferences.get("extensions.torbirdy.emailwizard", false)) { + disableAutoConfiguration = true; + } fixupTorbirdySettingsOnNewAccount = function(account) { var idkey = account.defaultIdentity.key; @@ -37,7 +40,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { } pub.adjustAutoWizard = function() { - if (!disableWizard) { + if (!disableAutoConfiguration) { var realname = document.getElementById("realname").value; var email = document.getElementById("email").value; var password = document.getElementById("password").value; @@ -134,7 +137,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { }; pub.onLoad = function() { - if (disableWizard) { + if (disableAutoConfiguration) { document.getElementById("torbirdy-protocol-box").collapsed = true; } document.getElementById("provisioner_button").disabled = true;

1 0

[torbirdy/develop] Set authentication for Gmail to OAuth2 (#17118)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 1d08d03c80cb01c5495c9e04301ad20b21ae06bb Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 9 10:43:35 2016 -0400 Set authentication for Gmail to OAuth2 (#17118) For Gmail, the authentication type is set to OAuth2 instead of the default "normal password" which is what most providers use (Google doesn't allow non-OAuth2 logins). To make this work with the manual configuration wizard in TorBirdy, the authorization step takes place when the user checks the account for the first time, and is not done automatically. We can probably improve this but it's better to wait for the patches that secure the automatic configuration wizard to be merged upstream. See bugzilla 669238. --- chrome/content/emailwizard.js | 16 ++++++++++++++++ components/torbirdy.js | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 0223e7a..d38828e 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -13,6 +13,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { fixupTorbirdySettingsOnNewAccount = function(account) { var idkey = account.defaultIdentity.key; + var outgoing = account.defaultIdentity.smtpServerKey; var serverkey = account.incomingServer.key; var protocol = account.incomingServer.type; @@ -21,6 +22,12 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { ['mail.server.%serverkey%.login_at_startup', false] ]; + // 10 specifies OAuth2 as the authentication method (used for Gmail). + if (pub.isGmail) { + pref_spec.push(['mail.smtpserver.%outgoing%.authMethod', 10]); + pref_spec.push(['mail.server.%serverkey%.authMethod', 10]); + } + // Make sure that drafts are saved to Local Folders if it is an IMAP account. if (protocol === "imap") { pref_spec.push(['mail.identity.%idkey%.draft_folder', @@ -35,6 +42,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { for each (var [pref_template, value] in pref_spec) { var pref = pref_template.replace("%idkey%", idkey); pref = pref.replace("%serverkey%", serverkey); + pref = pref.replace("%outgoing%", outgoing); Preferences.set(pref, value); } } @@ -78,9 +86,17 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { config.outgoing.socketType = 2; // Set the authentication to 'Normal' (connection is already encrypted). + // This is true for all providers except Gmail, which uses OAuth2. config.incoming.auth = 3; config.outgoing.auth = 3; + // We will deal with Gmail later because it makes it easier to handle + // OAuth2 with the manual configuration. + let emailDomain = email.split("@")[1]; + if (emailDomain === "gmail.com") { + pub.isGmail = true; + } + // Default the outgoing SMTP port. config.outgoing.port = 465; diff --git a/components/torbirdy.js b/components/torbirdy.js index 276c745..4f83513 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -85,8 +85,8 @@ const TorBirdyPrefs = { // We don't want user's of Thunderbird to even come close to such a bypass // issue and so we have disabled websockets out of an abundance of caution. "network.websocket.enabled": false, - // No cookies are allowed. - "network.cookie.cookieBehavior": 2, + // Cookies are allowed, but not third-party cookies. For Gmail and Twitter. + "network.cookie.cookieBehavior": 1, // Disable link prefetching. "network.prefetch-next": false,

1 0

[torbirdy/develop] Do not set the timezone to UTC
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit c6de0283fd8fe2a75312985d39e85ba8148f0c97 Author: Sukhbir Singh <sukhbir(a)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

1 0

[torbirdy/develop] Use Tor's SOCKSPort for Enigmail's keyserver configuration.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 89bf536f14872660815886f480cc88902904d4aa Author: anonym <anonym(a)riseup.net> Date: Fri Mar 18 17:42:16 2016 +0100 Use Tor's SOCKSPort for Enigmail's keyserver configuration. It's not necessarily the case that users have an HTTP proxy running on port 8118, and if they do it may be a non-torified Privoxy instance. Using the Tor SOCKSPort will always work, and be torified. --- chrome/content/preferences.js | 2 +- components/torbirdy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index de77205..94ccb39 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -41,7 +41,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) { opts += "--throw-keyids "; } - var proxy = "http-proxy=http://127.0.0.1:8118"; + var proxy = "socks5h://127.0.0.1:9050"; if (anonService === "jondo") { proxy = "http://127.0.0.1:4001"; } diff --git a/components/torbirdy.js b/components/torbirdy.js index 2efcfec..06ae80c 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -223,7 +223,7 @@ const TorBirdyPrefs = { // We want to force UTF-8 everywhere "--display-charset utf-8 " + // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell - "--keyserver-options http-proxy=http://127.0.0.1:8118 ", + "--keyserver-options http-proxy=socks5h://127.0.0.1:9050 ", // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network) "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",

1 0

[torbirdy/develop] Allow changing the default protocol (#15879)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 04fd3d875491a0fdcc598c43c53edc0eb384e4cf Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 2 14:49:52 2016 -0400 Allow changing the default protocol (#15879) --- chrome/content/emailwizard.js | 3 +++ defaults/preferences/prefs.js | 1 + 2 files changed, 4 insertions(+) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 2f2a6a7..123753b 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -144,6 +144,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { document.getElementById("provisioner_button").disabled = true; document.getElementById("provisioner_button").hidden = true; } + // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and prefs.js. + var selectProtocol = prefs.getIntPref("extensions.torbirdy.defaultprotocol") + document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; }; return pub; diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js index eec4539..8b43562 100644 --- a/defaults/preferences/prefs.js +++ b/defaults/preferences/prefs.js @@ -10,3 +10,4 @@ pref("extensions.torbirdy.whonix_run", true); pref("extensions.torbirdy.info_run", false); pref("extensions.torbirdy.emailwizard", false); pref("extensions.torbirdy.fetchall", false); +pref("extensions.torbirdy.defaultprotocol", 0); // 0 - POP3, 1 - IMAP

1 0

[torbirdy/develop] helo_argument IP should be encapsulated in []'s
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 0f14f38b7fad2983623157eaedc8af294eeb74fc Author: Ulrike Uhlig <u(a)451f.org> Date: Thu Jan 21 13:11:40 2016 +0100 helo_argument IP should be encapsulated in []'s This is a patch proposed by Chris Knadle chris.knadle(a)coredump.us to make torbirdy compliant with RFC 5821 §4.1.3. Also see Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812115 Also look at which has a related issue: https://trac.torproject.org/projects/tor/ticket/13006 --- components/torbirdy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 1dd87fe..22b5853 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -166,7 +166,7 @@ const TorBirdyPrefs = { */ // Prevent hostname leaks. - "mail.smtpserver.default.hello_argument": "127.0.0.1", + "mail.smtpserver.default.hello_argument": "[127.0.0.1]", // Compose messages in plain text (by default). "mail.html_compose": false, "mail.identity.default.compose_html": false,

1 0

[torbirdy/develop] Fix indentation in feedwizard.js
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 405564bc67868489607fab60c7e66beaa5f4ce00 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 11 21:49:54 2016 -0400 Fix indentation in feedwizard.js --- chrome/content/feedwizard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/feedwizard.js b/chrome/content/feedwizard.js index 07b01bc..e0698a1 100644 --- a/chrome/content/feedwizard.js +++ b/chrome/content/feedwizard.js @@ -15,8 +15,8 @@ if (!org.torbirdy.feedwizard) org.torbirdy.feedwizard = new function() { ]; for each (var [pref_template, value] in pref_spec) { - let pref = pref_template.replace("%serverkey%", accountKey); - Preferences.set(pref, value); + let pref = pref_template.replace("%serverkey%", accountKey); + Preferences.set(pref, value); } };

1 0

[torbirdy/develop] Update privacy settings and related preferences
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 2bdeffbbeedfdf382b33f0faaf6839427096544a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 12:26:34 2016 -0400 Update privacy settings and related preferences --- components/torbirdy.js | 161 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 111 insertions(+), 50 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 238c089..ba8195e 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -25,12 +25,7 @@ const kTorBirdyBranch = "extensions.torbirdy."; // preferences dialog. See `preferences.js'. const TorBirdyPrefs = { "extensions.torbirdy.protected": false, - // When the preferences below have been set, then only enable TorBirdy. - // Generate our own custom time-independent message-ID. - "mailnews.custom_message_id": true, - "mailnews.header.custom_message_id": "", - // Remove the date header. - "mailnews.local_date_header_generation": false, + // When the preferences below have been set, enable TorBirdy. /* Network @@ -38,6 +33,10 @@ const TorBirdyPrefs = { // Use a manual proxy configuration. "network.proxy.type": 1, + // https://bugs.torproject.org/10419 + "network.proxy.no_proxies_on": "", + // Restrict TBB ports. + "network.security.ports.banned": "9050,9051,9150,9151", // Number of seconds to wait before attempting to recontact an unresponsive proxy server. "network.proxy.failover_timeout": 1800, @@ -48,6 +47,8 @@ const TorBirdyPrefs = { // Set DNS proxying through SOCKS5. "network.proxy.socks_remote_dns": true, + // Disable DNS prefetching. + "network.dns.disablePrefetch": true, // https://lists.torproject.org/pipermail/tor-talk/2011-September/021398.html // "Towards a Tor-safe Mozilla Thunderbird" @@ -62,8 +63,15 @@ const TorBirdyPrefs = { // Likely privacy violations // https://blog.torproject.org/blog/experimental-defense-website-traffic-finge… - // https://trac.torproject.org/projects/tor/ticket/3914 + // https://bugs.torproject.org/3914 "network.http.pipelining": true, + "network.http.pipelining.aggressive": true, + "network.http.pipelining.maxrequests": 12, + "network.http.connection-retry-timeout": 0, + "network.http.max-persistent-connections-per-proxy": 256, + "network.http.pipelining.reschedule-timeout": 15000, + "network.http.pipelining.read-timeout": 60000, + // We do not fully understand the privacy issues of the SPDY protocol // We have no reason to believe that anyone would actually use it with // Thunderbird but we fail closed to keep users safe out of an abundance of @@ -74,8 +82,10 @@ const TorBirdyPrefs = { // author Mike Perry. "network.http.pipelining.ssl": true, "network.http.proxy.pipelining": true, - "network.http.pipelining.maxrequests": 12, - "network.http.sendRefererHeader": 0, + "network.http.sendRefererHeader": 2, + // https://bugs.torproject.org/16673 + "network.http.altsvc.enabled": false, + "network.http.altsvc.oe": false, // Disable proxy bypass issue. // Websockets have no use in Thunderbird over Tor; some versions of the @@ -87,6 +97,9 @@ const TorBirdyPrefs = { "network.websocket.enabled": false, // Cookies are allowed, but not third-party cookies. For Gmail and Twitter. "network.cookie.cookieBehavior": 1, + // http://kb.mozillazine.org/Network.cookie.lifetimePolicy + // 2: cookie expires at the end of the session. + "network.cookie.lifetimePolicy": 2, // Disable link prefetching. "network.prefetch-next": false, @@ -103,6 +116,7 @@ const TorBirdyPrefs = { // - OCSP servers may log information about a user as they use the internet // generally; it's everything we hate about CRLs and more "security.OCSP.enabled": 1, + "security.OCSP.GET.enabled": false, "security.OCSP.require": false, // Disable TLS Session Ticket. // See https://trac.torproject.org/projects/tor/ticket/4099 @@ -111,7 +125,9 @@ const TorBirdyPrefs = { // We do not want to enable a known weak protocol; users should use only use TLS "security.enable_ssl3": false, // Thunderbird 23.0 uses the following preference. + // https://bugs.torproject.org/11253 "security.tls.version.min": 1, + "security.tls.version.max": 3, // Display a dialog warning the user when entering an insecure site from a secure one. "security.warn_entering_weak": true, // Display a dialog warning the user when submtting a form to an insecure site. @@ -126,6 +142,8 @@ const TorBirdyPrefs = { // Disable 'extension blocklist' which might leak the OS information. // See https://trac.torproject.org/projects/tor/ticket/6734 "extensions.blocklist.enabled": false, + // Strict: certificate pinning is always enforced. + "security.cert_pinning.enforcement_level": 2, /* Mailnews @@ -196,6 +214,46 @@ const TorBirdyPrefs = { // Disable caching. "browser.cache.disk.enable": false, "browser.cache.memory.enable": false, + "browser.cache.offline.enable": false, + "browser.formfill.enable": false, + "signon.rememberSignons": false, + "signon.autofillForms": false, + + // https://bugs.torproject.org/10367 + "datareporting.healthreport.service.enabled": false, + "datareporting.healthreport.uploadEnabled": false, + "datareporting.policy.dataSubmissionEnabled": false, + "datareporting.healthreport.about.reportUrl": "data:text/plain,", + + // https://bugs.torproject.org/16256 + "browser.search.countryCode": "US", + "browser.search.region": "US", + "browser.search.geoip.url": "", + + // These have been copied from Tor Browser and don't apply to Thunderbird + // since the browser surface is limited (Gmail/Twitter) but we set them + // nevertheless. + // Disable client-side session and persistent storage. + "dom.storage.enabled": false, + // https://bugs.torproject.org/15758 + "device.sensors.enabled": false, + // https://bugs.torproject.org/5293 + "dom.battery.enabled": false, + // https://bugs.torproject.org/6204 + "dom.enable_performance": false, + // https://bugs.torproject.org/13023 + "dom.gamepad.enabled": false, + // https://bugs.torproject.org/8382 + "dom.indexedDB.enabled": false, + // https://bugs.torproject.org/13024 + "dom.enable_resource_timing": false, + // https://bugs.torproject.org/16336 + "dom.enable_user_timing": false, + // https://bugs.torproject.org/17046 + "dom.event.highrestimestamp.enabled": true, + + // https://bugs.torproject.org/11817 + "extensions.getAddons.cache.enabled": false, /* Enigmail @@ -230,6 +288,45 @@ const TorBirdyPrefs = { // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, + /* + Chat and Calendar + */ + + // Thunderbird 15 introduces the chat feature so disable the preferences below. + "purple.logging.log_chats": false, + "purple.logging.log_ims": false, + "purple.logging.log_system": false, + "purple.conversations.im.send_typing": false, + + // Messenger related preferences. + // Do not report idle. + "messenger.status.reportIdle": false, + "messenger.status.awayWhenIdle": false, + // Set the following preferences to empty strings. + "messenger.status.defaultIdleAwayMessage": "", + "messenger.status.userDisplayName": "", + // Do not connect automatically. + "messenger.startup.action": 0, + // Ignore invitations; do not automatically accept them. + "messenger.conversations.autoAcceptChatInvitations": 0, + // Do not format incoming messages. + "messenger.options.filterMode": 0, + // On copying the content in the chat window, remove the time information. + // See `comm-central/chat/locales/conversations.properties' for more information. + "messenger.conversations.selections.systemMessagesTemplate": "%message%", + "messenger.conversations.selections.contentMessagesTemplate": "%sender%: %message%", + "messenger.conversations.selections.actionMessagesTemplate": "%sender% %message%", + + // Mozilla Lightning. + "calendar.useragent.extra": "", + // We have to set a timezone otherwise the system time is used. "UTC" or + // "GMT" is not an option so we set it to Europe/London. + "calendar.timezone.local": "Europe/London", + + /* + Other Settings + */ + // RSS. "rss.display.prefer_plaintext": true, // These are similar to the mailnews.* settings. @@ -251,18 +348,10 @@ const TorBirdyPrefs = { // Disable JavaScript (email). "javascript.enabled": false, - // Disable client-side session and persistent storage. - "dom.storage.enabled": false, - // Do not run plugins out-of-process. - "dom.ipc.plugins.java.enabled": false, - // Disable changing of images via JavaScript. - "dom.disable_image_src_set": true, - // Disable WebM, WAV, Ogg, PeerConnection. - "media.webm.enabled": false, - "media.wave.enabled": false, - "media.ogg.enabled": false, + "media.navigator.enabled": false, "media.peerconnection.enabled": false, + "media.cache_size": 0, // Disable CSS :visited selector. "layout.css.visited_links_enabled": false, @@ -273,37 +362,9 @@ const TorBirdyPrefs = { // Disable remote images. "permissions.default.image": 2, - // Thunderbird 15 introduces the chat feature so disable the preferences below. - "purple.logging.log_chats": false, - "purple.logging.log_ims": false, - "purple.logging.log_system": false, - "purple.conversations.im.send_typing": false, - - // Messenger related preferences. - // Do not report idle. - "messenger.status.reportIdle": false, - "messenger.status.awayWhenIdle": false, - // Set the following preferences to empty strings. - "messenger.status.defaultIdleAwayMessage": "", - "messenger.status.userDisplayName": "", - // Do not connect automatically. - "messenger.startup.action": 0, - // Ignore invitations; do not automatically accept them. - "messenger.conversations.autoAcceptChatInvitations": 0, - // Do not format incoming messages. - "messenger.options.filterMode": 0, - // On copying the content in the chat window, remove the time information. - // See `comm-central/chat/locales/conversations.properties' for more information. - "messenger.conversations.selections.systemMessagesTemplate": "%message%", - "messenger.conversations.selections.contentMessagesTemplate": "%sender%: %message%", - "messenger.conversations.selections.actionMessagesTemplate": "%sender% %message%", - - // Mozilla Lightning. - "calendar.useragent.extra": "", - // We have to set a timezone otherwise the system time is used. "UTC" or - // "GMT" is not an option so we set it to Europe/London. - "calendar.timezone.local": "Europe/London", - + /* + Finish + */ // All preferences have been set: now enable TorBirdy. "extensions.torbirdy.protected": true, }

1 0