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

[torbirdy/develop] Work around Thunderbird forcing login_at_startup for the first account.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '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/develop] Disable HTML for RSS feeds
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 174cd106b9708d22c9825d6611b13d1f22d7397a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 11 15:34:48 2016 -0400 Disable HTML for RSS feeds --- components/torbirdy.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 4f83513..2740c64 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -231,8 +231,11 @@ const TorBirdyPrefs = { // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, - // Prefer plain text for RSS. + // RSS. "rss.display.prefer_plaintext": true, + // These are similar to the mailnews.* settings. + "rss.display.disallow_mime_handlers": 3, + "rss.display.html_as": 1, // Override the user agent by setting it to an empty string. "general.useragent.override": "",

1 0

[torbirdy/develop] Configure Riseup accounts automatically
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit d9f74a8f71c80eb70ad37a68f8ba743b1779414c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 12 17:51:44 2016 -0400 Configure Riseup accounts automatically --- chrome/content/emailwizard.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index d38828e..9d88d70 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -90,18 +90,24 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { 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; config.outgoing.hostname = "smtp.%EMAILDOMAIN%"; + let emailDomain = email.split("@")[1]; + // Gmail and Riseup settings. + switch (emailDomain) { + case "gmail.com": + // Gmail uses OAuth2, which we deal with later. + pub.isGmail = true; + break; + case "riseup.net": + config.incoming.hostname = "mail.%EMAILDOMAIN%"; + config.outgoing.hostname = "mail.%EMAILDOMAIN%"; + break; + } + replaceVariables(config, realname, email, password); config.rememberPassword = rememberPassword && !!password;

1 0

[torbirdy/develop] Merge pull request #30 from u451f/post-secure-autoconfig
by sukhbir＠torproject.org 25 Nov '16

25 Nov '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/develop] Refactor.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '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/develop] Set calender timezone to UTC
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit ff0bf3cad0d223342760c3d0275073f6c3bc527b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 12 17:52:40 2016 -0400 Set calender timezone to UTC --- components/torbirdy.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 2740c64..238c089 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -227,7 +227,6 @@ const TorBirdyPrefs = { // 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", - // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, @@ -301,7 +300,9 @@ const TorBirdyPrefs = { // Mozilla Lightning. "calendar.useragent.extra": "", - "calendar.timezone.local": "", + // 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", // All preferences have been set: now enable TorBirdy. "extensions.torbirdy.protected": true,

1 0

[torbirdy/develop] Add overlay to disable automatic checking and fetching of RSS feeds (#19031)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 0968621f307da8a9a0fcf6de9b30fb757169ccfe Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 11 21:32:14 2016 -0400 Add overlay to disable automatic checking and fetching of RSS feeds (#19031) To disable checking of new articles on startup and after a fixed interval (100 minutes as defined in FeedUtils.jsm), add an overlay which disables both these settings after a new RSS account is created. This is similar to what we are doing with the manual email configuration wizard. --- chrome.manifest | 1 + chrome/content/feedwizard.js | 43 +++++++++++++++++++++++++++++++++++++++++++ chrome/content/feedwizard.xul | 10 ++++++++++ 3 files changed, 54 insertions(+) diff --git a/chrome.manifest b/chrome.manifest index 78f1183..431b4c9 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -3,6 +3,7 @@ content castironthunderbirdclub chrome/content/ overlay chrome://messenger/content/messenger.xul chrome://castironthunderbirdclub/content/overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://castironthunderbirdclub/content/composeoverlay.xul overlay chrome://messenger/content/accountcreation/emailWizard.xul chrome://castironthunderbirdclub/content/emailwizard.xul +overlay chrome://messenger-newsblog/content/feedAccountWizard.xul chrome://castironthunderbirdclub/content/feedwizard.xul component {ebd85413-18c8-4265-a708-a8890ec8d1ed} components/torbirdy.js contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed} diff --git a/chrome/content/feedwizard.js b/chrome/content/feedwizard.js new file mode 100644 index 0000000..07b01bc --- /dev/null +++ b/chrome/content/feedwizard.js @@ -0,0 +1,43 @@ +Components.utils.import("resource://gre/modules/Preferences.jsm"); + +if (!org) var org = {}; +if (!org.torbirdy) org.torbirdy = {}; + +if (!org.torbirdy.feedwizard) org.torbirdy.feedwizard = new function() { + var pub = {}; + + pub.fixFeedAccount = function(account) { + let accountKey = account.incomingServer.key; + + let pref_spec = [ + ['mail.server.%serverkey%.check_new_mail', false], + ['mail.server.%serverkey%.login_at_startup', false] + ]; + + for each (var [pref_template, value] in pref_spec) { + let pref = pref_template.replace("%serverkey%", accountKey); + Preferences.set(pref, value); + } + }; + + // From comm-release/mailnews/extensions/newsblog/content/feedAccountWizard.js : onFinish(). + // We need to disable automatic checking of articles on startup and every X + // (100 is the default) minutes. Since these values are in FeedUtils.jsm, we + // use this overlay, create the account, and then apply our settings. + FeedAccountWizard.onFinish = function() { + let account = FeedUtils.createRssAccount(this.accountName); + if ("gFolderTreeView" in window.opener.top) + // Opened from 3pane File->New or Appmenu New Message, or + // Account Central link. + window.opener.top.gFolderTreeView.selectFolder(account.incomingServer.rootMsgFolder); + else if ("selectServer" in window.opener) + // Opened from Account Settings. + window.opener.selectServer(account.incomingServer); + + // Now apply the settings. + pub.fixFeedAccount(account); + window.close(); + }; + + return pub; +}; diff --git a/chrome/content/feedwizard.xul b/chrome/content/feedwizard.xul new file mode 100644 index 0000000..2f3c935 --- /dev/null +++ b/chrome/content/feedwizard.xul @@ -0,0 +1,10 @@ +<?xml version="1.0"?> + +<?xml-stylesheet href="chrome://messenger/skin/accountWizard.css" type="text/css"?> + +<wizard id="castironthunderbirdclub-feedwizard-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/feedwizard.js" /> + +</wizard>

1 0

[torbirdy/develop] Make TorBirdy XPI deterministic (#15459)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit caaf2b593ba2a116ac8f63416bb311bcdd140ee2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue May 3 15:29:52 2016 -0400 Make TorBirdy XPI deterministic (#15459) --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 96214b1..48c661c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,15 @@ SHELL := /bin/bash VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1) +FAKETIME := 200001010000 + make-xpi: zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" +make-reproducible: + find . -print0 | xargs -0 touch -t $(FAKETIME) + zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" -x *.git* + clean: rm -f ../torbirdy-$(VERSION).xpi

1 0

[torbirdy/develop] Update fetching preference value for default protocol
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 602b5d8f7d342ec86f3494791e65ecc5bfd097a6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 4 13:35:53 2016 -0400 Update fetching preference value for default protocol --- chrome/content/emailwizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 8218c1b..0223e7a 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -140,7 +140,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { 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") + var selectProtocol = Preferences.get("extensions.torbirdy.defaultprotocol") document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; };

1 0

[torbirdy/develop] Secure NNTP settings on account creation (#7847)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 0f1d01af3ab0572f4ffc25bb67c1b03afc9591f5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 13 18:26:10 2016 -0400 Secure NNTP settings on account creation (#7847) --- chrome.manifest | 1 + chrome/content/nntpwizard.js | 90 +++++++++++++++++++++++++++++++++++++++++++ chrome/content/nntpwizard.xul | 10 +++++ 3 files changed, 101 insertions(+) diff --git a/chrome.manifest b/chrome.manifest index 431b4c9..33b0a10 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -4,6 +4,7 @@ overlay chrome://messenger/content/messenger.xul chrome://castironthunderbirdclu overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://castironthunderbirdclub/content/composeoverlay.xul overlay chrome://messenger/content/accountcreation/emailWizard.xul chrome://castironthunderbirdclub/content/emailwizard.xul overlay chrome://messenger-newsblog/content/feedAccountWizard.xul chrome://castironthunderbirdclub/content/feedwizard.xul +overlay chrome://messenger/content/AccountWizard.xul chrome://castironthunderbirdclub/content/nntpwizard.xul component {ebd85413-18c8-4265-a708-a8890ec8d1ed} components/torbirdy.js contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed} diff --git a/chrome/content/nntpwizard.js b/chrome/content/nntpwizard.js new file mode 100644 index 0000000..90051bb --- /dev/null +++ b/chrome/content/nntpwizard.js @@ -0,0 +1,90 @@ +Components.utils.import("resource://gre/modules/Preferences.jsm"); + +if (!org) var org = {}; +if (!org.torbirdy) org.torbirdy = {}; + +if (!org.torbirdy.nntpwizard) org.torbirdy.nntpwizard = new function() { + var pub = {}; + + pub.fixNntpPort = function(account) { + let key = account.incomingServer.key; + + let pref_spec = [ + // Set the port to 563 and connection security to SSL/TLS (NNTPS). + ['mail.server.%serverkey%.port', 563], + ['mail.server.%serverkey%.socketType', 3] + ]; + + for each (var [pref_template, value] in pref_spec) { + let pref = pref_template.replace("%serverkey%", key); + Preferences.set(pref, value); + } + }; + + // This is from mailnews/base/prefs/content/AccountWizard.xul : FinishAccount(). + FinishAccount = function() { + try { + var pageData = GetPageData(); + + var accountData= gCurrentAccountData; + + if (!accountData) + { + accountData = new Object; + // Time to set the smtpRequiresUsername attribute + if (!serverIsNntp(pageData)) + accountData.smtpRequiresUsername = true; + } + + // we may need local folders before account is "Finished" + // if it's a pop3 account which defers to Local Folders. + verifyLocalFoldersAccount(); + + PageDataToAccountData(pageData, accountData); + + FixupAccountDataForIsp(accountData); + + // we might be simply finishing another account + if (!gCurrentAccount) + gCurrentAccount = createAccount(accountData); + + // transfer all attributes from the accountdata + finishAccount(gCurrentAccount, accountData); + + setupCopiesAndFoldersServer(gCurrentAccount, getCurrentServerIsDeferred(pageData), accountData); + + if (gCurrentAccount.incomingServer.canBeDefaultServer) + EnableCheckMailAtStartUpIfNeeded(gCurrentAccount); + + if (!document.getElementById("downloadMsgs").hidden) { + // skip the default biff, we will load messages manually if needed + window.opener.gLoadStartFolder = false; + if (document.getElementById("downloadMsgs").checked) { + window.opener.gNewAccountToLoad = gCurrentAccount; // load messages for new POP account + } + } + + pub.fixNntpPort(gCurrentAccount); + + // in case we crash, force us a save of the prefs file NOW + try { + MailServices.accounts.saveAccountInfo(); + } + catch (ex) { + dump("Error saving account info: " + ex + "\n"); + } + window.close(); + if(top.okCallback) + { + var state = true; + //dump("finish callback"); + top.okCallback(state); + } + } + catch(ex) { + dump("FinishAccount failed, " + ex +"\n"); + } + }; + + return pub; +}; diff --git a/chrome/content/nntpwizard.xul b/chrome/content/nntpwizard.xul new file mode 100644 index 0000000..c9ccea1 --- /dev/null +++ b/chrome/content/nntpwizard.xul @@ -0,0 +1,10 @@ +<?xml version="1.0"?> + +<?xml-stylesheet href="chrome://messenger/skin/accountWizard.css" type="text/css"?> + +<wizard id="castironthunderbirdclub-nntpwizard-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/nntpwizard.js" /> + +</wizard>

1 0