external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

some IDNA functionality was still using Python's built-in IDNA 2003 encoder rather than the idna package's IDNA 2008 encoder

Browse Source
This commit is contained in:
Joshua Tauberer 2015-06-30 12:45:58 +00:00
parent f89a98c78a
commit aa33428311
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
management/mailconfig.py
View File

@ -3,6 +3,7 @@
import subprocess, shutil, os, sqlite3, re import subprocess, shutil, os, sqlite3, re
import utils import utils
from email_validator import validate_email as validate_email_, EmailNotValidError from email_validator import validate_email as validate_email_, EmailNotValidError
import idna
def validate_email(email, mode=None): def validate_email(email, mode=None):
# Checks that an email address is syntactically valid. Returns True/False. # Checks that an email address is syntactically valid. Returns True/False.
@ -52,9 +53,9 @@ def sanitize_idn_email_address(email):
# to the underlying protocols. # to the underlying protocols.
try: try:
localpart, domainpart = email.split("@") localpart, domainpart = email.split("@")
domainpart = domainpart.encode("idna").decode('ascii') domainpart = idna.encode(domainpart).decode('ascii')
return localpart + "@" + domainpart return localpart + "@" + domainpart
except: except idna.IDNAError:
# Domain part is not IDNA-valid, so leave unchanged. If there # Domain part is not IDNA-valid, so leave unchanged. If there
# are non-ASCII characters it will be filtered out by # are non-ASCII characters it will be filtered out by
# validate_email. # validate_email.
@ -65,9 +66,9 @@ def prettify_idn_email_address(email):
# names in IDNA in the database, but we want to show Unicode to the user. # names in IDNA in the database, but we want to show Unicode to the user.
try: try:
localpart, domainpart = email.split("@") localpart, domainpart = email.split("@")
domainpart = domainpart.encode("ascii").decode('idna') domainpart = idna.decode(domainpart.encode("ascii"))
return localpart + "@" + domainpart return localpart + "@" + domainpart
except: except (UnicodeError, idna.IDNAError):
# Failed to decode IDNA. Should never happen. # Failed to decode IDNA. Should never happen.
return email return email
@ -238,7 +239,7 @@ def get_domain(emailaddr, as_unicode=True):
# Gets the domain part of an email address. Turns IDNA # Gets the domain part of an email address. Turns IDNA
# back to Unicode for display. # back to Unicode for display.
ret = emailaddr.split('@', 1)[1] ret = emailaddr.split('@', 1)[1]
if as_unicode: ret = ret.encode('ascii').decode('idna') if as_unicode: ret = idna.decode(ret.encode('ascii'))
return ret return ret
def get_mail_domains(env, filter_aliases=lambda alias : True): def get_mail_domains(env, filter_aliases=lambda alias : True):

3
management/status_checks.py
View File

@ -10,6 +10,7 @@ import sys, os, os.path, re, subprocess, datetime, multiprocessing.pool
import dns.reversename, dns.resolver import dns.reversename, dns.resolver
import dateutil.parser, dateutil.tz import dateutil.parser, dateutil.tz
import idna
from dns_update import get_dns_zones, build_tlsa_record, get_custom_dns_config, get_secondary_dns from dns_update import get_dns_zones, build_tlsa_record, get_custom_dns_config, get_secondary_dns
from web_update import get_web_domains, get_default_www_redirects, get_domain_ssl_files from web_update import get_web_domains, get_default_www_redirects, get_domain_ssl_files
@ -259,7 +260,7 @@ def run_domain_checks_on_domain(domain, rounded_time, env, dns_domains, dns_zone
output = BufferedOutput() output = BufferedOutput()
# The domain is IDNA-encoded, but for display use Unicode. # The domain is IDNA-encoded, but for display use Unicode.
output.add_heading(domain.encode('ascii').decode('idna')) output.add_heading(idna.decode(domain.encode('ascii')))
if domain == env["PRIMARY_HOSTNAME"]: if domain == env["PRIMARY_HOSTNAME"]:
check_primary_hostname_dns(domain, env, output, dns_domains, dns_zonefiles) check_primary_hostname_dns(domain, env, output, dns_domains, dns_zonefiles)

2
setup/management.sh
View File

@ -5,7 +5,7 @@ source setup/functions.sh
# build-essential libssl-dev libffi-dev python3-dev: Required to pip install cryptography. # build-essential libssl-dev libffi-dev python3-dev: Required to pip install cryptography.
apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil \ apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil \
build-essential libssl-dev libffi-dev python3-dev build-essential libssl-dev libffi-dev python3-dev
hide_output pip3 install rtyaml email_validator cryptography hide_output pip3 install rtyaml email_validator idna cryptography
# email_validator is repeated in setup/questions.sh # email_validator is repeated in setup/questions.sh
# Create a backup directory and a random key for encrypting backups. # Create a backup directory and a random key for encrypting backups.