diff --git a/modoboa/admin/handlers.py b/modoboa/admin/handlers.py index cc0f679b1..b6fbae762 100644 --- a/modoboa/admin/handlers.py +++ b/modoboa/admin/handlers.py @@ -7,8 +7,8 @@ from . import models @receiver(signals.post_save, sender=models.Domain) -def update_domain_mailboxes(sender, instance, **kwargs): - """Update associated mailboxes.""" +def update_domain_mxs_and_mailboxes(sender, instance, **kwargs): + """Update associated MXs and mailboxes.""" if kwargs.get("created"): return instance.mailbox_set.filter(use_domain_quota=True).update( diff --git a/modoboa/admin/management/commands/subcommands/_mx.py b/modoboa/admin/management/commands/subcommands/_mx.py index 935933f7f..483ca4c16 100644 --- a/modoboa/admin/management/commands/subcommands/_mx.py +++ b/modoboa/admin/management/commands/subcommands/_mx.py @@ -57,6 +57,9 @@ class CheckMXRecords(BaseCommand): "--skip-admin-emails", action="store_true", default=False, help="Skip domain's admins email notification.") + parser.add_argument( + "--domain", type=str, action="append", default=[], + help="Domain name or id to update.") parser.add_argument( "--timeout", type=int, default=3, help="Timeout used for queries.") @@ -80,28 +83,29 @@ class CheckMXRecords(BaseCommand): models.MXRecord.objects.filter(domain=domain).delete() try: answers = dns.resolver.query(domain.name, "MX") - except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN): + except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN, + dns.resolver.NoNameservers): raise StopIteration() delta = timedelta(seconds=ttl) for answer in answers: - address = None try: - ipaddress.ip_address(str(answer.exchange)) - except ValueError: - try: - address = socket.gethostbyname(str(answer.exchange)) - except socket.gaierror: - pass + # work if .exchange is a name or IP + address = socket.gethostbyname(str(answer.exchange)) + except socket.gaierror: + pass else: - address = str(answer.exchange) - finally: - if address is not None: + try: + # we must have a valid IP + address = ipaddress.ip_address(u'{}'.format(address)) + except ValueError: + pass + else: record = models.MXRecord.objects.create( domain=domain, - name=str(answer.exchange).strip("."), - address=address, + name=u'{}'.format(str(answer.exchange).strip(".")), + address=u'{}'.format(address), updated=now + delta) yield record @@ -237,5 +241,19 @@ class CheckMXRecords(BaseCommand): models.DNSBLResult.objects.exclude( provider__in=self.providers).delete() - for domain in models.Domain.objects.filter(enabled=True): + if options['domain']: + domains = [] + for domain in options['domain']: + if isinstance(domain, models.Domain): + domains.append(domain) + elif domain.isdigit(): + domains.append(models.Domain.objects.get(domain)) + else: + domains.append(models.Domain.objects.filter(name=domain)) + else: + domains = models.Domain.objects.filter(enabled=True) + + options.pop('domain') + + for domain in domains: self.check_domain(domain, **options) diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py index d90b00099..12ea14b0b 100644 --- a/modoboa/admin/models/domain.py +++ b/modoboa/admin/models/domain.py @@ -1,7 +1,10 @@ """Models related to domains management.""" +import datetime + from django.db import models from django.db.models.manager import Manager +from django.utils import timezone from django.utils.encoding import python_2_unicode_compatible, smart_text from django.utils.functional import cached_property from django.utils.translation import ugettext as _, ugettext_lazy @@ -103,8 +106,18 @@ class Domain(AdminObject): return self.domainalias_set @property - def mx_records(self): - self.mxrecord_set + def just_created(self): + """return true if the domain was created in the latest 24h""" + now = timezone.now() + delta = datetime.timedelta(days=1) + return self.creation + delta > now + + def awaiting_checks(self): + """return true if the domain has no valid MX records and was created + in the latest 24h""" + if (not self.mxrecord_set.has_valids()) and self.just_created: + return True + return False @cached_property def dnsbl_status_color(self): diff --git a/modoboa/admin/templates/admin/domain_detail.html b/modoboa/admin/templates/admin/domain_detail.html index ab79891ad..578f48fd9 100644 --- a/modoboa/admin/templates/admin/domain_detail.html +++ b/modoboa/admin/templates/admin/domain_detail.html @@ -24,11 +24,15 @@ {% if enable_mx_checks == "yes" or enable_dnsbl_checks == "yes" %}
{% trans "DNS status" %} - {% if enable_mx_checks == "yes" %} - MX - {% endif %} - {% if enable_dnsbl_checks == "yes" %} - DNSBL + {% if domain.awaiting_checks %} + {% trans "Awaiting checks" %} + {% else %} + {% if enable_mx_checks == "yes" %} + MX + {% endif %} + {% if enable_dnsbl_checks == "yes" %} + DNSBL + {% endif %} {% endif %}
{% endif %} diff --git a/modoboa/admin/templates/admin/domains_table.html b/modoboa/admin/templates/admin/domains_table.html index da4587af4..5278c1829 100644 --- a/modoboa/admin/templates/admin/domains_table.html +++ b/modoboa/admin/templates/admin/domains_table.html @@ -8,11 +8,15 @@ {% if enable_mx_checks == "yes" or enable_dnsbl_checks == "yes" %} - {% if enable_mx_checks == "yes" %} - MX - {% endif %} - {% if enable_dnsbl_checks == "yes" %} - DNSBL + {% if domain.awaiting_checks %} + {% trans "Awaiting checks" %} + {% else %} + {% if enable_mx_checks == "yes" %} + MX + {% endif %} + {% if enable_dnsbl_checks == "yes" %} + DNSBL + {% endif %} {% endif %} diff --git a/modoboa/admin/tests/test_mx.py b/modoboa/admin/tests/test_mx.py index 7b958aa71..73812a7a4 100644 --- a/modoboa/admin/tests/test_mx.py +++ b/modoboa/admin/tests/test_mx.py @@ -21,6 +21,7 @@ class MXTestCase(ModoTestCase): cls.domain = factories.DomainFactory(name="modoboa.org") factories.DomainFactory(name="pouet.com") # should not exist parameters.save_admin('VALID_MXS', '127.0.0.1', app='admin') + models.MXRecord.objects.all().delete() def test_management_command(self): """Check that command works fine.""" @@ -53,6 +54,7 @@ class DNSBLTestCase(ModoTestCase): super(DNSBLTestCase, cls).setUpTestData() cls.domain = factories.DomainFactory(name="modoboa.org") factories.DomainFactory(name="pouet.com") # should not exist + models.DNSBLResult.objects.all().delete() @override_settings(DNSBL_PROVIDERS=["zen.spamhaus.org"]) def test_management_command(self):