v0.12b

fixes #482

CHANGELOG.md

@@ -6,6 +6,8 @@ v0.12 (July 3, 2015)
 
 This is a minor update to v0.11, which was a major update. Please read v0.11's advisories.
 
+* v0.12b was posted shortly after the initial posting of v0.12 correcting a minor regression in v0.12 related to creating aliases targetting multiple addresses.
+
 * The administrator@ alias was incorrectly created starting with v0.11. If your first install was v0.11, check that the administrator@ alias forwards mail to you.
 * Intrusion detection rules (fail2ban) are relaxed (i.e. less is blocked).
 * SSL certificates could not be installed for the new automatic 'www.' redirect domains.

README.md

@@ -57,7 +57,7 @@ I sign the release tags on git. To verify that a tag is signed by me, you can pe
 	$ cd mailinabox
 
 	# Verify the tag.
-	$ git verify-tag v0.12
+	$ git verify-tag v0.12b
 	gpg: Signature made ..... using RSA key ID C10BDD81
 	gpg: Good signature from "Joshua Tauberer <jt@occams.info>"
 	gpg: WARNING: This key is not certified with a trusted signature!
@@ -65,7 +65,7 @@ I sign the release tags on git. To verify that a tag is signed by me, you can pe
 	Primary key fingerprint: 5F4C 0E73 13CC D744 693B  2AEA B920 41F4 C10B DD81
 
 	# Check out the tag.
-	$ git checkout v0.12
+	$ git checkout v0.12b
 
 The key ID and fingerprint above should match my [Keybase.io key](https://keybase.io/joshdata) and the fingerprint I publish on [my homepage](https://razor.occams.info/).
 

management/mailconfig.py

@@ -55,9 +55,11 @@ def sanitize_idn_email_address(email):
 		localpart, domainpart = email.split("@")
 		domainpart = idna.encode(domainpart).decode('ascii')
 		return localpart + "@" + domainpart
-	except idna.IDNAError:
-		# Domain part is not IDNA-valid, so leave unchanged. If there
-		# are non-ASCII characters it will be filtered out by
+	except (ValueError, idna.IDNAError):
+		# ValueError: String does not have a single @-sign, so it is not
+		# a valid email address. IDNAError: Domain part is not IDNA-valid.
+		# Validation is not this function's job, so return value unchanged. 
+		# If there are non-ASCII characters it will be filtered out by
 		# validate_email.
 		return email
 
@@ -68,8 +70,9 @@ def prettify_idn_email_address(email):
 		localpart, domainpart = email.split("@")
 		domainpart = idna.decode(domainpart.encode("ascii"))
 		return localpart + "@" + domainpart
-	except (UnicodeError, idna.IDNAError):
-		# Failed to decode IDNA. Should never happen.
+	except (ValueError, UnicodeError, idna.IDNAError):
+		# Failed to decode IDNA, or the email address does not have a
+		# single @-sign. Should never happen.
 		return email
 
 def is_dcv_address(email):

setup/bootstrap.sh

@@ -7,7 +7,7 @@
 #########################################################
 
 if [ -z "$TAG" ]; then
-	TAG=v0.12
+	TAG=v0.12b
 fi
 
 # Are we running as root?