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

[torbirdy/master] Simplify.
by sukhbir＠torproject.org 04 May '16

04 May '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/master] Switch to Preferences.jsm.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit c87a2a2b11dc62b4b9a11fe27b2dbc3fd8d163f5 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 20:07:17 2016 +0100 Switch to Preferences.jsm. It's cleaner and simpler due to the type inference which we already use, so let's stick with one approach. Also the explicit default values make stuff clearer. --- 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 ec73113..3352fb9 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -6,11 +6,8 @@ if (!org.torbirdy) org.torbirdy = {}; if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var pub = {}; - var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - var disableWizard = false; - if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) { + if (Preferences.get("extensions.torbirdy.emailwizard", false)) { disableWizard = true; }

1 0

[torbirdy/master] Refactor.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 7fc8da14e00d2e6d2436358ffd509e81527bdfa6 Author: anonym <anonym(a)riseup.net> Date: Fri Mar 18 16:51:09 2016 +0100 Refactor. --- chrome/content/preferences.js | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 1359f63..de77205 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -37,36 +37,20 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { }; pub.setEnigmailPrefs = function(anonService) { + var opts = ""; if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) { - if (anonService === "tor") { - return "--no-emit-version " + - "--no-comments " + - "--throw-keyids " + - "--display-charset utf-8 " + - "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118"; - } - if (anonService === "jondo") { - return "--no-emit-version " + - "--no-comments " + - "--throw-keyids " + - "--display-charset utf-8 " + - "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001"; - } - } - else { - if (anonService === "tor") { - return "--no-emit-version " + - "--no-comments " + - "--display-charset utf-8 " + - "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118"; - } - if (anonService === "jondo") { - return "--no-emit-version " + - "--no-comments " + - "--display-charset utf-8 " + - "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001"; - } + opts += "--throw-keyids "; } + var proxy = "http-proxy=http://127.0.0.1:8118"; + if (anonService === "jondo") { + proxy = "http://127.0.0.1:4001"; + } + return opts + + "--no-emit-version " + + "--no-comments " + + "--display-charset utf-8 " + + "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=" + + proxy; }; pub.updateKeyserver = function(anonService) {

1 0

[torbirdy/master] Don't deal with some account settings twice.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 56150f9c520a4d995a2f187471a462395ca8760e Author: anonym <anonym(a)riseup.net> Date: Thu Mar 10 00:58:40 2016 +0100 Don't deal with some account settings twice. We already deal with these in fixupTorbirdySettingsOnNewAccount() through prefs. --- chrome/content/emailwizard.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index fc2d48e..30024ac 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -81,10 +81,6 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { config.incoming.auth = 3; config.outgoing.auth = 3; - // Set default values to disable automatic email fetching. - config.incoming.loginAtStartup = false; - config.incoming.downloadOnBiff = false; - // Default the outgoing SMTP port. config.outgoing.port = 465;

1 0

[torbirdy/master] Merge pull request #30 from u451f/post-secure-autoconfig
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 1da072c0051b4ca05ec667ed516ce8edcb8186fe Merge: caaf2b5 188fbd6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 4 13:14:59 2016 -0400 Merge pull request #30 from u451f/post-secure-autoconfig Secure autoconfiguration chrome/content/emailwizard.js | 111 ++++++++++++++++++++--------------------- chrome/content/emailwizard.xul | 2 +- chrome/content/preferences.js | 40 +++++---------- components/torbirdy.js | 10 +++- 4 files changed, 75 insertions(+), 88 deletions(-)

1 0

[torbirdy/master] Use Tor's SOCKSPort for Enigmail's keyserver configuration.
by sukhbir＠torproject.org 04 May '16

04 May '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/master] Work around Thunderbird forcing login_at_startup for the first account.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit eede7c74389004e8d01d83068e524461adcaa32a Author: anonym <anonym(a)riseup.net> Date: Thu Mar 17 14:08:18 2016 +0100 Work around Thunderbird forcing login_at_startup for the first account. --- components/torbirdy.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/torbirdy.js b/components/torbirdy.js index 5867f98..2efcfec 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -181,6 +181,14 @@ const TorBirdyPrefs = { "mail.inline_attachments": false, // Do not IDLE (disable push mail). "mail.server.default.use_idle": false, + // Thunderbird's autoconfig wizard is designed to enable an initial + // mail fetch (by setting login_at_start) for the first account it + // creates (which will become the "default" account, see + // msgMail3PaneWindow.js for details) which side-steps the settings + // we apply in fixupTorbirdySettingsOnNewAccount(). Hence, fool + // Thunderbird to think that this initial mail fetch has already + // been done so we get the settings we want. + "mail.startup.enabledMailCheckOnce": true, /* Browser

1 0

[torbirdy/master] Fix name.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 9ea891ff0819ece07418cde374b97923a0dde2a1 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 14:00:24 2016 +0100 Fix name. This method does not necessarily disable the wizard. --- chrome/content/emailwizard.js | 4 ++-- chrome/content/emailwizard.xul | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index f3f1abd..e17bbd1 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -12,7 +12,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { disableWizard = true; } - pub.disableAutoWizard = function() { + pub.adjustAutoWizard = function() { if (!disableWizard) { var realname = document.getElementById("realname").value; var email = document.getElementById("email").value; @@ -117,7 +117,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { if (keycode == 13) { if (document.getElementById("next_button").disabled === false) { if (!disableWizard) { - pub.disableAutoWizard(); + pub.adjustAutoWizard(); } else { gEmailConfigWizard.onNext(); diff --git a/chrome/content/emailwizard.xul b/chrome/content/emailwizard.xul index 72fad2a..f3a9c60 100644 --- a/chrome/content/emailwizard.xul +++ b/chrome/content/emailwizard.xul @@ -9,7 +9,7 @@ </stringbundleset> <button id="next_button" - oncommand="org.torbirdy.emailwizard.disableAutoWizard();" /> + oncommand="org.torbirdy.emailwizard.adjustAutoWizard();" /> <vbox id="mastervbox" flex="1"> <groupbox id="torbirdy-protocol-box" class="indent" insertafter="initialSettings">

1 0

[torbirdy/master] Drop special treatment of Tails vs account creation.
by sukhbir＠torproject.org 04 May '16

04 May '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/master] Simplify.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 63aba79747531845fd44fd96879c669b2921fab3 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 14:00:41 2016 +0100 Simplify. The removed logic is already present in pub.adjustAutoWizard(). --- chrome/content/emailwizard.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index e17bbd1..a82a188 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -116,12 +116,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var keycode = event.keyCode; if (keycode == 13) { if (document.getElementById("next_button").disabled === false) { - if (!disableWizard) { - pub.adjustAutoWizard(); - } - else { - gEmailConfigWizard.onNext(); - } + pub.adjustAutoWizard(); } } };

1 0