diff options
| author | Rajesh Veeranki <rveeranki01@gmail.com> | 2017-05-25 19:19:01 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-05-25 08:19:01 -0400 |
| commit | 67e1afb4a8478af6725e45a9fdcd2a511b2eb005 (patch) | |
| tree | 3a306f9d8643e66b878a9a1187a5824af94c9daa /tests/requests | |
| parent | f8bce94997739e4e61919cddff84fc3e3302d8f7 (diff) | |
Fixed #28224 -- Tested for SuspiciousOperation subclasses in Django's tests.
Diffstat (limited to 'tests/requests')
| -rw-r--r-- | tests/requests/tests.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/requests/tests.py b/tests/requests/tests.py index 932078fb0e..1ab90660f7 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -5,7 +5,7 @@ from io import BytesIO from itertools import chain from urllib.parse import urlencode -from django.core.exceptions import SuspiciousOperation +from django.core.exceptions import DisallowedHost from django.core.handlers.wsgi import LimitedStream, WSGIRequest from django.http import ( HttpRequest, HttpResponse, RawPostDataException, UnreadablePostError, @@ -695,7 +695,7 @@ class HostValidationTests(SimpleTestCase): # Poisoned host headers are rejected as suspicious for host in chain(self.poisoned_hosts, ['other.com', 'example.com..']): - with self.assertRaises(SuspiciousOperation): + with self.assertRaises(DisallowedHost): request = HttpRequest() request.META = { 'HTTP_HOST': host, @@ -759,7 +759,7 @@ class HostValidationTests(SimpleTestCase): request.get_host() for host in self.poisoned_hosts: - with self.assertRaises(SuspiciousOperation): + with self.assertRaises(DisallowedHost): request = HttpRequest() request.META = { 'HTTP_HOST': host, @@ -810,8 +810,8 @@ class HostValidationTests(SimpleTestCase): request.META = {'HTTP_HOST': host} self.assertEqual(request.get_host(), host) - # Other hostnames raise a SuspiciousOperation. - with self.assertRaises(SuspiciousOperation): + # Other hostnames raise a DisallowedHost. + with self.assertRaises(DisallowedHost): request = HttpRequest() request.META = {'HTTP_HOST': 'example.com'} request.get_host() @@ -831,7 +831,7 @@ class HostValidationTests(SimpleTestCase): ]: request = HttpRequest() request.META = {'HTTP_HOST': host} - with self.assertRaisesMessage(SuspiciousOperation, msg_suggestion % (host, host)): + with self.assertRaisesMessage(DisallowedHost, msg_suggestion % (host, host)): request.get_host() for domain, port in [ # Valid-looking hosts with a port number @@ -842,18 +842,18 @@ class HostValidationTests(SimpleTestCase): host = '%s:%s' % (domain, port) request = HttpRequest() request.META = {'HTTP_HOST': host} - with self.assertRaisesMessage(SuspiciousOperation, msg_suggestion % (host, domain)): + with self.assertRaisesMessage(DisallowedHost, msg_suggestion % (host, domain)): request.get_host() for host in self.poisoned_hosts: request = HttpRequest() request.META = {'HTTP_HOST': host} - with self.assertRaisesMessage(SuspiciousOperation, msg_invalid_host % host): + with self.assertRaisesMessage(DisallowedHost, msg_invalid_host % host): request.get_host() request = HttpRequest() request.META = {'HTTP_HOST': "invalid_hostname.com"} - with self.assertRaisesMessage(SuspiciousOperation, msg_suggestion2 % "invalid_hostname.com"): + with self.assertRaisesMessage(DisallowedHost, msg_suggestion2 % "invalid_hostname.com"): request.get_host() def test_split_domain_port_removes_trailing_dot(self): |
