From dd9b4920713145e51eeef74063c15d715a746d37 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 18 Nov 2015 23:14:42 +0200 Subject: Fail silently with invalid emails in cron jobs --- servo/management/commands/cron.py | 7 +++++++ servo/migrations/0044_auto_20151118_2310.py | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 servo/migrations/0044_auto_20151118_2310.py (limited to 'servo') diff --git a/servo/management/commands/cron.py b/servo/management/commands/cron.py index adc6d34..eaed8bd 100755 --- a/servo/management/commands/cron.py +++ b/servo/management/commands/cron.py @@ -6,6 +6,7 @@ from datetime import date, timedelta from django.conf import settings from django.core.files import File from django.core.mail import send_mail +from django.core.validators import validate_email from django.utils.translation import ugettext as _ from django.core.management.base import BaseCommand @@ -22,6 +23,12 @@ def send_table(sender, recipient, subject, table, send_empty=False): if send_empty is False and table.has_body() is False: return + try: + validate_email(sender) + validate_email(recipient) + except Exception: + return + config = Configuration.conf() host, port = Configuration.get_smtp_server() diff --git a/servo/migrations/0044_auto_20151118_2310.py b/servo/migrations/0044_auto_20151118_2310.py new file mode 100644 index 0000000..dddef82 --- /dev/null +++ b/servo/migrations/0044_auto_20151118_2310.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('servo', '0043_auto_20151109_1354'), + ] + + operations = [ + migrations.AlterField( + model_name='calendar', + name='hours_per_day', + field=models.FloatField(help_text='How many hours per day should be in this calendar', null=True, verbose_name='Hours per day', blank=True), + ), + ] -- cgit v1.2.3