Commit 186b6c61 authored by Denis Cornehl's avatar Denis Cornehl Committed by Tim Graham
Browse files

Fixed #26024 -- Fixed regression in ConditionalGetMiddleware ETag support. 

Thanks Denis Cornehl for help with the patch.
parent d5b90c8e

django/middleware/common.py

+2 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ from django.core.mail import mail_managers 
from django.urls import is_valid_path

from django.utils.cache import get_conditional_response, set_response_etag

from django.utils.encoding import force_text

from django.utils.http import unquote_etag

from django.utils.six.moves.urllib.parse import urlparse



logger = logging.getLogger('django.request')
@@ -120,9 +121,7 @@ class CommonMiddleware(object): 
            if response.has_header('ETag'):

                return get_conditional_response(

                    request,

                    # get_conditional_response() requires an unquoted version

                    # of the response's ETag.

                    etag=response['ETag'].strip('"'),

                    etag=unquote_etag(response['ETag']),

                    response=response,

                )

django/middleware/http.py

+2 −2
Original line number Diff line number Diff line 
from django.utils.cache import get_conditional_response

from django.utils.http import http_date, parse_http_date_safe

from django.utils.http import http_date, parse_http_date_safe, unquote_etag





class ConditionalGetMiddleware(object):
@@ -23,7 +23,7 @@ class ConditionalGetMiddleware(object): 
        if etag or last_modified:

            return get_conditional_response(

                request,

                etag=etag,

                etag=unquote_etag(etag),

                last_modified=last_modified,

                response=response,

            )

django/utils/http.py

+7 −0
Original line number Diff line number Diff line
@@ -253,6 +253,13 @@ def quote_etag(etag): 
    return '"%s"' % etag.replace('\\', '\\\\').replace('"', '\\"')





def unquote_etag(etag):

    """

    Unquote an ETag string; i.e. revert quote_etag().

    """

    return etag.strip('"').replace('\\"', '"').replace('\\\\', '\\') if etag else etag





def is_same_domain(host, pattern):

    """

    Return ``True`` if the host is either an exact match or a match

docs/releases/1.9.2.txt

+2 −1
Original line number Diff line number Diff line
@@ -9,4 +9,5 @@ Django 1.9.2 fixes several bugs in 1.9.1. 
Bugfixes

========



* ...
 
* Fixed a regression in ``ConditionalGetMiddleware`` causing ``If-None-Match`` checks

  to always return HTTP 200 (:ticket:`26024`).

tests/middleware/tests.py

+5 −0
Original line number Diff line number Diff line
@@ -470,6 +470,11 @@ class ConditionalGetMiddlewareTest(SimpleTestCase): 
        self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp)

        self.assertEqual(self.resp.status_code, 304)



    def test_if_none_match_and_same_etag_with_quotes(self):

        self.req.META['HTTP_IF_NONE_MATCH'] = self.resp['ETag'] = '"spam"'

        self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp)

        self.assertEqual(self.resp.status_code, 304)



    def test_if_none_match_and_different_etag(self):

        self.req.META['HTTP_IF_NONE_MATCH'] = 'spam'

        self.resp['ETag'] = 'eggs'