summaryrefslogtreecommitdiff
path: root/tests/logging_tests
diff options
context:
space:
mode:
authorVlastimil Zíma <vlastimil.zima@gmail.com>2015-09-03 20:52:49 +0200
committerTim Graham <timograham@gmail.com>2015-09-04 09:24:21 -0400
commitcf29b6b5610f242d18dcc31eb897c873109b67e2 (patch)
treebd60ca9d686cd22a002e7a2e2f3d4ab288c1d9eb /tests/logging_tests
parent4c0447b2ae57f4e8c44bcb2f371d160cb8daa930 (diff)
downloaddjango-cf29b6b5610f242d18dcc31eb897c873109b67e2.tar.gz
Fixed #25099 -- Fixed crash in AdminEmailHandler on DisallowedHost.
Diffstat (limited to 'tests/logging_tests')
-rw-r--r--tests/logging_tests/tests.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py
index 0b4abbfef6..9c39bb2d59 100644
--- a/tests/logging_tests/tests.py
+++ b/tests/logging_tests/tests.py
@@ -352,6 +352,25 @@ class AdminEmailHandlerTest(SimpleTestCase):
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].to, ['manager@example.com'])
+ @override_settings(ALLOWED_HOSTS='example.com')
+ def test_disallowed_host_doesnt_crash(self):
+ admin_email_handler = self.get_admin_email_handler(self.logger)
+ old_include_html = admin_email_handler.include_html
+
+ # Text email
+ admin_email_handler.include_html = False
+ try:
+ self.client.get('/', HTTP_HOST='evil.com')
+ finally:
+ admin_email_handler.include_html = old_include_html
+
+ # HTML email
+ admin_email_handler.include_html = True
+ try:
+ self.client.get('/', HTTP_HOST='evil.com')
+ finally:
+ admin_email_handler.include_html = old_include_html
+
class SettingsConfigTest(AdminScriptTestCase):
"""