Merge branch 'master' into post-secure-autoconfig

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
 

chrome/content/emailwizard.js

@@ -138,6 +138,10 @@ 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;

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,
@@ -320,6 +320,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;
@@ -347,6 +366,7 @@ function TorBirdy() {
 
   this.setAccountPrefs();
   this.setPrefs();
+  sanitizeDateHeaders();
 
   dump("TorBirdy registered!\n");
 }

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