Fixed #17281 -- Prevented `AdminErrorHandler` from silently failing if the log message contains newlines. Thanks to Russell Keith-Magee for the report and to Bartolome Sanchez Salado and Marcin Wróbel for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17501 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 47 insertions, 0 deletions

diff --git a/tests/regressiontests/logging_tests/tests.py b/tests/regressiontests/logging_tests/tests.py
index a2c178c3b7..8eba44bf77 100644
--- a/tests/regressiontests/logging_tests/tests.py
+++ b/tests/regressiontests/logging_tests/tests.py
@@ -160,3 +160,50 @@ class AdminEmailHandlerTest(TestCase):
 
         # Restore original filters
         admin_email_handler.filters = orig_filters
+
+    @override_settings(
+            ADMINS=(('admin', 'admin@example.com'),),
+            EMAIL_SUBJECT_PREFIX='',
+            DEBUG=False,
+        )
+    def test_subject_accepts_newlines(self):
+        """
+        Ensure that newlines in email reports' subjects are escaped to avoid
+        AdminErrorHandler to fail.
+        Refs #17281.
+        """
+        message = u'Message \r\n with newlines'
+        expected_subject = u'ERROR: Message \\r\\n with newlines'
+
+        self.assertEqual(len(mail.outbox), 0)
+
+        logger = getLogger('django.request')
+        logger.error(message)
+
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertFalse('\n' in mail.outbox[0].subject)
+        self.assertFalse('\r' in mail.outbox[0].subject)
+        self.assertEqual(mail.outbox[0].subject, expected_subject)
+
+    @override_settings(
+            ADMINS=(('admin', 'admin@example.com'),),
+            EMAIL_SUBJECT_PREFIX='',
+            DEBUG=False,
+        )
+    def test_truncate_subject(self):
+        """
+        RFC 2822's hard limit is 998 characters per line.
+        So, minus "Subject: ", the actual subject must be no longer than 989
+        characters.
+        Refs #17281.
+        """
+        message = 'a' * 1000
+        expected_subject = 'ERROR: aa' + 'a' * 980
+
+        self.assertEqual(len(mail.outbox), 0)
+
+        logger = getLogger('django.request')
+        logger.error(message)
+
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].subject, expected_subject)