Permalink
Browse files

[1.11.x] Fixed #30070, CVE-2019-3498 -- Fixed content spoofing possib…

…lity in the default 404 page.

Co-Authored-By: Tim Graham <timograham@gmail.com>
Backport of 1ecc0a3 from master.
  • Loading branch information...
tasn authored and timgraham committed Jan 4, 2019
1 parent b683bb0 commit 1cd00fcf52d089ef0fe03beabd05d59df8ea052a
Showing with 32 additions and 7 deletions.
  1. +5 −3 django/views/defaults.py
  2. +18 −0 docs/releases/1.11.18.txt
  3. +1 −0 docs/releases/index.txt
  4. +8 −4 tests/handlers/tests.py
@@ -2,6 +2,7 @@
from django.template import Context, Engine, TemplateDoesNotExist, loader
from django.utils import six
from django.utils.encoding import force_text
from django.utils.http import urlquote
from django.views.decorators.csrf import requires_csrf_token

ERROR_404_TEMPLATE_NAME = '404.html'
@@ -21,7 +22,8 @@ def page_not_found(request, exception, template_name=ERROR_404_TEMPLATE_NAME):
Templates: :template:`404.html`
Context:
request_path
The path of the requested URL (e.g., '/app/pages/bad_page/')
The path of the requested URL (e.g., '/app/pages/bad_page/'). It's
quoted to prevent a content injection attack.
exception
The message from the exception which triggered the 404 (if one was
supplied), or the exception class name
@@ -37,7 +39,7 @@ def page_not_found(request, exception, template_name=ERROR_404_TEMPLATE_NAME):
if isinstance(message, six.text_type):
exception_repr = message
context = {
'request_path': request.path,
'request_path': urlquote(request.path),
'exception': exception_repr,
}
try:
@@ -50,7 +52,7 @@ def page_not_found(request, exception, template_name=ERROR_404_TEMPLATE_NAME):
raise
template = Engine().from_string(
'<h1>Not Found</h1>'
'<p>The requested URL {{ request_path }} was not found on this server.</p>')
'<p>The requested resource was not found on this server.</p>')
body = template.render(Context(context))
content_type = 'text/html'
return http.HttpResponseNotFound(body, content_type=content_type)
@@ -0,0 +1,18 @@
============================
Django 1.11.18 release notes
============================

*January 4, 2019*

Django 1.11.18 fixes a security issue in 1.11.17.

CVE-2019-3498: Content spoofing possibility in the default 404 page
-------------------------------------------------------------------

An attacker could craft a malicious URL that could make spoofed content appear
on the default page generated by the ``django.views.defaults.page_not_found()``
view.

The URL path is no longer displayed in the default 404 template and the
``request_path`` context variable is now quoted to fix the issue for custom
templates that use the path.
@@ -26,6 +26,7 @@ versions of the documentation contain the release notes for any later releases.
.. toctree::
:maxdepth: 1

1.11.18
1.11.17
1.11.16
1.11.15
@@ -2,6 +2,7 @@

from __future__ import unicode_literals

import sys
import unittest

from django.core.exceptions import ImproperlyConfigured
@@ -19,6 +20,8 @@
except ImportError: # Python < 3.5
HTTPStatus = None

PY37 = sys.version_info >= (3, 7, 0)


class HandlerTests(SimpleTestCase):

@@ -184,16 +187,17 @@ def test_suspiciousop_in_view_returns_400(self):

def test_invalid_urls(self):
response = self.client.get('~%A9helloworld')
self.assertContains(response, '~%A9helloworld', status_code=404)
self.assertEqual(response.status_code, 404)
self.assertEqual(response.context['request_path'], '/~%25A9helloworld' if PY37 else '/%7E%25A9helloworld')

response = self.client.get('d%aao%aaw%aan%aal%aao%aaa%aad%aa/')
self.assertContains(response, 'd%AAo%AAw%AAn%AAl%AAo%AAa%AAd%AA', status_code=404)
self.assertEqual(response.context['request_path'], '/d%25AAo%25AAw%25AAn%25AAl%25AAo%25AAa%25AAd%25AA')

response = self.client.get('/%E2%99%E2%99%A5/')
self.assertContains(response, '%E2%99\u2665', status_code=404)
self.assertEqual(response.context['request_path'], '/%25E2%2599%E2%99%A5/')

response = self.client.get('/%E2%98%8E%E2%A9%E2%99%A5/')
self.assertContains(response, '\u260e%E2%A9\u2665', status_code=404)
self.assertEqual(response.context['request_path'], '/%E2%98%8E%25E2%25A9%E2%99%A5/')

def test_environ_path_info_type(self):
environ = RequestFactory().get('/%E2%A8%87%87%A5%E2%A8%A0').environ

0 comments on commit 1cd00fc

Please sign in to comment.