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

[torbirdy/develop] Add trailing / to chrome.manifest
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit f5a3b5233baa12b4250cdff42b119c33766a4008 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Mar 4 21:19:18 2014 -0500 Add trailing / to chrome.manifest --- chrome.manifest | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index 317f41f..666f166 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -15,14 +15,14 @@ locale castironthunderbirdclub de chrome/locale/de/ locale castironthunderbirdclub en chrome/locale/en/ locale castironthunderbirdclub es chrome/locale/es/ locale castironthunderbirdclub eu chrome/locale/eu/ -locale castironthunderbirdclub fa chrome/locale/fa +locale castironthunderbirdclub fa chrome/locale/fa/ locale castironthunderbirdclub fr chrome/locale/fr/ -locale castironthunderbirdclub fr-CA chrome/locale/fr-CA +locale castironthunderbirdclub fr-CA chrome/locale/fr-CA/ locale castironthunderbirdclub he chrome/locale/he/ locale castironthunderbirdclub it chrome/locale/it/ locale castironthunderbirdclub ja chrome/locale/ja/ -locale castironthunderbirdclub km chrome/locale/km -locale castironthunderbirdclub ko chrome/locale/ko +locale castironthunderbirdclub km chrome/locale/km/ +locale castironthunderbirdclub ko chrome/locale/ko/ locale castironthunderbirdclub lv chrome/locale/lv/ locale castironthunderbirdclub ms-MY chrome/locale/ms-MY/ locale castironthunderbirdclub nb chrome/locale/nb/

1 0

[torbirdy/develop] Fix a typo
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit a178f33f2ec49758c7a3c451548e4732a54a69d4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Mar 4 21:24:20 2014 -0500 Fix a typo --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index de1382e..3a1778d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,7 +17,7 @@ * Restore preferences to the user's own defaults instead of Thunderbird's (closes #10588) * network.proxy.no_proxies_on is no longer set to "localhost, 127.0.0.1" - (thanks for Carsten N.) + (thanks to Carsten N.) 0.1.2, 04 Nov 2013

1 0

[torbirdy/develop] Drop special treatment of Tails vs account creation.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit c8da9f2e9006751631a7fbc46be80aaaec31562f Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 13:53:32 2016 +0100 Drop special treatment of Tails vs account creation. The extensions.torbirdy.emailwizard pref is enough for Tails' purposes, so let's clean up a bit. --- chrome/content/emailwizard.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 2f2a6a7..f3f1abd 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -7,16 +7,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var prefs = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefBranch); - // Check if we are running Tails. If yes, disable the manual account - // configuration wizard since Tails handles that on its own. See: - // https://tails.boum.org/todo/Return_of_Icedove__63__/#index6h2 - // This is also disabled if "extensions.torbirdy.emailwizard" is true. var disableWizard = false; - if (prefs.prefHasUserValue("vendor.name")) { - if (prefs.getCharPref("vendor.name") === "Tails") { - disableWizard = true; - } - } if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) { disableWizard = true; }

1 0

[torbirdy/develop] Merge pull request #18 from adrelanos/patch-1
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 9be34f6ac3c12b7b972c6e5768749f6c18725d8c Merge: 1ec029f b44db6e Author: Sukhbir Singh <s3singh(a)uwaterloo.ca> Date: Sun Nov 30 21:22:08 2014 +0530 Merge pull request #18 from adrelanos/patch-1 updated Whonix settings chrome/content/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torbirdy/develop] remove dump()
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 44ea30351bcbcccc96a91505c77fd0e7141e35e0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:06:29 2014 +0000 remove dump() --- components/torbirdy.js | 1 - 1 file changed, 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 71d250e..40adadb 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -413,7 +413,6 @@ TorBirdy.prototype = { }, setPrefs: function() { - dump("Setting TorBirdy preferences\n"); // If custom values are set for specific preferences, override the defaults with them. // For each preference, get the type and then set the property. for (var i = 0; i < this.customPrefs.length; i++) {

1 0

[torbirdy/develop] updated Whonix settings
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit b44db6e23773fea1d079acb88980b34f1733844f Author: Patrick Schleizer <adrelanos(a)riseup.net> Date: Sun Nov 30 15:22:11 2014 +0100 updated Whonix settings Changed socks host IP from 192.168.0.10 to 10.152.152.10 because Whonix network configuration has changed. (Source: https://github.com/Whonix/whonix-gw-network-conf/blob/master/etc/network/in…) --- chrome/content/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 1930f98..1359f63 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -252,7 +252,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.setProxyWhonix = function() { pub.resetAll(); - pub.setPreferences("network.proxy.socks", "192.168.0.10"); + pub.setPreferences("network.proxy.socks", "10.152.152.10"); pub.setPreferences("network.proxy.socks_port", 9102); pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.whonix"), "green");

1 0

[torbirdy/develop] Bug #6314: Round Date header down to nearest minute.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 7169642643b91f203782d8e6a885d53fbb43f49e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Dec 8 16:59:22 2015 -0800 Bug #6314: Round Date header down to nearest minute. --- components/torbirdy.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/components/torbirdy.js b/components/torbirdy.js index 5867f98..1dd87fe 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -312,6 +312,25 @@ var TorBirdyOldPrefs = [ "network.proxy.http", ] +// sanitizeDateHeaders() +// Run this function to make sure that the Date header in a new message +// is rounded down to the nearest minute. +function sanitizeDateHeaders() { + // Import the jsmime module that is used to generate mail headers. + let { jsmime } = Components.utils.import("resource:///modules/jsmime.jsm"); + // Inject our own structured encoder to the default header emitter, + // to override the default Date encoder with a rounded-down version. + jsmime.headeremitter.addStructuredEncoder("Date", function (date) { + // Copy date + let roundedDate = new Date(date.getTime()); + // Round down to the nearest minute. + roundedDate.setSeconds(0); + // Use the headeremitter's addDate function to format it properly. + // `this` magically refers to the headeremitter object. + this.addDate(roundedDate); + }); +} + function TorBirdy() { this._uninstall = false; this.wrappedJSObject = this; @@ -339,6 +358,7 @@ function TorBirdy() { this.setAccountPrefs(); this.setPrefs(); + sanitizeDateHeaders(); dump("TorBirdy registered!\n"); }

1 0

[torbirdy/develop] As suggested by anonym on #13721, add en-US locale to chrome.manifest
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 3d625f36926b958dcaa23ea453d1d2b5a61edee4 Author: Ulrike Uhlig <u(a)451f.org> Date: Sun Sep 27 14:11:07 2015 +0200 As suggested by anonym on #13721, add en-US locale to chrome.manifest --- chrome.manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome.manifest b/chrome.manifest index 79134aa..78f1183 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -16,6 +16,7 @@ locale castironthunderbirdclub de chrome/locale/de/ locale castironthunderbirdclub el chrome/locale/el/ locale castironthunderbirdclub en chrome/locale/en/ locale castironthunderbirdclub en-GB chrome/locale/en-GB/ +locale castironthunderbirdclub en-US chrome/locale/en/ locale castironthunderbirdclub es chrome/locale/es/ locale castironthunderbirdclub eu chrome/locale/eu/ locale castironthunderbirdclub fr chrome/locale/fr/

1 0

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

25 Nov '16

commit 9b75deeba42e6e7e94cc5acf6e74651d04f63c10 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 20:16:59 2016 +0100 Simplify. --- chrome/content/emailwizard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 3352fb9..d5adc85 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -6,10 +6,7 @@ if (!org.torbirdy) org.torbirdy = {}; if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var pub = {}; - var disableWizard = false; - if (Preferences.get("extensions.torbirdy.emailwizard", false)) { - disableWizard = true; - } + var disableWizard = !Preferences.get("extensions.torbirdy.emailwizard", false); fixupTorbirdySettingsOnNewAccount = function(account) { var idkey = account.defaultIdentity.key;

1 0

[torbirdy/develop] Also apply TorBirdy's account tweaks after autoconfiguraion.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 56c72de801a816a3f0e231a37a2dff5b7cf3bffb Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 18:53:34 2016 +0100 Also apply TorBirdy's account tweaks after autoconfiguraion. This fixes Tails bug #11204: https://labs.riseup.net/code/issues/11204 --- chrome/content/emailwizard.js | 70 +++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index f149446..baf1ef5 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -12,6 +12,36 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { disableWizard = true; } + fixupTorbirdySettingsOnNewAccount = function(account) { + var idkey = account.defaultIdentity.key; + var serverkey = account.incomingServer.key; + var protocol = account.incomingServer.type; + + // 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"); + } + + // 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. + if (protocol === "pop3") { + var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; + var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); + prefs.setBoolPref(downloadOnBiffPref, false); + } + } + pub.adjustAutoWizard = function() { if (!disableWizard) { var realname = document.getElementById("realname").value; @@ -66,31 +96,8 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { replaceVariables(config, realname, email, password); config.rememberPassword = rememberPassword && !!password; - var newAccount = createAccountInBackend(config); - - // 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 serverkey = newAccount.incomingServer.key; - var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); - prefs.setBoolPref(checkNewMailPref, false); - - // Make sure that drafts are saved to Local Folders if it is an IMAP account. - if (protocol === "imap") { - var identity = newAccount.defaultIdentity; - identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts"; - } - - // 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. - if (protocol === "pop3") { - var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; - var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); - prefs.setBoolPref(downloadOnBiffPref, false); - } + var new_account = createAccountInBackend(config); + fixupTorbirdySettingsOnNewAccount(new_account); // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup(). var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"] @@ -102,12 +109,23 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { } else { window.openDialog("chrome://messenger/content/AccountManager.xul", "AccountManager", "chrome,centerscreen,modal,titlebar", - { server: newAccount.incomingServer, + { server: new_account.incomingServer, selectPage: "am-server.xul" }); } window.close(); } else { + // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : finish(). + // We need somewhere to hook in, so we can access the new + // account object created through the autoconfig wizard, and + // apply Torbirdy's settings on it. + gEmailConfigWizard.finish = function() { + gEmailWizardLogger.info("creating account in backend"); + var account = createAccountInBackend(this.getConcreteConfig()); + fixupTorbirdySettingsOnNewAccount(account); + window.close(); + } + gEmailConfigWizard.onNext(); } };

1 0